Merge branch 'master' of https://gitlab.veeble.ru/pismenov/yourroomads

app/Models/Campaigns.php

@@ -11,7 +11,7 @@ class Campaigns extends Model
 
     protected $fillable = [
         'external_id',
-        'name',
+        'Name',
         'TimeTargeting',
         'NegativeKeywords',
         'BlockedIps',

app/Service/Requests/Direct/GetCampaigns.php

@@ -3,8 +3,6 @@ namespace App\Service\Requests\Direct;
 
 use App\Jobs\ProcessCallLimitedAPI;
 use App\Models\Campaigns;
-use App\Service\API\API;
-use App\Service\Requests\APIRequest;
 use App\Service\Requests\DirectRequest;
 
 class GetCampaigns extends DirectRequest{
@@ -23,6 +21,7 @@ class GetCampaigns extends DirectRequest{
         foreach ($response['result']['Campaigns'] as $campaign){
             $data[] = [
                 'external_id'   =>  $campaign['Id'],
+                'Name'   =>  $campaign['Name'],
                 'TimeTargeting'   =>  json_encode($campaign['TimeTargeting']),
                 'NegativeKeywords'   =>  !empty($campaign['NegativeKeywords']['Items']) ?implode("\n", $campaign['NegativeKeywords']['Items']):'',
                 'BlockedIps'   =>  !empty($campaign['BlockedIps']['Items']) ?implode("\n", $campaign['BlockedIps']['Items']):'',
@@ -37,44 +36,23 @@ class GetCampaigns extends DirectRequest{
                 'AttributionModel'   =>  $campaign['TextCampaign']['AttributionModel'],
                 'PriorityGoals'   =>  json_encode($campaign['TextCampaign']['PriorityGoals']),
             ];
-print_r($campaign['Name']);
-            $camp = Campaigns::firstOrCreate([
-                'external_id'   =>  $campaign['Id']
-            ],[
-                'Name'   =>  $campaign['Name'],
-//                'TimeTargeting'   =>  json_encode($campaign['TimeTargeting']),
-//                'NegativeKeywords'   =>  implode("\n", $campaign['NegativeKeywords']['Items']),
-//                'BlockedIps'   =>  implode("\n", $campaign['BlockedIps']['Items']),
-//                'ExcludedSites'   =>  implode("\n", $campaign['BlockedIps']['Items']),
-//                'DailyBudget'   =>  json_encode($campaign['DailyBudget']),
-//                'TextCampaignStrategySearch'   =>  $campaign['TextCampaign']['BiddingStrategy']['Search']['BiddingStrategyType'],
-//                'TextCampaignStrategyNetwork'   =>  $campaign['TextCampaign']['BiddingStrategy']['[Network']['BiddingStrategyType'],
-//                'Settings'   =>  json_encode($campaign['TextCampaign']['Settings']),
-//                'CounterIds'   =>  implode("\n", $campaign['TextCampaign']['CounterIds']['Items']),
-//                'RelevantKeywordsSettingBudgetPercent'   =>  $campaign['TextCampaign']['RelevantKeywords']['BudgetPercent'],
-//                'RelevantKeywordsSettingOptimizeGoalId'   =>  $campaign['TextCampaign']['RelevantKeywords']['OptimizeGoalId'],
-//                'AttributionModel'   =>  $campaign['TextCampaign']['AttributionModel'],
-//                'PriorityGoals'   =>  json_encode($campaign['TextCampaign']['PriorityGoals']),
-            ]);
-            $camp->Name = $campaign['Name'];
-            $camp->save();
         }
         Campaigns::upsert($data, [
             'external_id'
         ],[
             'Name',
-//            'TimeTargeting',
-//            'NegativeKeywords',
-//            'BlockedIps',
-//            'ExcludedSites',
-//            'DailyBudget',
-//            'TextCampaignStrategySearch',
-//            'TextCampaignStrategyNetwork',
-//            'Settings',
-//            'CounterIds',
-//            'RelevantKeywordsSettingBudgetPercent',
-//            'RelevantKeywordsSettingOptimizeGoalId',
-//            'AttributionModel',
+            'TimeTargeting',
+            'NegativeKeywords',
+            'BlockedIps',
+            'ExcludedSites',
+            'DailyBudget',
+            'TextCampaignStrategySearch',
+            'TextCampaignStrategyNetwork',
+            'Settings',
+            'CounterIds',
+            'RelevantKeywordsSettingBudgetPercent',
+            'RelevantKeywordsSettingOptimizeGoalId',
+            'AttributionModel',
         ]);
     }