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 631665f1
authored
Mar 03, 2022
by
Vladislav
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#22429 Работа команд только при наличии минимального кол-во балов
1 parent
8673a028
Hide whitespace changes
Inline
Side-by-side
Showing
53 changed files
with
152 additions
and
97 deletions
app/Console/Commands/AdExtensionsAdd.php
app/Console/Commands/AdExtensionsLoad.php
app/Console/Commands/AdGroupsAdd.php
app/Console/Commands/AdGroupsDelete.php
app/Console/Commands/AdGroupsLoadKeywords.php
app/Console/Commands/AdGroupsLoadUpdated.php
app/Console/Commands/AdGroupsUpdate.php
app/Console/Commands/AdImagesAdd.php
app/Console/Commands/AdImagesLoad.php
app/Console/Commands/AdvertisementsAdd.php
app/Console/Commands/AdvertisementsArchive.php
app/Console/Commands/AdvertisementsDelete.php
app/Console/Commands/AdvertisementsLoadUpdated.php
app/Console/Commands/AdvertisementsSuspend.php
app/Console/Commands/AdvertisementsUpdate.php
app/Console/Commands/AudienceTargetsAdd.php
app/Console/Commands/AudienceTargetsDelete.php
app/Console/Commands/BidModifiersAdd.php
app/Console/Commands/BidModifiersDelete.php
app/Console/Commands/BidModifiersUpdate.php
app/Console/Commands/CampaignsAdd.php
app/Console/Commands/CampaignsCheckChange.php
app/Console/Commands/CampaignsCheckUpdatedChildren.php
app/Console/Commands/CampaignsFirstLoad.php
app/Console/Commands/CampaignsLoadAds.php
app/Console/Commands/CampaignsLoadBidModifiers.php
app/Console/Commands/CampaignsLoadGroups.php
app/Console/Commands/CampaignsLoadUpdated.php
app/Console/Commands/CampaignsResume.php
app/Console/Commands/CampaignsSuspend.php
app/Console/Commands/CampaignsUpdate.php
app/Console/Commands/DictionariesLoad.php
app/Console/Commands/KeywordsAdd.php
app/Console/Commands/KeywordsDelete.php
app/Console/Commands/KeywordsUpdate.php
app/Console/Commands/NegativeKeywordSharedSetsAdd.php
app/Console/Commands/NegativeKeywordSharedSetsLoad.php
app/Console/Commands/NegativeKeywordSharedSetsUpdate.php
app/Console/Commands/RetargetinglistsAdd.php
app/Console/Commands/RetargetinglistsDelete.php
app/Console/Commands/RetargetinglistsLoad.php
app/Console/Commands/RetargetinglistsUpdate.php
app/Console/Commands/SitelinksAdd.php
app/Console/Commands/SitelinksDelete.php
app/Console/Commands/SitelinksLoad.php
app/Console/Commands/VCardsAdd.php
app/Console/Commands/VCardsDelete.php
app/Console/Commands/VCardsLoad.php
app/Http/Controllers/TokensController.php
app/Models/Tokens.php
database/migrations/2021_07_16_090704_update_bid_modifiers_table.php
database/migrations/2022_03_03_092218_add_limit_to_run_column.php
resources/js/Pages/Tokens/Edit.vue
app/Console/Commands/AdExtensionsAdd.php
View file @
631665f
...
...
@@ -43,7 +43,7 @@ class AdExtensionsAdd extends Command
*/
public
function
handle
()
{
$tokens
=
Tokens
::
whereHas
(
'goalAdExtensionsForNotExternalForNotReserveCreate.adExtension'
)
$tokens
=
Tokens
::
allowedLimit
()
->
whereHas
(
'goalAdExtensionsForNotExternalForNotReserveCreate.adExtension'
)
->
where
(
'type'
,
'!='
,
Tokens
::
MAIN
)
->
get
();
...
...
app/Console/Commands/AdExtensionsLoad.php
View file @
631665f
...
...
@@ -40,10 +40,10 @@ class AdExtensionsLoad extends Command
*/
public
function
handle
()
{
$token
=
Tokens
::
where
(
'type'
,
Tokens
::
MAIN
)
->
first
();
$token
=
Tokens
::
allowedLimit
()
->
where
(
'type'
,
Tokens
::
MAIN
)
->
first
();
if
(
!
$token
)
{
throw
new
\Exception
(
'Не найден токен блин'
)
;
return
0
;
}
$request
=
new
GetAdExtensions
();
...
...
app/Console/Commands/AdGroupsAdd.php
View file @
631665f
...
...
@@ -43,7 +43,7 @@ class AdGroupsAdd extends Command
*/
public
function
handle
()
{
$tokens
=
Tokens
::
whereHas
(
'dictionaryCampaignsEnabledForExternalSynchronized.groupsForNotExternalForNotReserveCreate.group'
,
function
(
Builder
$query
)
{
$tokens
=
Tokens
::
allowedLimit
()
->
whereHas
(
'dictionaryCampaignsEnabledForExternalSynchronized.groupsForNotExternalForNotReserveCreate.group'
,
function
(
Builder
$query
)
{
return
$query
->
has
(
'keywords'
)
->
orHas
(
'bidModifiers'
)
->
orHas
(
'advertisements'
);
})
->
where
(
'type'
,
'!='
,
Tokens
::
MAIN
)
...
...
app/Console/Commands/AdGroupsDelete.php
View file @
631665f
...
...
@@ -42,7 +42,7 @@ class AdGroupsDelete extends Command
*/
public
function
handle
()
{
foreach
(
Tokens
::
where
(
'type'
,
'!='
,
Tokens
::
MAIN
)
->
get
()
as
$token
)
{
foreach
(
Tokens
::
allowedLimit
()
->
where
(
'type'
,
'!='
,
Tokens
::
MAIN
)
->
get
()
as
$token
)
{
$result
=
DB
::
select
(
"SELECT gag.external_id
FROM goal_ad_groups gag
INNER JOIN ad_groups ag ON gag.ad_group_id = ag.id
...
...
app/Console/Commands/AdGroupsLoadKeywords.php
View file @
631665f
...
...
@@ -50,9 +50,9 @@ class AdGroupsLoadKeywords extends Command
return
0
;
}
$token
=
Tokens
::
where
(
'type'
,
Tokens
::
MAIN
)
->
first
();
$token
=
Tokens
::
allowedLimit
()
->
where
(
'type'
,
Tokens
::
MAIN
)
->
first
();
if
(
!
$token
)
{
throw
new
\Exception
(
'Не найден токен блин'
)
;
return
0
;
}
$ad_group_ids
=
$campaigns
->
pluck
(
'groupsForKeywordsLoadable'
)
...
...
app/Console/Commands/AdGroupsLoadUpdated.php
View file @
631665f
...
...
@@ -54,9 +54,9 @@ class AdGroupsLoadUpdated extends Command
if
(
$adGroups
->
count
())
{
$token
=
Tokens
::
where
(
'type'
,
Tokens
::
MAIN
)
->
first
();
$token
=
Tokens
::
allowedLimit
()
->
where
(
'type'
,
Tokens
::
MAIN
)
->
first
();
if
(
!
$token
)
{
throw
new
\Exception
(
'Не найден токен блин'
)
;
return
0
;
}
$request
=
new
GetAdGroups
();
...
...
app/Console/Commands/AdGroupsUpdate.php
View file @
631665f
...
...
@@ -42,7 +42,7 @@ class AdGroupsUpdate extends Command
*/
public
function
handle
()
{
$tokens
=
Tokens
::
whereHas
(
'dictionaryCampaignsEnabledForExternalUpdated.groupsForExternalForNeedUpdatedForNotReserveUpdate.group'
)
$tokens
=
Tokens
::
allowedLimit
()
->
whereHas
(
'dictionaryCampaignsEnabledForExternalUpdated.groupsForExternalForNeedUpdatedForNotReserveUpdate.group'
)
->
where
(
'type'
,
'!='
,
Tokens
::
MAIN
)
->
get
();
...
...
app/Console/Commands/AdImagesAdd.php
View file @
631665f
...
...
@@ -43,7 +43,7 @@ class AdImagesAdd extends Command
*/
public
function
handle
()
{
$tokens
=
Tokens
::
whereHas
(
'goalAdImagesForNotExternalForNotReserveCreate.adImage'
)
$tokens
=
Tokens
::
allowedLimit
()
->
whereHas
(
'goalAdImagesForNotExternalForNotReserveCreate.adImage'
)
->
where
(
'type'
,
'!='
,
Tokens
::
MAIN
)
->
get
();
...
...
app/Console/Commands/AdImagesLoad.php
View file @
631665f
...
...
@@ -43,10 +43,10 @@ class AdImagesLoad extends Command
*/
public
function
handle
()
{
$token
=
Tokens
::
where
(
'type'
,
Tokens
::
MAIN
)
->
first
();
$token
=
Tokens
::
allowedLimit
()
->
where
(
'type'
,
Tokens
::
MAIN
)
->
first
();
if
(
!
$token
)
{
throw
new
\Exception
(
'Не найден токен блин'
)
;
return
0
;
}
$request
=
new
GetAdImages
();
...
...
app/Console/Commands/AdvertisementsAdd.php
View file @
631665f
...
...
@@ -43,7 +43,7 @@ class AdvertisementsAdd extends Command
*/
public
function
handle
()
{
$tokens
=
Tokens
::
where
(
'type'
,
'!='
,
Tokens
::
MAIN
)
$tokens
=
Tokens
::
allowedLimit
()
->
where
(
'type'
,
'!='
,
Tokens
::
MAIN
)
->
get
();
foreach
(
$tokens
as
$token
)
{
...
...
app/Console/Commands/AdvertisementsArchive.php
View file @
631665f
...
...
@@ -42,13 +42,13 @@ class AdvertisementsArchive extends Command
*/
public
function
handle
()
{
$token
=
Tokens
::
firstWhere
(
'type'
,
'!='
,
Tokens
::
MAIN
);
$token
=
Tokens
::
allowedLimit
()
->
firstWhere
(
'type'
,
'!='
,
Tokens
::
MAIN
);
if
(
$token
)
{
$this
->
sendRequest
(
$token
,
Advertisement
::
forNotArchived
()
->
needArchived
()
->
forNotReserveArchive
()
->
get
());
}
$tokens
=
Tokens
::
has
(
'dictionaryCampaignsEnabledForExternalSynchronized.goalAdvertisementsForNeedArchivedForNotReserveArchiveForNotArchived'
)
$tokens
=
Tokens
::
allowedLimit
()
->
has
(
'dictionaryCampaignsEnabledForExternalSynchronized.goalAdvertisementsForNeedArchivedForNotReserveArchiveForNotArchived'
)
->
where
(
'type'
,
'!='
,
Tokens
::
MAIN
)
->
get
();
...
...
app/Console/Commands/AdvertisementsDelete.php
View file @
631665f
...
...
@@ -42,7 +42,7 @@ class AdvertisementsDelete extends Command
*/
public
function
handle
()
{
$tokens
=
Tokens
::
has
(
'dictionaryCampaignsEnabledForExternalSynchronized.goalAdvertisementsForNeedDeletedForNotReserveDelete'
)
$tokens
=
Tokens
::
allowedLimit
()
->
has
(
'dictionaryCampaignsEnabledForExternalSynchronized.goalAdvertisementsForNeedDeletedForNotReserveDelete'
)
->
where
(
'type'
,
'!='
,
Tokens
::
MAIN
)
->
get
();
...
...
app/Console/Commands/AdvertisementsLoadUpdated.php
View file @
631665f
...
...
@@ -51,9 +51,9 @@ class AdvertisementsLoadUpdated extends Command
if
(
$advertisements
->
count
())
{
$token
=
Tokens
::
where
(
'type'
,
Tokens
::
MAIN
)
->
first
();
$token
=
Tokens
::
allowedLimit
()
->
where
(
'type'
,
Tokens
::
MAIN
)
->
first
();
if
(
!
$token
)
{
throw
new
\Exception
(
'Не найден токен блин'
)
;
return
0
;
}
$ids
=
$advertisements
->
pluck
(
'external_id'
)
->
toArray
();
...
...
app/Console/Commands/AdvertisementsSuspend.php
View file @
631665f
...
...
@@ -41,7 +41,7 @@ class AdvertisementsSuspend extends Command
*/
public
function
handle
()
{
$tokens
=
Tokens
::
has
(
'dictionaryCampaignsEnabledForExternalSynchronized.goalAdvertisementsForNeedSuspendedForNotReserveSuspendForNotSuspended'
)
$tokens
=
Tokens
::
allowedLimit
()
->
has
(
'dictionaryCampaignsEnabledForExternalSynchronized.goalAdvertisementsForNeedSuspendedForNotReserveSuspendForNotSuspended'
)
->
where
(
'type'
,
'!='
,
Tokens
::
MAIN
)
->
get
();
...
...
app/Console/Commands/AdvertisementsUpdate.php
View file @
631665f
...
...
@@ -43,7 +43,7 @@ class AdvertisementsUpdate extends Command
*/
public
function
handle
()
{
$tokens
=
Tokens
::
whereHas
(
'dictionaryCampaignsEnabledForExternalSynchronized.goalAdvertisementsForNeedUpdatedForNotReserveUpdate.advertisement'
)
$tokens
=
Tokens
::
allowedLimit
()
->
whereHas
(
'dictionaryCampaignsEnabledForExternalSynchronized.goalAdvertisementsForNeedUpdatedForNotReserveUpdate.advertisement'
)
->
where
(
'type'
,
'!='
,
Tokens
::
MAIN
)
->
get
();
...
...
app/Console/Commands/AudienceTargetsAdd.php
View file @
631665f
...
...
@@ -43,7 +43,7 @@ class AudienceTargetsAdd extends Command
*/
public
function
handle
()
{
$tokens
=
Tokens
::
whereHas
(
'dictionaryCampaignsEnabledForExternalSynchronized.goalAudienceTargetsForNotExternalForNotReserveCreate.audienceTarget'
)
$tokens
=
Tokens
::
allowedLimit
()
->
whereHas
(
'dictionaryCampaignsEnabledForExternalSynchronized.goalAudienceTargetsForNotExternalForNotReserveCreate.audienceTarget'
)
->
where
(
'type'
,
'!='
,
Tokens
::
MAIN
)
->
get
();
...
...
app/Console/Commands/AudienceTargetsDelete.php
View file @
631665f
...
...
@@ -44,7 +44,7 @@ class AudienceTargetsDelete extends Command
*/
public
function
handle
()
{
$tokens
=
Tokens
::
whereHas
(
'dictionaryCampaignsEnabledForExternalSynchronized.goalAudienceTargetsNeedDeleteForNotReserveDelete'
)
$tokens
=
Tokens
::
allowedLimit
()
->
whereHas
(
'dictionaryCampaignsEnabledForExternalSynchronized.goalAudienceTargetsNeedDeleteForNotReserveDelete'
)
->
where
(
'type'
,
'!='
,
Tokens
::
MAIN
)
->
get
();
...
...
app/Console/Commands/BidModifiersAdd.php
View file @
631665f
...
...
@@ -45,7 +45,7 @@ class BidModifiersAdd extends Command
*/
public
function
handle
()
{
$tokens
=
Tokens
::
whereHas
(
'dictionaryCampaignsEnabledForExternalSynchronized.goalBidModifiersForNotExternal.bidModifier'
)
$tokens
=
Tokens
::
allowedLimit
()
->
whereHas
(
'dictionaryCampaignsEnabledForExternalSynchronized.goalBidModifiersForNotExternal.bidModifier'
)
->
where
(
'type'
,
'!='
,
Tokens
::
MAIN
)
->
get
();
...
...
app/Console/Commands/BidModifiersDelete.php
View file @
631665f
...
...
@@ -40,7 +40,7 @@ class BidModifiersDelete extends Command
*/
public
function
handle
()
{
foreach
(
Tokens
::
where
(
'type'
,
'!='
,
Tokens
::
MAIN
)
->
get
()
as
$token
)
{
foreach
(
Tokens
::
allowedLimit
()
->
where
(
'type'
,
'!='
,
Tokens
::
MAIN
)
->
get
()
as
$token
)
{
$ids
=
DB
::
table
(
'goal_bid_modifiers'
)
->
join
(
'bid_modifiers'
,
'goal_bid_modifiers.bid_modifier_id'
,
'='
,
'bid_modifiers.id'
)
->
join
(
'dictionary_campaigns'
,
'goal_bid_modifiers.dictionary_campaign_id'
,
'='
,
'dictionary_campaigns.id'
)
...
...
app/Console/Commands/BidModifiersUpdate.php
View file @
631665f
...
...
@@ -42,7 +42,7 @@ class BidModifiersUpdate extends Command
*/
public
function
handle
()
{
$tokens
=
Tokens
::
where
(
'type'
,
'!='
,
Tokens
::
MAIN
)
$tokens
=
Tokens
::
allowedLimit
()
->
where
(
'type'
,
'!='
,
Tokens
::
MAIN
)
->
get
();
foreach
(
$tokens
as
$token
)
{
...
...
app/Console/Commands/CampaignsAdd.php
View file @
631665f
...
...
@@ -41,7 +41,7 @@ class CampaignsAdd extends Command
*/
public
function
handle
()
{
$tokens
=
Tokens
::
whereHas
(
'dictionaryCampaignsEnabledForNotExternalForNotReserveCreateSynchronized'
)
$tokens
=
Tokens
::
allowedLimit
()
->
whereHas
(
'dictionaryCampaignsEnabledForNotExternalForNotReserveCreateSynchronized'
)
->
with
(
'dictionaryCampaignsEnabledForNotExternalForNotReserveCreateSynchronized.campaign'
)
->
where
(
'type'
,
'!='
,
Tokens
::
MAIN
)
->
get
();
...
...
app/Console/Commands/CampaignsCheckChange.php
View file @
631665f
...
...
@@ -39,7 +39,7 @@ class CampaignsCheckChange extends Command
*/
public
function
handle
()
{
$token_main
=
Tokens
::
where
(
'type'
,
Tokens
::
MAIN
)
->
first
();
$token_main
=
Tokens
::
allowedLimit
()
->
where
(
'type'
,
Tokens
::
MAIN
)
->
first
();
if
(
$token_main
)
{
$request
=
new
CheckCampaignsChanges
();
...
...
@@ -47,7 +47,7 @@ class CampaignsCheckChange extends Command
->
call
();
}
$tokens
=
Tokens
::
has
(
'dictionaryCampaignsEnabledForExternalUpdated'
)
$tokens
=
Tokens
::
allowedLimit
()
->
has
(
'dictionaryCampaignsEnabledForExternalUpdated'
)
->
with
(
'dictionaryCampaignsEnabledForExternalUpdated'
)
->
where
(
'type'
,
'!='
,
Tokens
::
MAIN
)
->
get
();
...
...
app/Console/Commands/CampaignsCheckUpdatedChildren.php
View file @
631665f
...
...
@@ -41,28 +41,26 @@ class CampaignsCheckUpdatedChildren extends Command
public
function
handle
()
{
if
(
Campaigns
::
forUpdatedChildren
()
->
exists
())
{
$token
=
Tokens
::
where
(
'type'
,
Tokens
::
MAIN
)
->
first
();
if
(
!
$token
)
{
throw
new
\Exception
(
'Не найден токен блин'
);
}
$campaign_ids_group
=
Campaigns
::
forUpdatedChildren
()
->
pluck
(
'external_id'
)
->
chunk
(
3000
)
->
toArray
();
foreach
(
$campaign_ids_group
as
$campaign_ids
)
{
$request
=
new
CheckChanges
();
$request
->
setToken
(
$token
)
->
call
([
'CampaignIds'
=>
array_values
(
$campaign_ids
),
'FieldNames'
=>
[
'AdGroupIds'
,
'AdIds'
,
],
]);
$token
=
Tokens
::
allowedLimit
()
->
where
(
'type'
,
Tokens
::
MAIN
)
->
first
();
if
(
$token
)
{
$campaign_ids_group
=
Campaigns
::
forUpdatedChildren
()
->
pluck
(
'external_id'
)
->
chunk
(
3000
)
->
toArray
();
foreach
(
$campaign_ids_group
as
$campaign_ids
)
{
$request
=
new
CheckChanges
();
$request
->
setToken
(
$token
)
->
call
([
'CampaignIds'
=>
array_values
(
$campaign_ids
),
'FieldNames'
=>
[
'AdGroupIds'
,
'AdIds'
,
],
]);
}
}
}
$tokens
=
Tokens
::
has
(
'dictionaryCampaignsEnabledForExternalSynchronizedUpdatedChildren'
)
$tokens
=
Tokens
::
allowedLimit
()
->
has
(
'dictionaryCampaignsEnabledForExternalSynchronizedUpdatedChildren'
)
->
with
(
'dictionaryCampaignsEnabledForExternalSynchronizedUpdatedChildren'
)
->
where
(
'type'
,
'!='
,
Tokens
::
MAIN
)
->
get
();
...
...
app/Console/Commands/CampaignsFirstLoad.php
View file @
631665f
...
...
@@ -40,9 +40,9 @@ class CampaignsFirstLoad extends Command
*/
public
function
handle
()
{
$token
=
Tokens
::
where
(
'type'
,
Tokens
::
MAIN
)
->
first
();
$token
=
Tokens
::
allowedLimit
()
->
where
(
'type'
,
Tokens
::
MAIN
)
->
first
();
if
(
!
$token
){
throw
new
\Exception
(
'Не найден токен блин'
)
;
return
0
;
}
$request
=
new
GetCampaigns
();
...
...
app/Console/Commands/CampaignsLoadAds.php
View file @
631665f
...
...
@@ -47,9 +47,9 @@ class CampaignsLoadAds extends Command
return
0
;
}
$token
=
Tokens
::
where
(
'type'
,
Tokens
::
MAIN
)
->
first
();
$token
=
Tokens
::
allowedLimit
()
->
where
(
'type'
,
Tokens
::
MAIN
)
->
first
();
if
(
!
$token
)
{
throw
new
\Exception
(
'Не найден токен блин'
)
;
return
0
;
}
foreach
(
$campaigns
->
pluck
(
'external_id'
)
->
chunk
(
10
)
->
toArray
()
as
$campaign_ids
)
{
...
...
app/Console/Commands/CampaignsLoadBidModifiers.php
View file @
631665f
...
...
@@ -47,9 +47,9 @@ class CampaignsLoadBidModifiers extends Command
return
0
;
}
$token
=
Tokens
::
where
(
'type'
,
Tokens
::
MAIN
)
->
first
();
$token
=
Tokens
::
allowedLimit
()
->
where
(
'type'
,
Tokens
::
MAIN
)
->
first
();
if
(
!
$token
)
{
throw
new
\Exception
(
'Не найден токен блин'
)
;
return
0
;
}
foreach
(
$campaigns
->
pluck
(
'external_id'
)
->
chunk
(
10
)
->
toArray
()
as
$campaign_ids
)
{
...
...
app/Console/Commands/CampaignsLoadGroups.php
View file @
631665f
...
...
@@ -47,9 +47,9 @@ class CampaignsLoadGroups extends Command
return
0
;
}
$token
=
Tokens
::
where
(
'type'
,
Tokens
::
MAIN
)
->
first
();
$token
=
Tokens
::
allowedLimit
()
->
where
(
'type'
,
Tokens
::
MAIN
)
->
first
();
if
(
!
$token
)
{
throw
new
\Exception
(
'Не найден токен блин'
)
;
return
0
;
}
foreach
(
$campaigns
->
pluck
(
'external_id'
)
->
chunk
(
10
)
->
toArray
()
as
$campaign_ids
)
{
...
...
app/Console/Commands/CampaignsLoadUpdated.php
View file @
631665f
...
...
@@ -46,18 +46,18 @@ class CampaignsLoadUpdated extends Command
if
(
$campaigns
->
count
())
{
$token
=
Tokens
::
where
(
'type'
,
Tokens
::
MAIN
)
->
first
();
if
(
!
$token
)
{
throw
new
\Exception
(
'Не найден токен блин'
);
$token
=
Tokens
::
allowedLimit
()
->
where
(
'type'
,
Tokens
::
MAIN
)
->
first
();
if
(
$token
)
{
$request
=
new
GetCampaigns
();
$request
->
setToken
(
$token
)
->
call
([
'ids'
=>
$campaigns
->
pluck
(
'external_id'
)
->
toArray
(),
]);
}
$request
=
new
GetCampaigns
();
$request
->
setToken
(
$token
)
->
call
([
'ids'
=>
$campaigns
->
pluck
(
'external_id'
)
->
toArray
(),
]);
}
$tokens
=
Tokens
::
has
(
'dictionaryCampaignsEnabledForExternalSynchronizedUpdatedSelf'
)
$tokens
=
Tokens
::
allowedLimit
()
->
has
(
'dictionaryCampaignsEnabledForExternalSynchronizedUpdatedSelf'
)
->
with
(
'dictionaryCampaignsEnabledForExternalSynchronizedUpdatedSelf'
)
->
where
(
'type'
,
'!='
,
Tokens
::
MAIN
)
->
get
();
...
...
app/Console/Commands/CampaignsResume.php
View file @
631665f
...
...
@@ -57,7 +57,7 @@ class CampaignsResume extends Command
}
*/
$tokens
=
Tokens
::
whereHas
(
'dictionaryCampaignsEnabledForExternalDisabledForNotReserveResume'
)
$tokens
=
Tokens
::
allowedLimit
()
->
whereHas
(
'dictionaryCampaignsEnabledForExternalDisabledForNotReserveResume'
)
->
with
(
'dictionaryCampaignsEnabledForExternalDisabledForNotReserveResume'
)
->
where
(
'type'
,
'!='
,
Tokens
::
MAIN
)
->
get
();
...
...
app/Console/Commands/CampaignsSuspend.php
View file @
631665f
...
...
@@ -55,7 +55,7 @@ class CampaignsSuspend extends Command
}
*/
$tokens
=
Tokens
::
whereHas
(
'dictionaryCampaignsNotEnabledForExternalNotDisabledForNotReserveSuspend'
)
$tokens
=
Tokens
::
allowedLimit
()
->
whereHas
(
'dictionaryCampaignsNotEnabledForExternalNotDisabledForNotReserveSuspend'
)
->
with
(
'dictionaryCampaignsNotEnabledForExternalNotDisabledForNotReserveSuspend'
)
->
where
(
'type'
,
'!='
,
Tokens
::
MAIN
)
->
get
();
...
...
app/Console/Commands/CampaignsUpdate.php
View file @
631665f
...
...
@@ -41,7 +41,7 @@ class CampaignsUpdate extends Command
*/
public
function
handle
()
{
$tokens
=
Tokens
::
whereHas
(
'dictionaryCampaignsEnabledForExternalUpdatedNeedUpdatedForNotReserveUpdate.campaign'
)
$tokens
=
Tokens
::
allowedLimit
()
->
whereHas
(
'dictionaryCampaignsEnabledForExternalUpdatedNeedUpdatedForNotReserveUpdate.campaign'
)
->
with
(
'dictionaryCampaignsEnabledForExternalUpdatedNeedUpdatedForNotReserveUpdate.campaign'
)
->
where
(
'type'
,
'!='
,
Tokens
::
MAIN
)
->
get
();
...
...
app/Console/Commands/DictionariesLoad.php
View file @
631665f
...
...
@@ -40,9 +40,9 @@ class DictionariesLoad extends Command
*/
public
function
handle
()
{
$token
=
Tokens
::
where
(
'type'
,
Tokens
::
MAIN
)
->
first
();
$token
=
Tokens
::
allowedLimit
()
->
where
(
'type'
,
Tokens
::
MAIN
)
->
first
();
if
(
!
$token
)
{
throw
new
\Exception
(
'Не найден токен блин'
)
;
return
0
;
}
$request
=
new
GetDictionaries
();
...
...
app/Console/Commands/KeywordsAdd.php
View file @
631665f
...
...
@@ -43,7 +43,7 @@ class KeywordsAdd extends Command
*/
public
function
handle
()
{
$tokens
=
Tokens
::
whereHas
(
'dictionaryCampaignsEnabledForExternalSynchronized.goalKeywordsForNotExternal.keyword'
)
$tokens
=
Tokens
::
allowedLimit
()
->
whereHas
(
'dictionaryCampaignsEnabledForExternalSynchronized.goalKeywordsForNotExternal.keyword'
)
->
where
(
'type'
,
'!='
,
Tokens
::
MAIN
)
->
get
();
...
...
app/Console/Commands/KeywordsDelete.php
View file @
631665f
...
...
@@ -42,7 +42,7 @@ class KeywordsDelete extends Command
*/
public
function
handle
()
{
foreach
(
Tokens
::
where
(
'type'
,
'!='
,
Tokens
::
MAIN
)
->
get
()
as
$token
)
{
foreach
(
Tokens
::
allowedLimit
()
->
where
(
'type'
,
'!='
,
Tokens
::
MAIN
)
->
get
()
as
$token
)
{
$sql
=
"SELECT gk.external_id
FROM goal_keywords gk
INNER JOIN keywords k ON gk.keyword_id=k.id
...
...
app/Console/Commands/KeywordsUpdate.php
View file @
631665f
...
...
@@ -41,7 +41,7 @@ class KeywordsUpdate extends Command
*/
public
function
handle
()
{
$tokens
=
Tokens
::/*
whereHas
(
'dictionaryCampaignsEnabledForExternalUpdated.goalKeywordsForNeedUpdated.keyword'
)
$tokens
=
Tokens
::
allowedLimit
()
->
/*
whereHas
(
'dictionaryCampaignsEnabledForExternalUpdated.goalKeywordsForNeedUpdated.keyword'
)
->*/
where
(
'type'
,
'!='
,
Tokens
::
MAIN
)
->
get
();
...
...
app/Console/Commands/NegativeKeywordSharedSetsAdd.php
View file @
631665f
...
...
@@ -43,7 +43,7 @@ class NegativeKeywordSharedSetsAdd extends Command
*/
public
function
handle
()
{
$tokens
=
Tokens
::
whereHas
(
'goalNegativeKeywordSharedSetsForNotExternalForNotReserveCreate.negativeKeywordSharedSet'
)
$tokens
=
Tokens
::
allowedLimit
()
->
whereHas
(
'goalNegativeKeywordSharedSetsForNotExternalForNotReserveCreate.negativeKeywordSharedSet'
)
->
where
(
'type'
,
'!='
,
Tokens
::
MAIN
)
->
get
();
...
...
app/Console/Commands/NegativeKeywordSharedSetsLoad.php
View file @
631665f
...
...
@@ -40,10 +40,10 @@ class NegativeKeywordSharedSetsLoad extends Command
*/
public
function
handle
()
{
$token
=
Tokens
::
where
(
'type'
,
Tokens
::
MAIN
)
->
first
();
$token
=
Tokens
::
allowedLimit
()
->
where
(
'type'
,
Tokens
::
MAIN
)
->
first
();
if
(
!
$token
)
{
throw
new
\Exception
(
'Не найден токен блин'
)
;
return
0
;
}
$request
=
new
GetNegativeKeywordSharedSets
();
...
...
app/Console/Commands/NegativeKeywordSharedSetsUpdate.php
View file @
631665f
...
...
@@ -44,7 +44,7 @@ class NegativeKeywordSharedSetsUpdate extends Command
*/
public
function
handle
()
{
$tokens
=
Tokens
::
whereHas
(
'goalNegativeKeywordSharedSetsForExternalForNotReserveUpdateNeedUpdated.negativeKeywordSharedSet'
)
$tokens
=
Tokens
::
allowedLimit
()
->
whereHas
(
'goalNegativeKeywordSharedSetsForExternalForNotReserveUpdateNeedUpdated.negativeKeywordSharedSet'
)
->
where
(
'type'
,
'!='
,
Tokens
::
MAIN
)
->
get
();
...
...
app/Console/Commands/RetargetinglistsAdd.php
View file @
631665f
...
...
@@ -43,7 +43,7 @@ class RetargetinglistsAdd extends Command
*/
public
function
handle
()
{
$tokens
=
Tokens
::
whereHas
(
'goalRetargetinglistsForNotExternalForNotReserveCreate.retargetinglist'
)
$tokens
=
Tokens
::
allowedLimit
()
->
whereHas
(
'goalRetargetinglistsForNotExternalForNotReserveCreate.retargetinglist'
)
->
where
(
'type'
,
'!='
,
Tokens
::
MAIN
)
->
get
();
...
...
app/Console/Commands/RetargetinglistsDelete.php
View file @
631665f
...
...
@@ -43,7 +43,7 @@ class RetargetinglistsDelete extends Command
*/
public
function
handle
()
{
$tokens
=
Tokens
::
whereHas
(
'goalRetargetinglistsForExternalNeedDeletedForNotReserveDelete'
)
$tokens
=
Tokens
::
allowedLimit
()
->
whereHas
(
'goalRetargetinglistsForExternalNeedDeletedForNotReserveDelete'
)
->
where
(
'type'
,
'!='
,
Tokens
::
MAIN
)
->
get
();
...
...
app/Console/Commands/RetargetinglistsLoad.php
View file @
631665f
...
...
@@ -40,10 +40,10 @@ class RetargetinglistsLoad extends Command
*/
public
function
handle
()
{
$token
=
Tokens
::
where
(
'type'
,
Tokens
::
MAIN
)
->
first
();
$token
=
Tokens
::
allowedLimit
()
->
where
(
'type'
,
Tokens
::
MAIN
)
->
first
();
if
(
!
$token
)
{
throw
new
\Exception
(
'Не найден токен блин'
)
;
return
0
;
}
$request
=
new
GetRetargetinglists
();
...
...
app/Console/Commands/RetargetinglistsUpdate.php
View file @
631665f
...
...
@@ -43,7 +43,7 @@ class RetargetinglistsUpdate extends Command
*/
public
function
handle
()
{
$tokens
=
Tokens
::
whereHas
(
'goalRetargetinglistsForExternalForNotReserveUpdateNeedUpdated.retargetinglist'
)
$tokens
=
Tokens
::
allowedLimit
()
->
whereHas
(
'goalRetargetinglistsForExternalForNotReserveUpdateNeedUpdated.retargetinglist'
)
->
where
(
'type'
,
'!='
,
Tokens
::
MAIN
)
->
get
();
...
...
app/Console/Commands/SitelinksAdd.php
View file @
631665f
...
...
@@ -45,7 +45,7 @@ class SitelinksAdd extends Command
public
function
handle
()
{
$tokens
=
Tokens
::
where
(
'type'
,
'!='
,
Tokens
::
MAIN
)
$tokens
=
Tokens
::
allowedLimit
()
->
where
(
'type'
,
'!='
,
Tokens
::
MAIN
)
->
get
();
foreach
(
$tokens
as
$token
)
{
...
...
app/Console/Commands/SitelinksDelete.php
View file @
631665f
...
...
@@ -43,7 +43,7 @@ class SitelinksDelete extends Command
*/
public
function
handle
()
{
$tokens
=
Tokens
::
whereHas
(
'goalSitelinksForExternalNeedDeletedForNotReserveCreate'
)
$tokens
=
Tokens
::
allowedLimit
()
->
whereHas
(
'goalSitelinksForExternalNeedDeletedForNotReserveCreate'
)
->
where
(
'type'
,
'!='
,
Tokens
::
MAIN
)
->
get
();
...
...
app/Console/Commands/SitelinksLoad.php
View file @
631665f
...
...
@@ -42,10 +42,10 @@ class SitelinksLoad extends Command
*/
public
function
handle
()
{
$token
=
Tokens
::
where
(
'type'
,
Tokens
::
MAIN
)
->
first
();
$token
=
Tokens
::
allowedLimit
()
->
where
(
'type'
,
Tokens
::
MAIN
)
->
first
();
if
(
!
$token
)
{
throw
new
\Exception
(
'Не найден токен блин'
)
;
return
0
;
}
$sitelink_external_ids
=
DB
::
table
(
'advertisements'
)
...
...
app/Console/Commands/VCardsAdd.php
View file @
631665f
...
...
@@ -43,7 +43,7 @@ class VCardsAdd extends Command
*/
public
function
handle
()
{
$tokens
=
Tokens
::
whereHas
(
'dictionaryCampaignsEnabledForExternalSynchronized.goalVCardsForNotExternalForNotReserveCreate.vCard'
)
$tokens
=
Tokens
::
allowedLimit
()
->
whereHas
(
'dictionaryCampaignsEnabledForExternalSynchronized.goalVCardsForNotExternalForNotReserveCreate.vCard'
)
->
where
(
'type'
,
'!='
,
Tokens
::
MAIN
)
->
get
();
...
...
app/Console/Commands/VCardsDelete.php
View file @
631665f
...
...
@@ -43,7 +43,7 @@ class VCardsDelete extends Command
*/
public
function
handle
()
{
$tokens
=
Tokens
::
where
(
'type'
,
'!='
,
Tokens
::
MAIN
)
$tokens
=
Tokens
::
allowedLimit
()
->
where
(
'type'
,
'!='
,
Tokens
::
MAIN
)
->
get
();
foreach
(
$tokens
as
$token
)
{
...
...
app/Console/Commands/VCardsLoad.php
View file @
631665f
...
...
@@ -41,10 +41,10 @@ class VCardsLoad extends Command
*/
public
function
handle
()
{
$token
=
Tokens
::
where
(
'type'
,
Tokens
::
MAIN
)
->
first
();
$token
=
Tokens
::
allowedLimit
()
->
where
(
'type'
,
Tokens
::
MAIN
)
->
first
();
if
(
!
$token
)
{
throw
new
\Exception
(
'Не найден токен блин'
)
;
return
0
;
}
$v_card_external_ids
=
DB
::
table
(
'advertisements'
)
...
...
app/Http/Controllers/TokensController.php
View file @
631665f
...
...
@@ -61,6 +61,7 @@ class TokensController extends Controller
'token'
=>
$token
->
token
,
'type'
=>
$token
->
type
,
'main'
=>
$token
->
isMain
(),
'limit_to_run'
=>
$token
->
limit_to_run
,
'errors_count'
=>
$token
->
errors_count
,
'campaigns'
=>
(
$token
->
isMain
()
...
...
@@ -115,11 +116,20 @@ class TokensController extends Controller
public
function
update
(
Tokens
$token
)
{
$token
->
update
(
Request
::
validate
([
'type'
=>
[
'required'
,
'in:'
.
Tokens
::
MAIN
.
","
.
Tokens
::
GOAL
],
])
);
if
(
!
$token
->
type
)
{
$token
->
update
(
Request
::
validate
([
'type'
=>
[
'required'
,
'in:'
.
Tokens
::
MAIN
.
","
.
Tokens
::
GOAL
],
'limit_to_run'
=>
[
'required'
,
'integer'
,
'min:0'
],
])
);
}
else
{
$token
->
update
(
Request
::
validate
([
'limit_to_run'
=>
[
'required'
,
'integer'
,
'min:0'
],
])
);
}
if
(
$token
->
isMain
())
{
Artisan
::
call
(
CampaignsFirstLoad
::
class
);
...
...
app/Models/Tokens.php
View file @
631665f
...
...
@@ -99,7 +99,8 @@ class Tokens extends Model
'check_changes_campaign'
,
'check_changes_ad_group'
,
'limit'
,
'retargetinglists_loaded_at'
'retargetinglists_loaded_at'
,
'limit_to_run'
,
];
protected
$casts
=
[
...
...
@@ -148,6 +149,16 @@ class Tokens extends Model
});
}
/**
* @param Builder $query
* @param array $filters
* @return Builder
*/
public
function
scopeAllowedLimit
(
$query
)
{
return
$query
->
whereColumn
(
'limit_to_run'
,
'<'
,
'limit'
);
}
public
function
isMain
()
{
return
$this
->
type
===
$this
::
MAIN
;
...
...
database/migrations/2021_07_16_090704_update_bid_modifiers_table.php
View file @
631665f
...
...
@@ -28,8 +28,8 @@ class UpdateBidModifiersTable extends Migration
public
function
down
()
{
Schema
::
table
(
'bid_modifiers'
,
function
(
Blueprint
$table
)
{
$table
->
dropColumn
(
'video_adjustment'
)
->
nullable
()
;
$table
->
dropColumn
(
'regional_adjustment'
)
->
nullable
()
;
$table
->
dropColumn
(
'video_adjustment'
);
$table
->
dropColumn
(
'regional_adjustment'
);
});
}
}
database/migrations/2022_03_03_092218_add_limit_to_run_column.php
0 → 100644
View file @
631665f
<?php
use
Illuminate\Database\Migrations\Migration
;
use
Illuminate\Database\Schema\Blueprint
;
use
Illuminate\Support\Facades\Schema
;
class
AddLimitToRunColumn
extends
Migration
{
/**
* Run the migrations.
*
* @return void
*/
public
function
up
()
{
Schema
::
table
(
'tokens'
,
function
(
Blueprint
$table
)
{
$table
->
integer
(
'limit_to_run'
)
->
default
(
0
);
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public
function
down
()
{
Schema
::
table
(
'tokens'
,
function
(
Blueprint
$table
)
{
$table
->
dropColumn
(
'limit_to_run'
);
});
}
}
resources/js/Pages/Tokens/Edit.vue
View file @
631665f
...
...
@@ -21,6 +21,8 @@
<option
:value=
"null"
/>
<option
v-for=
"type,key in types"
:value=
"key"
>
{{
type
}}
</option>
</select-input>
<text-input
v-model=
"form.limit_to_run"
:error=
"form.errors.limit_to_run"
type=
"number"
class=
"pr-6 pb-8 w-full"
label=
"Минимум баллов для синхронизации"
/>
</div>
<div
class=
"px-8 py-4 bg-gray-50 border-t border-gray-100 flex items-center"
>
<button
class=
"text-red-600 hover:underline"
...
...
@@ -30,7 +32,7 @@
>
Delete Token
</button>
<loading-button
:loading=
"form.processing"
v-if=
"!token.type"
class=
"btn-indigo ml-auto"
type=
"submit"
>
<loading-button
:loading=
"form.processing"
class=
"btn-indigo ml-auto"
type=
"submit"
>
Update Token
</loading-button>
</div>
...
...
@@ -100,6 +102,7 @@ export default {
},
remember
:
'form'
,
data
()
{
console
.
log
(
this
.
token
);
return
{
form
:
this
.
$inertia
.
form
({
id
:
this
.
token
.
id
,
...
...
@@ -107,6 +110,7 @@ export default {
token
:
this
.
token
.
token
,
api
:
this
.
token
.
api
,
type
:
this
.
token
.
type
,
limit_to_run
:
this
.
token
.
limit_to_run
,
}),
}
},
...
...
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