#19472 Синхронизация групп с целевыми

app/Console/Commands/AdGroupsLoadUpdated.php

@@ -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
                 'FieldNames' => [
                 'FieldNames' => [
                     'AdGroupIds',
                     'AdGroupIds',
                 ],
                 ],
+                'Timestamp' => $token->check_changes_ad_group_at->toIso8601ZuluString(),
             ]);
             ]);
         }
         }
 
 

app/Models/AdGroup.php

@@ -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()
@@ -192,4 +193,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

@@ -57,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']);
         }
         }
@@ -65,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) {
 
 
@@ -108,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']),
             ]);
             ]);