Skip to content

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

Go to a project
Commit 879faa7e by Vladislav
Options

#19468 Первоначальная загрузка групп объявлений.

1 parent 3c283578
Inline Side-by-side
Showing with 50 additions and 109 deletions
app/Console/Commands/AdGroupLoadUpdated.php deleted 100644 → 0
<?php
namespace App\Console\Commands;
use App\Jobs\ProcessCallLimitedAPI;
use App\Models\AdGroup;
use App\Models\Campaigns;
use App\Models\Pivots\DictionaryCampaign;
use App\Models\Tokens;
use App\Service\API\API;
use App\Service\Direct\CheckDictionaries;
use App\Service\Direct\GetCampaigns;
use App\Service\Requests\APIRequest;
use Illuminate\Console\Command;
use Illuminate\Database\Eloquent\Relations\HasManyThrough;
use Illuminate\Support\Facades\Bus;
class AdGroupLoadUpdated extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'adgroups:loadUpdated';
/**
* The console command description.
*
* @var string
*/
protected $description = 'Загрузка измененные группы';
/**
* Create a new command instance.
*
* @return void
*/
public function __construct()
{
parent::__construct();
}
/**
* Execute the console command.
*
* @return int
*/
public function handle()
{
$campaigns = AdGroup::forUpdatedSelf()->get();
if (!$campaigns->count()) {
return;
}
$token = Tokens::where('type', Tokens::MAIN)->first();
if (!$token) {
throw new \Exception('Не найден токен блин');
}
$factory = APIRequest::getInstance(API::YANDEX);
$factory->setToken($token);
$factory->getRequest('Campaigns', 'get')->call([
'ids' => $campaigns->pluck('external_id')->all(),
]);
$tokens = Tokens::has('dictionaryCampaignsEnabledForExternalSynchronized.groupsForExternalForUpdatedSelf')
->with('dictionaryCampaignsEnabledForExternalSynchronized.groupsForExternalForUpdatedSelf')
->where('type', '!=', Tokens::MAIN)
->get();
foreach ($tokens as $token) {
$factory = APIRequest::getInstance(API::YANDEX);
$factory->setToken($token);
$factory->getRequest('AdGroups', 'get')->call([
'Ids' => $token->dictionaryCampaignsEnabledForExternalSynchronized->pluck('groupsForExternalForUpdatedSelf')
->collapse()->all(),
]);
}
return 0;
}
}
app/Console/Commands/AdGroupsAdd.php
...@@ -54,10 +54,9 @@ class AdGroupsAdd extends Command ...@@ -54,10 +54,9 @@ class AdGroupsAdd extends Command
$factory = APIRequest::getInstance(API::YANDEX); $factory = APIRequest::getInstance(API::YANDEX);
$factory->setToken($token); $factory->setToken($token);
$factory->getRequest('AdGroups', 'add') $factory->getRequest('AdGroups', 'add')
->call([ ->call([
'goalAdGroups' => $token->dictionaryCampaignsEnabledForExternal->pluck('dictionaryCampaignsEnabledForExternalSynchronized') 'goalAdGroups' => $token->dictionaryCampaignsEnabledForExternalSynchronized->pluck('groupsForNotExternal')
->collapse(), ->collapse(),
]); ]);
} }
......
app/Console/Commands/AdGroupsLoadUpdated.php
...@@ -2,11 +2,18 @@ ...@@ -2,11 +2,18 @@
namespace App\Console\Commands; namespace App\Console\Commands;
use App\Jobs\ProcessCallLimitedAPI;
use App\Models\AdGroup;
use App\Models\Campaigns;
use App\Models\Pivots\DictionaryCampaign;
use App\Models\Tokens; use App\Models\Tokens;
use App\Service\API\API; use App\Service\API\API;
use App\Service\Direct\CheckDictionaries;
use App\Service\Direct\GetCampaigns;
use App\Service\Requests\APIRequest; use App\Service\Requests\APIRequest;
use Illuminate\Console\Command; use Illuminate\Console\Command;
use Illuminate\Database\Eloquent\Relations\HasManyThrough; use Illuminate\Database\Eloquent\Relations\HasManyThrough;
use Illuminate\Support\Facades\Bus;
class AdGroupsLoadUpdated extends Command class AdGroupsLoadUpdated extends Command
{ {
...@@ -22,7 +29,7 @@ class AdGroupsLoadUpdated extends Command ...@@ -22,7 +29,7 @@ class AdGroupsLoadUpdated extends Command
* *
* @var string * @var string
*/ */
protected $description = 'Загрузка измененных групп'; protected $description = 'Загрузка измененные группы';
/** /**
* Create a new command instance. * Create a new command instance.
...@@ -38,27 +45,43 @@ class AdGroupsLoadUpdated extends Command ...@@ -38,27 +45,43 @@ class AdGroupsLoadUpdated extends Command
* Execute the console command. * Execute the console command.
* *
* @return int * @return int
* @throws \Exception
*/ */
public function handle() public function handle()
{ {
$token = Tokens::has('campaignsAdGroupsForUpdatedSelf') $adGroups = AdGroup::forUpdatedSelf()->get();
->with('campaignsAdGroupsForUpdatedSelf') if (!$adGroups->count()) {
->where('type', '!=', Tokens::MAIN) return;
->first(); }
$token = Tokens::where('type', Tokens::MAIN)->first();
if (!$token) { if (!$token) {
return 0; throw new \Exception('Не найден токен блин');
} }
$factory = APIRequest::getInstance(API::YANDEX); $factory = APIRequest::getInstance(API::YANDEX);
$factory->setToken($token); $factory->setToken($token);
$factory->getRequest('AdGroups', 'get') $factory->getRequest('AdGroups', 'get')->call([
->call([ 'Ids' => $adGroups->pluck('external_id')->all(),
'CampaignIds' => $token->campaignsAdGroupsForUpdatedSelf->pluck('campaign_external_id')->all(),
]); ]);
$tokens = Tokens::has('dictionaryCampaignsEnabledForExternalSynchronized.groupsForExternalForUpdatedSelf')
->with('dictionaryCampaignsEnabledForExternalSynchronized.groupsForExternalForUpdatedSelf')
->where('type', '!=', Tokens::MAIN)
->get();
foreach ($tokens as $token) {
$factory = APIRequest::getInstance(API::YANDEX);
$factory->setToken($token);
$factory->getRequest('AdGroups', 'get')->call([
'Ids' => $token->dictionaryCampaignsEnabledForExternalSynchronized->pluck('groupsForExternalForUpdatedSelf')
->collapse()
->pluck('external_id')
->all(),
]);
}
return 0; return 0;
} }
} }
app/Models/AdGroup.php
...@@ -105,8 +105,6 @@ class AdGroup extends Model ...@@ -105,8 +105,6 @@ class AdGroup extends Model
protected $casts = [ protected $casts = [
'campaign_id' => 'int', 'campaign_id' => 'int',
'external_id' => 'int',
'campaign_external_id' => 'int',
'region_ids' => 'array', 'region_ids' => 'array',
'negative_keywords' => 'json', 'negative_keywords' => 'json',
'negative_keyword_shared_set_ids' => 'json', 'negative_keyword_shared_set_ids' => 'json',
...@@ -126,7 +124,6 @@ class AdGroup extends Model ...@@ -126,7 +124,6 @@ class AdGroup extends Model
static public function getPropertiesWatch() static public function getPropertiesWatch()
{ {
return collect([ return collect([
'campaign_external_id',
'name', 'name',
'region_ids', 'region_ids',
'negative_keywords', 'negative_keywords',
...@@ -156,10 +153,14 @@ class AdGroup extends Model ...@@ -156,10 +153,14 @@ 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->copyGroupInGoalGroup();
} else {
$ad_group->goalGroups()->update( $ad_group->goalGroups()->update(
GoalAdGroup::copyPropertyFromMain($ad_group) GoalAdGroup::copyPropertyFromMain($ad_group)
); );
} }
}
if (self::getPropertiesWatch()->first(function ($property_name) use ($ad_group) { if (self::getPropertiesWatch()->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);
......
app/Models/Campaigns.php
...@@ -111,7 +111,6 @@ class Campaigns extends Model ...@@ -111,7 +111,6 @@ class Campaigns extends Model
]; ];
protected $casts = [ protected $casts = [
'external_id' => 'int',
'time_targeting' => 'array', 'time_targeting' => 'array',
'negative_keywords' => 'array', 'negative_keywords' => 'array',
'blocked_ips' => 'array', 'blocked_ips' => 'array',
...@@ -232,7 +231,8 @@ class Campaigns extends Model ...@@ -232,7 +231,8 @@ class Campaigns extends Model
$campaign->groups()->get()->each(function (AdGroup $adGroup) use ($dictionaryCampaign) { $campaign->groups()->get()->each(function (AdGroup $adGroup) use ($dictionaryCampaign) {
$dictionaryCampaign->groups()->updateOrCreate([ $dictionaryCampaign->groups()->updateOrCreate([
'campaign_id' => $dictionaryCampaign->external_id, 'campaign_external_id' => $dictionaryCampaign->external_id,
'ad_group_id' => $adGroup->getKey(),
], GoalAdGroup::copyPropertyFromMain($adGroup)); ], GoalAdGroup::copyPropertyFromMain($adGroup));
}); });
......
app/Models/Pivots/DictionaryCampaign.php
...@@ -102,7 +102,6 @@ class DictionaryCampaign extends Pivot ...@@ -102,7 +102,6 @@ class DictionaryCampaign extends Pivot
]; ];
protected $casts = [ protected $casts = [
'external_id' => 'int',
'campaign_id' => 'int', 'campaign_id' => 'int',
'dictionary_id' => 'int', 'dictionary_id' => 'int',
'negative_keywords' => 'array', 'negative_keywords' => 'array',
......
app/Models/Pivots/GoalAdGroup.php
...@@ -71,8 +71,6 @@ class GoalAdGroup extends Pivot ...@@ -71,8 +71,6 @@ class GoalAdGroup extends Pivot
]; ];
protected $casts = [ protected $casts = [
'external_id' => 'int',
'campaign_external_id' => 'int',
'ad_group_id' => 'int', 'ad_group_id' => 'int',
'dictionary_campaign_id' => 'int', 'dictionary_campaign_id' => 'int',
'negative_keywords' => 'array', 'negative_keywords' => 'array',
......
app/Models/Tokens.php
...@@ -27,8 +27,8 @@ use Illuminate\Database\Eloquent\Model; ...@@ -27,8 +27,8 @@ use Illuminate\Database\Eloquent\Model;
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Campaigns[] $campaigns * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Campaigns[] $campaigns
* @property-read int|null $campaigns_count * @property-read int|null $campaigns_count
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\AdGroup[] $campaignsAdGroups * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\AdGroup[] $campaignsAdGroups
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\AdGroup[] $campaignsAdGroupsForUpdatedSelf * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\AdGroup[] $campaignsForEnabledAdGroupsForUpdatedSelf
* @property-read int|null $campaigns_ad_groups_count * @property-read int|null $campaigns_for_enabled_ad_groups_count
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Campaigns[] $campaignsNotEnabledNotDisabled * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Campaigns[] $campaignsNotEnabledNotDisabled
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Campaigns[] $campaignsEnabledDisabled * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Campaigns[] $campaignsEnabledDisabled
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Campaigns[] $campaignsEnabledNotDisabledUpdatedChildren * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Campaigns[] $campaignsEnabledNotDisabledUpdatedChildren
...@@ -145,9 +145,9 @@ class Tokens extends Model ...@@ -145,9 +145,9 @@ class Tokens extends Model
return $this->hasManyThrough(AdGroup::class, Campaigns::class, 'token', 'campaign_id'); return $this->hasManyThrough(AdGroup::class, Campaigns::class, 'token', 'campaign_id');
} }
public function campaignsAdGroupsForUpdatedSelf() public function campaignsForEnabledAdGroupsForUpdatedSelf()
{ {
return $this->campaignsAdGroups()->forUpdatedSelf(); return $this->campaignsAdGroups()->forUpdatedSelf()->where(Campaigns::getModel()->getTable() . '.enabled', true);
} }
public function campaignsNotEnabledNotDisabled() public function campaignsNotEnabledNotDisabled()
......
app/Service/Requests/Direct/CheckChanges.php
...@@ -72,6 +72,12 @@ class CheckChanges extends DirectRequest ...@@ -72,6 +72,12 @@ class CheckChanges extends DirectRequest
$adGroup->update([ $adGroup->update([
'updated_self' => Carbon::now(), 'updated_self' => Carbon::now(),
]); ]);
} else {
$adGroup = AdGroup::create([
'token_id' => $this->getToken()->getKey(),
'external_id' => $ad_group_id,
'updated_self' => Carbon::now(),
]);
} }
} else { } else {
$goalAdGroup = GoalAdGroup::where('external_id', $ad_group_id)->first(); $goalAdGroup = GoalAdGroup::where('external_id', $ad_group_id)->first();
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!