Skip to content

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

Go to a project
Commit 3a0613cf by Vladislav
Options

Merge branch 'master' into ticket_19473

2 parents 76e0f902 9482d9dc
Inline Side-by-side
Showing with 29 additions and 13 deletions
app/Console/Commands/AdGroupsLoadUpdated.php
...@@ -48,7 +48,7 @@ class AdGroupsLoadUpdated extends Command ...@@ -48,7 +48,7 @@ class AdGroupsLoadUpdated extends Command
*/ */
public function handle() public function handle()
{ {
$adGroups = AdGroup::forUpdatedSelf()->get(); $adGroups = AdGroup::has('campaignForEnabledForManaged')->forUpdatedSelf()->get();
if (!$adGroups->count()) { if (!$adGroups->count()) {
return; return;
} }
......
app/Console/Commands/CampaignsCheckUpdatedChildrenAdGroups.php
...@@ -82,6 +82,7 @@ class CampaignsCheckUpdatedChildrenAdGroups extends Command ...@@ -82,6 +82,7 @@ class CampaignsCheckUpdatedChildrenAdGroups extends Command
'FieldNames' => [ 'FieldNames' => [
'AdGroupIds', 'AdGroupIds',
], ],
'Timestamp' => $token->check_changes_ad_group_at->toIso8601ZuluString(),
]); ]);
} }
......
app/Console/Commands/CampaignsLoadGroups.php
...@@ -42,7 +42,7 @@ class CampaignsLoadGroups extends Command ...@@ -42,7 +42,7 @@ class CampaignsLoadGroups extends Command
*/ */
public function handle() public function handle()
{ {
$campaigns = Campaigns::forGroupsLoadable()->get(); $campaigns = Campaigns::forManaged()->forEnabled()->forGroupsLoadable()->get();
if (!$campaigns->count()) { if (!$campaigns->count()) {
return; return;
} }
......
app/Jobs/ProcessCallAPI.php
...@@ -58,22 +58,17 @@ class ProcessCallAPI implements ShouldQueue ...@@ -58,22 +58,17 @@ class ProcessCallAPI implements ShouldQueue
} }
} }
$response = $api->execute(); $response = $api->execute();
try{
$limits->acceptRezerv($this->limitId, new HeaderLimits($response->headers())); $limits->acceptRezerv($this->limitId, new HeaderLimits($response->headers()));
}catch(\Exception $e){
Log::debug($e);
Log::debug($response->headers());
}
//TODO: обработать результат. //TODO: обработать результат.
// если не хватило баллов на все что хотели запросить, то в очередь отправляем новый запрос на получение новых данных // если не хватило баллов на все что хотели запросить, то в очередь отправляем новый запрос на получение новых данных
AdsHandler::getInstance($this->api)->handle($response); AdsHandler::getInstance($this->api)->handle($response);
} catch (\Exception $e) { } catch (\Exception $e) {
\Log::debug($e);
//TODO: надо отдельно выделить ошибки вызовов, за которые списываются баллы //TODO: надо отдельно выделить ошибки вызовов, за которые списываются баллы
//https://yandex.ru/dev/direct/doc/dg/concepts/errors.html //https://yandex.ru/dev/direct/doc/dg/concepts/errors.html
Log::debug($e); Log::debug($e);
$limits->removeRezerv($this->limitId); $limits->removeRezerv($this->limitId);
throw $e;
} }
} }
} }
app/Models/AdGroup.php
...@@ -29,6 +29,7 @@ use Illuminate\Support\Collection; ...@@ -29,6 +29,7 @@ use Illuminate\Support\Collection;
* @property \Illuminate\Support\Carbon|null $created_at * @property \Illuminate\Support\Carbon|null $created_at
* @property \Illuminate\Support\Carbon|null $updated_at * @property \Illuminate\Support\Carbon|null $updated_at
* @property-read \App\Models\Campaigns $campaign * @property-read \App\Models\Campaigns $campaign
* @property-read \App\Models\Campaigns|null $campaignForEnabledForManaged
* @property-read \Illuminate\Database\Eloquent\Collection|GoalAdGroup[] $goalGroups * @property-read \Illuminate\Database\Eloquent\Collection|GoalAdGroup[] $goalGroups
* @property-read int|null $goal_groups_count * @property-read int|null $goal_groups_count
* @method static Builder|AdGroup forUpdatedSelf() * @method static Builder|AdGroup forUpdatedSelf()
...@@ -194,4 +195,9 @@ class AdGroup extends Model ...@@ -194,4 +195,9 @@ class AdGroup extends Model
return $this->belongsTo(Campaigns::class, 'campaign_id'); return $this->belongsTo(Campaigns::class, 'campaign_id');
} }
public function campaignForEnabledForManaged()
{
return $this->campaign()->forEnabled()->forManaged();
}
} }
app/Service/Requests/Direct/CheckChanges.php
...@@ -16,6 +16,9 @@ use Illuminate\Support\Facades\Log; ...@@ -16,6 +16,9 @@ use Illuminate\Support\Facades\Log;
class CheckChanges extends DirectRequest class CheckChanges extends DirectRequest
{ {
protected $max_count = -1; protected $max_count = -1;
protected $max_count_CampaignIds = 3000;
protected $max_count_AdGroupIds = 10000;
protected $max_count_AdIds = 50000;
public function call($params = null) public function call($params = null)
{ {
...@@ -54,6 +57,11 @@ class CheckChanges extends DirectRequest ...@@ -54,6 +57,11 @@ class CheckChanges extends DirectRequest
public function handle($response) public function handle($response)
{ {
if (!isset($response['result'])) {
Log::debug($response);
return;
}
if (isset($response['result']['NotFound'])) { if (isset($response['result']['NotFound'])) {
Log::debug($response['result']['NotFound']); Log::debug($response['result']['NotFound']);
} }
...@@ -62,6 +70,7 @@ class CheckChanges extends DirectRequest ...@@ -62,6 +70,7 @@ class CheckChanges extends DirectRequest
Log::debug($response['result']['Unprocessed']); Log::debug($response['result']['Unprocessed']);
} }
if (isset($response['result']['Modified']['AdGroupIds'])) { if (isset($response['result']['Modified']['AdGroupIds'])) {
foreach ($response['result']['Modified']['AdGroupIds'] as $ad_group_id) { foreach ($response['result']['Modified']['AdGroupIds'] as $ad_group_id) {
...@@ -105,6 +114,7 @@ class CheckChanges extends DirectRequest ...@@ -105,6 +114,7 @@ class CheckChanges extends DirectRequest
]); ]);
} }
$this->getToken()->update([ $this->getToken()->update([
'check_changes_ad_group' => Carbon::parse($response['result']['Timestamp']), 'check_changes_ad_group' => Carbon::parse($response['result']['Timestamp']),
]); ]);
...@@ -124,15 +134,15 @@ class CheckChanges extends DirectRequest ...@@ -124,15 +134,15 @@ class CheckChanges extends DirectRequest
$this->setMethod('check'); $this->setMethod('check');
if (isset($params['CampaignIds'])){ if (isset($params['CampaignIds'])){
$this->max_count = 3000; $this->max_count = $this->max_count_CampaignIds;
} }
if (isset($params['AdGroupIds'])){ if (isset($params['AdGroupIds'])){
$this->max_count = 10000; $this->max_count = $this->max_count_AdGroupIds;
} }
if (isset($params['AdIds'])){ if (isset($params['AdIds'])){
$this->max_count = 50000; $this->max_count = $this->max_count_AdIds;
} }
$this->setParams($params); $this->setParams($params);
......
app/Service/Requests/Direct/GetAdGroups.php
...@@ -16,6 +16,7 @@ use Illuminate\Support\Facades\Log; ...@@ -16,6 +16,7 @@ use Illuminate\Support\Facades\Log;
class GetAdGroups extends DirectRequest class GetAdGroups extends DirectRequest
{ {
protected $max_count = 10000; protected $max_count = 10000;
protected $max_count_CampaignIds = 10;
function call($params = null) function call($params = null)
{ {
...@@ -83,7 +84,7 @@ class GetAdGroups extends DirectRequest ...@@ -83,7 +84,7 @@ class GetAdGroups extends DirectRequest
foreach ($response['result']['AdGroups'] as $ad_group) { foreach ($response['result']['AdGroups'] as $ad_group) {
$campaign = $campaigns->get($ad_group['CampaignId']); $campaign = $campaigns->firstWhere('external_id', $ad_group['CampaignId']);
if (!$campaign) if (!$campaign)
continue; continue;
...@@ -156,6 +157,9 @@ class GetAdGroups extends DirectRequest ...@@ -156,6 +157,9 @@ class GetAdGroups extends DirectRequest
], ],
]; ];
if (isset($filter['CampaignIds'])) { if (isset($filter['CampaignIds'])) {
$this->max_count = $this->max_count_CampaignIds;
$params['SelectionCriteria'] = [ $params['SelectionCriteria'] = [
'CampaignIds' => $filter['CampaignIds'], 'CampaignIds' => $filter['CampaignIds'],
]; ];
......
app/Service/Requests/Direct/GetCampaigns.php
...@@ -11,7 +11,7 @@ use Illuminate\Support\Facades\Log; ...@@ -11,7 +11,7 @@ use Illuminate\Support\Facades\Log;
class GetCampaigns extends DirectRequest class GetCampaigns extends DirectRequest
{ {
protected $max_count = 10000; protected $max_count = 1000;
protected $timestamp; protected $timestamp;
public function call($params = null) public function call($params = null)
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!