Skip to content

Письменов Дмитрий Иванович / yourroomads

Go to a project
Commit 0c3d2a64 by Vladislav
Options

fix save AdGroup

1 parent 286c5489
Inline Side-by-side
Showing with 22 additions and 21 deletions
app/Models/AdGroup.php
...@@ -166,8 +166,9 @@ class AdGroup extends Model ...@@ -166,8 +166,9 @@ class AdGroup extends Model
static::created(function (AdGroup $ad_group) { static::created(function (AdGroup $ad_group) {
if ($ad_group->campaign) { if ($ad_group->campaign) {
$ad_group->campaign->copyGroupInGoalGroup(); $ad_group->campaign->dictionaryCampaigns()->update([
$ad_group->campaign->copyGroupInGoalKeyword(); 'synced_need' => Carbon::now(),
]);
} }
}); });
...@@ -176,14 +177,9 @@ class AdGroup extends Model ...@@ -176,14 +177,9 @@ class AdGroup extends Model
if (GoalAdGroup::getPropertiesCopyWithPivot()->first(function ($property_name) use ($ad_group) { if (GoalAdGroup::getPropertiesCopyWithPivot()->first(function ($property_name) use ($ad_group) {
return $ad_group->{$property_name} !== $ad_group->getOriginal($property_name); return $ad_group->{$property_name} !== $ad_group->getOriginal($property_name);
})) { })) {
if (!is_null($ad_group->campaign_id) && is_null($ad_group->getOriginal('campaign_id'))) { $ad_group->campaign->dictionaryCampaigns()->update([
$ad_group->campaign->copyGroupInGoalGroup(); 'synced_need' => Carbon::now(),
$ad_group->campaign->copyGroupInGoalKeyword(); ]);
} else {
$ad_group->goalGroups()->has('dictionaryCampaignSynchronized')->update(
GoalAdGroup::copyPropertyFromMain($ad_group)
);
}
} }
if (self::getPropertiesWatch()->first(function ($property_name) use ($ad_group) { if (self::getPropertiesWatch()->first(function ($property_name) use ($ad_group) {
......
app/Models/Keyword.php
...@@ -113,7 +113,9 @@ class Keyword extends Model ...@@ -113,7 +113,9 @@ class Keyword extends Model
static::created(function (Keyword $keyword) { static::created(function (Keyword $keyword) {
if ($keyword->campaign) { if ($keyword->campaign) {
$keyword->campaign->copyGroupInGoalKeyword(); $keyword->campaign->dictionaryCampaigns()->update([
'synced_need' => Carbon::now(),
]);
} }
}); });
...@@ -122,15 +124,9 @@ class Keyword extends Model ...@@ -122,15 +124,9 @@ class Keyword extends Model
if (GoalKeyword::getPropertiesCopyWithPivot()->first(function ($property_name) use ($keyword) { if (GoalKeyword::getPropertiesCopyWithPivot()->first(function ($property_name) use ($keyword) {
return $keyword->{$property_name} !== $keyword->getOriginal($property_name); return $keyword->{$property_name} !== $keyword->getOriginal($property_name);
})) { })) {
$keyword->campaign->dictionaryCampaigns()->update([
if (!is_null($keyword->campaign_id) && is_null($keyword->getOriginal('campaign_id'))) { 'synced_need' => Carbon::now(),
$keyword->campaign->copyGroupInGoalKeyword(); ]);
} else {
$keyword->goalKeywords()->update(
GoalKeyword::copyPropertyFromMain($keyword)
);
}
} }
if (self::getPropertiesWatch()->first(function ($property_name) use ($keyword) { if (self::getPropertiesWatch()->first(function ($property_name) use ($keyword) {
......
app/Models/Pivots/GoalKeyword.php
...@@ -124,6 +124,8 @@ class GoalKeyword extends Pivot ...@@ -124,6 +124,8 @@ class GoalKeyword extends Pivot
static public function updateOrCreateByMain(Keyword $keyword, GoalAdGroup $goalAdGroup, DictionaryCampaign $dictionaryCampaign) static public function updateOrCreateByMain(Keyword $keyword, GoalAdGroup $goalAdGroup, DictionaryCampaign $dictionaryCampaign)
{ {
if (!$goalAdGroup->getKey())
\Log::debug($goalAdGroup);
return GoalKeyword::updateOrCreate([ return GoalKeyword::updateOrCreate([
'dictionary_campaign_id' => $dictionaryCampaign->getKey(), 'dictionary_campaign_id' => $dictionaryCampaign->getKey(),
'dictionary_campaign_external_id' => $dictionaryCampaign->external_id, 'dictionary_campaign_external_id' => $dictionaryCampaign->external_id,
......
app/Service/Requests/Direct/GetAdGroups.php
...@@ -56,6 +56,8 @@ class GetAdGroups extends DirectRequest ...@@ -56,6 +56,8 @@ class GetAdGroups extends DirectRequest
try { try {
$external_ids = []; $external_ids = [];
\Log::debug($response);
if (!isset($response['result']['AdGroups'])) { if (!isset($response['result']['AdGroups'])) {
return; return;
} }
...@@ -83,14 +85,19 @@ class GetAdGroups extends DirectRequest ...@@ -83,14 +85,19 @@ class GetAdGroups extends DirectRequest
->keyBy('external_id'); ->keyBy('external_id');
} }
\Log::debug($campaigns);
foreach ($response['result']['AdGroups'] as $ad_group) { foreach ($response['result']['AdGroups'] as $ad_group) {
$external_id = (string)$ad_group['CampaignId']; $external_id = (string)$ad_group['CampaignId'];
$campaign = $campaigns->firstWhere('external_id', $external_id); $campaign = $campaigns->firstWhere('external_id', $external_id);
if (!$campaign) if (!$campaign) {
\Log::debug('Not Fround campaign for external_id');
\Log::debug($external_id);
continue; continue;
}
$external_id = (string)$ad_group['Id']; $external_id = (string)$ad_group['Id'];
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!