Skip to content

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

Go to a project
Commit cbe20b4d by Vladislav
Options

fix Objects count

1 parent b952a862
Inline Side-by-side
Showing with 14 additions and 131 deletions
app/Service/Requests/Direct/AddAdExtensions.php
...@@ -4,7 +4,6 @@ namespace App\Service\Requests\Direct; ...@@ -4,7 +4,6 @@ namespace App\Service\Requests\Direct;
use App\Jobs\ProcessCallLimitedAPI; use App\Jobs\ProcessCallLimitedAPI;
use App\Models\Pivots\GoalAdExtension; use App\Models\Pivots\GoalAdExtension;
use App\Models\Pivots\GoalAdGroup;
use App\Models\Variable; use App\Models\Variable;
use App\Service\Contract\APIRequest; use App\Service\Contract\APIRequest;
use App\Service\Requests\DirectRequest; use App\Service\Requests\DirectRequest;
......
app/Service/Requests/Direct/AddCampaigns.php
...@@ -12,7 +12,6 @@ use App\Service\StrReplaceByVariables; ...@@ -12,7 +12,6 @@ use App\Service\StrReplaceByVariables;
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Collection;
use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Log;
use function MongoDB\Driver\Monitoring\removeSubscriber;
class AddCampaigns extends DirectRequest class AddCampaigns extends DirectRequest
{ {
......
app/Service/Requests/Direct/AddVCards.php
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
namespace App\Service\Requests\Direct; namespace App\Service\Requests\Direct;
use App\Jobs\ProcessCallLimitedAPI; use App\Jobs\ProcessCallLimitedAPI;
use App\Models\NegativeKeywordSharedSet;
use App\Models\Pivots\GoalNegativeKeywordSharedSet;
use App\Models\Pivots\GoalVCard; use App\Models\Pivots\GoalVCard;
use App\Models\Variable; use App\Models\Variable;
use App\Service\Contract\APIRequest; use App\Service\Contract\APIRequest;
......
app/Service/Requests/Direct/CheckChanges.php
...@@ -8,7 +8,6 @@ use App\Models\Advertisement; ...@@ -8,7 +8,6 @@ use App\Models\Advertisement;
use App\Models\Campaigns; use App\Models\Campaigns;
use App\Models\Pivots\DictionaryCampaign; use App\Models\Pivots\DictionaryCampaign;
use App\Models\Pivots\GoalAdGroup; use App\Models\Pivots\GoalAdGroup;
use App\Models\Pivots\GoalAdvertisement;
use App\Service\Contract\APIRequest; use App\Service\Contract\APIRequest;
use App\Service\Requests\DirectRequest; use App\Service\Requests\DirectRequest;
use Carbon\Carbon; use Carbon\Carbon;
...@@ -28,15 +27,6 @@ class CheckChanges extends DirectRequest ...@@ -28,15 +27,6 @@ class CheckChanges extends DirectRequest
dispatch($process)->onQueue('limits'); dispatch($process)->onQueue('limits');
} }
public function getObjectsCount()
{
$params = $this->getParams();
if (isset($params['CampaignIds'])){
return count($params['CampaignIds']);
}
return parent::getObjectsCount();
}
public function slice($maxObjects): ?APIRequest public function slice($maxObjects): ?APIRequest
{ {
$params = $this->getParams(); $params = $this->getParams();
......
app/Service/Requests/Direct/DeleteKeywords.php
...@@ -3,17 +3,9 @@ ...@@ -3,17 +3,9 @@
namespace App\Service\Requests\Direct; namespace App\Service\Requests\Direct;
use App\Jobs\ProcessCallLimitedAPI; use App\Jobs\ProcessCallLimitedAPI;
use App\Models\Campaigns;
use App\Models\Pivots\DictionaryCampaign;
use App\Models\Pivots\GoalAdGroup;
use App\Models\Pivots\GoalKeyword; use App\Models\Pivots\GoalKeyword;
use App\Models\Pivots\GoalKeywordDelete;
use App\Models\Variable;
use App\Service\Contract\APIRequest; use App\Service\Contract\APIRequest;
use App\Service\Requests\DirectRequest; use App\Service\Requests\DirectRequest;
use App\Service\StrReplaceByVariables;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Log;
class DeleteKeywords extends DirectRequest class DeleteKeywords extends DirectRequest
......
app/Service/Requests/Direct/GetAdExtensions.php
...@@ -4,12 +4,9 @@ namespace App\Service\Requests\Direct; ...@@ -4,12 +4,9 @@ namespace App\Service\Requests\Direct;
use App\Jobs\ProcessCallLimitedAPI; use App\Jobs\ProcessCallLimitedAPI;
use App\Models\AdExtension; use App\Models\AdExtension;
use App\Models\AdGroup;
use App\Models\Advertisement;
use App\Service\Contract\APIRequest; use App\Service\Contract\APIRequest;
use App\Service\Requests\DirectRequest; use App\Service\Requests\DirectRequest;
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Support\Facades\Log;
class GetAdExtensions extends DirectRequest class GetAdExtensions extends DirectRequest
{ {
...@@ -29,7 +26,7 @@ class GetAdExtensions extends DirectRequest ...@@ -29,7 +26,7 @@ class GetAdExtensions extends DirectRequest
if (isset($params['SelectionCriteria']['Ids'])) { if (isset($params['SelectionCriteria']['Ids'])) {
return count($params['SelectionCriteria']['Ids']); return count($params['SelectionCriteria']['Ids']);
} }
return -1; return parent::getObjectsCount();
} }
public function slice($maxObjects): ?APIRequest public function slice($maxObjects): ?APIRequest
......
app/Service/Requests/Direct/GetAdGroups.php
...@@ -7,16 +7,14 @@ use App\Models\AdGroup; ...@@ -7,16 +7,14 @@ use App\Models\AdGroup;
use App\Models\Campaigns; use App\Models\Campaigns;
use App\Models\NegativeKeywordSharedSet; use App\Models\NegativeKeywordSharedSet;
use App\Models\Pivots\DictionaryCampaign; use App\Models\Pivots\DictionaryCampaign;
use App\Models\Pivots\GoalAdGroup;
use App\Service\Contract\APIRequest; use App\Service\Contract\APIRequest;
use App\Service\Requests\DirectRequest; use App\Service\Requests\DirectRequest;
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Log;
class GetAdGroups extends DirectRequest class GetAdGroups extends DirectRequest
{ {
protected $max_count = 10000; protected $max_count = -1;
protected $max_count_CampaignIds = 10; protected $max_count_CampaignIds = 10;
protected $max_count_Ids = 10000; protected $max_count_Ids = 10000;
...@@ -33,7 +31,7 @@ class GetAdGroups extends DirectRequest ...@@ -33,7 +31,7 @@ class GetAdGroups extends DirectRequest
if (isset($params['SelectionCriteria']['Ids'])) { if (isset($params['SelectionCriteria']['Ids'])) {
return count($params['SelectionCriteria']['Ids']); return count($params['SelectionCriteria']['Ids']);
} }
return $this->getMaxCount(); return parent::getObjectsCount();
} }
public function slice($maxObjects): ?APIRequest public function slice($maxObjects): ?APIRequest
...@@ -222,9 +220,7 @@ class GetAdGroups extends DirectRequest ...@@ -222,9 +220,7 @@ class GetAdGroups extends DirectRequest
]; ];
} }
if (isset($filter['Ids'])) { if (isset($filter['Ids'])) {
$this->max_count = $this->max_count_Ids; $this->max_count = $this->max_count_Ids;
$params['SelectionCriteria'] = [ $params['SelectionCriteria'] = [
'Ids' => $filter['Ids'], 'Ids' => $filter['Ids'],
]; ];
......
app/Service/Requests/Direct/GetAdImages.php
...@@ -26,7 +26,7 @@ class GetAdImages extends DirectRequest ...@@ -26,7 +26,7 @@ class GetAdImages extends DirectRequest
if (isset($params['SelectionCriteria']['AdImageHashes'])) { if (isset($params['SelectionCriteria']['AdImageHashes'])) {
return count($params['SelectionCriteria']['AdImageHashes']); return count($params['SelectionCriteria']['AdImageHashes']);
} }
return -1; return parent::getObjectsCount();
} }
public function slice($maxObjects): ?APIRequest public function slice($maxObjects): ?APIRequest
......
app/Service/Requests/Direct/GetAds.php
...@@ -9,7 +9,6 @@ use App\Models\Advertisement; ...@@ -9,7 +9,6 @@ use App\Models\Advertisement;
use App\Service\Contract\APIRequest; use App\Service\Contract\APIRequest;
use App\Service\Requests\DirectRequest; use App\Service\Requests\DirectRequest;
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Support\Facades\Log;
class GetAds extends DirectRequest class GetAds extends DirectRequest
{ {
...@@ -28,16 +27,10 @@ class GetAds extends DirectRequest ...@@ -28,16 +27,10 @@ class GetAds extends DirectRequest
public function getObjectsCount() public function getObjectsCount()
{ {
$params = $this->getParams(); $params = $this->getParams();
if (isset($params['SelectionCriteria']['CampaignIds'])) {
return -1;
}
if (isset($params['SelectionCriteria']['AdGroupIds'])) {
return -1;
}
if (isset($params['SelectionCriteria']['Ids'])) { if (isset($params['SelectionCriteria']['Ids'])) {
return count($params['SelectionCriteria']['Ids']); return count($params['SelectionCriteria']['Ids']);
} }
return -1; return parent::getObjectsCount();
} }
public function slice($maxObjects): ?APIRequest public function slice($maxObjects): ?APIRequest
...@@ -238,9 +231,7 @@ class GetAds extends DirectRequest ...@@ -238,9 +231,7 @@ class GetAds extends DirectRequest
$params['SelectionCriteria']['AdGroupIds'] = $filter['AdGroupIds']; $params['SelectionCriteria']['AdGroupIds'] = $filter['AdGroupIds'];
} }
if (isset($filter['Ids'])) { if (isset($filter['Ids'])) {
$this->max_count = $this->max_count_Ids; $this->max_count = $this->max_count_Ids;
$params['SelectionCriteria']['Ids'] = $filter['Ids']; $params['SelectionCriteria']['Ids'] = $filter['Ids'];
} }
$this->setParams($params); $this->setParams($params);
......
app/Service/Requests/Direct/GetAudienceTargets.php
...@@ -10,7 +10,6 @@ use App\Models\Retargetinglist; ...@@ -10,7 +10,6 @@ use App\Models\Retargetinglist;
use App\Service\Contract\APIRequest; use App\Service\Contract\APIRequest;
use App\Service\Requests\DirectRequest; use App\Service\Requests\DirectRequest;
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Support\Facades\Log;
class GetAudienceTargets extends DirectRequest class GetAudienceTargets extends DirectRequest
{ {
...@@ -30,19 +29,10 @@ class GetAudienceTargets extends DirectRequest ...@@ -30,19 +29,10 @@ class GetAudienceTargets extends DirectRequest
public function getObjectsCount() public function getObjectsCount()
{ {
$params = $this->getParams(); $params = $this->getParams();
if (isset($params['SelectionCriteria']['CampaignIds'])) {
return count($params['SelectionCriteria']['CampaignIds']);
}
if (isset($params['SelectionCriteria']['RetargetingListIds'])) {
return count($params['SelectionCriteria']['RetargetingListIds']);
}
if (isset($params['SelectionCriteria']['AdGroupIds'])) {
return count($params['SelectionCriteria']['AdGroupIds']);
}
if (isset($params['SelectionCriteria']['Ids'])) { if (isset($params['SelectionCriteria']['Ids'])) {
return count($params['SelectionCriteria']['Ids']); return count($params['SelectionCriteria']['Ids']);
} }
return -1; return parent::getObjectsCount();
} }
public function slice($maxObjects): ?APIRequest public function slice($maxObjects): ?APIRequest
...@@ -188,27 +178,16 @@ class GetAudienceTargets extends DirectRequest ...@@ -188,27 +178,16 @@ class GetAudienceTargets extends DirectRequest
] ]
]; ];
if (isset($filter['Ids'])) { if (isset($filter['Ids'])) {
$this->max_count = $this->max_count_Ids; $this->max_count = $this->max_count_Ids;
$params['SelectionCriteria']['Ids'] = $filter['Ids']; $params['SelectionCriteria']['Ids'] = $filter['Ids'];
} }
if (isset($filter['AdGroupIds'])) { if (isset($filter['AdGroupIds'])) {
$this->max_count = $this->max_count_AdGroupIds;
$params['SelectionCriteria']['AdGroupIds'] = $filter['AdGroupIds']; $params['SelectionCriteria']['AdGroupIds'] = $filter['AdGroupIds'];
} }
if (isset($filter['RetargetingListIds'])) { if (isset($filter['RetargetingListIds'])) {
$this->max_count = $this->max_count_RetargetingListIds;
$params['SelectionCriteria']['RetargetingListIds'] = $filter['RetargetingListIds']; $params['SelectionCriteria']['RetargetingListIds'] = $filter['RetargetingListIds'];
} }
if (isset($filter['CampaignIds'])) { if (isset($filter['CampaignIds'])) {
$this->max_count = $this->max_count_CampaignIds;
$params['SelectionCriteria']['CampaignIds'] = $filter['CampaignIds']; $params['SelectionCriteria']['CampaignIds'] = $filter['CampaignIds'];
} }
$this->setParams($params); $this->setParams($params);
......
app/Service/Requests/Direct/GetBidModifiers.php
...@@ -4,14 +4,12 @@ namespace App\Service\Requests\Direct; ...@@ -4,14 +4,12 @@ namespace App\Service\Requests\Direct;
use App\Jobs\ProcessCallLimitedAPI; use App\Jobs\ProcessCallLimitedAPI;
use App\Models\AdGroup; use App\Models\AdGroup;
use App\Models\Advertisement;
use App\Models\BidModifier; use App\Models\BidModifier;
use App\Models\Campaigns; use App\Models\Campaigns;
use App\Service\Contract\APIRequest; use App\Service\Contract\APIRequest;
use App\Service\Requests\DirectRequest; use App\Service\Requests\DirectRequest;
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Log;
class GetBidModifiers extends DirectRequest class GetBidModifiers extends DirectRequest
{ {
...@@ -30,16 +28,10 @@ class GetBidModifiers extends DirectRequest ...@@ -30,16 +28,10 @@ class GetBidModifiers extends DirectRequest
public function getObjectsCount() public function getObjectsCount()
{ {
$params = $this->getParams(); $params = $this->getParams();
if (isset($params['SelectionCriteria']['CampaignIds'])) {
return -1;
}
if (isset($params['SelectionCriteria']['AdGroupIds'])) {
return -1;
}
if (isset($params['SelectionCriteria']['Ids'])) { if (isset($params['SelectionCriteria']['Ids'])) {
return count($params['SelectionCriteria']['Ids']); return count($params['SelectionCriteria']['Ids']);
} }
return -1; return parent::getObjectsCount();
} }
public function slice($maxObjects): ?APIRequest public function slice($maxObjects): ?APIRequest
...@@ -233,9 +225,7 @@ class GetBidModifiers extends DirectRequest ...@@ -233,9 +225,7 @@ class GetBidModifiers extends DirectRequest
$params['SelectionCriteria']['AdGroupIds'] = $filter['AdGroupIds']; $params['SelectionCriteria']['AdGroupIds'] = $filter['AdGroupIds'];
} }
if (isset($filter['Ids'])) { if (isset($filter['Ids'])) {
$this->max_count = $this->max_count_Ids; $this->max_count = $this->max_count_Ids;
$params['SelectionCriteria']['Ids'] = $filter['Ids']; $params['SelectionCriteria']['Ids'] = $filter['Ids'];
} }
$this->setParams($params); $this->setParams($params);
......
app/Service/Requests/Direct/GetCampaigns.php
...@@ -7,8 +7,6 @@ use App\Models\Campaigns; ...@@ -7,8 +7,6 @@ use App\Models\Campaigns;
use App\Models\Pivots\DictionaryCampaign; use App\Models\Pivots\DictionaryCampaign;
use App\Service\Contract\APIRequest; use App\Service\Contract\APIRequest;
use App\Service\Requests\DirectRequest; use App\Service\Requests\DirectRequest;
use Carbon\Carbon;
use Illuminate\Support\Facades\Log;
class GetCampaigns extends DirectRequest class GetCampaigns extends DirectRequest
{ {
...@@ -29,7 +27,7 @@ class GetCampaigns extends DirectRequest ...@@ -29,7 +27,7 @@ class GetCampaigns extends DirectRequest
if (isset($params['SelectionCriteria']['Ids'])) { if (isset($params['SelectionCriteria']['Ids'])) {
return count($params['SelectionCriteria']['Ids']); return count($params['SelectionCriteria']['Ids']);
} }
return -1; return parent::getObjectsCount();
} }
public function slice($maxObjects): ?APIRequest public function slice($maxObjects): ?APIRequest
...@@ -108,9 +106,7 @@ class GetCampaigns extends DirectRequest ...@@ -108,9 +106,7 @@ class GetCampaigns extends DirectRequest
] ]
]; ];
if (!empty($filter['ids'])) { if (!empty($filter['ids'])) {
$this->max_count = $this->max_count_Ids; $this->max_count = $this->max_count_Ids;
$params['SelectionCriteria']['Ids'] = $filter['ids']; $params['SelectionCriteria']['Ids'] = $filter['ids'];
} }
$this->setParams($params); $this->setParams($params);
......
app/Service/Requests/Direct/GetDictionaries.php
...@@ -5,7 +5,6 @@ namespace App\Service\Requests\Direct; ...@@ -5,7 +5,6 @@ namespace App\Service\Requests\Direct;
use App\Jobs\ProcessCallLimitedAPI; use App\Jobs\ProcessCallLimitedAPI;
use App\Models\Dictionary; use App\Models\Dictionary;
use App\Service\Requests\DirectRequest; use App\Service\Requests\DirectRequest;
use Illuminate\Support\Facades\Log;
class GetDictionaries extends DirectRequest class GetDictionaries extends DirectRequest
{ {
......
app/Service/Requests/Direct/GetKeywords.php
...@@ -4,19 +4,15 @@ namespace App\Service\Requests\Direct; ...@@ -4,19 +4,15 @@ namespace App\Service\Requests\Direct;
use App\Jobs\ProcessCallLimitedAPI; use App\Jobs\ProcessCallLimitedAPI;
use App\Models\AdGroup; use App\Models\AdGroup;
use App\Models\Campaigns;
use App\Models\Keyword; use App\Models\Keyword;
use App\Models\Pivots\GoalAdGroup;
use App\Models\Pivots\GoalKeyword;
use App\Service\Contract\APIRequest; use App\Service\Contract\APIRequest;
use App\Service\Requests\DirectRequest; use App\Service\Requests\DirectRequest;
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Log;
class GetKeywords extends DirectRequest class GetKeywords extends DirectRequest
{ {
protected $max_count = 10000; protected $max_count = -1;
protected $max_count_CampaignIds = 10; protected $max_count_CampaignIds = 10;
protected $max_count_AdGroupIds = 1000; protected $max_count_AdGroupIds = 1000;
protected $max_count_Ids = 10000; protected $max_count_Ids = 10000;
...@@ -31,16 +27,10 @@ class GetKeywords extends DirectRequest ...@@ -31,16 +27,10 @@ class GetKeywords extends DirectRequest
public function getObjectsCount() public function getObjectsCount()
{ {
$params = $this->getParams(); $params = $this->getParams();
// if (isset($params['SelectionCriteria']['CampaignIds'])) {
// return -1;
// }
// if (isset($params['SelectionCriteria']['AdGroupIds'])) {
// return -1;
// }
if (isset($params['SelectionCriteria']['Ids'])) { if (isset($params['SelectionCriteria']['Ids'])) {
return count($params['SelectionCriteria']['Ids']); return count($params['SelectionCriteria']['Ids']);
} }
return $this->getMaxCount(); return parent::getObjectsCount();
} }
public function slice($maxObjects): ?APIRequest public function slice($maxObjects): ?APIRequest
...@@ -209,9 +199,7 @@ class GetKeywords extends DirectRequest ...@@ -209,9 +199,7 @@ class GetKeywords extends DirectRequest
]; ];
} }
if (isset($filter['Ids'])) { if (isset($filter['Ids'])) {
$this->max_count = $this->max_count_Ids; $this->max_count = $this->max_count_Ids;
$params['SelectionCriteria'] = [ $params['SelectionCriteria'] = [
'Ids' => $filter['Ids'], 'Ids' => $filter['Ids'],
]; ];
......
app/Service/Requests/Direct/GetNegativeKeywordSharedSets.php
...@@ -3,14 +3,10 @@ ...@@ -3,14 +3,10 @@
namespace App\Service\Requests\Direct; namespace App\Service\Requests\Direct;
use App\Jobs\ProcessCallLimitedAPI; use App\Jobs\ProcessCallLimitedAPI;
use App\Models\AdExtension;
use App\Models\AdGroup;
use App\Models\Advertisement;
use App\Models\NegativeKeywordSharedSet; use App\Models\NegativeKeywordSharedSet;
use App\Service\Contract\APIRequest; use App\Service\Contract\APIRequest;
use App\Service\Requests\DirectRequest; use App\Service\Requests\DirectRequest;
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Support\Facades\Log;
class GetNegativeKeywordSharedSets extends DirectRequest class GetNegativeKeywordSharedSets extends DirectRequest
{ {
...@@ -30,7 +26,7 @@ class GetNegativeKeywordSharedSets extends DirectRequest ...@@ -30,7 +26,7 @@ class GetNegativeKeywordSharedSets extends DirectRequest
if (isset($params['SelectionCriteria']['Ids'])) { if (isset($params['SelectionCriteria']['Ids'])) {
return count($params['SelectionCriteria']['Ids']); return count($params['SelectionCriteria']['Ids']);
} }
return -1; return parent::getObjectsCount();
} }
public function slice($maxObjects): ?APIRequest public function slice($maxObjects): ?APIRequest
...@@ -89,9 +85,7 @@ class GetNegativeKeywordSharedSets extends DirectRequest ...@@ -89,9 +85,7 @@ class GetNegativeKeywordSharedSets extends DirectRequest
], ],
]; ];
if (isset($filter['Ids'])) { if (isset($filter['Ids'])) {
$this->max_count = $this->max_count_Ids; $this->max_count = $this->max_count_Ids;
$params['SelectionCriteria'] = [ $params['SelectionCriteria'] = [
'Ids' => $filter['Ids'], 'Ids' => $filter['Ids'],
]; ];
......
app/Service/Requests/Direct/GetRetargetinglists.php
...@@ -7,7 +7,6 @@ use App\Models\Retargetinglist; ...@@ -7,7 +7,6 @@ use App\Models\Retargetinglist;
use App\Service\Contract\APIRequest; use App\Service\Contract\APIRequest;
use App\Service\Requests\DirectRequest; use App\Service\Requests\DirectRequest;
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Support\Facades\Log;
class GetRetargetinglists extends DirectRequest class GetRetargetinglists extends DirectRequest
{ {
...@@ -27,7 +26,7 @@ class GetRetargetinglists extends DirectRequest ...@@ -27,7 +26,7 @@ class GetRetargetinglists extends DirectRequest
if (isset($params['SelectionCriteria']['Ids'])) { if (isset($params['SelectionCriteria']['Ids'])) {
return count($params['SelectionCriteria']['Ids']); return count($params['SelectionCriteria']['Ids']);
} }
return -1; return parent::getObjectsCount();
} }
public function slice($maxObjects): ?APIRequest public function slice($maxObjects): ?APIRequest
...@@ -87,9 +86,7 @@ class GetRetargetinglists extends DirectRequest ...@@ -87,9 +86,7 @@ class GetRetargetinglists extends DirectRequest
], ],
]; ];
if (isset($filter['Ids'])) { if (isset($filter['Ids'])) {
$this->max_count = $this->max_count_Ids; $this->max_count = $this->max_count_Ids;
$params['SelectionCriteria'] = [ $params['SelectionCriteria'] = [
'Ids' => $filter['Ids'], 'Ids' => $filter['Ids'],
]; ];
......
app/Service/Requests/Direct/GetSitelinks.php
...@@ -3,14 +3,10 @@ ...@@ -3,14 +3,10 @@
namespace App\Service\Requests\Direct; namespace App\Service\Requests\Direct;
use App\Jobs\ProcessCallLimitedAPI; use App\Jobs\ProcessCallLimitedAPI;
use App\Models\AdExtension;
use App\Models\AdGroup;
use App\Models\Advertisement;
use App\Models\Sitelink; use App\Models\Sitelink;
use App\Service\Contract\APIRequest; use App\Service\Contract\APIRequest;
use App\Service\Requests\DirectRequest; use App\Service\Requests\DirectRequest;
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Support\Facades\Log;
class GetSitelinks extends DirectRequest class GetSitelinks extends DirectRequest
{ {
...@@ -30,7 +26,7 @@ class GetSitelinks extends DirectRequest ...@@ -30,7 +26,7 @@ class GetSitelinks extends DirectRequest
if (isset($params['SelectionCriteria']['Ids'])) { if (isset($params['SelectionCriteria']['Ids'])) {
return count($params['SelectionCriteria']['Ids']); return count($params['SelectionCriteria']['Ids']);
} }
return -1; return parent::getObjectsCount();
} }
public function slice($maxObjects): ?APIRequest public function slice($maxObjects): ?APIRequest
...@@ -89,9 +85,7 @@ class GetSitelinks extends DirectRequest ...@@ -89,9 +85,7 @@ class GetSitelinks extends DirectRequest
], ],
]; ];
if (isset($filter['Ids'])) { if (isset($filter['Ids'])) {
$this->max_count = $this->max_count_Ids; $this->max_count = $this->max_count_Ids;
$params['SelectionCriteria'] = [ $params['SelectionCriteria'] = [
'Ids' => $filter['Ids'], 'Ids' => $filter['Ids'],
]; ];
......
app/Service/Requests/Direct/GetVCards.php
...@@ -3,16 +3,11 @@ ...@@ -3,16 +3,11 @@
namespace App\Service\Requests\Direct; namespace App\Service\Requests\Direct;
use App\Jobs\ProcessCallLimitedAPI; use App\Jobs\ProcessCallLimitedAPI;
use App\Models\AdExtension;
use App\Models\AdGroup;
use App\Models\Advertisement;
use App\Models\Campaigns; use App\Models\Campaigns;
use App\Models\NegativeKeywordSharedSet;
use App\Models\VCard; use App\Models\VCard;
use App\Service\Contract\APIRequest; use App\Service\Contract\APIRequest;
use App\Service\Requests\DirectRequest; use App\Service\Requests\DirectRequest;
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Support\Facades\Log;
class GetVCards extends DirectRequest class GetVCards extends DirectRequest
{ {
...@@ -32,7 +27,7 @@ class GetVCards extends DirectRequest ...@@ -32,7 +27,7 @@ class GetVCards extends DirectRequest
if (isset($params['SelectionCriteria']['Ids'])) { if (isset($params['SelectionCriteria']['Ids'])) {
return count($params['SelectionCriteria']['Ids']); return count($params['SelectionCriteria']['Ids']);
} }
return -1; return parent::getObjectsCount();
} }
public function slice($maxObjects): ?APIRequest public function slice($maxObjects): ?APIRequest
...@@ -116,9 +111,7 @@ class GetVCards extends DirectRequest ...@@ -116,9 +111,7 @@ class GetVCards extends DirectRequest
], ],
]; ];
if (isset($filter['Ids'])) { if (isset($filter['Ids'])) {
$this->max_count = $this->max_count_Ids; $this->max_count = $this->max_count_Ids;
$params['SelectionCriteria'] = [ $params['SelectionCriteria'] = [
'Ids' => $filter['Ids'], 'Ids' => $filter['Ids'],
]; ];
......
app/Service/Requests/Direct/ResumeCampaigns.php
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
namespace App\Service\Requests\Direct; namespace App\Service\Requests\Direct;
use App\Jobs\ProcessCallLimitedAPI; use App\Jobs\ProcessCallLimitedAPI;
use App\Models\Campaigns;
use App\Models\Pivots\DictionaryCampaign; use App\Models\Pivots\DictionaryCampaign;
use App\Service\Contract\APIRequest; use App\Service\Contract\APIRequest;
use App\Service\Requests\DirectRequest; use App\Service\Requests\DirectRequest;
......
app/Service/Requests/Direct/SetBidModifiers.php
...@@ -3,13 +3,9 @@ ...@@ -3,13 +3,9 @@
namespace App\Service\Requests\Direct; namespace App\Service\Requests\Direct;
use App\Jobs\ProcessCallLimitedAPI; use App\Jobs\ProcessCallLimitedAPI;
use App\Models\Pivots\GoalAdGroup;
use App\Models\Pivots\GoalBidModifier; use App\Models\Pivots\GoalBidModifier;
use App\Models\Variable;
use App\Service\Contract\APIRequest; use App\Service\Contract\APIRequest;
use App\Service\Requests\DirectRequest; use App\Service\Requests\DirectRequest;
use App\Service\StrReplaceByVariables;
use Carbon\Carbon;
use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Log;
class SetBidModifiers extends DirectRequest class SetBidModifiers extends DirectRequest
......
app/Service/Requests/Direct/SuspendCampaigns.php
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
namespace App\Service\Requests\Direct; namespace App\Service\Requests\Direct;
use App\Jobs\ProcessCallLimitedAPI; use App\Jobs\ProcessCallLimitedAPI;
use App\Models\Campaigns;
use App\Models\Pivots\DictionaryCampaign; use App\Models\Pivots\DictionaryCampaign;
use App\Service\Contract\APIRequest; use App\Service\Contract\APIRequest;
use App\Service\Requests\DirectRequest; use App\Service\Requests\DirectRequest;
......
app/Service/Requests/Direct/UpdateCampaigns.php
...@@ -11,7 +11,6 @@ use App\Service\Requests\DirectRequest; ...@@ -11,7 +11,6 @@ use App\Service\Requests\DirectRequest;
use App\Service\StrReplaceByVariables; use App\Service\StrReplaceByVariables;
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Log;
use phpDocumentor\Reflection\DocBlock\Tags\Return_;
class UpdateCampaigns extends DirectRequest class UpdateCampaigns extends DirectRequest
{ {
......
app/Service/Requests/Direct/UpdateKeywords.php
...@@ -9,7 +9,6 @@ use App\Models\Variable; ...@@ -9,7 +9,6 @@ use App\Models\Variable;
use App\Service\Contract\APIRequest; use App\Service\Contract\APIRequest;
use App\Service\Requests\DirectRequest; use App\Service\Requests\DirectRequest;
use App\Service\StrReplaceByVariables; use App\Service\StrReplaceByVariables;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Log;
class UpdateKeywords extends DirectRequest class UpdateKeywords extends DirectRequest
......
app/Service/Requests/Direct/UpdateNegativeKeywordSharedSets.php
...@@ -9,7 +9,6 @@ use App\Models\Variable; ...@@ -9,7 +9,6 @@ use App\Models\Variable;
use App\Service\Contract\APIRequest; use App\Service\Contract\APIRequest;
use App\Service\Requests\DirectRequest; use App\Service\Requests\DirectRequest;
use App\Service\StrReplaceByVariables; use App\Service\StrReplaceByVariables;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Collection;
use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Log;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!