Commit 9b66d52c by Vladislav

#21104 Перенос проекта в продакшн

1 parent 42fd82e8
...@@ -73,7 +73,7 @@ class AdGroupsLoadUpdated extends Command ...@@ -73,7 +73,7 @@ class AdGroupsLoadUpdated extends Command
foreach ($adGroups->chunk(1000) as $adGroups_chunk) { foreach ($adGroups->chunk(1000) as $adGroups_chunk) {
$adGroupIds = $adGroups_chunk->pluck('external_id')->toArray(); $adGroupIds = $adGroups_chunk->values()->pluck('external_id')->toArray();
$request = new GetKeywords(); $request = new GetKeywords();
$request->setToken($token) $request->setToken($token)
......
...@@ -68,7 +68,7 @@ class AdImagesAdd extends Command ...@@ -68,7 +68,7 @@ class AdImagesAdd extends Command
$request = new AddAdImages(); $request = new AddAdImages();
$request->setToken($token) $request->setToken($token)
->call([ ->call([
'goalAdImages' => $items, 'goalAdImages' => $items->values(),
]); ]);
} }
} }
......
...@@ -52,7 +52,7 @@ class CampaignsCheckUpdatedChildren extends Command ...@@ -52,7 +52,7 @@ class CampaignsCheckUpdatedChildren extends Command
$request = new CheckChanges(); $request = new CheckChanges();
$request->setToken($token) $request->setToken($token)
->call([ ->call([
'CampaignIds' => $campaign_ids, 'CampaignIds' => array_values($campaign_ids),
'FieldNames' => [ 'FieldNames' => [
'AdGroupIds', 'AdIds', 'AdGroupIds', 'AdIds',
], ],
...@@ -76,7 +76,7 @@ class CampaignsCheckUpdatedChildren extends Command ...@@ -76,7 +76,7 @@ class CampaignsCheckUpdatedChildren extends Command
$request = new CheckChanges(); $request = new CheckChanges();
$request->setToken($token) $request->setToken($token)
->call([ ->call([
'CampaignIds' => $campaign_ids, 'CampaignIds' => array_values($campaign_ids),
'FieldNames' => [ 'FieldNames' => [
'AdGroupIds', 'AdIds', 'AdGroupIds', 'AdIds',
], ],
......
...@@ -56,7 +56,7 @@ class CampaignsLoadAds extends Command ...@@ -56,7 +56,7 @@ class CampaignsLoadAds extends Command
$request = new GetAds(); $request = new GetAds();
$request->setToken($token) $request->setToken($token)
->call([ ->call([
'CampaignIds' => $campaign_ids, 'CampaignIds' => array_values($campaign_ids),
]); ]);
} }
......
...@@ -56,7 +56,7 @@ class CampaignsLoadBidModifiers extends Command ...@@ -56,7 +56,7 @@ class CampaignsLoadBidModifiers extends Command
$request = new GetBidModifiers(); $request = new GetBidModifiers();
$request->setToken($token) $request->setToken($token)
->call([ ->call([
'CampaignIds' => $campaign_ids, 'CampaignIds' => array_values($campaign_ids),
]); ]);
} }
......
...@@ -56,7 +56,7 @@ class CampaignsLoadGroups extends Command ...@@ -56,7 +56,7 @@ class CampaignsLoadGroups extends Command
$request = new GetAdGroups(); $request = new GetAdGroups();
$request->setToken($token) $request->setToken($token)
->call([ ->call([
'CampaignIds' => $campaign_ids, 'CampaignIds' => array_values($campaign_ids),
]); ]);
} }
......
...@@ -71,7 +71,7 @@ class ProcessCallAPI implements ShouldQueue ...@@ -71,7 +71,7 @@ class ProcessCallAPI implements ShouldQueue
} }
$response = $api->execute(); $response = $api->execute();
$handler = AdsHandler::getInstance($this->api); $handler = AdsHandler::getInstance($this->api);
$handler->checkError($response); $handler->checkError($response, $this->api->getService(), $this->api->getMethod());
$limits->acceptRezerv($this->limitId, new HeaderLimits($response->headers())); $limits->acceptRezerv($this->limitId, new HeaderLimits($response->headers()));
$handler->handle($response); $handler->handle($response);
......
...@@ -13,11 +13,11 @@ class DirectHandler extends AdsHandler ...@@ -13,11 +13,11 @@ class DirectHandler extends AdsHandler
$this->response = $response->json(); $this->response = $response->json();
} }
public function checkError($response) public function checkError($response, $service, $method)
{ {
$this->parse($response); $this->parse($response);
if ($this->response['error'] ?? false) { if ($this->response['error'] ?? false) {
throw new \Exception($this->response['error']['error_detail']); throw new \Exception("[$service][{$method}] {$this->response['error']['error_detail']}");
} }
} }
} }
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!