mise à plat, renomage v1 et v2 en V1 et V2
This commit is contained in:
parent
01b3659a36
commit
19e1a022a2
30 changed files with 149 additions and 55 deletions
7
CRM V2.code-workspace
Normal file
7
CRM V2.code-workspace
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
{
|
||||
"folders": [
|
||||
{
|
||||
"path": "."
|
||||
}
|
||||
]
|
||||
}
|
||||
97
app/Console/Commands/GenerateCrmClient.php
Normal file
97
app/Console/Commands/GenerateCrmClient.php
Normal file
|
|
@ -0,0 +1,97 @@
|
|||
<?php
|
||||
|
||||
namespace App\Console\Commands;
|
||||
|
||||
use App\Enums\ApiError;
|
||||
use App\Enums\ApiStatus;
|
||||
use App\Enums\ArcadiaMailType;
|
||||
use App\Enums\ArcadiaOrderType;
|
||||
use App\Exceptions\Api\V2\CrmException;
|
||||
use Illuminate\Console\Command;
|
||||
use Illuminate\Support\Facades\File;
|
||||
|
||||
class GenerateCrmClient extends Command
|
||||
{
|
||||
|
||||
private const TARGET = 'clients/V2/src';
|
||||
private const CLIENTNAMESPACE = 'LDC\\LDCCRM';
|
||||
|
||||
/**
|
||||
* The name and signature of the console command.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
protected $signature = 'client:generate';
|
||||
|
||||
/**
|
||||
* The console command description.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
protected $description = 'Generate the crm v2 client in clients/V2 folder';
|
||||
|
||||
/**
|
||||
* Execute the console command.
|
||||
*
|
||||
* @return int
|
||||
*/
|
||||
public function handle()
|
||||
{
|
||||
$this->copyEnums();
|
||||
$this->copyExceptions();
|
||||
}
|
||||
|
||||
private function copyExceptions(): void
|
||||
{
|
||||
$this->info('Copy Exceptions');
|
||||
$this->copyToFolder([
|
||||
CrmException::class
|
||||
], 'Exceptions');
|
||||
}
|
||||
|
||||
private function copyEnums(): void
|
||||
{
|
||||
$this->info('Copy Enums');
|
||||
$this->copyToFolder([
|
||||
ApiError::class,
|
||||
ApiStatus::class,
|
||||
ArcadiaMailType::class,
|
||||
ArcadiaOrderType::class
|
||||
], 'Enums');
|
||||
}
|
||||
|
||||
/**
|
||||
* Copy Classes to specified folder
|
||||
*
|
||||
* @param array $classes
|
||||
* @param string $folder
|
||||
* @return void
|
||||
*/
|
||||
private function copyToFolder(array $classes, string $folder): void
|
||||
{
|
||||
$rootTarget = app_path('../' . self::TARGET);
|
||||
foreach ($classes as $class) {
|
||||
$classFileName = \str_replace("App\\$folder\\", '', sprintf('%s.php', $class));
|
||||
$classFileName = \str_replace('\\', '/', $classFileName);
|
||||
$classBasename = class_basename($class);
|
||||
$source = \app_path("$folder/$classFileName");
|
||||
$dest = "$rootTarget/$folder/$classBasename.php";
|
||||
if (File::exists($dest)) {
|
||||
File::delete($dest);
|
||||
}
|
||||
File::copy($source, $dest);
|
||||
$this->replaceNamespaceinPhpFile($dest);
|
||||
}
|
||||
}
|
||||
|
||||
private function replaceNamespaceinPhpFile(string $source): void
|
||||
{
|
||||
$search = 'namespace App';
|
||||
$replace = 'namespace ' . self::CLIENTNAMESPACE;
|
||||
$fContent = File::get($source);
|
||||
$pos = strpos($fContent, $search);
|
||||
if ($pos !== false) {
|
||||
File::put($source, substr_replace($fContent, $replace, $pos, strlen($search)));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace App\Exceptions\Api\v2;
|
||||
namespace App\Exceptions\Api\V2;
|
||||
|
||||
use App\Enums\ApiError;
|
||||
use Exception;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace App\Exceptions\Api\v2;
|
||||
namespace App\Exceptions\Api\V2;
|
||||
|
||||
use Exception;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
|
|
@ -3,8 +3,8 @@
|
|||
namespace App\Exceptions;
|
||||
|
||||
use App\Enums\ApiError;
|
||||
use App\Exceptions\Api\v2\ApiErrorException;
|
||||
use App\Exceptions\Api\v2\CrmException;
|
||||
use App\Exceptions\Api\V2\ApiErrorException;
|
||||
use App\Exceptions\Api\V2\CrmException;
|
||||
use App\Lib\Helper;
|
||||
use Illuminate\Auth\AuthenticationException;
|
||||
use Illuminate\Database\Eloquent\ModelNotFoundException;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Api\v1;
|
||||
namespace App\Http\Controllers\Api\V1;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Resources\StatusResource;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Api\v1;
|
||||
namespace App\Http\Controllers\Api\V1;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Resources\CustomerResource;
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Api\v2;
|
||||
namespace App\Http\Controllers\Api\V2;
|
||||
|
||||
use App\Enums\ApiError;
|
||||
use App\Exceptions\Api\v2\ApiErrorException;
|
||||
use App\Exceptions\Api\V2\ApiErrorException;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\Service;
|
||||
use Illuminate\Database\Eloquent\ModelNotFoundException;
|
||||
|
|
@ -1,13 +1,13 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Api\v2;
|
||||
namespace App\Http\Controllers\Api\V2;
|
||||
|
||||
use App\Enums\ApiError;
|
||||
use App\Enums\ArcadiaMailType;
|
||||
use App\Enums\ArcadiaOrderType;
|
||||
use App\Exceptions\Api\v2\ApiErrorException;
|
||||
use App\Exceptions\Api\V2\ApiErrorException;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests\Api\v2\SendArchadiaMailRequest;
|
||||
use App\Http\Requests\Api\V2\SendArchadiaMailRequest;
|
||||
use App\Mail\CourrierArcadiaError;
|
||||
use App\Models\Customer;
|
||||
use App\Models\CustomerInfo;
|
||||
|
|
@ -1,15 +1,15 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Api\v2;
|
||||
namespace App\Http\Controllers\Api\V2;
|
||||
|
||||
use App\Enums\ApiError;
|
||||
use App\Exceptions\Api\v2\ApiErrorException;
|
||||
use App\Exceptions\Api\v2\CrmException;
|
||||
use App\Exceptions\Api\V2\ApiErrorException;
|
||||
use App\Exceptions\Api\V2\CrmException;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests\Api\v2\AuthenticateRequest;
|
||||
use App\Http\Requests\Api\v2\StoreCustomerRequest;
|
||||
use App\Http\Requests\Api\v2\UpdateCustomerRequest;
|
||||
use App\Http\Resources\Api\v2\CustomerResource;
|
||||
use App\Http\Requests\Api\V2\AuthenticateRequest;
|
||||
use App\Http\Requests\Api\V2\StoreCustomerRequest;
|
||||
use App\Http\Requests\Api\V2\UpdateCustomerRequest;
|
||||
use App\Http\Resources\Api\V2\CustomerResource;
|
||||
use App\Models\Customer;
|
||||
use App\Models\Service;
|
||||
use Illuminate\Database\Eloquent\ModelNotFoundException;
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Api\v2;
|
||||
namespace App\Http\Controllers\Api\V2;
|
||||
|
||||
use App\Enums\ApiError;
|
||||
use App\Exceptions\Api\v2\ApiErrorException;
|
||||
use App\Exceptions\Api\V2\ApiErrorException;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests\Api\v2\SingleOptinRequest;
|
||||
use App\Http\Requests\Api\V2\SingleOptinRequest;
|
||||
use App\Models\CustomerInfo;
|
||||
use App\Models\Service;
|
||||
use App\Models\SingleOptin;
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
{
|
||||
"folders": [
|
||||
{
|
||||
"path": "../../../../.."
|
||||
}
|
||||
],
|
||||
"settings": {}
|
||||
}
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
namespace App\Http\Middleware;
|
||||
|
||||
use App\Enums\ApiError;
|
||||
use App\Exceptions\Api\v2\ApiErrorException;
|
||||
use App\Exceptions\Api\V2\ApiErrorException;
|
||||
use App\Lib\Helper;
|
||||
use Closure;
|
||||
use Illuminate\Http\Request;
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
namespace App\Http\Middleware;
|
||||
|
||||
use App\Enums\ApiStatus;
|
||||
use App\Http\Resources\Api\v2\ApiResponse as V2ApiResponse;
|
||||
use App\Http\Resources\Api\V2\ApiResponse as V2ApiResponse;
|
||||
use Closure;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
|
|
|
|||
|
|
@ -56,7 +56,9 @@ class Authenticate extends Middleware
|
|||
try {
|
||||
$service = Service::getFromApiToken($apiToken);
|
||||
$service->authenticate($guards, $apiToken);
|
||||
$route->setParameter('service', $service);
|
||||
app()->bind(Service::class, function () use ($service) {
|
||||
return $service;
|
||||
});
|
||||
} catch (ModelNotFoundException $e) {
|
||||
throw new AuthenticationException('Unauthenticated.', $guards);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Requests\Api\v2;
|
||||
namespace App\Http\Requests\Api\V2;
|
||||
|
||||
class AuthenticateRequest extends BaseApiRequest
|
||||
{
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Requests\Api\v2;
|
||||
namespace App\Http\Requests\Api\V2;
|
||||
|
||||
use ArondeParon\RequestSanitizer\Sanitizers\Lowercase;
|
||||
use ArondeParon\RequestSanitizer\Sanitizers\RemoveNonNumeric;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Requests\Api\v2;
|
||||
namespace App\Http\Requests\Api\V2;
|
||||
|
||||
use App\Enums\ArcadiaMailType;
|
||||
use App\Enums\ArcadiaOrderType;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Requests\Api\v2;
|
||||
namespace App\Http\Requests\Api\V2;
|
||||
|
||||
class SingleOptinRequest extends BaseApiRequest
|
||||
{
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Requests\Api\v2;
|
||||
namespace App\Http\Requests\Api\V2;
|
||||
|
||||
use App\Enums\Country;
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Requests\Api\v2;
|
||||
namespace App\Http\Requests\Api\V2;
|
||||
|
||||
class StoreSingleOptinRequest extends BaseApiRequest
|
||||
{
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Requests\Api\v2;
|
||||
namespace App\Http\Requests\Api\V2;
|
||||
|
||||
use App\Enums\Country;
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Requests\Api\v2;
|
||||
namespace App\Http\Requests\Api\V2;
|
||||
|
||||
class UpdateSingleOptinRequest extends BaseApiRequest
|
||||
{
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Resources\Api\v2;
|
||||
namespace App\Http\Resources\Api\V2;
|
||||
|
||||
use App\Enums\ApiStatus;
|
||||
use App\Exceptions\Api\v2\CrmException;
|
||||
use App\Exceptions\Api\V2\CrmException;
|
||||
use Illuminate\Http\Resources\Json\JsonResource;
|
||||
use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
|
||||
use Illuminate\Contracts\Routing\UrlRoutable;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Resources\Api\v2;
|
||||
namespace App\Http\Resources\Api\V2;
|
||||
|
||||
use App\Models\Brand;
|
||||
use App\Models\Customer;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Resources\Api\v2;
|
||||
namespace App\Http\Resources\Api\V2;
|
||||
|
||||
use Illuminate\Http\Resources\Json\JsonResource;
|
||||
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
<?php
|
||||
|
||||
use Illuminate\Support\Facades\Route;
|
||||
use App\Http\Controllers\Api\v1\CustomerController;
|
||||
use App\Http\Controllers\Api\v1\ArcadiaController;
|
||||
use App\Http\Controllers\Api\v2\ApiController as V2ApiController;
|
||||
use App\Http\Controllers\Api\v2\ArcadiaController as V2ArcadiaController;
|
||||
use App\Http\Controllers\Api\v2\CustomerController as V2CustomerController;
|
||||
use App\Http\Controllers\Api\v2\OptinController as V2OptinController;
|
||||
use App\Http\Controllers\Api\V1\CustomerController;
|
||||
use App\Http\Controllers\Api\V1\ArcadiaController;
|
||||
use App\Http\Controllers\Api\V2\ApiController as V2ApiController;
|
||||
use App\Http\Controllers\Api\V2\ArcadiaController as V2ArcadiaController;
|
||||
use App\Http\Controllers\Api\V2\CustomerController as V2CustomerController;
|
||||
use App\Http\Controllers\Api\V2\OptinController as V2OptinController;
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ use App\Enums\ApiStatus;
|
|||
use App\Enums\ArcadiaMailType;
|
||||
use App\Enums\ArcadiaOrderType;
|
||||
use Illuminate\Foundation\Testing\DatabaseTransactions;
|
||||
use Illuminate\Support\Carbon;
|
||||
use Illuminate\Support\Str;
|
||||
use Tests\CreatesApplication;
|
||||
|
||||
|
|
|
|||
|
|
@ -5,14 +5,11 @@ namespace Tests\Feature\ApiV2;
|
|||
use App\Enums\ApiError;
|
||||
use App\Enums\ApiStatus;
|
||||
use App\Enums\Country;
|
||||
use App\Http\Resources\Api\v2\ApiResponse;
|
||||
use App\Http\Resources\Api\v2\CustomerResource;
|
||||
use App\Models\Customer;
|
||||
use App\Models\CustomerInfo;
|
||||
use App\Models\CustomerLogin;
|
||||
use Illuminate\Database\Eloquent\Collection;
|
||||
use Illuminate\Foundation\Testing\DatabaseTransactions;
|
||||
use Illuminate\Testing\AssertableJsonString;
|
||||
use Tests\CreatesApplication;
|
||||
|
||||
class CustomerTest extends ApiBase
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ class HelperTest extends TestCase
|
|||
|
||||
public function testIsRequestForApiV1()
|
||||
{
|
||||
$request = $this->makeRequest('App\Http\Controllers\Api\v1\CustomerController@activateAccount');
|
||||
$request = $this->makeRequest('App\Http\Controllers\Api\V1\CustomerController@activateAccount');
|
||||
$this->assertTrue(Helper::isRequestForApiV1($request));
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue