use config to convert exception to status codes

jorge07 · May 24, 2020 · c3cefb4 · c3cefb4
1 parent 789e2cb
commit c3cefb4
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 23 deletions.
diff --git a/config/services.yaml b/config/services.yaml
@@ -8,6 +8,13 @@ parameters:
   env(ELASTIC_HOST): 'elasticsearch:9200'
   env(DATABASE_URL): 'mysql://root:api@mysql:3306/api?serverVersion=8.0'
 
+  exception_to_status:
+    InvalidArgumentException: 400
+    App\Domain\User\Exception\InvalidCredentialsException: 401
+    App\Domain\User\Exception\ForbiddenException: 403
+    App\Domain\Shared\Query\Exception\NotFoundException: 404
+    Broadway\Repository\AggregateNotFoundException: 404
+
 services:
     _defaults:
         autowire: true
@@ -85,6 +92,7 @@ services:
     App\UI\Http\Rest\EventSubscriber\ExceptionSubscriber:
         arguments:
             - "%kernel.environment%"
+            - "%exception_to_status%"
         tags:
             - { name: 'kernel.event_listener', event: 'kernel.exception' }
 

diff --git a/src/UI/Http/Rest/EventSubscriber/ExceptionSubscriber.php b/src/UI/Http/Rest/EventSubscriber/ExceptionSubscriber.php
@@ -19,10 +19,12 @@
 final class ExceptionSubscriber implements EventSubscriberInterface
 {
     private string $environment;
+    private array $exceptionToStatus;
 
-    public function __construct(string $environment)
+    public function __construct(string $environment, array $exceptionToStatus)
     {
         $this->environment = $environment;
+        $this->exceptionToStatus = $exceptionToStatus;
     }
 
     public static function getSubscribedEvents(): array
@@ -85,32 +87,22 @@ private function getExceptionMessage(Throwable $exception): string
 
     private function determineStatusCode(Throwable $exception): int
     {
-        // Default status code is always 500
-        $statusCode = Response::HTTP_INTERNAL_SERVER_ERROR;
-
-        switch (true) {
-            case $exception instanceof HttpExceptionInterface:
-                $statusCode = $exception->getStatusCode();
-
-                break;
-            case $exception instanceof InvalidCredentialsException:
-                $statusCode = Response::HTTP_UNAUTHORIZED;
-
-                break;
-            case $exception instanceof ForbiddenException:
-                $statusCode = Response::HTTP_FORBIDDEN;
+        $exceptionClass = \get_class($exception);
 
-                break;
-            case $exception instanceof AggregateNotFoundException || $exception instanceof NotFoundException:
-                $statusCode = Response::HTTP_NOT_FOUND;
+        foreach ($this->exceptionToStatus as $class => $status) {
+            if (is_a($exceptionClass, $class, true)) {
+                return $status;
 
                 break;
-            case $exception instanceof \InvalidArgumentException:
-                $statusCode = Response::HTTP_BAD_REQUEST;
+            }
+        }
 
-                break;
+        // Process HttpExceptionInterface after `exceptionToStatus` to allow overrides from config
+        if ($exception instanceof HttpExceptionInterface) {
+            return $exception->getStatusCode();
         }
 
-        return $statusCode;
+        // Default status code is always 500
+        return Response::HTTP_INTERNAL_SERVER_ERROR;
     }
 }
diff --git a/tests/UI/Http/Rest/EventSubscriber/JsonBodyParserSubscriberTest.php b/tests/UI/Http/Rest/EventSubscriber/JsonBodyParserSubscriberTest.php
@@ -33,7 +33,7 @@ public function when_json_body_is_invalid(): void
         $request->headers->set('Content-Type', 'application/json');
 
         $requestEvent = new RequestEvent(
-            $this->prophesize(HttpKernelInterface::class)->reveal(),
+            $this->createMock(HttpKernelInterface::class),
             $request,
             HttpKernelInterface::MASTER_REQUEST
         );