#20359 Каждый час обновляются РК

app/Console/Commands/CampaignsUpdate.php

@@ -40,7 +40,7 @@ class CampaignsUpdate extends Command
      */
      */
     public function handle()
     public function handle()
     {
     {
-        $tokens = Tokens::whereHas('dictionaryCampaignsEnabledForExternalUpdatedNeedUpdated')
+        $tokens = Tokens::whereHas('dictionaryCampaignsEnabledForExternalUpdatedNeedUpdated.campaign')
             ->with('dictionaryCampaignsEnabledForExternalUpdatedNeedUpdated.campaign')
             ->with('dictionaryCampaignsEnabledForExternalUpdatedNeedUpdated.campaign')
             ->where('type', '!=', Tokens::MAIN)
             ->where('type', '!=', Tokens::MAIN)
             ->get();
             ->get();

app/Service/Requests/Direct/AddAds.php

@@ -51,7 +51,6 @@ class AddAds extends DirectRequest
     public function handle($response)
     public function handle($response)
     {
     {
         try {
         try {
-            \Log::debug($response);
             if (isset($response['result']['Errors'])) {
             if (isset($response['result']['Errors'])) {
                 Log::debug($response['Errors']);
                 Log::debug($response['Errors']);
                 Log::debug($this->getParams());
                 Log::debug($this->getParams());

app/Service/Requests/Direct/GetCampaigns.php

@@ -7,6 +7,7 @@ use App\Models\Campaigns;
 use App\Models\Pivots\DictionaryCampaign;
 use App\Models\Pivots\DictionaryCampaign;
 use App\Service\Contract\APIRequest;
 use App\Service\Contract\APIRequest;
 use App\Service\Requests\DirectRequest;
 use App\Service\Requests\DirectRequest;
+use Carbon\Carbon;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Log;
 
 
 class GetCampaigns extends DirectRequest
 class GetCampaigns extends DirectRequest
@@ -25,7 +26,7 @@ class GetCampaigns extends DirectRequest
     public function getObjectsCount()
     public function getObjectsCount()
     {
     {
         $params = $this->getParams();
         $params = $this->getParams();
-        if (isset($params['SelectionCriteria']['Ids'])){
+        if (isset($params['SelectionCriteria']['Ids'])) {
             return count($params['SelectionCriteria']['Ids']);
             return count($params['SelectionCriteria']['Ids']);
         }
         }
         return -1;
         return -1;
@@ -35,7 +36,7 @@ class GetCampaigns extends DirectRequest
     {
     {
         $params = $this->getParams();
         $params = $this->getParams();
 
 
-        if (isset($params['SelectionCriteria']['Ids'])){
+        if (isset($params['SelectionCriteria']['Ids'])) {
             return $this->sliceByKey($maxObjects, ['SelectionCriteria', 'Ids']);
             return $this->sliceByKey($maxObjects, ['SelectionCriteria', 'Ids']);
         }
         }
 
 
@@ -83,7 +84,9 @@ class GetCampaigns extends DirectRequest
                         continue;
                         continue;
 
 
                     $dictionaryCampaign->update(
                     $dictionaryCampaign->update(
-                        $dictionaryCampaign::copyPropertyFromMain($campaign_data)
+                        array_merge([
+                            'updated_self' => null,
+                        ], $dictionaryCampaign::copyPropertyFromMain($campaign_data))
                     );
                     );
                 }
                 }
 
 

app/Service/Requests/Direct/UpdateAdGroups.php

@@ -115,17 +115,17 @@ class UpdateAdGroups extends DirectRequest
                     $data['SmartAdGroup'] = $goalAdGroup->group->smart_ad_group;
                     $data['SmartAdGroup'] = $goalAdGroup->group->smart_ad_group;
                 }
                 }
 
 
-                if ($goalAdGroup->group->negative_keywords && count($goalAdGroup->group->negative_keywords)) {
+                if ($goalAdGroup->group->negative_keywords && isset($goalAdGroup->group->negative_keywords['Items']) && count($goalAdGroup->group->negative_keywords['Items'])) {
                     $data['NegativeKeywords'] = [
                     $data['NegativeKeywords'] = [
                         'Items' => array_map(function ($value) use ($list) {
                         'Items' => array_map(function ($value) use ($list) {
                             return StrReplaceByVariables::getInstance($value, $list)->get();
                             return StrReplaceByVariables::getInstance($value, $list)->get();
-                        }, $goalAdGroup->group->negative_keywords),
+                        }, $goalAdGroup->group->negative_keywords['Items']),
                     ];
                     ];
                 }
                 }
 
 
-                if ($goalAdGroup->group->negative_keyword_shared_set_ids && count($goalAdGroup->group->negative_keyword_shared_set_ids)) {
+                if ($goalAdGroup->group->negative_keyword_shared_set_ids && isset($goalAdGroup->group->negative_keyword_shared_set_ids['Items']) && count($goalAdGroup->group->negative_keyword_shared_set_ids['Items'])) {
                     $data['NegativeKeywordSharedSetIds'] = [
                     $data['NegativeKeywordSharedSetIds'] = [
-                        'Items' => $goalAdGroup->group->negative_keyword_shared_set_ids,
+                        'Items' => $goalAdGroup->group->negative_keyword_shared_set_ids['Items'],
                     ];
                     ];
                 }
                 }
 
 

app/Service/Requests/Direct/UpdateCampaigns.php

@@ -44,7 +44,7 @@ class UpdateCampaigns extends DirectRequest
                 Log::debug($this->getParams());
                 Log::debug($this->getParams());
             }
             }
 
 
-            if (isset($response['result']['UpdateResults'])) {
+            if (!isset($response['result']['UpdateResults'])) {
                 return;
                 return;
             }
             }