Skip to content

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

Go to a project
Commit 91e43e51 by Vladislav
Options

Merge branch 'master' of https://gitlab.veeble.ru/pismenov/yourroomads

2 parents bb0c1463 3df410e4
Inline Side-by-side
Showing with 493 additions and 70 deletions
app/Console/Commands/CheckChangeCampaigns.php 0 → 100644
<?php
namespace App\Console\Commands;
use App\Jobs\ProcessCallLimitedAPI;
use App\Models\Tokens;
use App\Service\API\API;
use App\Service\Direct\CheckDictionaries;
use App\Service\Direct\GetCampaigns;
use App\Service\Requests\APIRequest;
use Illuminate\Console\Command;
use Illuminate\Support\Facades\Bus;
class CheckChangeCampaigns extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'campaigns:checkChange';
/**
* 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()
{
$token = Tokens::where('type', Tokens::MAIN)->first();
if (!$token){
throw new \Exception('Не найден токен блин');
}
$factory = APIRequest::getInstance(API::YANDEX);
$factory->setToken($token);
$factory->getRequest('change', 'checkCampaigns')
->call();
return 0;
}
}
app/Console/Commands/FirstLoadCampaigns.php
...@@ -53,9 +53,8 @@ class FirstLoadCampaigns extends Command ...@@ -53,9 +53,8 @@ class FirstLoadCampaigns extends Command
$factory->setToken($token); $factory->setToken($token);
$factory->getRequest('change', 'CheckDictionaries') $factory->getRequest('change', 'CheckDictionaries')
->call( ->call();
$factory->getRequest('campaigns', 'get') $factory->getRequest('campaigns', 'get')->call();
);
return 0; return 0;
} }
......
app/Console/Commands/LoadUpdatedCampaigns.php 0 → 100644
<?php
namespace App\Console\Commands;
use App\Jobs\ProcessCallLimitedAPI;
use App\Models\Campaigns;
use App\Models\Tokens;
use App\Service\API\API;
use App\Service\Direct\CheckDictionaries;
use App\Service\Direct\GetCampaigns;
use App\Service\Requests\APIRequest;
use Illuminate\Console\Command;
use Illuminate\Support\Facades\Bus;
class LoadUpdatedCampaigns extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'campaigns:loadUpdated';
/**
* 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()
{
$campaigns = Campaigns::forUpdated()->get();
if (!$campaigns)
return;
$token = Tokens::where('type', Tokens::MAIN)->first();
if (!$token){
throw new \Exception('Не найден токен блин');
}
$factory = APIRequest::getInstance(API::YANDEX);
$factory->setToken($token);
$ids = [];
foreach ($campaigns as $campaign){
$ids[] = $campaign['external_id'];
}
if (!empty($ids)){
$factory->getRequest('campaigns', 'get')->call(['ids' => $ids]);
}
return 0;
}
}
app/Models/Campaigns.php
...@@ -12,6 +12,7 @@ class Campaigns extends Model ...@@ -12,6 +12,7 @@ class Campaigns extends Model
protected $fillable = [ protected $fillable = [
'external_id', 'external_id',
'Name', 'Name',
'token',
'TimeTargeting', 'TimeTargeting',
'NegativeKeywords', 'NegativeKeywords',
'BlockedIps', 'BlockedIps',
...@@ -24,5 +25,11 @@ class Campaigns extends Model ...@@ -24,5 +25,11 @@ class Campaigns extends Model
'RelevantKeywordsSettingBudgetPercent', 'RelevantKeywordsSettingBudgetPercent',
'RelevantKeywordsSettingOptimizeGoalId', 'RelevantKeywordsSettingOptimizeGoalId',
'AttributionModel', 'AttributionModel',
'updated'
]; ];
public function scopeForUpdated($query)
{
$query->whereNotNull('updated');
}
} }
app/Service/Contract/APIRequest.php
...@@ -16,6 +16,6 @@ interface APIRequest{ ...@@ -16,6 +16,6 @@ interface APIRequest{
function chunk($objects): ?APIRequest; function chunk($objects): ?APIRequest;
function call($next = null, $response = null); function call($params = null);
function handle($response); function handle($response);
} }
app/Service/Limits.php
...@@ -40,6 +40,8 @@ class Limits implements \App\Service\Contract\Limits { ...@@ -40,6 +40,8 @@ class Limits implements \App\Service\Contract\Limits {
function refreshCurrentLimit(){ function refreshCurrentLimit(){
//последние лимиты по баллам из АПИ //последние лимиты по баллам из АПИ
$limit = $this->token->limits()->complited()->first(); $limit = $this->token->limits()->complited()->first();
if (!$limit)
return;
//сколько часов прошло после последнего запуска //сколько часов прошло после последнего запуска
$hours = Date::now()->diffInHours($limit->updated_at); $hours = Date::now()->diffInHours($limit->updated_at);
......
app/Service/Requests/APIRequest.php
...@@ -83,7 +83,7 @@ class APIRequest implements \App\Service\Contract\APIRequest { ...@@ -83,7 +83,7 @@ class APIRequest implements \App\Service\Contract\APIRequest {
throw new Exception('Я не знаю формата запрсов, чтобы его разбить'); throw new Exception('Я не знаю формата запрсов, чтобы его разбить');
} }
function call($next = null, $response = null){ function call($params = null){
} }
......
app/Service/Requests/Direct/CheckCampaignsChange.php 0 → 100644
<?php
namespace App\Service\Requests\Direct;
use App\Jobs\ProcessCallLimitedAPI;
use App\Models\Campaigns;
use App\Service\API\API;
use App\Service\Requests\APIRequest;
use App\Service\Requests\DirectRequest;
class CheckCampaignsChange extends DirectRequest {
CONST SELF = 'SELF';
CONST CHILDREN = 'CHILDREN';
CONST STAT = 'STAT';
protected $next;
function call($params = null){
$this->requestPrepare($params);
$process = new ProcessCallLimitedAPI($this);
dispatch($process)->onQueue('limits');
}
function handle($response){
foreach ($response['result']['Campaigns'] as $campaign){
if ($campaign['ChangesIn']==self::SELF || $campaign['ChangesIn']==self::CHILDREN){
Campaigns::firstOrCreate([
'external_id' => $campaign['CampaignId']
],
[
'updated' => $campaign['ChangesIn'],
'token' => $this->getToken()->id
]);
}
}
$this->getToken()->timestamp = $response['result']['Timestamp'];
$this->getToken()->save();
}
private function requestPrepare($params){
$this->setService('changes');
$this->setMethod('checkDictionaries');
$this->setParams([
"Timestamp" => $this->getToken()->timestamp
]);
}
}
app/Service/Requests/Direct/CheckDictionariesChange.php
...@@ -7,22 +7,18 @@ use App\Service\Requests\APIRequest; ...@@ -7,22 +7,18 @@ use App\Service\Requests\APIRequest;
use App\Service\Requests\DirectRequest; use App\Service\Requests\DirectRequest;
class CheckDictionariesChange extends DirectRequest { class CheckDictionariesChange extends DirectRequest {
protected $next; function call($params = null){
$this->requestPrepare($params);
function call($next = null, $response = null){
$this->next = $next;
$this->requestPrepare($response);
$process = new ProcessCallLimitedAPI($this); $process = new ProcessCallLimitedAPI($this);
dispatch($process)->onQueue('limits'); dispatch($process)->onQueue('limits');
} }
function handle($response){ function handle($response){
if ($this->next){ $this->token->timestamp = $response['result']['Timestamp'] ?? '';
$this->next->call(null, $response); $this->token->save();
}
} }
private function requestPrepare($response){ private function requestPrepare($params){
$this->setService('changes'); $this->setService('changes');
$this->setMethod('checkDictionaries'); $this->setMethod('checkDictionaries');
} }
......
app/Service/Requests/Direct/GetCampaigns.php
...@@ -6,12 +6,10 @@ use App\Models\Campaigns; ...@@ -6,12 +6,10 @@ use App\Models\Campaigns;
use App\Service\Requests\DirectRequest; use App\Service\Requests\DirectRequest;
class GetCampaigns extends DirectRequest{ class GetCampaigns extends DirectRequest{
protected $next;
protected $timestamp; protected $timestamp;
function call($next = null, $response = null){ function call($params = null){
$this->next = $next; $this->requestPrepare($params);
$this->requestPrepare($response);
$process = new ProcessCallLimitedAPI($this); $process = new ProcessCallLimitedAPI($this);
dispatch($process)->onQueue('limits'); dispatch($process)->onQueue('limits');
} }
...@@ -21,6 +19,7 @@ class GetCampaigns extends DirectRequest{ ...@@ -21,6 +19,7 @@ class GetCampaigns extends DirectRequest{
foreach ($response['result']['Campaigns'] as $campaign){ foreach ($response['result']['Campaigns'] as $campaign){
$data[] = [ $data[] = [
'external_id' => $campaign['Id'], 'external_id' => $campaign['Id'],
'token' => $this->getToken()->id,
'Name' => $campaign['Name'], 'Name' => $campaign['Name'],
'TimeTargeting' => json_encode($campaign['TimeTargeting']), 'TimeTargeting' => json_encode($campaign['TimeTargeting']),
'NegativeKeywords' => !empty($campaign['NegativeKeywords']['Items']) ?implode("\n", $campaign['NegativeKeywords']['Items']):'', 'NegativeKeywords' => !empty($campaign['NegativeKeywords']['Items']) ?implode("\n", $campaign['NegativeKeywords']['Items']):'',
...@@ -35,11 +34,13 @@ class GetCampaigns extends DirectRequest{ ...@@ -35,11 +34,13 @@ class GetCampaigns extends DirectRequest{
'RelevantKeywordsSettingOptimizeGoalId' => $campaign['TextCampaign']['RelevantKeywords']['OptimizeGoalId'], 'RelevantKeywordsSettingOptimizeGoalId' => $campaign['TextCampaign']['RelevantKeywords']['OptimizeGoalId'],
'AttributionModel' => $campaign['TextCampaign']['AttributionModel'], 'AttributionModel' => $campaign['TextCampaign']['AttributionModel'],
'PriorityGoals' => json_encode($campaign['TextCampaign']['PriorityGoals']), 'PriorityGoals' => json_encode($campaign['TextCampaign']['PriorityGoals']),
'updated' => null
]; ];
} }
Campaigns::upsert($data, [ Campaigns::upsert($data, [
'external_id' 'external_id'
],[ ],[
'token',
'Name', 'Name',
'TimeTargeting', 'TimeTargeting',
'NegativeKeywords', 'NegativeKeywords',
...@@ -53,13 +54,13 @@ class GetCampaigns extends DirectRequest{ ...@@ -53,13 +54,13 @@ class GetCampaigns extends DirectRequest{
'RelevantKeywordsSettingBudgetPercent', 'RelevantKeywordsSettingBudgetPercent',
'RelevantKeywordsSettingOptimizeGoalId', 'RelevantKeywordsSettingOptimizeGoalId',
'AttributionModel', 'AttributionModel',
'updated'
]); ]);
} }
private function requestPrepare($response){ private function requestPrepare($filter){
$this->setService('campaigns'); $this->setService('campaigns');
$this->setMethod('get'); $this->setMethod('get');
$this->setTimestamp($response);
$params = [ $params = [
'SelectionCriteria' => [ 'SelectionCriteria' => [
'Types' => ["TEXT_CAMPAIGN"] 'Types' => ["TEXT_CAMPAIGN"]
...@@ -71,11 +72,9 @@ class GetCampaigns extends DirectRequest{ ...@@ -71,11 +72,9 @@ class GetCampaigns extends DirectRequest{
"BiddingStrategy", "Settings", "CounterIds", "RelevantKeywords", "PriorityGoals", "AttributionModel" "BiddingStrategy", "Settings", "CounterIds", "RelevantKeywords", "PriorityGoals", "AttributionModel"
] ]
]; ];
$this->setParams($params); if (!empty($filter['ids'])){
$params['SelectionCriteria']['Ids'] = $filter['ids'];
} }
$this->setParams($params);
private function setTimestamp($response){
$this->timestamp = $response['result']['Timestamp'] ?? '';
} }
} }
app/Service/Requests/DirectRequest.php
...@@ -21,7 +21,7 @@ class DirectRequest extends APIRequest { ...@@ -21,7 +21,7 @@ class DirectRequest extends APIRequest {
//для запросов get ничего не разбиваем, т.к. заранее не знаем сколько чего будет //для запросов get ничего не разбиваем, т.к. заранее не знаем сколько чего будет
//для них только после выполнения запроса будет известно есть ли кроме $count еще данные //для них только после выполнения запроса будет известно есть ли кроме $count еще данные
//а текущий запрос просто устанавливается в $count //а текущий запрос просто устанавливается в $count
//а вот для запросов мутатрово будем разбивать. Но тут уже будет зависеть от запроса //а вот для запросов мутаторов будем разбивать. Но тут уже будет зависеть от запроса
//будем под каждый реализовывать делитель //будем под каждый реализовывать делитель
if (!isset($this->params['Page'])){ if (!isset($this->params['Page'])){
$this->params['Page'] = []; $this->params['Page'] = [];
......
database/migrations/2021_04_29_142844_create_tokens_table.php
...@@ -20,9 +20,9 @@ class CreateTokensTable extends Migration ...@@ -20,9 +20,9 @@ class CreateTokensTable extends Migration
$table->enum('api', ['yd']); $table->enum('api', ['yd']);
$table->enum('type', ['main', 'goal'])->nullable(); $table->enum('type', ['main', 'goal'])->nullable();
$table->integer('created_by'); $table->integer('created_by');
$table->timestamps(); $table->string('timestamp')->nullable();
$table->unique('token'); $table->unique('token');
$table->timestamps();
}); });
} }
......
database/migrations/2021_05_11_084828_create_campaigns_table.php
...@@ -15,22 +15,30 @@ class CreateCampaignsTable extends Migration ...@@ -15,22 +15,30 @@ class CreateCampaignsTable extends Migration
{ {
Schema::create('campaigns', function (Blueprint $table) { Schema::create('campaigns', function (Blueprint $table) {
$table->id(); $table->id();
$table->bigInteger('token');
$table->bigInteger('external_id')->unique(); $table->bigInteger('external_id')->unique();
$table->string('Name', 255); $table->string('Name', 255)->nullable();
$table->json('TimeTargeting'); $table->json('TimeTargeting')->nullable();
$table->text('NegativeKeywords'); $table->text('NegativeKeywords')->nullable();
$table->text('BlockedIps'); $table->text('BlockedIps')->nullable();
$table->text('ExcludedSites'); $table->text('ExcludedSites')->nullable();
$table->json('DailyBudget'); $table->json('DailyBudget')->nullable();
$table->string('TextCampaignStrategySearch'); $table->string('TextCampaignStrategySearch')->nullable();
$table->string('TextCampaignStrategyNetwork'); $table->string('TextCampaignStrategyNetwork')->nullable();
$table->json('Settings'); $table->json('Settings')->nullable();
$table->text('CounterIds'); $table->text('CounterIds')->nullable();
$table->integer('RelevantKeywordsSettingBudgetPercent'); $table->integer('RelevantKeywordsSettingBudgetPercent')->nullable();
$table->bigInteger('RelevantKeywordsSettingOptimizeGoalId'); $table->bigInteger('RelevantKeywordsSettingOptimizeGoalId')->nullable();
$table->string('AttributionModel', 4); $table->string('AttributionModel', 4)->nullable();
$table->json('PriorityGoals'); $table->json('PriorityGoals')->nullable();
$table->enum('updated', [
\App\Service\Requests\Direct\CheckCampaignsChange::CHILDREN,
\App\Service\Requests\Direct\CheckCampaignsChange::SELF,
\App\Service\Requests\Direct\CheckCampaignsChange::STAT,
])->nullable();
$table->timestamps(); $table->timestamps();
$table->foreign('token')->references('id')->on('tokens');
}); });
} }
...@@ -41,6 +49,9 @@ class CreateCampaignsTable extends Migration ...@@ -41,6 +49,9 @@ class CreateCampaignsTable extends Migration
*/ */
public function down() public function down()
{ {
Schema::table('campaigns', function (Blueprint $table) {
$table->dropForeign('campaigns_token_foreign');
});
Schema::dropIfExists('campaigns'); Schema::dropIfExists('campaigns');
} }
} }
tests/Unit/ApiRequestTest.php
...@@ -52,28 +52,4 @@ class ApiRequestTest extends TestCase ...@@ -52,28 +52,4 @@ class ApiRequestTest extends TestCase
$this->expectException(\TypeError::class); $this->expectException(\TypeError::class);
$this->request->setToken( 1 ); $this->request->setToken( 1 );
} }
public function testChunk(){
$this->markTestIncomplete();
// $this->request->setParams([
// 'Page' => [
// "Limit" => 10,
// "Offset" => 0
// ]
// ]);
// $request = $this->request->chunk(3);
// $this->assertEquals($request->getParams()['Page']['Offset'], 3);
// $this->assertEquals($this->request->getParams()['Page']['Limit'], 3);
//
// $this->request->setParams([
// 'Page' => [
// "Limit" => 10,
// "Offset" => 0
// ]
// ]);
// $request = $this->request->chunk(20);
// $this->assertNull($request);
// $this->assertEquals($this->request->getParams()['Page']['Limit'], 10);
}
} }
tests/Unit/CheckCampaignsTest.php 0 → 100644
<?php
namespace Tests\Unit;
use App\Jobs\ProcessCallLimitedAPI;
use App\Models\Account;
use App\Models\Campaigns;
use App\Models\Tokens;
use App\Models\User;
use App\Service\Contract\API;
use App\Service\Requests\APIRequest;
use Illuminate\Support\Facades\Queue;
use Tests\TestCase;
use Illuminate\Foundation\Testing\RefreshDatabase;
class CheckCampaignsTest extends TestCase
{
use RefreshDatabase;
private $request;
protected function setUp(): void
{
parent::setUp();
$account = Account::create(['name' => 'Acme Corporation']);
$this->user = factory(User::class)->create([
'account_id' => $account->id,
'first_name' => 'John',
'last_name' => 'Doe',
'email' => 'johndoe@example.com',
'owner' => true,
]);
$this->token = factory(Tokens::class)->create([
'created_by' => $this->user->id
]);
$this->request = APIRequest::getInstance(API::YANDEX)
->setToken($this->token)
->getRequest('change', 'CheckCampaigns');
}
public function testCallApi(){
Queue::fake();
Queue::assertNothingPushed();
$this->request->call();
Queue::assertPushed(ProcessCallLimitedAPI::class);
}
public function testHandleApi(){
$this->request->handle([
'result' => [
'Timestamp' => 'test time',
'Campaigns' => [
[
'ChangesIn' => 'SELF',
'CampaignId' => 1
],
[
'ChangesIn' => 'CHILDREN',
'CampaignId' => 2
]
]
]
]);
$this->assertEquals($this->request->getToken()->timestamp, 'test time');
$this->assertEquals(2, Campaigns::forUpdated()->count());
foreach (Campaigns::forUpdated()->get() as $c){
if ($c->external_id==1){
$this->assertEquals('SELF', $c->updated);
}else{
$this->assertEquals('CHILDREN', $c->updated);
}
}
}
}
tests/Unit/CheckDictionariesTest.php 0 → 100644
<?php
namespace Tests\Unit;
use App\Jobs\ProcessCallLimitedAPI;
use App\Models\Account;
use App\Models\Tokens;
use App\Models\User;
use App\Service\Contract\API;
use App\Service\Requests\APIRequest;
use Illuminate\Support\Facades\Queue;
use Tests\TestCase;
use Illuminate\Foundation\Testing\RefreshDatabase;
class CheckDictionariesTest extends TestCase
{
use RefreshDatabase;
private $request;
protected function setUp(): void
{
parent::setUp();
$account = Account::create(['name' => 'Acme Corporation']);
$this->user = factory(User::class)->create([
'account_id' => $account->id,
'first_name' => 'John',
'last_name' => 'Doe',
'email' => 'johndoe@example.com',
'owner' => true,
]);
$this->token = factory(Tokens::class)->create([
'created_by' => $this->user->id
]);
$this->request = APIRequest::getInstance(API::YANDEX)
->setToken($this->token)
->getRequest('change', 'CheckDictionaries');
}
public function testCallApi(){
Queue::fake();
Queue::assertNothingPushed();
$this->request->call();
Queue::assertPushed(ProcessCallLimitedAPI::class);
}
public function testHandleApi(){
$this->request->handle([
'result' => [
'Timestamp' => 'test time'
]
]);
$this->assertEquals($this->request->getToken()->timestamp, 'test time');
}
}
tests/Unit/GetCampaignsTest.php 0 → 100644
<?php
namespace Tests\Unit;
use App\Jobs\ProcessCallLimitedAPI;
use App\Models\Account;
use App\Models\Campaigns;
use App\Models\Tokens;
use App\Models\User;
use App\Service\Contract\API;
use App\Service\Requests\APIRequest;
use Illuminate\Support\Facades\Queue;
use Tests\TestCase;
use Illuminate\Foundation\Testing\RefreshDatabase;
class GetCampaignsTest extends TestCase
{
use RefreshDatabase;
private $request;
protected function setUp(): void
{
parent::setUp();
$account = Account::create(['name' => 'Acme Corporation']);
$this->user = factory(User::class)->create([
'account_id' => $account->id,
'first_name' => 'John',
'last_name' => 'Doe',
'email' => 'johndoe@example.com',
'owner' => true,
]);
$this->token = factory(Tokens::class)->create([
'created_by' => $this->user->id
]);
$this->request = APIRequest::getInstance(API::YANDEX)
->setToken($this->token)
->getRequest('campaigns', 'get');
}
public function testCallApi(){
Queue::fake();
Queue::assertNothingPushed();
$this->request->call(['ids'=>[1,2,3]]);
Queue::assertPushed(ProcessCallLimitedAPI::class);
}
public function testHandleApi(){
$this->request->handle([
'result' => [
'Campaigns' => [
[
'Id' => 1,
'Name' => 'test',
'TimeTargeting' => ['test time schedule'],
'NegativeKeywords' => ['Items' => [1,2,3]],
'BlockedIps' => ['Items' => [1,2,3]],
'ExcludedSites' => ['Items' => [1,2,3]],
'DailyBudget' => ['Items' => [1,2,3]],
'TextCampaign' => [
'BiddingStrategy' =>[
'Search' => [
'BiddingStrategyType' => 12312
],
'Network' => [
'BiddingStrategyType' => 12312
]
],
'Settings' => [123,123,12],
'CounterIds' => ['Items' => [1,2,3]],
'RelevantKeywords' => [
'BudgetPercent' => 1,
'OptimizeGoalId' => 2,
],
'AttributionModel' => 'AL',
'PriorityGoals' => [34234,2435567,23423]
],
]
]
]
]);
$this->assertEquals(1, Campaigns::all()->count());
$campaign = Campaigns::all()->first();
$this->assertEquals($campaign->external_id, 1);
$this->assertEquals($campaign->Name, 'test');
$this->assertEquals($campaign->TimeTargeting, json_encode(['test time schedule']));
$this->assertEquals($campaign->NegativeKeywords, implode("\n", [1,2,3]));
$this->assertEquals($campaign->BlockedIps, implode("\n", [1,2,3]));
$this->assertEquals($campaign->ExcludedSites, implode("\n", [1,2,3]));
$this->assertEquals($campaign->DailyBudget, json_encode(['Items' => [1,2,3]]));
$this->assertEquals($campaign->TextCampaignStrategySearch, 12312);
$this->assertEquals($campaign->TextCampaignStrategyNetwork, 12312);
$this->assertEquals($campaign->Settings, json_encode([123,123,12]));
$this->assertEquals($campaign->CounterIds, implode("\n", [1,2,3]));
$this->assertEquals($campaign->RelevantKeywordsSettingBudgetPercent, 1);
$this->assertEquals($campaign->RelevantKeywordsSettingOptimizeGoalId, 2);
$this->assertEquals($campaign->AttributionModel, 'AL');
$this->assertEquals($campaign->PriorityGoals, json_encode([34234,2435567,23423]));
$this->assertEquals($campaign->updated, null);
}
}
tests/Unit/HeaderLimitsTest.php
...@@ -9,12 +9,12 @@ class HeaderLimitsTest extends TestCase ...@@ -9,12 +9,12 @@ class HeaderLimitsTest extends TestCase
{ {
public function testParse(){ public function testParse(){
$limits = new HeaderLimits(['Units' => "0/0/0"]); $limits = new HeaderLimits(['Units' => ["0/0/0"]]);
$this->assertEquals($limits->getDayLimit(), 0); $this->assertEquals($limits->getDayLimit(), 0);
$this->assertEquals($limits->getCurrentLimit(), 0); $this->assertEquals($limits->getCurrentLimit(), 0);
$this->assertEquals($limits->getSpentLimit(), 0); $this->assertEquals($limits->getSpentLimit(), 0);
$limits = new HeaderLimits(['Units' => "1/2/3"]); $limits = new HeaderLimits(['Units' => ["1/2/3"]]);
$this->assertEquals($limits->getDayLimit(), 3); $this->assertEquals($limits->getDayLimit(), 3);
$this->assertEquals($limits->getCurrentLimit(), 2); $this->assertEquals($limits->getCurrentLimit(), 2);
$this->assertEquals($limits->getSpentLimit(), 1); $this->assertEquals($limits->getSpentLimit(), 1);
......
tests/Unit/LimitsTest.php
...@@ -192,7 +192,7 @@ class LimitsTest extends TestCase ...@@ -192,7 +192,7 @@ class LimitsTest extends TestCase
])); ]));
$this->limitService->acceptRezerv( $this->limitService->acceptRezerv(
$limit->id, $limit->id,
new HeaderLimits(['Units' => "1/2/3"]) new HeaderLimits(['Units' => ["1/2/3"]])
); );
$this->assertEquals($this->token->limit, 2); $this->assertEquals($this->token->limit, 2);
...@@ -205,7 +205,7 @@ class LimitsTest extends TestCase ...@@ -205,7 +205,7 @@ class LimitsTest extends TestCase
public function testUpdateLimits(){ public function testUpdateLimits(){
$this->limitService->updateLimits( $this->limitService->updateLimits(
new HeaderLimits(['Units' => "1/2/3"]) new HeaderLimits(['Units' => ["1/2/3"]])
); );
$this->assertEquals($this->token->limit, 2); $this->assertEquals($this->token->limit, 2);
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!