#20794 Сделать чтобы в целевых РК оставалась одна карточка (исправление удаление…

… AudienceTarget при создании, если не найдена группа)

app/Console/Commands/KeywordsAdd.php

@@ -75,18 +75,23 @@ class KeywordsAdd extends Command
                 ])
                 ->get();
 
-            foreach (array_chunk($goalKeywords->pluck('id')->toArray(), 1000) as $items) {
-                GoalKeyword::whereIn('id', $items)
-                    ->update([
-                        'reserve_create_at' => Carbon::now(),
+            if ($goalKeywords->count()) {
+
+                foreach (array_chunk($goalKeywords->pluck('id')->toArray(), 1000) as $items) {
+                    GoalKeyword::whereIn('id', $items)
+                        ->update([
+                            'reserve_create_at' => Carbon::now(),
+                        ]);
+                }
+
+                $request = new AddKeywords();
+                $request->setToken($token)
+                    ->call([
+                        'goalKeywords' => $goalKeywords,
                     ]);
+
             }
 
-            $request = new AddKeywords();
-            $request->setToken($token)
-                ->call([
-                    'goalKeywords' => $goalKeywords,
-                ]);
         }
 
         return 0;

app/Models/Pivots/GoalAudienceTarget.php

@@ -3,6 +3,7 @@
 namespace App\Models\Pivots;
 
 use App\Models\AudienceTarget;
+use App\Models\YandexError;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\Pivot;
 use Illuminate\Database\Eloquent\SoftDeletes;
@@ -145,4 +146,9 @@ class GoalAudienceTarget extends Pivot
         return $this->belongsTo(DictionaryCampaign::class, 'dictionary_campaign_id');
     }
 
+    public function errors()
+    {
+        return $this->morphMany(YandexError::class, 'cause');
+    }
+
 }

app/Service/Requests/Direct/AddAudienceTargets.php

@@ -3,7 +3,6 @@
 namespace App\Service\Requests\Direct;
 
 use App\Jobs\ProcessCallLimitedAPI;
-use App\Models\AudienceTarget;
 use App\Models\Pivots\GoalAudienceTarget;
 use App\Service\Contract\APIRequest;
 use App\Service\Requests\DirectRequest;
@@ -16,7 +15,7 @@ class AddAudienceTargets extends DirectRequest
     protected $max_count = 30;
 
     protected $timestamp;
-    /* @var Collection|AudienceTarget[] */
+    /* @var Collection|GoalAudienceTarget[] */
     protected $goalAudienceTargets;
 
     public function call($params = null)
@@ -56,10 +55,35 @@ class AddAudienceTargets extends DirectRequest
 
             $goalAudienceTarget = $this->goalAudienceTargets->get($key);
 
+            $data = $this->getParams()['AudienceTargets'][$key];
+
             if (!isset($add_result['Id'])) {
+
+                if (isset($add_result['Errors'][0]['Message']) && $add_result['Errors'][0]['Message'] === 'Object not found') {
+                    GoalAudienceTarget::where('id', $goalAudienceTarget->getKey())
+                        ->forceDelete();
+                    continue;
+                } elseif (isset($add_result['Errors']) && count($add_result['Errors'])) {
+                    $goalAudienceTarget->errors()->create([
+                        'token_id' => $this->getToken()->getKey(),
+                        'service' => $this->getService(),
+                        'method' => $this->getMethod(),
+                        'params' => $data,
+                        'errors' => $add_result['Errors'],
+                    ]);
+
+                    GoalAudienceTarget::where('id', $goalAudienceTarget->getKey())
+                        ->update([
+                            'reserve_create_at' => null,
+                        ]);
+
+                    continue;
+
+                }
+
                 Log::debug("AddAudienceTarget, empty Id, token_id {$this->getToken()->getKey()}");
                 Log::debug($add_result);
-                Log::debug($this->getParams()['AudienceTargets'][$key]);
+                Log::debug($data);
 
 
                 GoalAudienceTarget::where('id', $goalAudienceTarget->getKey())