This removes api authentification with token in favor of signature method. Refactorize code and clean up. It add more unit test plus code coverage in test/converage. - Added config.api.timestampTimeout - Added Helper::signRequest This calculates the request signature - Added more unit tests and extend code coverage. - Added rate limiter for web routes - Added RemoveSpaces Sanitizer on api requests - Added stress test suite - Changed AuthServiceProvider api-token to api-hmac - Changed CustomerSeeder to have at least of customer activated (for unit tests) - Changed used transation for saveing multiple models - Changed, in ServiceController generateApiToken to generateServicePassword - Changed, timestamp has to be send in request with a DateTime format, it also has to a UTC value - Composer added brianium/paratest - Composer update - Fixed case where removing single optin could be the wrong one (not for the good service) - Fixed customer delete - Fixed customer would not be resolved by brand. - Fixed Really check that request is json checking body content, preventing sending malformed requests - Remove ApiError::needAuth - Removed api_token - Removed ApiController::authenticate - Removed config.api.tokenTimeout - Removed Header check or usage because of HAProxy doing weird stuff - Removed lock files from gitignore - Removed memcached dependency - Removed unused questions resources api routes - Removed workspace file Migrations - Added unique index on services.bearer_token - Changed customer_id on customer_answer is nullable - Changed services.bearer_pwd length to 312 (the size of the token) - Dropped services.api_token and service.api_token_date
86 lines
2.4 KiB
PHP
86 lines
2.4 KiB
PHP
<?php
|
|
|
|
namespace App\Jobs;
|
|
|
|
use App\Models\Brand;
|
|
use App\Models\BrandStat;
|
|
use App\Models\CustomerInfo;
|
|
use App\Models\CustomerLogin;
|
|
use App\Models\SingleOptin;
|
|
use Illuminate\Bus\Queueable;
|
|
use Illuminate\Contracts\Queue\ShouldQueue;
|
|
use Illuminate\Foundation\Bus\Dispatchable;
|
|
use Illuminate\Queue\InteractsWithQueue;
|
|
use Illuminate\Queue\Middleware\WithoutOverlapping;
|
|
use Illuminate\Queue\SerializesModels;
|
|
use Illuminate\Support\Carbon;
|
|
|
|
/**
|
|
* @codeCoverageIgnore
|
|
*/
|
|
class StatJob implements ShouldQueue
|
|
{
|
|
use Dispatchable;
|
|
use InteractsWithQueue;
|
|
use Queueable;
|
|
use SerializesModels;
|
|
|
|
/**
|
|
* Set high max tries as using prevent overlap
|
|
*
|
|
* @var integer
|
|
*/
|
|
public $tries = 10;
|
|
|
|
/** Used to prevent overlaping */
|
|
private const JOBKEY = 32644296;
|
|
|
|
/** @var \App\Models\Brand */
|
|
private $brand;
|
|
|
|
/**
|
|
* Create a new job instance.
|
|
*
|
|
* @param Brand $brand
|
|
* @return void
|
|
*/
|
|
public function __construct(Brand $brand)
|
|
{
|
|
$this->brand = $brand;
|
|
}
|
|
|
|
/**
|
|
* Execute the job.
|
|
*
|
|
* @return void
|
|
*/
|
|
public function handle()
|
|
{
|
|
$stats = new BrandStat([
|
|
'active' => CustomerLogin::whereBrandId($this->brand->id)
|
|
->whereDate('last_connection', '<', Carbon::now()->subMonths(6))->count(),
|
|
'inactive' => CustomerLogin::whereBrandId($this->brand->id)
|
|
->whereDate('last_connection', '>', Carbon::now()->subMonths(6))->count(),
|
|
'new_accounts' => CustomerLogin::whereBrandId($this->brand->id)
|
|
->whereDate('created_at', '<', Carbon::now()->subMonths(6))->count(),
|
|
'old_accounts' => CustomerLogin::whereBrandId($this->brand->id)
|
|
->whereDate('created_at', '>', Carbon::now()->subMonths(6))->count(),
|
|
'total_accounts' => CustomerLogin::whereBrandId($this->brand->id)->count(),
|
|
'total_opt_in' => CustomerInfo::whereBrandId($this->brand->id)
|
|
->whereOptIn(true)->count() + SingleOptin::whereBrandId($this->brand->id)->count()
|
|
]);
|
|
$stats->brand()->associate($this->brand);
|
|
$stats->saveOrFail();
|
|
}
|
|
|
|
/**
|
|
* Get the middleware the job should pass through.
|
|
*
|
|
* @return array
|
|
*/
|
|
public function middleware()
|
|
{
|
|
// * Dispatch randomly overlaping jobs if overlapping.
|
|
return [(new WithoutOverlapping(self::JOBKEY))->releaseAfter(rand(20, 90))];
|
|
}
|
|
}
|