#19498 Снхронизация объявлений с целевыми

app/Console/Commands/AdvertisementsAdd.php

@@ -45,10 +45,12 @@ class AdvertisementsAdd extends Command
      */
     public function handle()
     {
-        $tokens = Tokens::whereHas('dictionaryCampaignsEnabledForExternalSynchronized.goalAdvertisementsForNotExternal.advertisement')
+        $tokens = Tokens::has('dictionaryCampaignsEnabledForExternalSynchronized.goalAdvertisementsForNotExternalForNotReserveCreate.advertisement')
             ->where('type', '!=', Tokens::MAIN)
             ->get();
 
+        dd($tokens);
+
         foreach ($tokens as $token) {
 
             $factory = APIRequest::getInstance(API::YANDEX);

app/Console/Commands/AdvertisementsUpdate.php

@@ -45,18 +45,12 @@ class AdvertisementsUpdate extends Command
      */
     public function handle()
     {
-        $tokens = Tokens::whereHas('dictionaryCampaignsEnabledForExternalSynchronized.goalAdvertisementsForNeedUpdated.advertisement')
+        $tokens = Tokens::whereHas('dictionaryCampaignsEnabledForExternalSynchronized.goalAdvertisementsForNeedUpdatedForNotReserveUpdate.advertisement')
             ->where('type', '!=', Tokens::MAIN)
             ->get();
 
         foreach ($tokens as $token) {
 
-            $token->load([
-                'dictionaryCampaignsEnabledForExternalSynchronized' => function (HasManyThrough $query) {
-                    return $query->has('goalAdvertisementsForNeedUpdated.advertisement');
-                },
-            ]);
-
             $factory = APIRequest::getInstance(API::YANDEX);
             $factory->setToken($token);
 

app/Models/Pivots/DictionaryCampaign.php

@@ -491,14 +491,14 @@ class DictionaryCampaign extends Pivot
         return $this->hasMany(GoalAdvertisement::class, 'dictionary_campaign_id');
     }
 
-    public function goalAdvertisementsForNotExternal()
+    public function goalAdvertisementsForNotExternalForNotReserveCreate()
     {
-        return $this->goalAdvertisements()->forNotExternal();
+        return $this->goalAdvertisements()->forNotExternal()->forNotReserveCreate();
     }
 
-    public function goalAdvertisementsForNeedUpdated()
+    public function goalAdvertisementsForNeedUpdatedForNotReserveUpdate()
     {
-        return $this->goalAdvertisements()->needUpdated();
+        return $this->goalAdvertisements()->needUpdated()->forNotReserveUpdate();
     }
 
     public function goalBidModifiers()