Update Handler.php

app/Exceptions/Handler.php

@@ -49,21 +49,23 @@ class Handler extends ExceptionHandler
         });
 
         $this->renderable(function (Throwable $e, $request) {
-            return $this->handleException($request, $e);
+            if ($request->is('api/*')) {
+                return $this->handleApiException($e);
+            }
         });
     }
 
-    public function handleException($request, Throwable $exception)
+    public function handleApiException(Throwable $exception)
     {
         // Route Not Found
         if ($exception instanceof RouteNotFoundException) {
-            return $this->exceptionResponse($request, $exception, Response::HTTP_NOT_FOUND, config('response-message.router_failed'));
+            return $this->apiExceptionResponse($exception, Response::HTTP_NOT_FOUND, config('response-message.router_failed'));
         }
 
         // Not Found
         if ($exception instanceof NotFoundHttpException) {
-            $message = $exception->getMessage() ?? config('response-message.not_found');
-            return $this->exceptionResponse($request, $exception, Response::HTTP_NOT_FOUND, $message);
+            $message = $exception->getMessage() ?: config('response-message.not_found');
+            return $this->apiExceptionResponse($exception, Response::HTTP_NOT_FOUND, $message);
         }
 
         // Model Not Found
@@ -73,67 +75,60 @@ class Handler extends ExceptionHandler
 
         // Authentication
         if ($exception instanceof AuthenticationException) {
-            return $this->exceptionResponse($request, $exception, Response::HTTP_UNAUTHORIZED, config('response-message.authenticate_failed'));
+            return $this->apiExceptionResponse($exception, Response::HTTP_UNAUTHORIZED, config('response-message.authenticate_failed'));
         }
 
         // Unauthorized
         if ($exception instanceof UnauthorizedHttpException) {
-            return $this->exceptionResponse($request, $exception, $exception->getStatusCode(), config('response-message.authorize_failed'));
+            return $this->apiExceptionResponse($exception, $exception->getStatusCode(), config('response-message.authorize_failed'));
         }
 
         // Http
         if ($exception instanceof HttpException) {
-            return $this->exceptionResponse($request, $exception, $exception->getStatusCode(), $exception->getMessage());
+            return $this->apiExceptionResponse($exception, $exception->getStatusCode(), $exception->getMessage());
         }
 
         // Query
         if ($exception instanceof QueryException) {
-            $this->exceptionResponse($request, $exception, Response::HTTP_INTERNAL_SERVER_ERROR, config('response-message.sql_error'));
+            $this->apiExceptionResponse($exception, Response::HTTP_INTERNAL_SERVER_ERROR, config('response-message.sql_error'));
         }
 
-        // Validation
+        // Validation 422
         if ($exception instanceof ValidationException) {
 
-            if (!$request->is('api/*')) {
-                return $this->convertValidationExceptionToResponse($exception, $request);
-            }
-
             $validationData = [];
-            foreach ($exception->errors() as $key => $item) {
-                $validationData['errors']['validation'][$key] = $item[0];
+            foreach ($exception->errors() as $col => $errorMsg) {
+                $validationData['errors']['validation'][$col] = $errorMsg[0];
             }
-            return $this->exceptionResponse($request, $exception, Response::HTTP_UNPROCESSABLE_ENTITY, config('response-message.validation_failed'), $validationData);
+            return $this->apiExceptionResponse($exception, Response::HTTP_UNPROCESSABLE_ENTITY, config('response-message.validation_failed'), $validationData);
         }
 
-        // Others
-        return $this->exceptionResponse($request, $exception, Response::HTTP_INTERNAL_SERVER_ERROR, 'server error');
+        // Others: 500 error
+        return $this->apiExceptionResponse($exception, Response::HTTP_INTERNAL_SERVER_ERROR, 'server error');
     }
 
-    public function exceptionResponse($request, $exception, $code, $message, $mergeData = [])
+    public function apiExceptionResponse(Throwable $exception, int $code, string $message, array $mergeData = [])
     {
         if ($code === Response::HTTP_INTERNAL_SERVER_ERROR) {
             Log::info($exception->getMessage());
         }
 
+        $data = [
+            'code'    => $code,
+            'message' => $message,
+        ];
 
-        if ($request->is('api/*')) {
-            $data = [
-                'code'    => $code,
-                'message' => $message,
+        if (!app()->environment('production')) {
+            $data['errors'] = [
+                'message' => $exception->getMessage(),
+                'trace'   => $exception->getTrace(),
             ];
+        }
 
-            if (!app()->environment('production')) {
-                $data['errors'] = [
-                    'message' => $exception->getMessage(),
-                    'trace'   => $exception->getTrace(),
-                ];
-            }
-
-            if (!empty($mergeData)) {
-                $data = array_merge($data, $mergeData);
-            }
-
-            return response()->json($data, $code);
+        if (!empty($mergeData)) {
+            $data = array_merge($data, $mergeData);
         }
+
+        return response()->json($data, $code);
     }
 }