Skip to content

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

Go to a project
Commit 1fbee67f by Vladislav
Options

#19465 Реализация синхронизации данных по РК.

1 parent 3f1ebeaf
Inline Side-by-side
Showing with 266 additions and 10 deletions
app/Console/Commands/CampaignsAdd.php
...@@ -42,16 +42,16 @@ class CampaignsAdd extends Command ...@@ -42,16 +42,16 @@ class CampaignsAdd extends Command
*/ */
public function handle() public function handle()
{ {
$token = Tokens::whereHas('dictionaryCampaignsForNotExternal') $tokens = Tokens::whereHas('dictionaryCampaignsForNotExternal')
->with([ ->with([
'dictionaryCampaignsForNotExternal' => function (HasManyThrough $query) { 'dictionaryCampaignsForNotExternal' => function (HasManyThrough $query) {
return $query->limit(10); return $query->limit(10);
}, },
'dictionaryCampaignsForNotExternal.campaign' 'dictionaryCampaignsForNotExternal.campaign'
])->where('type', Tokens::GOAL) ])->where('type', '!=', Tokens::MAIN)
->first(); ->get();
if ($token) { foreach ($tokens as $token) {
$factory = APIRequest::getInstance(API::YANDEX); $factory = APIRequest::getInstance(API::YANDEX);
$factory->setToken($token); $factory->setToken($token);
......
app/Console/Commands/CampaignsUpdate.php 0 → 100644
<?php
namespace App\Console\Commands;
use App\Models\Tokens;
use App\Models\Variable;
use App\Service\API\API;
use App\Service\Requests\APIRequest;
use Illuminate\Console\Command;
use Illuminate\Database\Eloquent\Relations\HasManyThrough;
class CampaignsUpdate extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'campaigns:update';
/**
* 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()
{
$tokens = Tokens::whereHas('dictionaryCampaignsForExternalNeedUpdated')
->with([
'dictionaryCampaignsForExternalNeedUpdated' => function (HasManyThrough $query) {
return $query->limit(10);
},
'dictionaryCampaignsForExternalNeedUpdated.campaign'
])->where('type', '!=', Tokens::MAIN)
->first();
foreach ($tokens as $token) {
$factory = APIRequest::getInstance(API::YANDEX);
$factory->setToken($token);
$factory->getRequest('campaigns', 'update')
->call([
'dictionaryCampaigns' => $token->dictionaryCampaignsForExternalNeedUpdated,
'variables' => Variable::all(),
]);
}
return 0;
}
}
app/Models/Campaigns.php
...@@ -4,9 +4,11 @@ namespace App\Models; ...@@ -4,9 +4,11 @@ namespace App\Models;
use App\Models\Pivots\DictionaryCampaignVariable; use App\Models\Pivots\DictionaryCampaignVariable;
use App\Models\Pivots\DictionaryCampaign; use App\Models\Pivots\DictionaryCampaign;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Collection;
/** /**
* App\Models\Campaigns * App\Models\Campaigns
...@@ -121,6 +123,28 @@ class Campaigns extends Model ...@@ -121,6 +123,28 @@ class Campaigns extends Model
'enabled' => 'boolean', 'enabled' => 'boolean',
]; ];
/**
* @return Collection
*/
static public function getPropertiesWatch()
{
return collect([
'name',
'negative_keywords',
'blocked_ips',
'excluded_sites',
'daily_budget',
'text_campaign_strategy_search',
'text_campaign_strategy_network',
'settings',
'counter_ids',
'relevant_keywords_setting_budget_percent',
'relevant_keywords_setting_optimize_goal_id',
'attribution_model',
'priority_goals',
]);
}
public static function boot() public static function boot()
{ {
parent::boot(); parent::boot();
...@@ -136,6 +160,7 @@ class Campaigns extends Model ...@@ -136,6 +160,7 @@ class Campaigns extends Model
}); });
static::updated(function (Campaigns $campaign) { static::updated(function (Campaigns $campaign) {
if ($campaign->manage !== $campaign->getOriginal('manage')) { if ($campaign->manage !== $campaign->getOriginal('manage')) {
if ($campaign->manage) { if ($campaign->manage) {
Dictionary::whereNotNull('token_id')->each(function (Dictionary $dictionary) use ($campaign) { Dictionary::whereNotNull('token_id')->each(function (Dictionary $dictionary) use ($campaign) {
...@@ -147,8 +172,6 @@ class Campaigns extends Model ...@@ -147,8 +172,6 @@ class Campaigns extends Model
$campaign->dictionaries()->detach(); $campaign->dictionaries()->detach();
} }
} }
// if ($campaign->name === 'change name')
// dd($campaign->dictionaryCampaigns()->synchronized()->get());
if (DictionaryCampaign::getPropertiesCopyWithPivot()->first(function ($property_name) use ($campaign) { if (DictionaryCampaign::getPropertiesCopyWithPivot()->first(function ($property_name) use ($campaign) {
return $campaign->{$property_name} !== $campaign->getOriginal($property_name); return $campaign->{$property_name} !== $campaign->getOriginal($property_name);
...@@ -157,6 +180,15 @@ class Campaigns extends Model ...@@ -157,6 +180,15 @@ class Campaigns extends Model
DictionaryCampaign::copyPropertyInCampaign($campaign) DictionaryCampaign::copyPropertyInCampaign($campaign)
); );
} }
if (self::getPropertiesWatch()->first(function ($property_name) use ($campaign) {
return $campaign->{$property_name} !== $campaign->getOriginal($property_name);
})) {
$campaign->dictionaryCampaigns()->synchronized()->forExternal()->update([
'updated_need' => Carbon::now(),
]);
}
}); });
} }
......
app/Models/Pivots/DictionaryCampaign.php
...@@ -34,6 +34,7 @@ use Illuminate\Support\Collection; ...@@ -34,6 +34,7 @@ use Illuminate\Support\Collection;
* @property-read int|null $variables_count * @property-read int|null $variables_count
* @method static \Illuminate\Database\Eloquent\Builder|DictionaryCampaign forExternal() * @method static \Illuminate\Database\Eloquent\Builder|DictionaryCampaign forExternal()
* @method static \Illuminate\Database\Eloquent\Builder|DictionaryCampaign forNotExternal() * @method static \Illuminate\Database\Eloquent\Builder|DictionaryCampaign forNotExternal()
* @method static \Illuminate\Database\Eloquent\Builder|DictionaryCampaign needUpdated()
* @method static \Illuminate\Database\Eloquent\Builder|DictionaryCampaign updated($value = true) * @method static \Illuminate\Database\Eloquent\Builder|DictionaryCampaign updated($value = true)
* @method static \Illuminate\Database\Eloquent\Builder|DictionaryCampaign synced($value = true) * @method static \Illuminate\Database\Eloquent\Builder|DictionaryCampaign synced($value = true)
* @method static \Illuminate\Database\Eloquent\Builder|DictionaryCampaign synchronized() * @method static \Illuminate\Database\Eloquent\Builder|DictionaryCampaign synchronized()
...@@ -52,6 +53,7 @@ use Illuminate\Support\Collection; ...@@ -52,6 +53,7 @@ use Illuminate\Support\Collection;
* @method static \Illuminate\Database\Eloquent\Builder|DictionaryCampaign whereId($value) * @method static \Illuminate\Database\Eloquent\Builder|DictionaryCampaign whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|DictionaryCampaign whereName($value) * @method static \Illuminate\Database\Eloquent\Builder|DictionaryCampaign whereName($value)
* @method static \Illuminate\Database\Eloquent\Builder|DictionaryCampaign whereNegativeKeywords($value) * @method static \Illuminate\Database\Eloquent\Builder|DictionaryCampaign whereNegativeKeywords($value)
* @method static \Illuminate\Database\Eloquent\Builder|DictionaryCampaign whereUpdatedNeed($value)
* @method static \Illuminate\Database\Eloquent\Builder|DictionaryCampaign whereUpdated($value) * @method static \Illuminate\Database\Eloquent\Builder|DictionaryCampaign whereUpdated($value)
* @method static \Illuminate\Database\Eloquent\Builder|DictionaryCampaign whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|DictionaryCampaign whereUpdatedAt($value)
* @method static Builder|DictionaryCampaign whereExternalUploadAt($value) * @method static Builder|DictionaryCampaign whereExternalUploadAt($value)
...@@ -70,6 +72,7 @@ class DictionaryCampaign extends Pivot ...@@ -70,6 +72,7 @@ class DictionaryCampaign extends Pivot
'excluded_sites', 'excluded_sites',
'external_upload_at', 'external_upload_at',
'external_updated_at', 'external_updated_at',
'updated_need',
'updated_self', 'updated_self',
'updated_children', 'updated_children',
'updated', 'updated',
...@@ -84,6 +87,7 @@ class DictionaryCampaign extends Pivot ...@@ -84,6 +87,7 @@ class DictionaryCampaign extends Pivot
'excluded_sites' => 'array', 'excluded_sites' => 'array',
'external_upload_at' => 'datetime', 'external_upload_at' => 'datetime',
'external_updated_at' => 'datetime', 'external_updated_at' => 'datetime',
'updated_need' => 'datetime',
'updated_self' => 'datetime', 'updated_self' => 'datetime',
'updated_children' => 'datetime', 'updated_children' => 'datetime',
'updated' => 'boolean', 'updated' => 'boolean',
...@@ -100,6 +104,7 @@ class DictionaryCampaign extends Pivot ...@@ -100,6 +104,7 @@ class DictionaryCampaign extends Pivot
'excluded_sites', 'excluded_sites',
'external_upload_at', 'external_upload_at',
'external_updated_at', 'external_updated_at',
'updated_need',
'updated_self', 'updated_self',
'updated_children', 'updated_children',
'updated', 'updated',
...@@ -157,6 +162,11 @@ class DictionaryCampaign extends Pivot ...@@ -157,6 +162,11 @@ class DictionaryCampaign extends Pivot
return $query->where('updated', $updated); return $query->where('updated', $updated);
} }
public function scopeNeedUpdated(Builder $query)
{
return $query->whereNotNull('updated_need');
}
public function scopeSynced(Builder $query, $synced = true) public function scopeSynced(Builder $query, $synced = true)
{ {
return $query->where('synced', $synced); return $query->where('synced', $synced);
......
app/Models/Tokens.php
...@@ -25,6 +25,9 @@ use Illuminate\Database\Eloquent\Model; ...@@ -25,6 +25,9 @@ use Illuminate\Database\Eloquent\Model;
* @property-read \Illuminate\Database\Eloquent\Collection|DictionaryCampaign[] $dictionaryCampaigns * @property-read \Illuminate\Database\Eloquent\Collection|DictionaryCampaign[] $dictionaryCampaigns
* @property-read int|null $dictionary_campaigns_count * @property-read int|null $dictionary_campaigns_count
* @property-read \Illuminate\Database\Eloquent\Collection|DictionaryCampaign[] $dictionaryCampaignsForNotExternal * @property-read \Illuminate\Database\Eloquent\Collection|DictionaryCampaign[] $dictionaryCampaignsForNotExternal
* @property-read \Illuminate\Database\Eloquent\Collection|DictionaryCampaign[] $dictionaryCampaignsForExternal
* @property-read \Illuminate\Database\Eloquent\Collection|DictionaryCampaign[] $dictionaryCampaignsForExternalNeedUpdated
* @property-read \Illuminate\Database\Eloquent\Collection|DictionaryCampaign[] $dictionaryCampaignsForExternalSynchronizedUpdatedSelf
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Dictionary[] $campaignsForManaged * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Dictionary[] $campaignsForManaged
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Dictionary[] $campaignsNotForManaged * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Dictionary[] $campaignsNotForManaged
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Limits[] $limits * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Limits[] $limits
...@@ -108,6 +111,11 @@ class Tokens extends Model ...@@ -108,6 +111,11 @@ class Tokens extends Model
return $this->dictionaryCampaigns()->forExternal(); return $this->dictionaryCampaigns()->forExternal();
} }
public function dictionaryCampaignsForExternalNeedUpdated()
{
return $this->dictionaryCampaigns()->forExternal()->needUpdated();
}
public function dictionaryCampaignsForExternalSynchronizedUpdatedSelf() public function dictionaryCampaignsForExternalSynchronizedUpdatedSelf()
{ {
return $this->dictionaryCampaignsForExternal()->synchronized()->forUpdatedSelf(); return $this->dictionaryCampaignsForExternal()->synchronized()->forUpdatedSelf();
......
app/Service/Requests/Direct/AddCampaigns.php
...@@ -83,10 +83,13 @@ class AddCampaigns extends DirectRequest ...@@ -83,10 +83,13 @@ class AddCampaigns extends DirectRequest
'OptimizeGoalId' => $dictionaryCampaign->campaign->relevant_keywords_setting_optimize_goal_id, 'OptimizeGoalId' => $dictionaryCampaign->campaign->relevant_keywords_setting_optimize_goal_id,
], ],
'AttributionModel' => $dictionaryCampaign->campaign->attribution_model, 'AttributionModel' => $dictionaryCampaign->campaign->attribution_model,
'PriorityGoals' => $dictionaryCampaign->campaign->priority_goals,
], ],
]; ];
if ($dictionaryCampaign->campaign->priority_goals && count($dictionaryCampaign->campaign->priority_goals)) {
$data['PriorityGoals'] = $dictionaryCampaign->campaign->priority_goals;
}
if ($dictionaryCampaign->campaign->daily_budget && count($dictionaryCampaign->campaign->daily_budget)) { if ($dictionaryCampaign->campaign->daily_budget && count($dictionaryCampaign->campaign->daily_budget)) {
$data['DailyBudget'] = $dictionaryCampaign->campaign->daily_budget; $data['DailyBudget'] = $dictionaryCampaign->campaign->daily_budget;
} }
......
app/Service/Requests/Direct/GetCampaigns.php
...@@ -37,10 +37,10 @@ class GetCampaigns extends DirectRequest ...@@ -37,10 +37,10 @@ class GetCampaigns extends DirectRequest
'text_campaign_strategy_network' => $campaign_data['TextCampaign']['BiddingStrategy']['Network']['BiddingStrategyType'], 'text_campaign_strategy_network' => $campaign_data['TextCampaign']['BiddingStrategy']['Network']['BiddingStrategyType'],
'settings' => json_encode($campaign_data['TextCampaign']['Settings'] ?? []), 'settings' => json_encode($campaign_data['TextCampaign']['Settings'] ?? []),
'counter_ids' => json_encode($campaign_data['TextCampaign']['CounterIds']['Items'] ?? []), 'counter_ids' => json_encode($campaign_data['TextCampaign']['CounterIds']['Items'] ?? []),
'relevant_keywords_setting_budget_percent' => $campaign_data['TextCampaign']['RelevantKeywords']['BudgetPercent'], 'relevant_keywords_setting_budget_percent' => $campaign_data['TextCampaign']['RelevantKeywords']['BudgetPercent'] ?? null,
'relevant_keywords_setting_optimize_goal_id' => $campaign_data['TextCampaign']['RelevantKeywords']['OptimizeGoalId'], 'relevant_keywords_setting_optimize_goal_id' => $campaign_data['TextCampaign']['RelevantKeywords']['OptimizeGoalId'] ?? null,
'attribution_model' => $campaign_data['TextCampaign']['AttributionModel'], 'attribution_model' => $campaign_data['TextCampaign']['AttributionModel'],
'priority_goals' => json_encode($campaign_data['TextCampaign']['PriorityGoals']), 'priority_goals' => json_encode($campaign_data['TextCampaign']['PriorityGoals'] ?? []),
'updated_self' => null, 'updated_self' => null,
'updated_children' => null, 'updated_children' => null,
]; ];
......
app/Service/Requests/Direct/UpdateCampaigns.php 0 → 100644
<?php
namespace App\Service\Requests\Direct;
use App\Jobs\ProcessCallLimitedAPI;
use App\Models\Pivots\DictionaryCampaign;
use App\Models\Variable;
use App\Service\Requests\DirectRequest;
use App\Service\StrReplaceByVariables;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Support\Facades\Log;
class UpdateCampaigns extends DirectRequest
{
protected $timestamp;
/* @var Collection|DictionaryCampaign[] $dictionaryCampaigns */
protected $dictionaryCampaigns;
/* @var Collection|Variable[] $dictionaryCampaigns */
protected $variables;
public function call($params = null)
{
$this->requestPrepare($params);
$process = new ProcessCallLimitedAPI($this);
dispatch($process)->onQueue('limits');
}
public function handle($response)
{
try {
foreach ($response['result']['UpdateResults'] as $key => $add_result) {
$id = $add_result['Id'] ?? '';
if (!$id) {
Log::debug("AddCampaigns, empty Id, [dictionary_campaigns.id = {$this->dictionaryCampaigns->get($key)->getKey()}]", $add_result);
continue;
}
DictionaryCampaign::forExternal()->needUpdated()
->where('external_id', $id)
->update([
'updated_need' => null,
]);
}
} catch (\Exception $e) {
Log::debug($e);
}
}
public function putParams($params)
{
$this->dictionaryCampaigns = $params['dictionaryCampaigns'];
$this->variables = $params['variables'];
}
private function requestPrepare($params)
{
$this->setService('campaigns');
$this->setMethod('update');
$this->putParams($params);
$this->setParams([
'Campaigns' => $this->dictionaryCampaigns->map(function ($dictionaryCampaign) {
/* @var DictionaryCampaign $dictionaryCampaign */
$list = Variable::getListVariablesByDictionaryCampaign($dictionaryCampaign);
$data = [
'Name' => StrReplaceByVariables::getInstance($dictionaryCampaign->name, $list)->get(),
'StartDate' => Carbon::now()->format('Y-m-d'),
'TextCampaign' => [
'BiddingStrategy' => [
'Search' => [
'BiddingStrategyType' => $dictionaryCampaign->campaign->text_campaign_strategy_search,
],
'Network' => [
'BiddingStrategyType' => $dictionaryCampaign->campaign->text_campaign_strategy_network,
],
],
'RelevantKeywords' => [
'BudgetPercent' => $dictionaryCampaign->campaign->relevant_keywords_setting_budget_percent,
'OptimizeGoalId' => $dictionaryCampaign->campaign->relevant_keywords_setting_optimize_goal_id,
],
'AttributionModel' => $dictionaryCampaign->campaign->attribution_model,
],
];
if ($dictionaryCampaign->campaign->priority_goals && count($dictionaryCampaign->campaign->priority_goals)) {
$data['PriorityGoals'] = $dictionaryCampaign->campaign->priority_goals;
}
if ($dictionaryCampaign->campaign->daily_budget && count($dictionaryCampaign->campaign->daily_budget)) {
$data['DailyBudget'] = $dictionaryCampaign->campaign->daily_budget;
}
if ($dictionaryCampaign->negative_keywords && count($dictionaryCampaign->negative_keywords)) {
$data['NegativeKeywords'] = [
'Items' => array_map(function ($value) use ($list) {
return StrReplaceByVariables::getInstance($value, $list)->get();
}, $dictionaryCampaign->negative_keywords),
];
}
if ($dictionaryCampaign->campaign->blocked_ips && count($dictionaryCampaign->campaign->blocked_ips)) {
$data['BlockedIps'] = [
'Items' => $dictionaryCampaign->campaign->blocked_ips,
];
}
if ($dictionaryCampaign->excluded_sites && count($dictionaryCampaign->excluded_sites)) {
$data['ExcludedSites'] = [
'Items' => array_map(function ($value) use ($list) {
return StrReplaceByVariables::getInstance($value, $list)->get();
}, $dictionaryCampaign->excluded_sites),
];
}
if ($dictionaryCampaign->campaign->settings && count($dictionaryCampaign->campaign->settings)) {
$data['TextCampaign']['Settings'] = $dictionaryCampaign->campaign->settings;
}
if ($dictionaryCampaign->campaign->counter_ids && count($dictionaryCampaign->campaign->counter_ids)) {
$data['TextCampaign']['CounterIds'] = [
'Items' => $dictionaryCampaign->campaign->counter_ids,
];
}
return $data;
}),
]);
}
}
database/migrations/2021_05_17_141740_create_dictionary_campaigns_table.php
...@@ -25,6 +25,7 @@ class CreateDictionaryCampaignsTable extends Migration ...@@ -25,6 +25,7 @@ class CreateDictionaryCampaignsTable extends Migration
$table->boolean('updated')->default(0); $table->boolean('updated')->default(0);
$table->timestamp('external_upload_at')->nullable(); $table->timestamp('external_upload_at')->nullable();
$table->timestamp('external_updated_at')->nullable(); $table->timestamp('external_updated_at')->nullable();
$table->timestamp('updated_need')->nullable();
$table->timestamp('updated_self')->nullable(); $table->timestamp('updated_self')->nullable();
$table->timestamp('updated_children')->nullable(); $table->timestamp('updated_children')->nullable();
$table->timestamps(); $table->timestamps();
......
tests/Unit/CheckCampaignsTest.php
...@@ -163,6 +163,7 @@ class CheckCampaignsTest extends TestCase ...@@ -163,6 +163,7 @@ class CheckCampaignsTest extends TestCase
$campaign = $this->dictionary->campaigns()->first(); $campaign = $this->dictionary->campaigns()->first();
$this->assertEquals(1, $campaign->pivot->external_id); $this->assertEquals(1, $campaign->pivot->external_id);
$this->assertNotNull( $campaign->pivot->updated_need);
$this->assertEquals('change name', $campaign->name); $this->assertEquals('change name', $campaign->name);
$this->assertEquals('change name', $campaign->pivot->name); $this->assertEquals('change name', $campaign->pivot->name);
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!