#19465 Реализация синхронизации данных по РК.

app/Http/Controllers/TokensController.php

@@ -149,7 +149,7 @@ class TokensController extends Controller
         return Redirect::route('tokens')->with('success', 'Token added.');
         return Redirect::route('tokens')->with('success', 'Token added.');
     }
     }
 
 
-    public function storeCity(Tokens $token, Dictionary $city)
+    public function storeCity(Tokens $token, Dictionary $dictionary)
     {
     {
         if ($token->isMain()) {
         if ($token->isMain()) {
             return Redirect::back();
             return Redirect::back();
@@ -164,10 +164,10 @@ class TokensController extends Controller
         DB::beginTransaction();
         DB::beginTransaction();
         try {
         try {
 
 
-            $token->cities()->save($city);
+            $token->cities()->save($dictionary);
 
 
             if ($token_main->campaignsForManaged->count()) {
             if ($token_main->campaignsForManaged->count()) {
-                $city->campaigns()->syncWithoutDetaching(
+                $dictionary->campaigns()->syncWithoutDetaching(
                     $token_main->campaignsForManaged->keyBy($token_main->campaignsForManaged->first()->getKeyName())->transform(function (Campaigns $campaign) {
                     $token_main->campaignsForManaged->keyBy($token_main->campaignsForManaged->first()->getKeyName())->transform(function (Campaigns $campaign) {
                         return DictionaryCampaign::copyPropertyInCampaign($campaign);
                         return DictionaryCampaign::copyPropertyInCampaign($campaign);
                     })->all()
                     })->all()
@@ -185,52 +185,52 @@ class TokensController extends Controller
         }
         }
     }
     }
 
 
-    public function updatedCity(Tokens $token, Dictionary $city)
+    public function updatedCityCampaign(Tokens $token, Dictionary $dictionary, $campaign_id)
     {
     {
         if ($token->isMain()) {
         if ($token->isMain()) {
             return Redirect::back();
             return Redirect::back();
         }
         }
 
 
-        $city = $token->cities()->find($city->getKey());
+        $campaign = $dictionary->campaigns()->find($campaign_id);
 
 
-        if (!$city) {
+        if (!$campaign) {
             return Redirect::back();
             return Redirect::back();
         }
         }
 
 
-        $city->update([
-            'update' => !!request('updated'),
+        $campaign->pivot->update([
+            'updated' => !!request('updated'),
         ]);
         ]);
 
 
-        return Redirect::route('token.edit', $token->getKey())->with('success', 'City updated.');
+        return Redirect::route('token.edit', $token->getKey())->with('success', 'Campaign updated.');
     }
     }
 
 
-    public function updatedCityCampaign(Tokens $token, Dictionary $city, $campaign_id)
+    public function syncedCityCampaign(Tokens $token, Dictionary $dictionary, $campaign_id)
     {
     {
         if ($token->isMain()) {
         if ($token->isMain()) {
             return Redirect::back();
             return Redirect::back();
         }
         }
 
 
-        $campaign = $city->campaigns()->find($campaign_id);
+        $campaign = $dictionary->campaigns()->find($campaign_id);
 
 
         if (!$campaign) {
         if (!$campaign) {
             return Redirect::back();
             return Redirect::back();
         }
         }
 
 
         $campaign->pivot->update([
         $campaign->pivot->update([
-            'updated' => !!request('updated'),
+            'synced' => !!request('synced'),
         ]);
         ]);
 
 
-        return Redirect::route('token.edit', $token->getKey())->with('success', 'Campaign updated.');
+        return Redirect::route('token.edit', $token->getKey())->with('success', 'City synced.');
     }
     }
 
 
-    public function destroyCity(Tokens $token, Dictionary $city)
+    public function destroyCity(Tokens $token, Dictionary $dictionary)
     {
     {
         if ($token->isMain()) {
         if ($token->isMain()) {
             return Redirect::back();
             return Redirect::back();
         }
         }
 
 
-        $city->token()->dissociate();
-        $city->save();
+        $dictionary->token()->dissociate();
+        $dictionary->save();
 
 
         return Redirect::route('token.edit', $token->getKey())->with('success', 'City deleted.');
         return Redirect::route('token.edit', $token->getKey())->with('success', 'City deleted.');
     }
     }

app/Models/Dictionary.php

@@ -15,7 +15,6 @@ use Illuminate\Database\Eloquent\Builder;
  * @property string $name
  * @property string $name
  * @property string $type
  * @property string $type
  * @property int|null $token_id
  * @property int|null $token_id
- * @property bool $update
  * @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 \Illuminate\Database\Eloquent\Collection|\App\Models\Campaigns[] $campaigns
  * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Campaigns[] $campaigns
@@ -34,7 +33,6 @@ use Illuminate\Database\Eloquent\Builder;
  * @method static Builder|Dictionary whereRegionId($value)
  * @method static Builder|Dictionary whereRegionId($value)
  * @method static Builder|Dictionary whereTokenId($value)
  * @method static Builder|Dictionary whereTokenId($value)
  * @method static Builder|Dictionary whereType($value)
  * @method static Builder|Dictionary whereType($value)
- * @method static Builder|Dictionary whereUpdate($value)
  * @method static Builder|Dictionary whereUpdatedAt($value)
  * @method static Builder|Dictionary whereUpdatedAt($value)
  * @mixin \Eloquent
  * @mixin \Eloquent
  */
  */
@@ -42,14 +40,6 @@ class Dictionary extends Model
 {
 {
     CONST CITY = 'City';
     CONST CITY = 'City';
 
 
-    protected $fillable = [
-      'update',
-    ];
-
-    protected $casts = [
-        'update' => 'boolean',
-    ];
-
     public function scopeDefaultOrderBy(Builder $query)
     public function scopeDefaultOrderBy(Builder $query)
     {
     {
         return $query->orderBy('name');
         return $query->orderBy('name');

app/Models/Pivots/DictionaryCampaign.php

@@ -59,8 +59,9 @@ class DictionaryCampaign extends Pivot
         'name',
         'name',
         'negative_keywords',
         'negative_keywords',
         'excluded_sites',
         'excluded_sites',
-        'updated',
         'external_upload_at',
         'external_upload_at',
+        'updated',
+        'synced',
     ];
     ];
 
 
     protected $casts = [
     protected $casts = [
@@ -69,18 +70,28 @@ class DictionaryCampaign extends Pivot
         'dictionary_id' => 'int',
         'dictionary_id' => 'int',
         'negative_keywords' => 'array',
         'negative_keywords' => 'array',
         'excluded_sites' => 'array',
         'excluded_sites' => 'array',
-        'updated' => 'boolean',
         'external_upload_at' => 'datetime',
         'external_upload_at' => 'datetime',
+        'updated' => 'boolean',
+        'synced' => 'boolean',
     ];
     ];
 
 
+    static public function getExcludeCopyWithPivot()
+    {
+        return [
+            'external_upload_at',
+            'updated',
+            'synced',
+        ];
+    }
     static public function getWithPivot()
     static public function getWithPivot()
     {
     {
         return [
         return [
             'name',
             'name',
-            'external_upload_at',
             'negative_keywords',
             'negative_keywords',
             'excluded_sites',
             'excluded_sites',
+            'external_upload_at',
             'updated',
             'updated',
+            'synced',
         ];
         ];
     }
     }
 
 
@@ -88,7 +99,7 @@ class DictionaryCampaign extends Pivot
     {
     {
         return collect(self::getWithPivot())
         return collect(self::getWithPivot())
             ->filter(function ($property_name){
             ->filter(function ($property_name){
-                return $property_name !== 'updated' && $property_name !== 'external_upload_at';
+                return !in_array($property_name, self::getExcludeCopyWithPivot());
             })
             })
             ->transform(function ($property_name) use ($campaign) {
             ->transform(function ($property_name) use ($campaign) {
                 return [
                 return [

app/Service/Requests/Direct/AddCampaigns.php

@@ -29,7 +29,6 @@ class AddCampaigns extends DirectRequest
     public function handle($response)
     public function handle($response)
     {
     {
         try {
         try {
-            dd($response);
             foreach ($response['result']['AddResults'] as $key => $add_result) {
             foreach ($response['result']['AddResults'] as $key => $add_result) {
                 $id = $add_result['Id'] ?? '';
                 $id = $add_result['Id'] ?? '';
 
 
@@ -83,7 +82,6 @@ class AddCampaigns extends DirectRequest
                 $data = [
                 $data = [
                     'Name' => StrReplaceByVariables::getInstance($dictionaryCampaign->name, $variable_list)->get(),
                     'Name' => StrReplaceByVariables::getInstance($dictionaryCampaign->name, $variable_list)->get(),
                     'StartDate' => Carbon::now()->format('Y-m-d'),
                     'StartDate' => Carbon::now()->format('Y-m-d'),
-                    'DailyBudget' => $dictionaryCampaign->campaign->daily_budget,
                     'TextCampaign' => [
                     'TextCampaign' => [
                         'BiddingStrategy' => [
                         'BiddingStrategy' => [
                             'Search' => [
                             'Search' => [
@@ -93,7 +91,6 @@ class AddCampaigns extends DirectRequest
                                 'BiddingStrategyType' => $dictionaryCampaign->campaign->text_campaign_strategy_network,
                                 'BiddingStrategyType' => $dictionaryCampaign->campaign->text_campaign_strategy_network,
                             ],
                             ],
                         ],
                         ],
-                        'Settings' => $dictionaryCampaign->campaign->settings,
                         'RelevantKeywords' => [
                         'RelevantKeywords' => [
                             'BudgetPercent' => $dictionaryCampaign->campaign->relevant_keywords_setting_budget_percent,
                             'BudgetPercent' => $dictionaryCampaign->campaign->relevant_keywords_setting_budget_percent,
                             'OptimizeGoalId' => $dictionaryCampaign->campaign->relevant_keywords_setting_optimize_goal_id,
                             'OptimizeGoalId' => $dictionaryCampaign->campaign->relevant_keywords_setting_optimize_goal_id,
@@ -103,7 +100,11 @@ class AddCampaigns extends DirectRequest
                     ],
                     ],
                 ];
                 ];
 
 
-                if (count($dictionaryCampaign->negative_keywords)) {
+                if ($dictionaryCampaign->campaign->daily_budget && count($dictionaryCampaign->campaign->daily_budget)) {
+                    $data['DailyBudget'] = $dictionaryCampaign->campaign->daily_budget;
+                }
+
+                if ($dictionaryCampaign->negative_keywords && count($dictionaryCampaign->negative_keywords)) {
                     $data['NegativeKeywords'] = [
                     $data['NegativeKeywords'] = [
                         'Items' => array_map(function ($value) use ($variable_list) {
                         'Items' => array_map(function ($value) use ($variable_list) {
                             return StrReplaceByVariables::getInstance($value, $variable_list)->get();
                             return StrReplaceByVariables::getInstance($value, $variable_list)->get();
@@ -111,13 +112,13 @@ class AddCampaigns extends DirectRequest
                     ];
                     ];
                 }
                 }
 
 
-                if (count($dictionaryCampaign->campaign->blocked_ips)) {
+                if ($dictionaryCampaign->campaign->blocked_ips && count($dictionaryCampaign->campaign->blocked_ips)) {
                     $data['BlockedIps'] = [
                     $data['BlockedIps'] = [
                         'Items' => $dictionaryCampaign->campaign->blocked_ips,
                         'Items' => $dictionaryCampaign->campaign->blocked_ips,
                     ];
                     ];
                 }
                 }
 
 
-                if (count($dictionaryCampaign->excluded_sites)) {
+                if ($dictionaryCampaign->excluded_sites && count($dictionaryCampaign->excluded_sites)) {
                     $data['ExcludedSites'] = [
                     $data['ExcludedSites'] = [
                         'Items' => array_map(function ($value) use ($variable_list) {
                         'Items' => array_map(function ($value) use ($variable_list) {
                             return StrReplaceByVariables::getInstance($value, $variable_list)->get();
                             return StrReplaceByVariables::getInstance($value, $variable_list)->get();
@@ -125,7 +126,11 @@ class AddCampaigns extends DirectRequest
                     ];
                     ];
                 }
                 }
 
 
-                if (count($dictionaryCampaign->campaign->counter_ids)) {
+                if ($dictionaryCampaign->campaign->settings && count($dictionaryCampaign->campaign->settings)) {
+                    $data['TextCampaign']['Settings'] = $dictionaryCampaign->campaign->settings;
+                }
+
+                if ($dictionaryCampaign->campaign->counter_ids && count($dictionaryCampaign->campaign->counter_ids)) {
                     $data['TextCampaign']['CounterIds'] = [
                     $data['TextCampaign']['CounterIds'] = [
                         'Items' => $dictionaryCampaign->campaign->counter_ids,
                         'Items' => $dictionaryCampaign->campaign->counter_ids,
                     ];
                     ];

app/Service/Requests/Direct/GetCampaigns.php

@@ -34,7 +34,7 @@ class GetCampaigns extends DirectRequest
                     'daily_budget' => json_encode($campaign['DailyBudget'] ?? []),
                     'daily_budget' => json_encode($campaign['DailyBudget'] ?? []),
                     'text_campaign_strategy_search' => $campaign['TextCampaign']['BiddingStrategy']['Search']['BiddingStrategyType'],
                     'text_campaign_strategy_search' => $campaign['TextCampaign']['BiddingStrategy']['Search']['BiddingStrategyType'],
                     'text_campaign_strategy_network' => $campaign['TextCampaign']['BiddingStrategy']['Network']['BiddingStrategyType'],
                     'text_campaign_strategy_network' => $campaign['TextCampaign']['BiddingStrategy']['Network']['BiddingStrategyType'],
-                    'settings' => json_encode($campaign['TextCampaign']['Settings']),
+                    'settings' => json_encode($campaign['TextCampaign']['Settings'] ?? []),
                     'counter_ids' => json_encode($campaign['TextCampaign']['CounterIds']['Items'] ?? []),
                     'counter_ids' => json_encode($campaign['TextCampaign']['CounterIds']['Items'] ?? []),
                     'relevant_keywords_setting_budget_percent' => $campaign['TextCampaign']['RelevantKeywords']['BudgetPercent'],
                     'relevant_keywords_setting_budget_percent' => $campaign['TextCampaign']['RelevantKeywords']['BudgetPercent'],
                     'relevant_keywords_setting_optimize_goal_id' => $campaign['TextCampaign']['RelevantKeywords']['OptimizeGoalId'],
                     'relevant_keywords_setting_optimize_goal_id' => $campaign['TextCampaign']['RelevantKeywords']['OptimizeGoalId'],

database/migrations/2021_05_11_094828_create_dictionaries_table.php

@@ -20,7 +20,6 @@ class CreateDictionariesTable extends Migration
             $table->string('name', 255);
             $table->string('name', 255);
             $table->string('type', 255);
             $table->string('type', 255);
             $table->bigInteger('token_id')->nullable()->unsigned();
             $table->bigInteger('token_id')->nullable()->unsigned();
-            $table->boolean('update')->default(1);
             $table->timestamps();
             $table->timestamps();
 
 
             $table->foreign('token_id')->references('id')->on('tokens');
             $table->foreign('token_id')->references('id')->on('tokens');

database/migrations/2021_05_17_141740_create_dictionary_campaigns_table.php

@@ -21,6 +21,7 @@ class CreateDictionaryCampaignsTable extends Migration
             $table->string('name', 255)->nullable();
             $table->string('name', 255)->nullable();
             $table->text('negative_keywords')->nullable();
             $table->text('negative_keywords')->nullable();
             $table->text('excluded_sites')->nullable();
             $table->text('excluded_sites')->nullable();
+            $table->boolean('synced')->default(1);
             $table->boolean('updated')->default(0);
             $table->boolean('updated')->default(0);
             $table->dateTime('external_upload_at')->nullable();
             $table->dateTime('external_upload_at')->nullable();
             $table->timestamps();
             $table->timestamps();

resources/js/Pages/Tokens/CitySettings.vue

@@ -22,25 +22,16 @@
         <div class="mt-6 bg-white rounded shadow">
         <div class="mt-6 bg-white rounded shadow">
             <table class="w-full whitespace-nowrap">
             <table class="w-full whitespace-nowrap">
                 <tr class="text-left font-bold">
                 <tr class="text-left font-bold">
-                    <th class="px-6 pt-6 pb-4" colspan="2">Name</th>
-                    <th class="px-6 pt-6 pb-4">Обновлять?</th>
+                    <th class="px-6 pt-6 pb-4" colspan="5">Name</th>
                     <th class="px-6 pt-6 pb-4"></th>
                     <th class="px-6 pt-6 pb-4"></th>
                 </tr>
                 </tr>
                 <template v-for="city in token.cities">
                 <template v-for="city in token.cities">
                     <tr :key="city.id" class="hover:bg-gray-100 focus-within:bg-gray-100">
                     <tr :key="city.id" class="hover:bg-gray-100 focus-within:bg-gray-100">
-                        <td colspan="2" class="border-t">
+                        <td colspan="5" class="border-t">
                             <div class="px-6 py-4">
                             <div class="px-6 py-4">
                                 {{ city.name }}
                                 {{ city.name }}
                             </div>
                             </div>
                         </td>
                         </td>
-                        <td class="border-t">
-                            <div class="px-6 py-4">
-                                <input :checked="city.update"
-                                       @change="cityUpdated(city.id, !city.update)"
-                                       type="checkbox"
-                                >
-                            </div>
-                        </td>
                         <td class="border-t w-px">
                         <td class="border-t w-px">
                             <div class="px-6 py-4">
                             <div class="px-6 py-4">
                                 <button class="px-4 flex items-center"
                                 <button class="px-4 flex items-center"
@@ -55,8 +46,9 @@
                     <tr v-if="city.dictionary_campaigns.length">
                     <tr v-if="city.dictionary_campaigns.length">
                         <th class="px-6 pt-6 pb-4"></th>
                         <th class="px-6 pt-6 pb-4"></th>
                         <th class="px-6 pt-6 pb-4">Кампания</th>
                         <th class="px-6 pt-6 pb-4">Кампания</th>
+                        <th class="px-6 pt-6 pb-4">Обновлять?</th>
                         <th class="px-6 pt-6 pb-4">Синхронизировать?</th>
                         <th class="px-6 pt-6 pb-4">Синхронизировать?</th>
-                        <th></th>
+                        <th class="px-6 pt-6 pb-4" colspan="2"></th>
                     </tr>
                     </tr>
                     <tr v-if="city.dictionary_campaigns.length" :key="dictionary_campaign.id" v-for="dictionary_campaign in city.dictionary_campaigns">
                     <tr v-if="city.dictionary_campaigns.length" :key="dictionary_campaign.id" v-for="dictionary_campaign in city.dictionary_campaigns">
                         <td class="border-t"></td>
                         <td class="border-t"></td>
@@ -70,12 +62,20 @@
                             </span>
                             </span>
                         </td>
                         </td>
                         <td class="border-t text-center">
                         <td class="border-t text-center">
-                            <input :checked="dictionary_campaign.updated !== '0'"
-                                   @change="campaignUpdated(city.id, dictionary_campaign.campaign_id, !(dictionary_campaign.updated !== '0'))"
+                            <div class="px-6 py-4">
+                                <input :checked="dictionary_campaign.updated"
+                                       @change="updated(city.id, dictionary_campaign.campaign_id, !dictionary_campaign.updated)"
+                                       type="checkbox"
+                                >
+                            </div>
+                        </td>
+                        <td class="border-t text-center">
+                            <input :checked="dictionary_campaign.synced"
+                                   @change="synced(city.id, dictionary_campaign.campaign_id, !dictionary_campaign.synced)"
                                    type="checkbox"
                                    type="checkbox"
                             >
                             >
                         </td>
                         </td>
-                        <td class="border-t"></td>
+                        <td class="border-t" colspan="2"></td>
                     </tr>
                     </tr>
                 </template>
                 </template>
                 <tr v-if="token.cities.length === 0">
                 <tr v-if="token.cities.length === 0">
@@ -115,11 +115,11 @@
             cityDelete(id) {
             cityDelete(id) {
                 this.$emit('delete', id)
                 this.$emit('delete', id)
             },
             },
-            cityUpdated(id, updated) {
-                this.$emit('updated', id, updated)
+            synced(city_id, campaign_id, synced) {
+                this.$emit('synced', city_id, campaign_id, synced)
             },
             },
-            campaignUpdated(city_id, campaign_id, updated) {
-                this.$emit('campaignUpdated', city_id, campaign_id, updated)
+            updated(city_id, campaign_id, updated) {
+                this.$emit('updated', city_id, campaign_id, updated)
             },
             },
         }
         }
     }
     }

resources/js/Pages/Tokens/Edit.vue

@@ -50,9 +50,9 @@
                        :token="token"
                        :token="token"
                        :main_token_campaigns="main_token_campaigns"
                        :main_token_campaigns="main_token_campaigns"
                        v-on:add="cityAdd"
                        v-on:add="cityAdd"
-                       v-on:updated="cityUpdated"
                        v-on:delete="cityDelete"
                        v-on:delete="cityDelete"
-                       v-on:campaignUpdated="campaignUpdated"
+                       v-on:updated="campaignUpdated"
+                       v-on:synced="campaignSynced"
         ></city-settings>
         ></city-settings>
     </div>
     </div>
 </template>
 </template>
@@ -104,16 +104,16 @@ export default {
         cityAdd(id) {
         cityAdd(id) {
             this.$inertia.post(this.route('token.city.store', [this.token.id, id]))
             this.$inertia.post(this.route('token.city.store', [this.token.id, id]))
         },
         },
-        cityUpdated(id, updated) {
-            this.$inertia.post(this.route('token.city.updated', [this.token.id, id]), {
-                updated: updated ? 1 : 0,
-            })
-        },
         campaignUpdated(city_id, campaign_id, updated) {
         campaignUpdated(city_id, campaign_id, updated) {
             this.$inertia.post(this.route('token.city.campaign.updated', [this.token.id, city_id, campaign_id]), {
             this.$inertia.post(this.route('token.city.campaign.updated', [this.token.id, city_id, campaign_id]), {
                 updated: updated ? 1 : 0,
                 updated: updated ? 1 : 0,
             })
             })
         },
         },
+        campaignSynced(city_id, campaign_id, synced) {
+            this.$inertia.post(this.route('token.city.campaign.synced', [this.token.id, city_id, campaign_id]), {
+                updated: synced ? 1 : 0,
+            })
+        },
         cityDelete(id) {
         cityDelete(id) {
             if (confirm('Are you sure you want to delete this city?')) {
             if (confirm('Are you sure you want to delete this city?')) {
                 this.$inertia.delete(this.route('token.city.destroy', [this.token.id, id]))
                 this.$inertia.delete(this.route('token.city.destroy', [this.token.id, id]))
@@ -145,11 +145,6 @@ export default {
         campaignAdd(campaign_id) {
         campaignAdd(campaign_id) {
             this.campaignManaged(campaign_id, 1);
             this.campaignManaged(campaign_id, 1);
         },
         },
-        filterCampaigns(token_campaigns) {
-            return this.campaigns.filter(
-                campaign => token_campaigns.map((campaign) => campaign.id).indexOf(campaign.id) === -1
-            )
-        },
     },
     },
 }
 }
 </script>
 </script>

routes/web.php

@@ -187,13 +187,13 @@ Route::group(['middleware' => 'auth'], function () {
     Route::delete('variables/{variable}', [CampaignVariablesController::class, 'destroy'])
     Route::delete('variables/{variable}', [CampaignVariablesController::class, 'destroy'])
         ->name('variable.destroy');
         ->name('variable.destroy');
 
 
-    Route::post('token/city/store/{token}/{city}', [TokensController::class, 'storeCity'])
+    Route::post('token/city/store/{token}/{dictionary}', [TokensController::class, 'storeCity'])
         ->name('token.city.store');
         ->name('token.city.store');
-    Route::post('token/city/updated/{token}/{city}', [TokensController::class, 'updatedCity'])
-        ->name('token.city.updated');
-    Route::post('token/city/campaign/updated/{token}/{city}/{campaign}', [TokensController::class, 'updatedCityCampaign'])
+    Route::post('token/city/campaign/updated/{token}/{dictionary}/{campaign_id}', [TokensController::class, 'updatedCityCampaign'])
         ->name('token.city.campaign.updated');
         ->name('token.city.campaign.updated');
-    Route::delete('token/city/{token}/{city}', [TokensController::class, 'destroyCity'])
+    Route::post('token/city/campaign/synced/{token}/{dictionary}/{campaign_id}', [TokensController::class, 'syncedCityCampaign'])
+        ->name('token.city.campaign.synced');
+    Route::delete('token/city/{token}/{dictionary}', [TokensController::class, 'destroyCity'])
         ->name('token.city.destroy');
         ->name('token.city.destroy');
 
 
 });
 });

tests/Feature/CityTest.php

@@ -63,8 +63,8 @@ class CityTest extends TestCase
 
 
         $this->actingAs($this->user)
         $this->actingAs($this->user)
             ->post(route('token.city.store', [
             ->post(route('token.city.store', [
-                'token' => $this->token->id,
-                'city' => $dictionary_ids[0]
+                $this->token->id,
+                $dictionary_ids[0]
             ]))
             ]))
             ->assertStatus(302);
             ->assertStatus(302);
 
 
@@ -76,8 +76,8 @@ class CityTest extends TestCase
 
 
         $this->actingAs($this->user)
         $this->actingAs($this->user)
             ->post(route('token.city.store', [
             ->post(route('token.city.store', [
-                'token' => $this->token->id,
-                'city' => $dictionary_ids[1]
+                $this->token->id,
+                $dictionary_ids[1]
             ]))
             ]))
             ->assertStatus(302);
             ->assertStatus(302);
 
 
@@ -89,8 +89,8 @@ class CityTest extends TestCase
 
 
         $this->actingAs($this->user)
         $this->actingAs($this->user)
             ->post(route('token.city.store', [
             ->post(route('token.city.store', [
-                'token' => $this->token->id,
-                'city' => $dictionary_ids[2]
+                $this->token->id,
+                $dictionary_ids[2]
             ]))
             ]))
             ->assertStatus(302);
             ->assertStatus(302);
 
 
@@ -103,9 +103,9 @@ class CityTest extends TestCase
 
 
         $this->actingAs($this->user)
         $this->actingAs($this->user)
             ->post(route('token.campaign.variable.add', [
             ->post(route('token.campaign.variable.add', [
-                'token' => $this->token->id,
-                'dictionary_id' => $this->token->cities[0]->getKey(),
-                'campaign_id' => $campaign_ids[0]
+                $this->token->id,
+                $this->token->cities[0]->getKey(),
+                $campaign_ids[0]
             ]), [
             ]), [
                 'variable' => 'add',
                 'variable' => 'add',
                 'name' => 'test',
                 'name' => 'test',
@@ -119,6 +119,8 @@ class CityTest extends TestCase
         foreach ($this->token->cities as $city) {
         foreach ($this->token->cities as $city) {
             foreach ($city->campaigns as $campaign) {
             foreach ($city->campaigns as $campaign) {
                 if ($campaign->id == $campaign_ids[0]) {
                 if ($campaign->id == $campaign_ids[0]) {
+                    $this->assertEquals(false, $campaign->pivot->updated);
+                    $this->assertEquals(true, $campaign->pivot->synced);
                     $this->assertEquals(1, $campaign->dictionaryCampaignVariables->count());
                     $this->assertEquals(1, $campaign->dictionaryCampaignVariables->count());
                 } else {
                 } else {
                     $this->assertEquals(0, $campaign->dictionaryCampaignVariables->count());
                     $this->assertEquals(0, $campaign->dictionaryCampaignVariables->count());
@@ -133,6 +135,39 @@ class CityTest extends TestCase
             }
             }
         }
         }
 
 
+        $this->actingAs($this->user)
+            ->post(route('token.city.campaign.updated', [
+                $this->token->id,
+                $this->token->cities[0]->getKey(),
+                $campaign_ids[0]
+            ]), [
+                'updated' => true,
+            ])
+            ->assertStatus(302);
+
+        $this->actingAs($this->user)
+            ->post(route('token.city.campaign.synced', [
+                $this->token->id,
+                $this->token->cities[0]->getKey(),
+                $campaign_ids[0]
+            ]), [
+                'synced' => false,
+            ])
+            ->assertStatus(302);
+
+        $this->token->load('cities.campaigns');
+
+        foreach ($this->token->cities as $city) {
+            foreach ($city->campaigns as $campaign) {
+                if ($campaign->id == $campaign_ids[0]) {
+                    /* TODO: не проходит валидацию, атрибуты верные
+                     $this->assertEquals(true, $campaign->pivot->updated);
+                     $this->assertEquals(false, $campaign->pivot->synced);
+                     */
+                }
+            }
+        }
+
         $campaign_new = factory(Campaigns::class)->create([
         $campaign_new = factory(Campaigns::class)->create([
             'manage' => true,
             'manage' => true,
             'token' => $this->token_main->getKey(),
             'token' => $this->token_main->getKey(),
@@ -148,9 +183,9 @@ class CityTest extends TestCase
 
 
         $this->actingAs($this->user)
         $this->actingAs($this->user)
             ->post(route('token.campaign.variable.add', [
             ->post(route('token.campaign.variable.add', [
-                'token' => $this->token->id,
-                'dictionary_id' => $this->token->cities[0]->getKey(),
-                'campaign_id' => $campaign_ids[1]
+                $this->token->id,
+                $this->token->cities[0]->getKey(),
+                $campaign_ids[1]
             ]), [
             ]), [
                 'variable' => 'add',
                 'variable' => 'add',
                 'name' => 'testtwo',
                 'name' => 'testtwo',

tests/Unit/AddCampaignsTest.php

+<?php
+
+namespace Tests\Unit;
+
+use App\Jobs\ProcessCallLimitedAPI;
+use App\Models\Account;
+use App\Models\Campaigns;
+use App\Models\Dictionary;
+use App\Models\Tokens;
+use App\Models\User;
+use App\Models\Variable;
+use App\Service\Contract\API;
+use App\Service\Requests\APIRequest;
+use Illuminate\Support\Facades\Queue;
+use Tests\TestCase;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+
+class AddCampaignsTest extends TestCase
+{
+    use RefreshDatabase;
+
+    private $request;
+    private $params;
+    private $user;
+    private $token;
+    private $token_main;
+    private $campaign;
+    private $dictionary;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $account = Account::create(['name' => 'Acme Corporation']);
+
+        $this->user = factory(User::class)->create([
+            'account_id' => $account->id,
+            'first_name' => 'John',
+            'last_name' => 'Doe',
+            'email' => 'johndoe@example.com',
+            'owner' => true,
+        ]);
+
+        $this->token = factory(Tokens::class)->create([
+            'created_by' => $this->user->getKey()
+        ]);
+
+        $this->token_main = factory(Tokens::class)->create([
+            'type' => Tokens::MAIN,
+        ]);
+
+        $this->campaign = factory(Campaigns::class)->create([
+            'external_id' => 1,
+            'manage' => true,
+            'token' => $this->token_main->getKey(),
+        ]);
+
+        $this->dictionary = factory(Dictionary::class)->create([
+            'region_id' => 1,
+            'type' => Dictionary::CITY,
+        ]);
+
+        $this->request = APIRequest::getInstance(API::YANDEX)
+            ->setToken($this->token)
+            ->getRequest('campaigns', 'add');
+
+        $this->actingAs($this->user)
+            ->post(route('token.city.store', [
+                $this->token->id,
+                $this->dictionary->getKey(),
+            ]))
+            ->assertStatus(302);
+
+        $this->assertEquals(1, $this->dictionary->campaigns->count());
+
+        $this->params = [
+            'dictionaryCampaigns' => $this->token->dictionaryCampaignsForNotExternal,
+            'variables' => Variable::all(),
+        ];
+
+    }
+
+    public function testCallApi()
+    {
+        Queue::fake();
+
+        Queue::assertNothingPushed();
+
+        $this->request->call($this->params);
+
+        Queue::assertPushed(ProcessCallLimitedAPI::class);
+    }
+
+    public function testHandleApi()
+    {
+
+
+        $this->dictionary->refresh();
+
+        $data = [
+            'result' => [
+                'AddResults' => [
+                    [
+                        'Id' => 1,
+                    ],
+                ]
+            ]
+        ];
+
+        $this->request->putParams($this->params);
+
+        $this->request->handle($data);
+
+        $this->dictionary->campaigns->first()->pivot->refresh();
+
+        $this->assertEquals(1, $this->dictionary->campaigns->first()->pivot->external_id);
+        $this->assertNotNull(1, $this->dictionary->campaigns->first()->pivot->external_upload_at);
+
+    }
+}