feat(error handler): catch more cases

phucvinh57 · Aug 22, 2023 · c746a39 · c746a39
1 parent ab84294
commit c746a39
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/src/configs/errorHandler.ts b/src/configs/errorHandler.ts
@@ -1,11 +1,22 @@
-import { TRY_LATER } from '@constants';
+import { NOT_FOUND_GENERIC, TRY_LATER } from '@constants';
 import { FastifyError, FastifyReply, FastifyRequest } from 'fastify';
 
 export function customErrorHandler(err: FastifyError, _req: FastifyRequest, res: FastifyReply) {
-    if (err.statusCode === undefined || err.statusCode >= 500) {
+    if (err.statusCode === undefined) {
+        if (err.name === 'NotFoundError' || err.code === 'P2025') {
+            err.statusCode = 400;
+            err.message = NOT_FOUND_GENERIC;
+            return res.send(err);
+        }
+        err.statusCode = 500;
+    }
+
+    // Intentionally thrown errors
+    if (err.statusCode >= 500) {
         err.message = TRY_LATER;
         return res.send(err);
     }
+
     if (!err.validation || err.validation.length === 0) {
         return res.send(err);
     }

diff --git a/src/constants/errorMessages.ts b/src/constants/errorMessages.ts
@@ -5,3 +5,4 @@ export const DUPLICATED_EMAIL = 'Email already exists !';
 export const LOGIN_FAIL = 'Incorrect login information !';
 export const MUST_LOGIN_FIRST = 'Login first !';
 export const INVALID_TOKEN = 'Invalid token !';
+export const NOT_FOUND_GENERIC = 'Not found !';
diff --git a/src/handlers/auth.handler.ts b/src/handlers/auth.handler.ts
@@ -7,6 +7,7 @@ import { User } from '@prisma/client';
 import { AuthInputDto } from '@dtos/in';
 import { AuthResultDto } from '@dtos/out';
 import { Handler } from '@interfaces';
+import { logger } from '@utils';
 
 const login: Handler<AuthResultDto, { Body: AuthInputDto }> = async (req, res) => {
     const user = await prisma.user.findUnique({
@@ -42,6 +43,7 @@ const signup: Handler<AuthResultDto, { Body: AuthInputDto }> = async (req, res)
             }
         });
     } catch (err) {
+        logger.info(err);
         return res.badRequest(DUPLICATED_EMAIL);
     }
 

diff --git a/src/utils/createRoutes.ts b/src/utils/createRoutes.ts
@@ -10,7 +10,7 @@ export function createRoutes(swaggerTag: HandlerTag, routesOptions: RouteOptions
                     tags: [swaggerTag]
                 },
                 /**
-                 * True by default. See https://www.fastify.io/docs/latest/Reference/Server/#exposeHeadRoutes
+                 * True by default. See https://www.fastify.dev/docs/latest/Reference/Server/#exposeHeadRoutes
                  * About HEAD http method: https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/HEAD
                  */
                 exposeHeadRoute: false