rollback BidModifiersAdd

app/Console/Commands/BidModifiersAdd.php

@@ -67,14 +67,20 @@ class BidModifiersAdd extends Command
                         });
                 })
                 ->whereIn('goal_bid_modifiers.dictionary_campaign_id', $token->dictionaryCampaignsEnabledForExternalSynchronized->pluck('id'))
+                ->groupBy([
+                    'goal_bid_modifiers.dictionary_campaign_external_id',
+                    'goal_bid_modifiers.goal_ad_group_external_id',
+                    'bid_modifiers.mobile_adjustment',
+                    'bid_modifiers.desktop_adjustment',
+                ])
                 ->select([
-                    'goal_bid_modifiers.id as id',
+                    DB::raw('json_arrayagg(bid_modifiers.id) as ids'),
                     'goal_bid_modifiers.dictionary_campaign_external_id as dictionary_campaign_external_id',
                     'goal_bid_modifiers.goal_ad_group_external_id as goal_ad_group_external_id',
                     'bid_modifiers.mobile_adjustment as mobile_adjustment',
                     'bid_modifiers.desktop_adjustment as desktop_adjustment',
-                    'bid_modifiers.demographics_adjustment as demographics_adjustment',
-                    'bid_modifiers.retargeting_adjustment as retargeting_adjustment',
+                    DB::raw('json_arrayagg(bid_modifiers.demographics_adjustment) as demographics_adjustments'),
+                    DB::raw('json_arrayagg(bid_modifiers.retargeting_adjustment) as retargeting_adjustments'),
                 ])
                 ->get();
 

app/Service/Requests/Direct/AddBidModifiers.php

@@ -74,7 +74,7 @@ class AddBidModifiers extends DirectRequest
 
                 $external_id = (string)$add_result['Id'];
 
-                GoalBidModifier::where('id', $goalBidModifier->id)
+                GoalBidModifier::whereIn('id', $goalBidModifier->ids)
                     ->update([
                         'external_id' => $external_id,
                         'external_upload_at' => Carbon::now(),
@@ -90,7 +90,7 @@ class AddBidModifiers extends DirectRequest
 
     public function failed()
     {
-        GoalBidModifier::whereIn('id', $this->goalBidModifiers->pluck('id')->toArray())
+        GoalBidModifier::whereIn('id', $this->goalBidModifiers->pluck('ids')->collapse()->toArray())
             ->update([
                 'reserve_create_at' => null,
             ]);
@@ -129,7 +129,7 @@ class AddBidModifiers extends DirectRequest
 
                     $data['DesktopAdjustment'] = $desktop_adjustment;
 
-                } elseif ($demographics_adjustment = @json_decode($goalBidModifier->demographics_adjustment, true)) {
+                } elseif ($demographics_adjustments = array_map(function ($demographics_adjustment) {
 
                     unset($demographics_adjustment['Enabled']);
 
@@ -140,18 +140,24 @@ class AddBidModifiers extends DirectRequest
                         unset($demographics_adjustment['Age']);
                     }
 
-                    $data['DemographicsAdjustments'] = [
-                        $demographics_adjustment
-                    ];
+                    return $demographics_adjustment;
 
-                } elseif ($retargeting_adjustment = @json_decode($goalBidModifier->retargeting_adjustment, true)) {
+                }, array_filter(@json_decode($goalBidModifier->demographics_adjustments, true)))) {
+
+                    $data['DemographicsAdjustments'] = $demographics_adjustments;
+
+                } elseif ($retargeting_adjustments = array_map(function ($retargeting_adjustment) {
 
                     unset($retargeting_adjustment['Accessible']);
                     unset($retargeting_adjustment['Enabled']);
 
-                    $data['RetargetingAdjustments'] = [
-                        $retargeting_adjustment
-                    ];
+                    return $retargeting_adjustment;
+
+                }, array_filter(@json_decode($goalBidModifier->retargeting_adjustments, true)))) {
+
+
+                    $data['RetargetingAdjustments'] = $retargeting_adjustments;
+
                 }
 
                 return $data;