Skip to content

Письменов Дмитрий Иванович / yourroomads

Go to a project
Commit 8fd54f7a by Vladislav
Options

Исправления

1 parent 295f4037
Inline Side-by-side
Showing with 170 additions and 116 deletions
app/Console/Commands/CampaignsAdd.php
...@@ -41,14 +41,14 @@ class CampaignsAdd extends Command ...@@ -41,14 +41,14 @@ class CampaignsAdd extends Command
*/ */
public function handle() public function handle()
{ {
$tokens = Tokens::whereHas('dictionaryCampaignsEnabledForNotExternalForNotReserveCreate') $tokens = Tokens::whereHas('dictionaryCampaignsEnabledForNotExternalForNotReserveCreateSynchronized')
->with('dictionaryCampaignsEnabledForNotExternalForNotReserveCreate.campaign') ->with('dictionaryCampaignsEnabledForNotExternalForNotReserveCreateSynchronized.campaign')
->where('type', '!=', Tokens::MAIN) ->where('type', '!=', Tokens::MAIN)
->get(); ->get();
foreach ($tokens as $token) { foreach ($tokens as $token) {
foreach (array_chunk($token->dictionaryCampaignsEnabledForNotExternalForNotReserveCreate->pluck('id')->toArray(), 100) as $items) { foreach (array_chunk($token->dictionaryCampaignsEnabledForNotExternalForNotReserveCreateSynchronized->pluck('id')->toArray(), 100) as $items) {
DictionaryCampaign::whereIn('id', $items) DictionaryCampaign::whereIn('id', $items)
->update([ ->update([
'reserve_create_at' => Carbon::now(), 'reserve_create_at' => Carbon::now(),
...@@ -58,7 +58,7 @@ class CampaignsAdd extends Command ...@@ -58,7 +58,7 @@ class CampaignsAdd extends Command
$request = new AddCampaigns(); $request = new AddCampaigns();
$request->setToken($token) $request->setToken($token)
->call([ ->call([
'dictionaryCampaigns' => $token->dictionaryCampaignsEnabledForNotExternalForNotReserveCreate, 'dictionaryCampaigns' => $token->dictionaryCampaignsEnabledForNotExternalForNotReserveCreateSynchronized,
]); ]);
} }
......
app/Http/Controllers/CampaignVariablesController.php
...@@ -216,11 +216,11 @@ class CampaignVariablesController extends Controller ...@@ -216,11 +216,11 @@ class CampaignVariablesController extends Controller
})->update([ })->update([
'updated_need' => Carbon::now(), 'updated_need' => Carbon::now(),
]); ]);
// $dictionary_campaign->goalGoalSitelink()->forExternal()->where(function ($query) { $dictionary_campaign->goalGoalSitelink()->forExternal()->where(function ($query) {
// $query->getModel()->timestamps = false; $query->getModel()->timestamps = false;
// })->update([ })->update([
// 'updated_need' => Carbon::now(), 'updated_need' => Carbon::now(),
// ]); ]);
$dictionary_campaign->goalVCards()->forExternal()->where(function ($query) { $dictionary_campaign->goalVCards()->forExternal()->where(function ($query) {
$query->getModel()->timestamps = false; $query->getModel()->timestamps = false;
})->update([ })->update([
......
app/Models/Pivots/DictionaryCampaign.php
...@@ -233,6 +233,8 @@ class DictionaryCampaign extends Pivot ...@@ -233,6 +233,8 @@ class DictionaryCampaign extends Pivot
array_merge( array_merge(
$data, $data,
[ [
'updated' => false,
'synced' => false,
'dictionary_id' => $dictionary->getKey(), 'dictionary_id' => $dictionary->getKey(),
'campaign_id' => $campaign->getKey(), 'campaign_id' => $campaign->getKey(),
] ]
......
app/Models/Tokens.php
...@@ -234,9 +234,9 @@ class Tokens extends Model ...@@ -234,9 +234,9 @@ class Tokens extends Model
return $this->dictionaryCampaigns()->enabled()->forExternal()->forUpdated()->needUpdated()->forNotReserveUpdate(); return $this->dictionaryCampaigns()->enabled()->forExternal()->forUpdated()->needUpdated()->forNotReserveUpdate();
} }
public function dictionaryCampaignsEnabledForNotExternalForNotReserveCreate() public function dictionaryCampaignsEnabledForNotExternalForNotReserveCreateSynchronized()
{ {
return $this->dictionaryCampaigns()->enabled()->forNotExternal()->forNotReserveCreate(); return $this->dictionaryCampaigns()->enabled()->forNotExternal()->forNotReserveCreate()->synchronized();
} }
public function dictionaryCampaignsNotEnabledForExternalNotDisabledForNotReserveSuspend() public function dictionaryCampaignsNotEnabledForExternalNotDisabledForNotReserveSuspend()
......
app/Service/Requests/Direct/AddAdExtensions.php
...@@ -97,10 +97,12 @@ class AddAdExtensions extends DirectRequest ...@@ -97,10 +97,12 @@ class AddAdExtensions extends DirectRequest
public function failed() public function failed()
{ {
GoalAdExtension::whereIn('id', $this->goalAdExtensions->pluck('id')->toArray()) foreach (array_chunk($this->goalAdExtensions->pluck('id')->toArray(), 100) as $items) {
->update([ GoalAdExtension::whereIn('id', $items)
'reserve_create_at' => null, ->update([
]); 'reserve_create_at' => null,
]);
}
} }
public function putParams($params) public function putParams($params)
......
app/Service/Requests/Direct/AddAdGroups.php
...@@ -113,10 +113,12 @@ class AddAdGroups extends DirectRequest ...@@ -113,10 +113,12 @@ class AddAdGroups extends DirectRequest
public function failed() public function failed()
{ {
GoalAdGroup::whereIn('id', $this->goalAdGroups->pluck('id')->toArray()) foreach (array_chunk($this->goalAdGroups->pluck('id')->toArray(), 100) as $items) {
->update([ GoalAdGroup::whereIn('id', $items)
'reserve_create_at' => null, ->update([
]); 'reserve_create_at' => null,
]);
}
} }
public function putParams($params) public function putParams($params)
......
app/Service/Requests/Direct/AddAds.php
...@@ -146,10 +146,12 @@ class AddAds extends DirectRequest ...@@ -146,10 +146,12 @@ class AddAds extends DirectRequest
public function failed() public function failed()
{ {
GoalAdvertisement::whereIn('id', $this->goalAds->pluck('id')->toArray()) foreach (array_chunk($this->goalAds->pluck('id')->toArray(), 100) as $items) {
->update([ GoalAdvertisement::whereIn('id', $items)
'reserve_create_at' => null, ->update([
]); 'reserve_create_at' => null,
]);
}
} }
public function putParams($params) public function putParams($params)
......
app/Service/Requests/Direct/AddBidModifiers.php
...@@ -105,12 +105,14 @@ class AddBidModifiers extends DirectRequest ...@@ -105,12 +105,14 @@ class AddBidModifiers extends DirectRequest
public function failed() public function failed()
{ {
GoalBidModifier::whereIn('id', $this->goalBidModifiers->pluck('ids')->map(function ($ids) { foreach (array_chunk($this->goalBidModifiers->pluck('ids')->map(function ($ids) {
return json_decode($ids); return json_decode($ids);
})->collapse()->toArray()) })->collapse()->toArray(), 100) as $items) {
->update([ GoalBidModifier::whereIn('id', $items)
'reserve_create_at' => null, ->update([
]); 'reserve_create_at' => null,
]);
}
} }
public function putParams($params) public function putParams($params)
......
app/Service/Requests/Direct/AddKeywords.php
...@@ -122,10 +122,12 @@ class AddKeywords extends DirectRequest ...@@ -122,10 +122,12 @@ class AddKeywords extends DirectRequest
public function failed() public function failed()
{ {
GoalKeyword::whereIn('id', $this->goalKeywords->pluck('id')->toArray()) foreach (array_chunk($this->goalKeywords->pluck('id')->toArray(), 100) as $items) {
->update([ GoalKeyword::whereIn('id', $items)
'reserve_create_at' => null, ->update([
]); 'reserve_create_at' => null,
]);
}
} }
private function requestPrepare($params) private function requestPrepare($params)
......
app/Service/Requests/Direct/AddRetargetinglists.php
...@@ -101,10 +101,12 @@ class AddRetargetinglists extends DirectRequest ...@@ -101,10 +101,12 @@ class AddRetargetinglists extends DirectRequest
public function failed() public function failed()
{ {
GoalRetargetinglist::whereIn('id', $this->goalRetargetinglists->pluck('id')->toArray()) foreach (array_chunk($this->goalRetargetinglists->pluck('id')->toArray(), 100) as $items) {
->update([ GoalRetargetinglist::whereIn('id', $items)
'reserve_create_at' => null, ->update([
]); 'reserve_create_at' => null,
]);
}
} }
public function putParams($params) public function putParams($params)
......
app/Service/Requests/Direct/AddSitelinks.php
...@@ -101,10 +101,12 @@ class AddSitelinks extends DirectRequest ...@@ -101,10 +101,12 @@ class AddSitelinks extends DirectRequest
public function failed() public function failed()
{ {
GoalSitelink::whereIn('id', $this->goalSitelinks->pluck('id')->toArray()) foreach (array_chunk($this->goalSitelinks->pluck('id')->toArray(), 100) as $items) {
->update([ GoalSitelink::whereIn('id', $items)
'reserve_create_at' => null, ->update([
]); 'reserve_create_at' => null,
]);
}
} }
public function putParams($params) public function putParams($params)
......
app/Service/Requests/Direct/ArchiveAds.php
...@@ -132,15 +132,19 @@ class ArchiveAds extends DirectRequest ...@@ -132,15 +132,19 @@ class ArchiveAds extends DirectRequest
public function failed() public function failed()
{ {
if ($this->getToken()->isMain()) { if ($this->getToken()->isMain()) {
Advertisement::whereIn('external_id', $this->getParams()['SelectionCriteria']['Ids']) foreach (array_chunk($this->getParams()['SelectionCriteria']['Ids'], 100) as $items) {
->update([ Advertisement::whereIn('external_id', $items)
'reserve_archive_at' => null, ->update([
]); 'reserve_archive_at' => null,
]);
}
} else { } else {
GoalAdvertisement::whereIn('external_id', $this->getParams()['SelectionCriteria']['Ids']) foreach (array_chunk($this->getParams()['SelectionCriteria']['Ids'], 100) as $items) {
->update([ GoalAdvertisement::whereIn('external_id', $items)
'reserve_archive_at' => null, ->update([
]); 'reserve_archive_at' => null,
]);
}
} }
} }
......
app/Service/Requests/Direct/DeleteAdGroups.php
...@@ -82,10 +82,12 @@ class DeleteAdGroups extends DirectRequest ...@@ -82,10 +82,12 @@ class DeleteAdGroups extends DirectRequest
public function failed() public function failed()
{ {
GoalAdGroup::whereIn('external_id', $this->getParams()['SelectionCriteria']['Ids']) foreach (array_chunk($this->getParams()['SelectionCriteria']['Ids'], 100) as $items) {
->update([ GoalAdGroup::whereIn('external_id', $items)
'reserve_delete_at' => null, ->update([
]); 'reserve_delete_at' => null,
]);
}
} }
private function requestPrepare($params) private function requestPrepare($params)
......
app/Service/Requests/Direct/DeleteAds.php
...@@ -114,15 +114,19 @@ class DeleteAds extends DirectRequest ...@@ -114,15 +114,19 @@ class DeleteAds extends DirectRequest
public function failed() public function failed()
{ {
if ($this->getToken()->isMain()) { if ($this->getToken()->isMain()) {
Advertisement::whereIn('external_id', $this->getParams()['SelectionCriteria']['Ids']) foreach (array_chunk($this->getParams()['SelectionCriteria']['Ids'], 100) as $items) {
->update([ Advertisement::whereIn('external_id', $items)
'reserve_delete_at' => null, ->update([
]); 'reserve_delete_at' => null,
]);
}
} else { } else {
GoalAdvertisement::whereIn('external_id', $this->getParams()['SelectionCriteria']['Ids']) foreach (array_chunk($this->getParams()['SelectionCriteria']['Ids'], 100) as $items) {
->update([ GoalAdvertisement::whereIn('external_id', $items)
'reserve_delete_at' => null, ->update([
]); 'reserve_delete_at' => null,
]);
}
} }
} }
......
app/Service/Requests/Direct/DeleteAudienceTarget.php
...@@ -99,15 +99,19 @@ class DeleteAudienceTarget extends DirectRequest ...@@ -99,15 +99,19 @@ class DeleteAudienceTarget extends DirectRequest
public function failed() public function failed()
{ {
if ($this->getToken()->isMain()) { if ($this->getToken()->isMain()) {
AudienceTarget::whereIn('external_id', $this->getParams()['SelectionCriteria']['Ids']) foreach (array_chunk($this->getParams()['SelectionCriteria']['Ids'], 100) as $items) {
->update([ AudienceTarget::whereIn('external_id', $items)
'reserve_delete_at' => null, ->update([
]); 'reserve_delete_at' => null,
]);
}
} else { } else {
GoalAudienceTarget::whereIn('external_id', $this->getParams()['SelectionCriteria']['Ids']) foreach (array_chunk($this->getParams()['SelectionCriteria']['Ids'], 100) as $items) {
->update([ GoalAudienceTarget::whereIn('external_id', $items)
'reserve_delete_at' => null, ->update([
]); 'reserve_delete_at' => null,
]);
}
} }
} }
......
app/Service/Requests/Direct/DeleteKeywords.php
...@@ -80,10 +80,12 @@ class DeleteKeywords extends DirectRequest ...@@ -80,10 +80,12 @@ class DeleteKeywords extends DirectRequest
public function failed() public function failed()
{ {
GoalKeyword::whereIn('external_id', $this->getParams()['SelectionCriteria']['Ids']) foreach (array_chunk($this->getParams()['SelectionCriteria']['Ids'], 100) as $items) {
->update([ GoalKeyword::whereIn('external_id', $items)
'reserve_delete_at' => null, ->update([
]); 'reserve_delete_at' => null,
]);
}
} }
private function requestPrepare($params) private function requestPrepare($params)
......
app/Service/Requests/Direct/DeleteRetargetinglists.php
...@@ -99,15 +99,19 @@ class DeleteRetargetinglists extends DirectRequest ...@@ -99,15 +99,19 @@ class DeleteRetargetinglists extends DirectRequest
public function failed() public function failed()
{ {
if ($this->getToken()->isMain()) { if ($this->getToken()->isMain()) {
Retargetinglist::whereIn('external_id', $this->getParams()['SelectionCriteria']['Ids']) foreach (array_chunk($this->getParams()['SelectionCriteria']['Ids'], 100) as $items) {
->update([ Retargetinglist::whereIn('external_id', $items)
'reserve_delete_at' => null, ->update([
]); 'reserve_delete_at' => null,
]);
}
} else { } else {
GoalRetargetinglist::whereIn('external_id', $this->getParams()['SelectionCriteria']['Ids']) foreach (array_chunk($this->getParams()['SelectionCriteria']['Ids'], 100) as $items) {
->update([ GoalRetargetinglist::whereIn('external_id', $items)
'reserve_delete_at' => null, ->update([
]); 'reserve_delete_at' => null,
]);
}
} }
} }
......
app/Service/Requests/Direct/DeleteVCards.php
...@@ -111,15 +111,19 @@ class DeleteVCards extends DirectRequest ...@@ -111,15 +111,19 @@ class DeleteVCards extends DirectRequest
public function failed() public function failed()
{ {
if ($this->getToken()->isMain()) { if ($this->getToken()->isMain()) {
VCard::whereIn('external_id', $this->getParams()['SelectionCriteria']['Ids']) foreach (array_chunk($this->getParams()['SelectionCriteria']['Ids'], 100) as $items) {
->update([ VCard::whereIn('external_id', $items)
'reserve_delete_at' => null, ->update([
]); 'reserve_delete_at' => null,
]);
}
} else { } else {
GoalVCard::whereIn('external_id', $this->getParams()['SelectionCriteria']['Ids']) foreach (array_chunk($this->getParams()['SelectionCriteria']['Ids'], 100) as $items) {
->update([ GoalVCard::whereIn('external_id', $items)
'reserve_delete_at' => null, ->update([
]); 'reserve_delete_at' => null,
]);
}
} }
} }
......
app/Service/Requests/Direct/ResumeCampaigns.php
...@@ -76,10 +76,12 @@ class ResumeCampaigns extends DirectRequest ...@@ -76,10 +76,12 @@ class ResumeCampaigns extends DirectRequest
public function failed() public function failed()
{ {
DictionaryCampaign::whereIn('external_id', array_column($this->getParams()['SelectionCriteria']['Ids'], 'Id')) foreach (array_chunk(array_column($this->getParams()['SelectionCriteria']['Ids'], 'Id'), 100) as $items) {
->update([ DictionaryCampaign::whereIn('external_id', $items)
'reserve_resume_at' => null, ->update([
]); 'reserve_resume_at' => null,
]);
}
} }
private function requestPrepare($filter) private function requestPrepare($filter)
......
app/Service/Requests/Direct/SetBidModifiers.php
...@@ -91,10 +91,12 @@ class SetBidModifiers extends DirectRequest ...@@ -91,10 +91,12 @@ class SetBidModifiers extends DirectRequest
public function failed() public function failed()
{ {
GoalBidModifier::whereIn('external_id', array_column($this->getParams()['BidModifiers'], 'Id')) foreach (array_chunk(array_column($this->getParams()['BidModifiers'], 'Id'), 100) as $items) {
->update([ GoalBidModifier::whereIn('external_id', $items)
'reserve_update_at' => null, ->update([
]); 'reserve_update_at' => null,
]);
}
} }
private function requestPrepare($params) private function requestPrepare($params)
......
app/Service/Requests/Direct/SuspendCampaigns.php
...@@ -76,10 +76,12 @@ class SuspendCampaigns extends DirectRequest ...@@ -76,10 +76,12 @@ class SuspendCampaigns extends DirectRequest
public function failed() public function failed()
{ {
DictionaryCampaign::whereIn('external_id', array_column($this->getParams()['SelectionCriteria']['Ids'], 'Id')) foreach (array_chunk(array_column($this->getParams()['SelectionCriteria']['Ids'], 'Id'), 100) as $items) {
->update([ DictionaryCampaign::whereIn('external_id', $items)
'reserve_suspend_at' => null, ->update([
]); 'reserve_suspend_at' => null,
]);
}
} }
private function requestPrepare($filter) private function requestPrepare($filter)
......
app/Service/Requests/Direct/UpdateAdGroups.php
...@@ -91,10 +91,12 @@ class UpdateAdGroups extends DirectRequest ...@@ -91,10 +91,12 @@ class UpdateAdGroups extends DirectRequest
public function failed() public function failed()
{ {
GoalAdGroup::whereIn('external_id', array_column($this->getParams()['AdGroups'], 'Id')) foreach (array_chunk(array_column($this->getParams()['AdGroups'], 'Id'), 100) as $items) {
->update([ GoalAdGroup::whereIn('external_id', $items)
'reserve_update_at' => null, ->update([
]); 'reserve_update_at' => null,
]);
}
} }
private function requestPrepare($params) private function requestPrepare($params)
......
app/Service/Requests/Direct/UpdateAds.php
...@@ -112,10 +112,12 @@ class UpdateAds extends DirectRequest ...@@ -112,10 +112,12 @@ class UpdateAds extends DirectRequest
public function failed() public function failed()
{ {
GoalAdvertisement::whereIn('external_id', array_column($this->getParams()['Ads'], 'Id')) foreach (array_chunk(array_column($this->getParams()['Ads'], 'Id'), 100) as $items) {
->update([ GoalAdvertisement::whereIn('external_id', $items)
'reserve_update_at' => null, ->update([
]); 'reserve_update_at' => null,
]);
}
} }
private function requestPrepare($params) private function requestPrepare($params)
......
app/Service/Requests/Direct/UpdateKeywords.php
...@@ -93,10 +93,12 @@ class UpdateKeywords extends DirectRequest ...@@ -93,10 +93,12 @@ class UpdateKeywords extends DirectRequest
public function failed() public function failed()
{ {
GoalKeyword::whereIn('external_id', array_column($this->getParams()['Keywords'], 'Id')) foreach (array_chunk(array_column($this->getParams()['Keywords'], 'Id'), 100) as $items) {
->update([ GoalKeyword::whereIn('external_id', $items)
'reserve_update_at' => null, ->update([
]); 'reserve_update_at' => null,
]);
}
} }
private function requestPrepare($params) private function requestPrepare($params)
......
app/Service/Requests/Direct/UpdateRetargetinglists.php
...@@ -88,10 +88,12 @@ class UpdateRetargetinglists extends DirectRequest ...@@ -88,10 +88,12 @@ class UpdateRetargetinglists extends DirectRequest
public function failed() public function failed()
{ {
GoalRetargetinglist::whereIn('external_id', array_column($this->getParams()['RetargetingLists'], 'Id')) foreach (array_chunk(array_column($this->getParams()['RetargetingLists'], 'Id'), 100) as $items) {
->update([ GoalRetargetinglist::whereIn('external_id', $items)
'reserve_update_at' => null, ->update([
]); 'reserve_update_at' => null,
]);
}
} }
private function requestPrepare($params) private function requestPrepare($params)
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!