#19499 Загрузка модификаторов ставок

app/Console/Commands/DictionaryCampaignsSyncByCampaign.php

@@ -102,7 +102,7 @@ class DictionaryCampaignsSyncByCampaign extends Command
             //грузиим РК которых по какой то причне нет в целевых.
             //грузиим РК которых по какой то причне нет в целевых.
             DB::insert("
             DB::insert("
                 INSERT INTO dictionary_campaigns(campaign_id, dictionary_id, name, negative_keywords, excluded_sites, created_at, updated_at)
                 INSERT INTO dictionary_campaigns(campaign_id, dictionary_id, name, negative_keywords, excluded_sites, created_at, updated_at)
-                SELECT c.id, {$city->id}, c.name, c.negative_keywords, c.excluded_sites, now(), now()
+                SELECT c.id, {$city->id}, c.name, c.negative_keywords, c.excluded_sites, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP
                 FROM campaigns c
                 FROM campaigns c
                  LEFT JOIN dictionary_campaigns dc on c.id = dc.campaign_id AND dc.dictionary_id={$city->id}
                  LEFT JOIN dictionary_campaigns dc on c.id = dc.campaign_id AND dc.dictionary_id={$city->id}
                 WHERE dc.campaign_id is null AND c.manage=1
                 WHERE dc.campaign_id is null AND c.manage=1
@@ -112,7 +112,7 @@ class DictionaryCampaignsSyncByCampaign extends Command
         //грузим группы которых по какой то причне нет в целевых.
         //грузим группы которых по какой то причне нет в целевых.
         DB::insert("
         DB::insert("
                 INSERT INTO goal_ad_groups(ad_group_id, dictionary_campaign_external_id, dictionary_campaign_id, name, negative_keywords, created_at, updated_at)
                 INSERT INTO goal_ad_groups(ad_group_id, dictionary_campaign_external_id, dictionary_campaign_id, name, negative_keywords, created_at, updated_at)
-                SELECT a.id, dc.external_id, dc.id,  a.name, a.negative_keywords, now(), now()
+                SELECT a.id, dc.external_id, dc.id,  a.name, a.negative_keywords, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP
                 FROM ad_groups a
                 FROM ad_groups a
                     INNER JOIN campaigns c on a.campaign_id = c.id
                     INNER JOIN campaigns c on a.campaign_id = c.id
                     INNER JOIN dictionary_campaigns dc on c.id = dc.campaign_id
                     INNER JOIN dictionary_campaigns dc on c.id = dc.campaign_id
@@ -124,7 +124,7 @@ class DictionaryCampaignsSyncByCampaign extends Command
         DB::insert("
         DB::insert("
                 INSERT INTO goal_keywords(dictionary_campaign_external_id, goal_ad_group_external_id, dictionary_campaign_id,
                 INSERT INTO goal_keywords(dictionary_campaign_external_id, goal_ad_group_external_id, dictionary_campaign_id,
                           goal_ad_group_id, keyword_id, created_at, updated_at)
                           goal_ad_group_id, keyword_id, created_at, updated_at)
-                    SELECT gag.dictionary_campaign_id, gag.external_id, gag.dictionary_campaign_id, gag.id, k.id, now(), now()
+                    SELECT gag.dictionary_campaign_external_id, gag.external_id, gag.dictionary_campaign_id, gag.id, k.id, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP
                     FROM keywords k
                     FROM keywords k
                         INNER JOIN ad_groups ag on k.ad_group_id = ag.id
                         INNER JOIN ad_groups ag on k.ad_group_id = ag.id
                         INNER JOIN goal_ad_groups gag on ag.id = gag.ad_group_id
                         INNER JOIN goal_ad_groups gag on ag.id = gag.ad_group_id
@@ -136,7 +136,7 @@ class DictionaryCampaignsSyncByCampaign extends Command
         DB::insert("
         DB::insert("
                 INSERT INTO goal_advertisements(dictionary_campaign_external_id, goal_ad_group_external_id, dictionary_campaign_id,
                 INSERT INTO goal_advertisements(dictionary_campaign_external_id, goal_ad_group_external_id, dictionary_campaign_id,
                           goal_ad_group_id, advertisement_id, created_at, updated_at)
                           goal_ad_group_id, advertisement_id, created_at, updated_at)
-                    SELECT gag.dictionary_campaign_id, gag.external_id, gag.dictionary_campaign_id, gag.id, ad.id, now(), now()
+                    SELECT gag.dictionary_campaign_external_id, gag.external_id, gag.dictionary_campaign_id, gag.id, ad.id, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP
                     FROM advertisements ad
                     FROM advertisements ad
                          INNER JOIN ad_groups ag on ad.ad_group_id = ag.id
                          INNER JOIN ad_groups ag on ad.ad_group_id = ag.id
                          INNER JOIN goal_ad_groups gag on ag.id = gag.ad_group_id
                          INNER JOIN goal_ad_groups gag on ag.id = gag.ad_group_id
@@ -148,11 +148,12 @@ class DictionaryCampaignsSyncByCampaign extends Command
         DB::insert("
         DB::insert("
                 INSERT INTO goal_bid_modifiers(dictionary_campaign_external_id, goal_ad_group_external_id, dictionary_campaign_id,
                 INSERT INTO goal_bid_modifiers(dictionary_campaign_external_id, goal_ad_group_external_id, dictionary_campaign_id,
                           goal_ad_group_id, bid_modifier_id, created_at, updated_at)
                           goal_ad_group_id, bid_modifier_id, created_at, updated_at)
-                    SELECT gag.dictionary_campaign_id, gag.external_id, gag.dictionary_campaign_id, gag.id, ad.id, now(), now()
-                    FROM advertisements ad
-                         INNER JOIN ad_groups ag on ad.ad_group_id = ag.id
-                         INNER JOIN goal_ad_groups gag on ag.id = gag.ad_group_id
-                         LEFT JOIN goal_bid_modifiers gbm on ad.id = gbm.bid_modifier_id AND gbm.goal_ad_group_id=gag.id
+                    SELECT dc.external_id, gag.external_id, dc.id, gag.id, bm.id, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP
+                    FROM bid_modifiers bm
+                         INNER JOIN campaigns c on bm.campaign_id = c.id
+                         INNER JOIN dictionary_campaigns dc on dc.campaign_id = c.id
+                         LEFT JOIN goal_ad_groups gag on dc.dictionary_id = gag.dictionary_campaign_id
+                         LEFT JOIN goal_bid_modifiers gbm on bm.id = gbm.bid_modifier_id AND (gbm.goal_ad_group_id = gag.id OR gbm.goal_ad_group_id IS NULL)
                     WHERE gbm.bid_modifier_id is null
                     WHERE gbm.bid_modifier_id is null
                             ");
                             ");
 
 

app/Service/Requests/Direct/GetBidModifiers.php

@@ -162,6 +162,10 @@ class GetBidModifiers extends DirectRequest
                     BidModifier::TYPE_DEMOGRAPHICS_ADJUSTMENT,
                     BidModifier::TYPE_DEMOGRAPHICS_ADJUSTMENT,
                     BidModifier::TYPE_RETARGETING_ADJUSTMENT,
                     BidModifier::TYPE_RETARGETING_ADJUSTMENT,
                 ],
                 ],
+                "Levels" => [
+                    BidModifier::LEVEL_AD_GROUP,
+                    BidModifier::LEVEL_CAMPAIGN,
+                ],
             ],
             ],
             "FieldNames" => [
             "FieldNames" => [
                 "Id", "CampaignId", "AdGroupId", "Level", "Type",
                 "Id", "CampaignId", "AdGroupId", "Level", "Type",