From 19e1a022a2e09251ac8e87691d097d0b01c50dbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Wed, 28 Jul 2021 14:18:47 +0200 Subject: [PATCH] =?UTF-8?q?mise=20=C3=A0=20plat,=20renomage=20v1=20et=20v2?= =?UTF-8?q?=20en=20V1=20et=20V2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CRM V2.code-workspace | 7 ++ app/Console/Commands/GenerateCrmClient.php | 97 +++++++++++++++++++ .../Api/{v2 => V2}/ApiErrorException.php | 2 +- .../Api/{v2 => V2}/CrmException.php | 2 +- app/Exceptions/Handler.php | 4 +- .../Api/{v1 => V1}/ArcadiaController.php | 2 +- .../Api/{v1 => V1}/CustomerController.php | 2 +- .../Api/{v2 => V2}/ApiController.php | 4 +- .../Api/{v2 => V2}/ArcadiaController.php | 6 +- .../Api/{v2 => V2}/CustomerController.php | 14 +-- .../Api/{v2 => V2}/OptinController.php | 6 +- .../Controllers/Api/v1/CRM V2.code-workspace | 8 -- app/Http/Middleware/ApiCheckTimeStamps.php | 2 +- app/Http/Middleware/ApiResponse.php | 2 +- app/Http/Middleware/Authenticate.php | 4 +- .../Api/{v2 => V2}/AuthenticateRequest.php | 2 +- .../Api/{v2 => V2}/BaseApiRequest.php | 2 +- .../{v2 => V2}/SendArchadiaMailRequest.php | 2 +- .../Api/{v2 => V2}/SingleOptinRequest.php | 2 +- .../Api/{v2 => V2}/StoreCustomerRequest.php | 2 +- .../{v2 => V2}/StoreSingleOptinRequest.php | 2 +- .../Api/{v2 => V2}/UpdateCustomerRequest.php | 2 +- .../{v2 => V2}/UpdateSingleOptinRequest.php | 2 +- .../Resources/Api/{v2 => V2}/ApiResponse.php | 4 +- .../Api/{v2 => V2}/CustomerResource.php | 2 +- .../Api/{v2 => V2}/SingleOptinResource.php | 2 +- routes/api.php | 12 +-- tests/Feature/ApiV2/ArcadiaTest.php | 1 - tests/Feature/ApiV2/CustomerTest.php | 3 - tests/Unit/HelperTest.php | 2 +- 30 files changed, 149 insertions(+), 55 deletions(-) create mode 100644 CRM V2.code-workspace create mode 100644 app/Console/Commands/GenerateCrmClient.php rename app/Exceptions/Api/{v2 => V2}/ApiErrorException.php (94%) rename app/Exceptions/Api/{v2 => V2}/CrmException.php (86%) rename app/Http/Controllers/Api/{v1 => V1}/ArcadiaController.php (99%) rename app/Http/Controllers/Api/{v1 => V1}/CustomerController.php (99%) rename app/Http/Controllers/Api/{v2 => V2}/ApiController.php (90%) rename app/Http/Controllers/Api/{v2 => V2}/ArcadiaController.php (95%) rename app/Http/Controllers/Api/{v2 => V2}/CustomerController.php (95%) rename app/Http/Controllers/Api/{v2 => V2}/OptinController.php (89%) delete mode 100644 app/Http/Controllers/Api/v1/CRM V2.code-workspace rename app/Http/Requests/Api/{v2 => V2}/AuthenticateRequest.php (93%) rename app/Http/Requests/Api/{v2 => V2}/BaseApiRequest.php (95%) rename app/Http/Requests/Api/{v2 => V2}/SendArchadiaMailRequest.php (98%) rename app/Http/Requests/Api/{v2 => V2}/SingleOptinRequest.php (86%) rename app/Http/Requests/Api/{v2 => V2}/StoreCustomerRequest.php (98%) rename app/Http/Requests/Api/{v2 => V2}/StoreSingleOptinRequest.php (84%) rename app/Http/Requests/Api/{v2 => V2}/UpdateCustomerRequest.php (98%) rename app/Http/Requests/Api/{v2 => V2}/UpdateSingleOptinRequest.php (87%) rename app/Http/Resources/Api/{v2 => V2}/ApiResponse.php (93%) rename app/Http/Resources/Api/{v2 => V2}/CustomerResource.php (98%) rename app/Http/Resources/Api/{v2 => V2}/SingleOptinResource.php (90%) diff --git a/CRM V2.code-workspace b/CRM V2.code-workspace new file mode 100644 index 0000000..b51044b --- /dev/null +++ b/CRM V2.code-workspace @@ -0,0 +1,7 @@ +{ + "folders": [ + { + "path": "." + } + ] +} diff --git a/app/Console/Commands/GenerateCrmClient.php b/app/Console/Commands/GenerateCrmClient.php new file mode 100644 index 0000000..5e7a818 --- /dev/null +++ b/app/Console/Commands/GenerateCrmClient.php @@ -0,0 +1,97 @@ +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))); + } + } +} diff --git a/app/Exceptions/Api/v2/ApiErrorException.php b/app/Exceptions/Api/V2/ApiErrorException.php similarity index 94% rename from app/Exceptions/Api/v2/ApiErrorException.php rename to app/Exceptions/Api/V2/ApiErrorException.php index 9077e08..6b10654 100644 --- a/app/Exceptions/Api/v2/ApiErrorException.php +++ b/app/Exceptions/Api/V2/ApiErrorException.php @@ -1,6 +1,6 @@ authenticate($guards, $apiToken); - $route->setParameter('service', $service); + app()->bind(Service::class, function () use ($service) { + return $service; + }); } catch (ModelNotFoundException $e) { throw new AuthenticationException('Unauthenticated.', $guards); } diff --git a/app/Http/Requests/Api/v2/AuthenticateRequest.php b/app/Http/Requests/Api/V2/AuthenticateRequest.php similarity index 93% rename from app/Http/Requests/Api/v2/AuthenticateRequest.php rename to app/Http/Requests/Api/V2/AuthenticateRequest.php index 309798e..4f6a710 100644 --- a/app/Http/Requests/Api/v2/AuthenticateRequest.php +++ b/app/Http/Requests/Api/V2/AuthenticateRequest.php @@ -1,6 +1,6 @@ makeRequest('App\Http\Controllers\Api\v1\CustomerController@activateAccount'); + $request = $this->makeRequest('App\Http\Controllers\Api\V1\CustomerController@activateAccount'); $this->assertTrue(Helper::isRequestForApiV1($request)); }