Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Письменов Дмитрий Иванович
/
yourroomads
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Settings
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 2d493762
authored
Jan 27, 2022
by
Vladislav
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#22112 Добавить команду и запрос остановки показа объявлений
1 parent
b863e82a
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
305 additions
and
4 deletions
app/Console/Commands/AdvertisementsDelete.php
app/Console/Commands/AdvertisementsSuspend.php
app/Console/Commands/DictionaryCampaignsSyncByCampaign.php
app/Console/Commands/VCardsDelete.php
app/Console/Kernel.php
app/Models/Pivots/DictionaryCampaign.php
app/Models/Pivots/GoalAdvertisement.php
app/Service/Requests/Direct/ArchiveAds.php
app/Service/Requests/Direct/SuspendAds.php
database/migrations/2022_01_27_153224_add_goal_advertisements_suspend_column.php
app/Console/Commands/AdvertisementsDelete.php
View file @
2d49376
...
@@ -23,7 +23,7 @@ class AdvertisementsDelete extends Command
...
@@ -23,7 +23,7 @@ class AdvertisementsDelete extends Command
*
*
* @var string
* @var string
*/
*/
protected
$description
=
'Удаление созданных объявлени'
;
protected
$description
=
'Удаление созданных объявлени
й
'
;
/**
/**
* Create a new command instance.
* Create a new command instance.
...
...
app/Console/Commands/AdvertisementsSuspend.php
0 → 100644
View file @
2d49376
<?php
namespace
App\Console\Commands
;
use
App\Models\Pivots\GoalAdvertisement
;
use
App\Models\Tokens
;
use
App\Service\Requests\Direct\SuspendAds
;
use
Carbon\Carbon
;
use
Illuminate\Console\Command
;
class
AdvertisementsSuspend
extends
Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected
$signature
=
'ads:suspend'
;
/**
* 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
::
has
(
'dictionaryCampaignsEnabledForExternalSynchronized.goalAdvertisementsForNeedSuspendedForNotReserveSuspendForNotSuspended'
)
->
where
(
'type'
,
'!='
,
Tokens
::
MAIN
)
->
get
();
foreach
(
$tokens
as
$token
)
{
$this
->
sendRequest
(
$token
,
$token
->
dictionaryCampaignsEnabledForExternalSynchronized
->
pluck
(
'goalAdvertisementsForNeedSuspendedForNotReserveSuspendForNotSuspended'
)
->
collapse
());
}
return
0
;
}
private
function
sendRequest
(
$token
,
$ads
)
{
/* @var $ads GoalAdvertisement[] */
if
(
!
$ads
->
count
())
{
return
;
}
foreach
(
array_chunk
(
$ads
->
pluck
(
'external_id'
)
->
toArray
(),
100
)
as
$items
)
{
GoalAdvertisement
::
whereIn
(
'external_id'
,
$items
)
->
update
([
'reserve_suspend_at'
=>
Carbon
::
now
(),
]);
}
$request
=
new
SuspendAds
();
$request
->
setToken
(
$token
)
->
call
([
'ids'
=>
$ads
->
pluck
(
'external_id'
)
->
toArray
(),
]);
}
}
app/Console/Commands/DictionaryCampaignsSyncByCampaign.php
View file @
2d49376
...
@@ -377,6 +377,26 @@ class DictionaryCampaignsSyncByCampaign extends Command
...
@@ -377,6 +377,26 @@ class DictionaryCampaignsSyncByCampaign extends Command
$this
->
info
(
'update goal_advertisements.dictionary_campaign_external_id successful!'
);
$this
->
info
(
'update goal_advertisements.dictionary_campaign_external_id successful!'
);
DB
::
update
(
"
DB
::
update
(
"
UPDATE goal_advertisements ga
INNER JOIN goal_sitelinks gs on ga.goal_sitelink_id = gs.id AND gs.external_id is not null AND gs.updated_need is null AND gs.deleted_at is null
SET ga.goal_sitelink_external_id = gs.external_id,
ga.updated_at = CURRENT_TIMESTAMP
WHERE ga.deleted_at IS NULL
AND ga.goal_sitelink_external_id IS NULL
"
);
$this
->
info
(
'update goal_advertisements.goal_sitelink_external_id successful!'
);
DB
::
update
(
"
UPDATE goal_advertisements ga
LEFT JOIN goal_v_cards gvc on ga.goal_v_card_id = gvc.id AND gvc.external_id is not null AND gvc.deleted_at is null
SET ga.goal_v_card_external_id = gvc.external_id,
ga.updated_at = CURRENT_TIMESTAMP
WHERE ga.deleted_at IS NULL
AND ga.goal_v_card_external_id IS NULL
"
);
$this
->
info
(
'update goal_advertisements.goal_v_card_external_id successful!'
);
DB
::
update
(
"
UPDATE goal_bid_modifiers gbm
UPDATE goal_bid_modifiers gbm
INNER JOIN dictionary_campaigns dc ON dc.id = gbm.dictionary_campaign_id AND dc.external_id IS NOT NULL AND dc.deleted_at IS NULL
INNER JOIN dictionary_campaigns dc ON dc.id = gbm.dictionary_campaign_id AND dc.external_id IS NOT NULL AND dc.deleted_at IS NULL
SET gbm.dictionary_campaign_external_id = dc.external_id,
SET gbm.dictionary_campaign_external_id = dc.external_id,
...
...
app/Console/Commands/VCardsDelete.php
View file @
2d49376
...
@@ -5,7 +5,6 @@ namespace App\Console\Commands;
...
@@ -5,7 +5,6 @@ namespace App\Console\Commands;
use
App\Models\VCard
;
use
App\Models\VCard
;
use
App\Models\Pivots\GoalVCard
;
use
App\Models\Pivots\GoalVCard
;
use
App\Models\Tokens
;
use
App\Models\Tokens
;
use
App\Service\Requests\Direct\DeleteAds
;
use
App\Service\Requests\Direct\DeleteVCards
;
use
App\Service\Requests\Direct\DeleteVCards
;
use
Carbon\Carbon
;
use
Carbon\Carbon
;
use
Illuminate\Console\Command
;
use
Illuminate\Console\Command
;
...
...
app/Console/Kernel.php
View file @
2d49376
...
@@ -14,6 +14,7 @@ use App\Console\Commands\AdvertisementsAdd;
...
@@ -14,6 +14,7 @@ use App\Console\Commands\AdvertisementsAdd;
use
App\Console\Commands\AdvertisementsArchive
;
use
App\Console\Commands\AdvertisementsArchive
;
use
App\Console\Commands\AdvertisementsDelete
;
use
App\Console\Commands\AdvertisementsDelete
;
use
App\Console\Commands\AdvertisementsLoadUpdated
;
use
App\Console\Commands\AdvertisementsLoadUpdated
;
use
App\Console\Commands\AdvertisementsSuspend
;
use
App\Console\Commands\AdvertisementsUpdate
;
use
App\Console\Commands\AdvertisementsUpdate
;
use
App\Console\Commands\AudienceTargetsAdd
;
use
App\Console\Commands\AudienceTargetsAdd
;
use
App\Console\Commands\AudienceTargetsDelete
;
use
App\Console\Commands\AudienceTargetsDelete
;
...
@@ -144,6 +145,7 @@ class Kernel extends ConsoleKernel
...
@@ -144,6 +145,7 @@ class Kernel extends ConsoleKernel
$schedule
->
command
(
KeywordsAdd
::
class
)
->
hourlyAt
(
40
);
$schedule
->
command
(
KeywordsAdd
::
class
)
->
hourlyAt
(
40
);
$schedule
->
command
(
KeywordsUpdate
::
class
)
->
hourlyAt
(
40
);
$schedule
->
command
(
KeywordsUpdate
::
class
)
->
hourlyAt
(
40
);
$schedule
->
command
(
AdvertisementsSuspend
::
class
)
->
hourlyAt
(
40
);
$schedule
->
command
(
AdvertisementsAdd
::
class
)
->
hourlyAt
(
50
);
$schedule
->
command
(
AdvertisementsAdd
::
class
)
->
hourlyAt
(
50
);
$schedule
->
command
(
AdvertisementsUpdate
::
class
)
->
hourlyAt
(
50
);
$schedule
->
command
(
AdvertisementsUpdate
::
class
)
->
hourlyAt
(
50
);
$schedule
->
command
(
AdvertisementsArchive
::
class
)
->
hourlyAt
(
50
);
$schedule
->
command
(
AdvertisementsArchive
::
class
)
->
hourlyAt
(
50
);
...
...
app/Models/Pivots/DictionaryCampaign.php
View file @
2d49376
...
@@ -515,6 +515,11 @@ class DictionaryCampaign extends Pivot
...
@@ -515,6 +515,11 @@ class DictionaryCampaign extends Pivot
return
$this
->
goalAdvertisements
()
->
forExternal
()
->
needArchived
()
->
forNotReserveArchive
()
->
forNotArchived
();
return
$this
->
goalAdvertisements
()
->
forExternal
()
->
needArchived
()
->
forNotReserveArchive
()
->
forNotArchived
();
}
}
public
function
goalAdvertisementsForNeedSuspendedForNotReserveSuspendForNotSuspended
()
{
return
$this
->
goalAdvertisements
()
->
forExternal
()
->
needSuspended
()
->
forNotReserveSuspend
()
->
forNotSuspended
();
}
public
function
goalAdvertisementsForNeedDeletedForNotReserveDelete
()
public
function
goalAdvertisementsForNeedDeletedForNotReserveDelete
()
{
{
return
$this
->
goalAdvertisements
()
->
forExternal
()
->
needDeleted
()
->
forNotReserveDelete
();
return
$this
->
goalAdvertisements
()
->
forExternal
()
->
needDeleted
()
->
forNotReserveDelete
();
...
...
app/Models/Pivots/GoalAdvertisement.php
View file @
2d49376
...
@@ -81,6 +81,9 @@ class GoalAdvertisement extends Pivot
...
@@ -81,6 +81,9 @@ class GoalAdvertisement extends Pivot
'reserve_archive_at'
,
'reserve_archive_at'
,
'deleted_need'
,
'deleted_need'
,
'reserve_delete_at'
,
'reserve_delete_at'
,
'suspended_need'
,
'suspended_at'
,
'reserve_suspend_at'
,
];
];
protected
$casts
=
[
protected
$casts
=
[
...
@@ -94,6 +97,9 @@ class GoalAdvertisement extends Pivot
...
@@ -94,6 +97,9 @@ class GoalAdvertisement extends Pivot
'reserve_archive_at'
=>
'datetime'
,
'reserve_archive_at'
=>
'datetime'
,
'deleted_need'
=>
'datetime'
,
'deleted_need'
=>
'datetime'
,
'reserve_delete_at'
=>
'datetime'
,
'reserve_delete_at'
=>
'datetime'
,
'suspended_need'
=>
'datetime'
,
'suspended_at'
=>
'datetime'
,
'reserve_suspend_at'
=>
'datetime'
,
];
];
public
$incrementing
=
true
;
public
$incrementing
=
true
;
...
@@ -195,7 +201,14 @@ class GoalAdvertisement extends Pivot
...
@@ -195,7 +201,14 @@ class GoalAdvertisement extends Pivot
*/
*/
public
function
scopeNeedArchived
(
$query
)
public
function
scopeNeedArchived
(
$query
)
{
{
return
$query
->
whereNotNull
(
'archived_need'
);
return
$query
->
whereNotNull
(
'archived_need'
)
->
where
(
function
(
Builder
$query
)
{
return
$query
->
whereNull
(
'suspended_need'
)
->
orWhere
(
function
(
Builder
$query
)
{
return
$query
->
whereNotNull
(
'suspended_need'
)
->
whereNotNull
(
'suspended_at'
);
});
});
}
}
/**
/**
...
@@ -220,11 +233,39 @@ class GoalAdvertisement extends Pivot
...
@@ -220,11 +233,39 @@ class GoalAdvertisement extends Pivot
* @param Builder $query
* @param Builder $query
* @return Builder
* @return Builder
*/
*/
public
function
scopeNeedSuspended
(
$query
)
{
return
$query
->
whereNotNull
(
'suspended_need'
);
}
/**
* @param Builder $query
* @return Builder
*/
public
function
scopeForNotReserveSuspend
(
$query
)
{
return
$query
->
whereNull
(
'reserve_suspend_at'
);
}
/**
* @param Builder $query
* @return Builder
*/
public
function
scopeForNotSuspended
(
$query
)
{
return
$query
->
whereNull
(
'suspended_at'
);
}
/**
* @param Builder $query
* @return Builder
*/
public
function
scopeNeedDeleted
(
$query
)
public
function
scopeNeedDeleted
(
$query
)
{
{
return
$query
->
whereNull
(
'goal_advertisements.deleted_at'
)
return
$query
->
whereNull
(
'goal_advertisements.deleted_at'
)
->
whereNull
(
'goal_advertisements.archive_at'
)
->
whereNull
(
'goal_advertisements.archive_at'
)
->
whereNull
(
'goal_advertisements.archived_need'
)
->
whereNull
(
'goal_advertisements.archived_need'
)
->
whereNull
(
'goal_advertisements.suspended_need'
)
->
where
(
function
(
Builder
$query
)
{
->
where
(
function
(
Builder
$query
)
{
return
$query
->
whereNotNull
(
'deleted_need'
)
return
$query
->
whereNotNull
(
'deleted_need'
)
->
orWhere
(
function
(
Builder
$query
)
{
->
orWhere
(
function
(
Builder
$query
)
{
...
...
app/Service/Requests/Direct/ArchiveAds.php
View file @
2d49376
...
@@ -78,7 +78,15 @@ class ArchiveAds extends DirectRequest
...
@@ -78,7 +78,15 @@ class ArchiveAds extends DirectRequest
* ),
* ),
* )
* )
*/
*/
if
(
isset
(
$archive_result
[
'Errors'
][
0
][
'Code'
])
==
8300
)
{
if
(
isset
(
$archive_result
[
'Errors'
][
0
][
'Code'
])
&&
$archive_result
[
'Errors'
][
0
][
'Code'
]
==
8300
&&
isset
(
$add_result
[
'Errors'
][
0
][
'Details'
])
&&
$archive_result
[
'Errors'
][
0
][
'Details'
]
===
'Ad is a draft and cannot be archived'
)
{
if
(
$this
->
getToken
()
->
isMain
())
{
if
(
$this
->
getToken
()
->
isMain
())
{
Advertisement
::
whereExternalId
(
$external_id
)
Advertisement
::
whereExternalId
(
$external_id
)
->
update
([
->
update
([
...
@@ -94,6 +102,19 @@ class ArchiveAds extends DirectRequest
...
@@ -94,6 +102,19 @@ class ArchiveAds extends DirectRequest
'reserve_archive_at'
=>
null
,
'reserve_archive_at'
=>
null
,
]);
]);
}
}
}
elseif
(
isset
(
$archive_result
[
'Errors'
][
0
][
'Code'
])
&&
$archive_result
[
'Errors'
][
0
][
'Code'
]
==
8300
&&
isset
(
$add_result
[
'Errors'
][
0
][
'Details'
])
&&
$archive_result
[
'Errors'
][
0
][
'Details'
]
===
'Ad is currently being displayed and cannot be achieved direct'
)
{
GoalAdvertisement
::
whereExternalId
(
$external_id
)
->
update
([
'suspended_need'
=>
Carbon
::
now
(),
]);
}
elseif
(
isset
(
$archive_result
[
'Errors'
])
&&
count
(
$archive_result
[
'Errors'
]))
{
}
elseif
(
isset
(
$archive_result
[
'Errors'
])
&&
count
(
$archive_result
[
'Errors'
]))
{
if
(
$this
->
getToken
()
->
isMain
())
{
if
(
$this
->
getToken
()
->
isMain
())
{
$model
=
Advertisement
::
whereExternalId
(
$external_id
)
->
first
();
$model
=
Advertisement
::
whereExternalId
(
$external_id
)
->
first
();
...
...
app/Service/Requests/Direct/SuspendAds.php
0 → 100644
View file @
2d49376
<?php
namespace
App\Service\Requests\Direct
;
use
App\Jobs\ProcessCallLimitedAPI
;
use
App\Models\Pivots\GoalAdvertisement
;
use
App\Service\Contract\APIRequest
;
use
App\Service\DirectResponseHelper
;
use
App\Service\Requests\DirectRequest
;
use
Carbon\Carbon
;
use
Illuminate\Support\Facades\Log
;
class
SuspendAds
extends
DirectRequest
{
protected
$max_count
=
10000
;
protected
$timestamp
;
public
function
call
(
$params
=
null
)
{
$this
->
requestPrepare
(
$params
);
$process
=
new
ProcessCallLimitedAPI
(
$this
);
dispatch
(
$process
)
->
onQueue
(
'limits'
);
}
public
function
getObjectsCount
()
{
return
count
(
$this
->
getParams
()[
'SelectionCriteria'
][
'Ids'
]);
}
public
function
slice
(
$maxObjects
)
:
?
APIRequest
{
return
$this
->
sliceByKey
(
$maxObjects
,
[
'SelectionCriteria'
,
'Ids'
]);;
}
public
function
handle
(
$response
)
{
if
(
!
isset
(
$response
[
'result'
][
'SuspendResults'
]))
{
return
;
}
foreach
(
DirectResponseHelper
::
getExternalIdsChunkByResult
(
$response
[
'result'
][
'SuspendResults'
])
as
$external_ids
)
{
GoalAdvertisement
::
whereIn
(
'external_id'
,
$external_ids
)
->
update
([
'suspended_at'
=>
Carbon
::
now
(),
'reserve_suspend_at'
=>
null
,
]);
}
foreach
(
$response
[
'result'
][
'SuspendResults'
]
as
$key
=>
$suspend_result
)
{
if
(
isset
(
$suspend_result
[
'Id'
]))
{
continue
;
}
$external_id
=
$this
->
getParams
()[
'SelectionCriteria'
][
'Ids'
][
$key
];
if
(
isset
(
$suspend_result
[
'Errors'
])
&&
count
(
$suspend_result
[
'Errors'
]))
{
$model
=
GoalAdvertisement
::
whereExternalId
(
$external_id
)
->
first
();
if
(
$model
)
{
$model
->
errors
()
->
create
([
'token_id'
=>
$this
->
getToken
()
->
getKey
(),
'service'
=>
$this
->
getService
(),
'method'
=>
$this
->
getMethod
(),
'params'
=>
$external_id
,
'errors'
=>
$suspend_result
[
'Errors'
],
]);
}
}
else
{
Log
::
debug
(
"SuspendAds, empty Id, token_id
{
$this
->
getToken
()
->
getKey
()
}
"
);
Log
::
debug
(
$suspend_result
);
Log
::
debug
(
$external_id
);
}
GoalAdvertisement
::
whereExternalId
(
$external_id
)
->
update
([
'reserve_suspend_at'
=>
null
,
]);
}
}
public
function
failed
()
{
foreach
(
array_chunk
(
$this
->
getParams
()[
'SelectionCriteria'
][
'Ids'
],
100
)
as
$items
)
{
GoalAdvertisement
::
whereIn
(
'external_id'
,
$items
)
->
update
([
'reserve_suspend_at'
=>
null
,
]);
}
}
private
function
requestPrepare
(
$params
)
{
$this
->
setService
(
'Ads'
);
$this
->
setMethod
(
'suspend'
);
$this
->
setParams
([
'SelectionCriteria'
=>
[
'Ids'
=>
$params
[
'ids'
],
],
]);
}
}
database/migrations/2022_01_27_153224_add_goal_advertisements_suspend_column.php
0 → 100644
View file @
2d49376
<?php
use
Illuminate\Database\Migrations\Migration
;
use
Illuminate\Database\Schema\Blueprint
;
use
Illuminate\Support\Facades\Schema
;
class
AddGoalAdvertisementsSuspendColumn
extends
Migration
{
/**
* Run the migrations.
*
* @return void
*/
public
function
up
()
{
Schema
::
create
(
'goal_advertisements'
,
function
(
Blueprint
$table
)
{
$table
->
timestamp
(
'suspended_need'
)
->
nullable
();
$table
->
timestamp
(
'suspended_at'
)
->
nullable
();
$table
->
timestamp
(
'reserve_suspend_at'
)
->
nullable
();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public
function
down
()
{
//
}
}
Write
Preview
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment