#20207 Доработка изменения РК

app/Jobs/ProcessCallLimitedAPI.php

@@ -40,7 +40,7 @@ class ProcessCallLimitedAPI implements ShouldQueue//, ShouldBeUnique
         $limits = Limits::getInstance($this->api->getToken());
         $limits = Limits::getInstance($this->api->getToken());
         //получаем сколько объектов можем обработать
         //получаем сколько объектов можем обработать
         $objects = $limits->countObjectsLimit($this->api);
         $objects = $limits->countObjectsLimit($this->api);
-        if (!$objects){
+        if ($objects !== 0) {
             //нет свободных баллов, замораживаем до следующего часа
             //нет свободных баллов, замораживаем до следующего часа
             $this->reRunHour();
             $this->reRunHour();
             return;
             return;

app/Service/Limits.php

@@ -60,14 +60,17 @@ class Limits implements \App\Service\Contract\Limits {
 
 
     function countObjectsLimit(\App\Service\Contract\APIRequest $request): int
     function countObjectsLimit(\App\Service\Contract\APIRequest $request): int
     {
     {
-        $cost = $this->limitCosts->getCostObject($request);
-        $costCall = $this->limitCosts->getCostCall($request);
+        $countObjects = $this->countObjects($request);
+        $spent = $this->getSpent($countObjects, $request);
 
 
-        if ($costCall > $this->current()) {
+        if ($spent > $this->current()) {
             return 0;
             return 0;
         }
         }
 
 
-        return $cost > 0 ? floor($this->current() - $this->getSpent($this->countObjects($request), $request)) : -1;
+        $cast = $this->limitCosts->getCostObject($request);
+        $castCall = $this->limitCosts->getCostCall($request);
+
+        return floor(($this->current() - $castCall) / $cast);
     }
     }
 
 
     /**
     /**

app/Service/Requests/Direct/AddCampaigns.php

@@ -54,7 +54,7 @@ class AddCampaigns extends DirectRequest
         $this->setMethod('add');
         $this->setMethod('add');
 
 
         $this->setParams([
         $this->setParams([
-            'Campaigns' => $this['dictionaryCampaigns']->map(function (DictionaryCampaign $dictionaryCampaign) {
+            'Campaigns' => $params['dictionaryCampaigns']->map(function (DictionaryCampaign $dictionaryCampaign) {
 
 
                 $list = Variable::getListVariablesByDictionaryCampaign($dictionaryCampaign);
                 $list = Variable::getListVariablesByDictionaryCampaign($dictionaryCampaign);
 
 

app/Service/Requests/Direct/UpdateCampaigns.php

@@ -6,6 +6,7 @@ use App\Jobs\ProcessCallLimitedAPI;
 use App\Models\Campaigns;
 use App\Models\Campaigns;
 use App\Models\Pivots\DictionaryCampaign;
 use App\Models\Pivots\DictionaryCampaign;
 use App\Models\Variable;
 use App\Models\Variable;
+use App\Service\Costs;
 use App\Service\Requests\DirectRequest;
 use App\Service\Requests\DirectRequest;
 use App\Service\StrReplaceByVariables;
 use App\Service\StrReplaceByVariables;
 use Carbon\Carbon;
 use Carbon\Carbon;
@@ -14,11 +15,6 @@ use Illuminate\Support\Facades\Log;
 
 
 class UpdateCampaigns extends DirectRequest
 class UpdateCampaigns extends DirectRequest
 {
 {
-    protected $timestamp;
-    /* @var Collection|DictionaryCampaign[] $dictionaryCampaigns */
-    protected $dictionaryCampaigns;
-    /* @var Collection|Variable[] $dictionaryCampaigns */
-    protected $variables;
 
 
     public function call($params = null)
     public function call($params = null)
     {
     {
@@ -29,10 +25,6 @@ class UpdateCampaigns extends DirectRequest
 
 
     function slice($count): ?\App\Service\Contract\APIRequest
     function slice($count): ?\App\Service\Contract\APIRequest
     {
     {
-
-        if ($count < 0)
-            return null;
-
         return null;
         return null;
     }
     }