diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 5c6f312..6e28433 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -2,8 +2,13 @@ namespace App\Exceptions; +use App\Http\Resources\StatusResource; use Exception; +use Illuminate\Database\Eloquent\ModelNotFoundException; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; +use Illuminate\Http\JsonResponse; +use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; +use Symfony\Component\Routing\Exception\ResourceNotFoundException; use Throwable; class Handler extends ExceptionHandler @@ -43,10 +48,14 @@ class Handler extends ExceptionHandler * * @param \Illuminate\Http\Request $request * @param \Throwable $exception - * @return \Illuminate\Http\Response + * @return \Symfony\Component\HttpFoundation\Response */ public function render($request, Throwable $exception) { + if ($request->wantsJson() && $exception instanceof ModelNotFoundException){ + return response()->json(new StatusResource(['status' => 'KO', 'code' => 404, 'message' => 'Resource not found.']), 404); + } + // if ($exception instanceof \ErrorException) { // $response = response()->view('errors.500', [], 500); // return $this->toIlluminateResponse($response,$exception); diff --git a/app/Http/Controllers/Api/v1/CustomerController.php b/app/Http/Controllers/Api/v1/CustomerController.php index 3d1c739..8be08f8 100644 --- a/app/Http/Controllers/Api/v1/CustomerController.php +++ b/app/Http/Controllers/Api/v1/CustomerController.php @@ -2,9 +2,13 @@ namespace App\Http\Controllers\Api\v1; +use App\Http\Requests\Customers\StoreRequest; +use App\Http\Requests\Customers\UpdateRequest; +use App\Http\Resources\CustomersResource; use App\Http\Resources\StatusResource; -use Illuminate\Http\Request; +use App\Models\Customers; use App\Http\Controllers\Controller; +use Illuminate\Support\Facades\Log; class CustomerController extends Controller { @@ -31,12 +35,21 @@ class CustomerController extends Controller /** * Store a newly created resource in storage. * - * @param \Illuminate\Http\Request $request - * @return \Illuminate\Http\Response + * @param StoreRequest $request + * @return CustomersResource | StatusResource */ - public function store(Request $request) + public function store(StoreRequest $request) { - die('test'); + try { + $customer = new Customers(); + $customer->fill($request->validated()); + $customer->saveOrFail(); + + return new CustomersResource($customer); + }catch (\Throwable $e) { + Log::critical($e->getMessage()); + return new StatusResource(['status' => 'KO', 'code' => '500', 'message' => 'Server Error.']); + } } /** @@ -64,13 +77,21 @@ class CustomerController extends Controller /** * Update the specified resource in storage. * - * @param \Illuminate\Http\Request $request - * @param int $id - * @return \Illuminate\Http\Response + * @param UpdateRequest $request + * @param Customers $customer + * @return CustomersResource | StatusResource */ - public function update(Request $request, $id) + public function update(UpdateRequest $request, Customers $customer) { - // + try { + $customer->fill($request->validated()); + $customer->saveOrFail(); + + return new CustomersResource($customer); + }catch (\Throwable $e) { + Log::critical($e->getMessage()); + return new StatusResource(['status' => 'KO', 'code' => '500', 'message' => 'Server Error.']); + } } /** diff --git a/app/Http/Requests/Customers/StoreRequest.php b/app/Http/Requests/Customers/StoreRequest.php new file mode 100644 index 0000000..bcf275a --- /dev/null +++ b/app/Http/Requests/Customers/StoreRequest.php @@ -0,0 +1,46 @@ + 'numeric|unique:customers,crm_id|required', + 'email' => 'email|unique:customers,email|required', + 'country' => 'string|required' + ]; + } + + protected function failedValidation(Validator $validator) + { + if ($this->wantsJson()) { + throw new HttpResponseException(response()->json(new StatusResource([ + 'status' => 'KO', + 'code' => 422, + 'message' => $validator->errors()->messages() + ]), 422)); + } + } +} diff --git a/app/Http/Requests/Customers/UpdateRequest.php b/app/Http/Requests/Customers/UpdateRequest.php new file mode 100644 index 0000000..54acf80 --- /dev/null +++ b/app/Http/Requests/Customers/UpdateRequest.php @@ -0,0 +1,46 @@ +route('customer'); + return [ + 'email' => "email|unique:customers,email,". $customer->crm_id .",crm_id|required", + 'country' => 'string|required' + ]; + } + + protected function failedValidation(Validator $validator) + { + if ($this->wantsJson()) { + throw new HttpResponseException(response()->json(new StatusResource([ + 'status' => 'KO', + 'code' => 422, + 'message' => $validator->errors()->messages() + ]), 422)); + } + } +} diff --git a/app/Http/Resources/CustomersResource.php b/app/Http/Resources/CustomersResource.php new file mode 100644 index 0000000..890f2ed --- /dev/null +++ b/app/Http/Resources/CustomersResource.php @@ -0,0 +1,22 @@ + 'OK', + 'customer' => parent::toArray($request) + ]); + } +} diff --git a/app/Http/Resources/StatusResource.php b/app/Http/Resources/StatusResource.php new file mode 100644 index 0000000..60f87ae --- /dev/null +++ b/app/Http/Resources/StatusResource.php @@ -0,0 +1,19 @@ +country = (new Customers)->getISOCountry($customer->country); + }); + + static::updating(function ($customer) { + $customer->country = (new Customers)->getISOCountry($customer->country); + }); + } + + private function getISOCountry($country) + { + switch ($country) + { + case 'Belgique': + return 56; + break; + case 'Luxembourg': + return 442; + break; + default: + return 250; //France + } + } } diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 66d4762..79057d8 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -2,10 +2,8 @@ namespace App\Providers; -use Illuminate\Http\Resources\Json\Resource; +use Illuminate\Http\Resources\Json\JsonResource; use Illuminate\Support\ServiceProvider; -use Illuminate\Support\Facades\URL; -use Illuminate\Support\Facades\App; class AppServiceProvider extends ServiceProvider { @@ -21,7 +19,7 @@ class AppServiceProvider extends ServiceProvider // } $this->loadViewsFrom(public_path('/landings'), 'landings'); - Resource::withoutWrapping(); + JsonResource::withoutWrapping(); } /** diff --git a/composer.lock b/composer.lock index e81a66a..6c45b42 100644 --- a/composer.lock +++ b/composer.lock @@ -974,16 +974,16 @@ }, { "name": "laravel/framework", - "version": "v8.37.0", + "version": "v8.38.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "cf4082973abc796ec285190f0603380021f6d26f" + "reference": "26a73532c54d2c090692bf2e3e64e449669053ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/cf4082973abc796ec285190f0603380021f6d26f", - "reference": "cf4082973abc796ec285190f0603380021f6d26f", + "url": "https://api.github.com/repos/laravel/framework/zipball/26a73532c54d2c090692bf2e3e64e449669053ba", + "reference": "26a73532c54d2c090692bf2e3e64e449669053ba", "shasum": "" }, "require": { @@ -1138,7 +1138,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2021-04-13T13:49:49+00:00" + "time": "2021-04-20T13:50:21+00:00" }, { "name": "laravel/tinker",