Explicitly handle QueryException.

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
katsana · Aug 19, 2020 · 5781437 · 5781437
1 parent 09c3deb
commit 5781437
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 13 deletions.
diff --git a/src/Http/ExceptionHandler.php b/src/Http/ExceptionHandler.php
@@ -25,7 +25,27 @@ public function handle($exception): Reply
             return $this->handleJsonRpcException($exception);
         }
 
-        return $this->handleGenericException($exception);
+        return $this->handleException($exception);
+    }
+
+    /**
+     * Handle generic Exception.
+     *
+     * @param \Throwable|\Error $exception
+     */
+    public function handleException($exception): Reply
+    {
+        \report($exception);
+
+        return new Reply(\json_encode([
+            'jsonrpc' => Server::VERSION,
+            'id' => null,
+            'error' => [
+                'code' => -32603,
+                'message' => \get_class($exception).' - '.$exception->getMessage(),
+                'exception' => \get_class($exception),
+            ],
+        ]));
     }
 
     /**
@@ -94,19 +114,12 @@ protected function handleValidationException(ValidationException $exception): Re
      * Handle generic Exception.
      *
      * @param \Throwable|\Error $exception
+     *
+     * @deprecated v2.5.0 and will be removed in v3.0.0
+     * @see self::handleException()
      */
     protected function handleGenericException($exception): Reply
     {
-        \report($exception);
-
-        return new Reply(\json_encode([
-            'jsonrpc' => Server::VERSION,
-            'id' => null,
-            'error' => [
-                'code' => -32603,
-                'message' => \get_class($exception).' - '.$exception->getMessage(),
-                'exception' => \get_class($exception),
-            ],
-        ]));
+       return $this->handleException($exception);
     }
 }
diff --git a/src/Http/Router.php b/src/Http/Router.php
@@ -5,6 +5,7 @@
 use Datto\JsonRpc\Evaluator;
 use ErrorException;
 use Illuminate\Contracts\Container\Container;
+use Illuminate\Database\QueryException;
 use Illuminate\Pipeline\Pipeline;
 use Minions\Configuration;
 use Minions\Exceptions\ProjectNotFound;
@@ -94,6 +95,7 @@ public function handle(ServerRequestInterface $request)
     {
         $project = $request->getHeader('X-Request-ID')[0] ?? null;
         $app = $this->container;
+        $exceptionHandler = new ExceptionHandler();
 
         try {
             $config = $this->projectConfiguration($project);
@@ -106,8 +108,10 @@ public function handle(ServerRequestInterface $request)
                     ])->then(static function (Message $message) use ($app) {
                         return $app->make('minions.controller')->handle($message);
                     });
+        } catch (QueryException $exception) {
+            return $exceptionHandler->handleException($exception);
         } catch (ErrorException | Throwable $exception) {
-            return (new ExceptionHandler())->handle($exception);
+            return $exceptionHandler->handle($exception);
         }
     }