fix add Keywords

app/Console/Commands/KeywordsAdd.php

@@ -6,6 +6,7 @@ use App\Models\Tokens;
 use App\Service\API\API;
 use App\Service\Requests\APIRequest;
 use Illuminate\Console\Command;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class KeywordsAdd extends Command
 {
@@ -40,21 +41,27 @@ class KeywordsAdd extends Command
      */
     public function handle()
     {
-        $tokens = Tokens::whereHas('dictionaryCampaignsEnabledForExternalSynchronized.goalKeywordsForNotExternal')
+        $tokens = Tokens::whereHas('dictionaryCampaignsEnabledForExternalSynchronized.goalKeywordsForNotExternal.keyword')
             ->with([
-                'dictionaryCampaignsEnabledForExternalSynchronized.goalKeywordsForNotExternal.keyword',
+                'dictionaryCampaignsEnabledForExternalSynchronized.goalKeywordsForNotExternal' => function (HasMany $query) {
+                    return $query->has('keyword');
+                },
+                'dictionaryCampaignsEnabledForExternalSynchronized.goalKeywordsForNotExternal.keyword'
             ])
             ->where('type', '!=', Tokens::MAIN)
             ->get();
 
         foreach ($tokens as $token) {
+
+            $goalKeywords = $token->dictionaryCampaignsEnabledForExternalSynchronized->pluck('goalKeywordsForNotExternal')
+                ->collapse();
+
             $factory = APIRequest::getInstance(API::YANDEX);
             $factory->setToken($token);
 
             $factory->getRequest('Keywords', 'add')
                 ->call([
-                    'goalKeywords' => $token->dictionaryCampaignsEnabledForExternalSynchronized->pluck('goalKeywordsForNotExternal')
-                        ->collapse(),
+                    'goalKeywords' => $goalKeywords,
                 ]);
         }
 

app/Service/Requests/Direct/AddAdGroups.php

@@ -52,16 +52,15 @@ class AddAdGroups extends DirectRequest
     public function handle($response)
     {
         try {
-            if (!isset($response['result'])) {
-                Log::debug($response);
-                Log::debug($this->getParams());
-            }
-
             if (isset($response['result']['Errors'])) {
                 Log::debug($response['Errors']);
                 Log::debug($this->getParams());
             }
 
+            if (!isset($response['result']['AddResults'])) {
+                return;
+            }
+
             foreach ($response['result']['AddResults'] as $key => $add_result) {
                 if (!isset($add_result['Id'])) {
                     Log::debug("AddAdGroup, empty Id");

app/Service/Requests/Direct/AddCampaigns.php

@@ -52,16 +52,15 @@ class AddCampaigns extends DirectRequest
     public function handle($response)
     {
         try {
-            if (!isset($response['result'])) {
-                Log::debug($response);
-                Log::debug($this->getParams());
-            }
-
             if (isset($response['result']['Errors'])) {
                 Log::debug($response['Errors']);
                 Log::debug($this->getParams());
             }
 
+            if (!isset($response['result']['AddResults'])) {
+                return;
+            }
+
             foreach ($response['result']['AddResults'] as $key => $add_result) {
                 if (!isset($add_result['Id'])) {
                     Log::debug("AddCampaigns, empty Id");

app/Service/Requests/Direct/AddKeywords.php

@@ -50,17 +50,16 @@ class AddKeywords extends DirectRequest
     public function handle($response)
     {
         try {
-            Log::debug($response);
-            if (!isset($response['result']['AddResults'])) {
-                Log::debug($response);
-                Log::debug($this->getParams());
-            }
 
             if (isset($response['result']['Errors'])) {
                 Log::debug($response['Errors']);
                 Log::debug($this->getParams());
             }
 
+            if (!isset($response['result']['AddResults'])) {
+                return;
+            }
+
             foreach ($response['result']['AddResults'] as $key => $add_result) {
                 if (!isset($add_result['Id'])) {
                     Log::debug("AddKeywords, empty Id");
@@ -77,7 +76,6 @@ class AddKeywords extends DirectRequest
                     'external_id' => $external_id,
                     'external_upload_at' => Carbon::now(),
                 ]);
-
             }
         } catch (\Exception $e) {
             Log::debug($e);

app/Service/Requests/Direct/DeleteKeywords.php

@@ -41,16 +41,15 @@ class DeleteKeywords extends DirectRequest
     public function handle($response)
     {
         try {
-            if (!isset($response['result']['DeleteResults'])) {
-                Log::debug($response);
-                Log::debug($this->getParams());
-            }
-
             if (isset($response['result']['Errors'])) {
                 Log::debug($response['Errors']);
                 Log::debug($this->getParams());
             }
 
+            if (!isset($response['result']['DeleteResults'])) {
+                return;
+            }
+
             foreach ($response['result']['DeleteResults'] as $key => $delete_result) {
                 if (!isset($delete_result['Id'])) {
                     Log::debug("DeleteKeywords, empty Id");

app/Service/Requests/Direct/UpdateAdGroups.php

@@ -42,16 +42,15 @@ class UpdateAdGroups extends DirectRequest
     public function handle($response)
     {
         try {
-            if (!isset($response['result']['UpdateResults'])) {
-                Log::debug($response);
-                Log::debug($this->getParams());
-            }
-
             if (isset($response['result']['Errors'])) {
                 Log::debug($response['Errors']);
                 Log::debug($this->getParams());
             }
 
+            if (!isset($response['result']['UpdateResults'])) {
+                return;
+            }
+
             foreach ($response['result']['UpdateResults'] as $key => $update_result) {
                 if (!isset($update_result['Id'])) {
                     Log::debug("UpdateAdGroup, empty Id");

app/Service/Requests/Direct/UpdateCampaigns.php

@@ -11,6 +11,7 @@ use App\Service\Requests\DirectRequest;
 use App\Service\StrReplaceByVariables;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Log;
+use phpDocumentor\Reflection\DocBlock\Tags\Return_;
 
 class UpdateCampaigns extends DirectRequest
 {
@@ -43,6 +44,10 @@ class UpdateCampaigns extends DirectRequest
                 Log::debug($this->getParams());
             }
 
+            if (isset($response['result']['UpdateResults'])) {
+                return;
+            }
+
             foreach ($response['result']['UpdateResults'] as $key => $add_result) {
                 if (!isset($add_result['Id'])) {
                     Log::debug("UpdateCampaigns, empty Id");

app/Service/Requests/Direct/UpdateKeywords.php

@@ -39,16 +39,15 @@ class UpdateKeywords extends DirectRequest
     public function handle($response)
     {
         try {
-            if (!isset($response['result']['UpdateResults'])) {
-                Log::debug($response);
-                Log::debug($this->getParams());
-            }
-
             if (isset($response['result']['Errors'])) {
                 Log::debug($response['Errors']);
                 Log::debug($this->getParams());
             }
 
+            if (!isset($response['result']['UpdateResults'])) {
+                return;
+            }
+
             foreach ($response['result']['UpdateResults'] as $key => $update_result) {
                 if (!isset($update_result['Id'])) {
                     Log::debug("UpdateKeywords, empty Id");