#19468 Первоначальная загрузка групп объявлений (added test)

app/Service/Requests/Direct/GetAdGroups.php

@@ -12,8 +12,6 @@ use Illuminate\Support\Facades\Log;
 
 class GetAdGroups extends DirectRequest
 {
-    protected $timestamp;
-    protected $filter;
 
     function call($params = null)
     {
@@ -28,7 +26,20 @@ class GetAdGroups extends DirectRequest
         try {
             $data = [];
 
-            $campaigns = Campaigns::whereIn('external_id', $this->filter['CampaignIds'])
+            $external_ids = [];
+
+            foreach ($response['result']['AdGroups'] as $ad_group) {
+                if (isset($external_ids[$ad_group['CampaignId']])) {
+                    continue;
+                }
+                $external_ids[$ad_group['CampaignId']] = true;
+            }
+
+            if (!count($external_ids)) {
+                return;
+            }
+
+            $campaigns = Campaigns::whereIn('external_id', array_keys($external_ids))
                 ->get()
                 ->keyBy('external_id');
 
@@ -36,12 +47,12 @@ class GetAdGroups extends DirectRequest
 
                 $campaign = $campaigns->get($ad_group['CampaignId']);
 
-                $campaign->groups_loaded_at = Carbon::now();
-                $campaign->save();
-
                 if (!$campaign)
                     continue;
 
+                $campaign->groups_loaded_at = Carbon::now();
+                $campaign->save();
+
                 $data[] = [
                     'campaign_id' => $campaign->getKey(),
                     'external_id' => $ad_group['Id'],
@@ -85,12 +96,11 @@ class GetAdGroups extends DirectRequest
 
     private function requestPrepare($filter)
     {
-        $this->filter = $filter;
         $this->setService('adgroups');
         $this->setMethod('get');
         $params = [
             'SelectionCriteria' =>  [
-                'CampaignIds' => $this->filter['CampaignIds'],
+                'CampaignIds' => $filter['CampaignIds'],
             ],
             "FieldNames" => [
                 "Id", "CampaignId", "Name", "NegativeKeywords",

database/factories/CampaingFactory.php

+<?php
+
+use App\Models\Campaigns;
+use Faker\Generator as Faker;
+
+$factory->define(App\Models\Campaigns::class, function (Faker $faker) {
+    return [
+        'name' => $faker->name,
+    ];
+});

tests/Unit/GetAdGroupTest.php

+<?php
+
+namespace Tests\Unit;
+
+use App\Jobs\ProcessCallLimitedAPI;
+use App\Models\Account;
+use App\Models\AdGroup;
+use App\Models\Campaigns;
+use App\Models\Tokens;
+use App\Models\User;
+use App\Service\Contract\API;
+use App\Service\Requests\APIRequest;
+use Illuminate\Support\Facades\Queue;
+use Tests\TestCase;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+
+class GetAdGroupTest extends TestCase
+{
+    use RefreshDatabase;
+
+    private $request;
+    private $token;
+    private $user;
+    private $data = [
+        'result' => [
+            'AdGroups' => [
+                [
+                    'Id' => 1,
+                    'Name' => 'Группа №1',
+                    'CampaignId' => 1,
+                    'Status' => 'ACCEPTED',
+                    'Type' => 'TEXT_AD_GROUP',
+                    'Subtype' => 'NONE',
+                    'ServingStatus' => 'ELIGIBLE',
+                    'RestrictedRegionIds' => NULL,
+                    'RegionIds' =>
+                        [
+                            0 => 1,
+                        ],
+                    'NegativeKeywords' =>
+                        [
+                            'Items' => [
+                                'minusword1',
+                                'minusword3',
+                            ],
+                        ],
+                    'NegativeKeywordSharedSetIds' => NULL,
+                    'TrackingParams' => '',
+                ],
+            ]
+        ]
+    ];
+
+    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->id
+        ]);
+
+        factory(Campaigns::class)->create([
+            'external_id' => 1,
+            'token' => $this->token->getKey(),
+        ]);
+
+        $this->request = APIRequest::getInstance(API::YANDEX)
+            ->setToken($this->token)
+            ->getRequest('adgroups', 'get');
+
+    }
+
+    public function testCallApi()
+    {
+        Queue::fake();
+
+        Queue::assertNothingPushed();
+
+        $this->request->call([
+            'CampaignIds' => [1, 2],
+        ]);
+
+        Queue::assertPushed(ProcessCallLimitedAPI::class);
+    }
+
+    public function testHandleApi()
+    {
+
+        $this->assertEquals(1, Campaigns::count());
+
+        $this->request->handle($this->data);
+
+        $this->assertEquals(1, AdGroup::count());
+
+        $ad_group = AdGroup::first();
+
+        $this->assertEquals($ad_group->name, $this->data['result']['AdGroups'][0]['Name']);
+        $this->assertEquals($ad_group->campaign_id, $this->data['result']['AdGroups'][0]['CampaignId']);
+        $this->assertEquals($ad_group->status, $this->data['result']['AdGroups'][0]['Status']);
+        $this->assertEquals($ad_group->type, $this->data['result']['AdGroups'][0]['Type']);
+        $this->assertEquals($ad_group->sub_type, $this->data['result']['AdGroups'][0]['Subtype']);
+        $this->assertEquals($ad_group->serving_status, $this->data['result']['AdGroups'][0]['ServingStatus']);
+        $this->assertEquals($ad_group->restricted_region_ids, $this->data['result']['AdGroups'][0]['RestrictedRegionIds']);
+        $this->assertEquals($ad_group->region_ids, $this->data['result']['AdGroups'][0]['RegionIds']);
+        $this->assertEquals($ad_group->negative_keywords, $this->data['result']['AdGroups'][0]['NegativeKeywords']);
+        $this->assertEquals($ad_group->negative_keyword_shared_set_ids, $this->data['result']['AdGroups'][0]['NegativeKeywordSharedSetIds']);
+        $this->assertEquals($ad_group->tracking_params, $this->data['result']['AdGroups'][0]['TrackingParams']);
+    }
+}

tests/Unit/GetCampaignsTest.php

@@ -56,7 +56,7 @@ class GetCampaignsTest extends TestCase
         $this->request->handle([
             'result'    =>  [
                 'Campaigns' =>  [
-                        [
+                    [
                         'Id'    =>  1,
                         'Name'    =>  'test',
                         'TimeTargeting'    =>  ['test time schedule'],
@@ -87,9 +87,9 @@ class GetCampaignsTest extends TestCase
             ]
         ]);
 
-        $this->assertEquals(1, Campaigns::all()->count());
+        $this->assertEquals(1, Campaigns::count());
 
-        $campaign = Campaigns::all()->first();
+        $campaign = Campaigns::first();
         $this->assertEquals($campaign->external_id, 1);
         $this->assertEquals($campaign->name, 'test');
         $this->assertEquals($campaign->time_targeting, json_encode(['test time schedule']));

tests/Unit/GetDictionariesTest.php

@@ -77,10 +77,9 @@ class GetDictionariesTest extends TestCase
                     ],
                 ]
             ]
-
         ]);
 
-        $this->assertEquals(3, Dictionary::all()->count());
+        $this->assertEquals(3, Dictionary::count());
 
         $city = Dictionary::where('region_id', 1)->first();
         $this->assertEquals($city->name, 'test');