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

…изация, удаление объявлений)

app/Console/Commands/AdvertisementsDelete.php

@@ -42,12 +42,12 @@ class AdvertisementsDelete extends Command
      */
     public function handle()
     {
-        $tokens = Tokens::has('dictionaryCampaignsEnabledForExternalSynchronized.goalAudienceTargetsNeedDeleteForNotReserveDelete')
+        $tokens = Tokens::has('dictionaryCampaignsEnabledForExternalSynchronized.goalAdvertisementsForNeedDeletedForNotReserveDelete')
             ->where('type', '!=', Tokens::MAIN)
             ->get();
 
         foreach ($tokens as $token) {
-            $this->sendRequest($token, $token->dictionaryCampaignsEnabledForExternalSynchronized->pluck('goalAudienceTargetsNeedDeleteForNotReserveDelete')->collapse());
+            $this->sendRequest($token, $token->dictionaryCampaignsEnabledForExternalSynchronized->pluck('goalAdvertisementsForNeedDeletedForNotReserveDelete')->collapse());
         }
 
         return 0;

app/Console/Commands/DictionaryCampaignsSyncByCampaign.php

@@ -346,6 +346,66 @@ class DictionaryCampaignsSyncByCampaign extends Command
                             ");
         $this->info('goal_bid_modifiers successful!');
 
+        //обновляем ключ компании в директ, если поо какйто причине не был установлен
+        DB::update("
+                UPDATE goal_ad_groups gag
+                INNER JOIN dictionary_campaigns dc ON dc.id = gag.dictionary_campaign_id AND dc.external_id IS NOT NULL AND dc.deleted_at IS NULL
+                SET gag.dictionary_campaign_external_id = dc.external_id,
+                    gag.updated_at = CURRENT_TIMESTAMP
+                WHERE gag.deleted_at IS NULL
+                  AND gag.dictionary_campaign_external_id IS NULL
+                    ");
+        $this->info('update goal_ad_groups.dictionary_campaign_external_id successful!');
+
+        DB::update("
+                UPDATE goal_keywords gk
+                INNER JOIN dictionary_campaigns dc ON dc.id = gk.dictionary_campaign_id AND dc.external_id IS NOT NULL AND dc.deleted_at IS NULL
+                SET gk.dictionary_campaign_external_id = dc.external_id,
+                    gk.updated_at = CURRENT_TIMESTAMP
+                WHERE gk.dictionary_campaign_external_id IS NULL
+                    ");
+        $this->info('update goal_keywords.dictionary_campaign_external_id successful!');
+
+        DB::update("
+                UPDATE goal_advertisements ga
+                INNER JOIN dictionary_campaigns dc ON dc.id = ga.dictionary_campaign_id AND dc.external_id IS NOT NULL AND dc.deleted_at IS NULL
+                SET ga.dictionary_campaign_external_id = dc.external_id,
+                    ga.updated_at = CURRENT_TIMESTAMP
+                WHERE ga.deleted_at IS NULL
+                  AND ga.dictionary_campaign_external_id IS NULL
+                    ");
+        $this->info('update goal_advertisements.dictionary_campaign_external_id successful!');
+
+        DB::update("
+                UPDATE goal_bid_modifiers gbm
+                INNER JOIN dictionary_campaigns dc ON dc.id = gbm.dictionary_campaign_id AND dc.external_id IS NOT NULL AND dc.deleted_at IS NULL
+                SET gbm.dictionary_campaign_external_id = dc.external_id,
+                    gbm.updated_at = CURRENT_TIMESTAMP
+                WHERE gbm.deleted_at IS NULL
+                  AND gbm.dictionary_campaign_external_id IS NULL
+                    ");
+        $this->info('update goal_bid_modifiers.dictionary_campaign_external_id successful!');
+
+        DB::update("
+                UPDATE goal_v_cards gvc
+                INNER JOIN dictionary_campaigns dc ON dc.id = gvc.dictionary_campaign_id AND dc.external_id IS NOT NULL AND dc.deleted_at IS NULL
+                SET gvc.dictionary_campaign_external_id = dc.external_id,
+                    gvc.updated_at = CURRENT_TIMESTAMP
+                WHERE gvc.deleted_at IS NULL
+                  AND gvc.dictionary_campaign_external_id IS NULL
+                    ");
+        $this->info('update goal_v_cards.dictionary_campaign_external_id successful!');
+
+        DB::update("
+                UPDATE goal_audience_targets gat
+                INNER JOIN dictionary_campaigns dc ON dc.id = gat.dictionary_campaign_id AND dc.external_id IS NOT NULL AND dc.deleted_at IS NULL
+                SET gat.dictionary_campaign_external_id = dc.external_id,
+                    gat.updated_at = CURRENT_TIMESTAMP
+                WHERE gat.deleted_at IS NULL
+                  AND gat.dictionary_campaign_external_id IS NULL
+                    ");
+        $this->info('update goal_v_cards.dictionary_campaign_external_id successful!');
+
         DictionaryCampaign::needSynced()->update([
             'synced_need' => null,
         ]);

app/Service/Requests/Direct/AddAds.php

@@ -80,7 +80,6 @@ class AddAds extends DirectRequest
                         $model = GoalAdvertisement::with('goalAdGroup')->firstWhere('id', $goalAd->id);
 
                         if ($model) {
-                            $model->goalVCard()->delete();
                             $model->forceDelete();
                         }
                     }

app/Service/Requests/Direct/UpdateAds.php

@@ -70,6 +70,13 @@ class UpdateAds extends DirectRequest
                     ]);
                 continue;
             } elseif (isset($update_result['Errors'][0]['Details']) && $update_result['Errors'][0]['Details'] === 'Ad not found') {
+
+                $model = GoalAdvertisement::whereExternalId($external_id)->first();
+
+                if ($model) {
+                    $model->goalAdGroup()->delete();
+                    $model->delete();
+                }
                 GoalAdvertisement::whereExternalId($external_id)
                     ->delete();
                 continue;