fix(200 response): change all responses with status 200 to JSON format

ngyngcphu · Dec 19, 2023 · ebf514c · ebf514c
1 parent cac4002
commit ebf514c
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 26 deletions.
diff --git a/src/handlers/auth.handler.ts b/src/handlers/auth.handler.ts
@@ -103,7 +103,7 @@ const logout: Handler = async (_req, res) => {
     return null;
 };
 
-const verifyOTP: Handler<string, { Params: { userId: string }; Body: VerifyOTPInputDto }> = async (req, res) => {
+const verifyOTP: Handler<{ message: string }, { Params: { userId: string }; Body: VerifyOTPInputDto }> = async (req, res) => {
     const verificationEmail = await prisma.verificationEmail.findFirst({
         select: {
             expiration_time: true
@@ -142,10 +142,10 @@ const verifyOTP: Handler<string, { Params: { userId: string }; Body: VerifyOTPIn
         }
     });
 
-    return 'Verify successfully !';
+    return { message: 'Verify successfully !' };
 };
 
-const sendOTP: Handler<string, { Params: { userId: string } }> = async (req, res) => {
+const sendOTP: Handler<{ message: string }, { Params: { userId: string } }> = async (req, res) => {
     const { userId } = req.params;
     const user = await prisma.user.findUnique({
         select: {
@@ -196,7 +196,7 @@ const sendOTP: Handler<string, { Params: { userId: string } }> = async (req, res
         html: `<p>Enter this OTP to verify your tick3d account: ${otp}</p>`
     });
 
-    return 'Verification email sent';
+    return { message: 'Verification email sent' };
 };
 
 export const authHandler = {

diff --git a/src/handlers/cart.handler.ts b/src/handlers/cart.handler.ts
@@ -31,7 +31,7 @@ const get: Handler<GetCartResultDto> = async (req, res) => {
     }
 };
 
-const add: Handler<string, { Body: AddCartInputDto }> = async (req, res) => {
+const add: Handler<{ message: string }, { Body: AddCartInputDto }> = async (req, res) => {
     const user_id = req.userId;
     const { models } = req.body;
 
@@ -75,7 +75,7 @@ const add: Handler<string, { Body: AddCartInputDto }> = async (req, res) => {
                 )
             );
         });
-        return res.send('Added successfully');
+        return res.send({ message: 'Added successfully' });
     } catch (e) {
         console.error('Error adding to cart:', e);
 
@@ -87,7 +87,7 @@ const add: Handler<string, { Body: AddCartInputDto }> = async (req, res) => {
     }
 };
 
-const del: Handler<string, { Body: DelCartInputDto }> = async (req, res) => {
+const del: Handler<{ message: string }, { Body: DelCartInputDto }> = async (req, res) => {
     const user_id = req.userId;
     const { models } = req.body;
 
@@ -105,13 +105,13 @@ const del: Handler<string, { Body: DelCartInputDto }> = async (req, res) => {
             )
         );
 
-        return 'Deleted successfully';
+        return { message: 'Deleted successfully' };
     } catch (e) {
         return res.badRequest(DELETE_CART_FAILED);
     }
 };
 
-const delAll: Handler<string> = async (req) => {
+const delAll: Handler<{ message: string }> = async (req) => {
     const user_id = req.userId;
 
     await prisma.cart.deleteMany({
@@ -120,7 +120,7 @@ const delAll: Handler<string> = async (req) => {
         }
     });
 
-    return 'Reset cart successfully';
+    return { message: 'Reset cart successfully' };
 };
 
 export const cartHandler = {

diff --git a/src/handlers/defaultModel.handler.ts b/src/handlers/defaultModel.handler.ts
@@ -208,7 +208,7 @@ const upload: Handler<DefaultModelListResultDto, { Body: UploadDefaultModelInput
     return outputList;
 };
 
-const del: Handler<string, { Params: { id: string } }> = async (req, res) => {
+const del: Handler<{ message: string }, { Params: { id: string } }> = async (req, res) => {
     const { id } = req.params;
 
     try {
@@ -226,10 +226,10 @@ const del: Handler<string, { Params: { id: string } }> = async (req, res) => {
         return res.internalServerError(DELETE_MODEL_FAILED);
     }
 
-    return 'Delete successfully';
+    return { message: 'Delete successfully' };
 };
 
-const update: Handler<string, { Params: { id: string }; Body: UpdateDefaultModelInputDto }> = async (req, res) => {
+const update: Handler<{ message: string }, { Params: { id: string }; Body: UpdateDefaultModelInputDto }> = async (req, res) => {
     const { id } = req.params;
     const { gcode, name, price, category_id, imageUrl, discount, description, subImageUrls } = req.body;
     try {
@@ -264,7 +264,7 @@ const update: Handler<string, { Params: { id: string }; Body: UpdateDefaultModel
         return res.internalServerError(UPDATE_MODEL_FAILED);
     }
 
-    return 'Update successfully';
+    return { message: 'Update successfully' };
 };
 
 const toggleLike: Handler<ToggleLikeResultDto, { Params: { id: string } }> = async (req, res) => {
@@ -335,7 +335,7 @@ const toggleLike: Handler<ToggleLikeResultDto, { Params: { id: string } }> = asy
     }
 };
 
-const discontinue: Handler<string, { Params: { id: string } }> = async (req, res) => {
+const discontinue: Handler<{ message: string }, { Params: { id: string } }> = async (req, res) => {
     const { id } = req.params;
     try {
         await prisma.$transaction(async (prisma) => {
@@ -360,7 +360,7 @@ const discontinue: Handler<string, { Params: { id: string } }> = async (req, res
         return res.internalServerError('Model is discontinued failed');
     }
 
-    return 'Discontinue successfully';
+    return { message: 'Discontinue successfully' };
 };
 
 export const defaultModelHandler = {

diff --git a/src/handlers/userModel.handler.ts b/src/handlers/userModel.handler.ts
@@ -142,7 +142,7 @@ const upload: Handler<UserModelListResultDto, { Body: UploadUserModelInputDto }>
     return outputList;
 };
 
-const del: Handler<string, { Params: { id: string } }> = async (req, res) => {
+const del: Handler<{ message: string }, { Params: { id: string } }> = async (req, res) => {
     const userId = req.userId;
     const { id } = req.params;
 
@@ -162,10 +162,10 @@ const del: Handler<string, { Params: { id: string } }> = async (req, res) => {
         return res.internalServerError(DELETE_MODEL_FAILED);
     }
 
-    return 'Delete succesfully';
+    return { message: 'Delete succesfully' };
 };
 
-const update: Handler<string, { Params: { id: string }; Body: UpdateUserModelInputDto }> = async (req, res) => {
+const update: Handler<{ message: string }, { Params: { id: string }; Body: UpdateUserModelInputDto }> = async (req, res) => {
     const userId = req.userId;
     const { id } = req.params;
     const { gcode, name, price } = req.body;
@@ -193,7 +193,7 @@ const update: Handler<string, { Params: { id: string }; Body: UpdateUserModelInp
         return res.internalServerError(UPDATE_MODEL_FAILED);
     }
 
-    return 'Update succesfully';
+    return { message: 'Update succesfully' };
 };
 
 export const userModelHandler = {

diff --git a/src/routes/apis/cart.plugin.ts b/src/routes/apis/cart.plugin.ts
@@ -27,7 +27,7 @@ export const cartPlugin = createRoutes('Cart', [
             summary: 'Add some models to the cart of the current user (based on jwt)',
             body: AddCartInputDto,
             response: {
-                200: Type.String(),
+                200: Type.Object({ message: Type.String() }),
                 400: Type.String()
             }
         },
@@ -40,7 +40,7 @@ export const cartPlugin = createRoutes('Cart', [
         schema: {
             summary: 'Reset the cart of the current user (based on jwt)',
             response: {
-                200: Type.String()
+                200: Type.Object({ message: Type.String() })
             }
         },
         handler: cartHandler.delAll
@@ -53,7 +53,7 @@ export const cartPlugin = createRoutes('Cart', [
             summary: 'Remove some models from the cart of the current user (based on jwt)',
             body: DelCartInputDto,
             response: {
-                200: Type.String(),
+                200: Type.Object({ message: Type.String() }),
                 400: Type.String()
             }
         },

diff --git a/src/routes/apis/defaultModel.plugin.ts b/src/routes/apis/defaultModel.plugin.ts
@@ -56,6 +56,7 @@ export const defaultModelPlugin = createRoutes('Default Model', [
         schema: {
             summary: 'Delete a default model with the specified id',
             description: 'Only the manager can do this',
+            response: { 200: Type.Object({ message: Type.String() }) },
             params: {
                 id: Type.String()
             }
@@ -72,6 +73,7 @@ export const defaultModelPlugin = createRoutes('Default Model', [
             params: {
                 id: Type.String()
             },
+            response: { 200: Type.Object({ message: Type.String() }) },
             body: UpdateDefaultModelInputDto
         },
         handler: defaultModelHandler.update
@@ -98,7 +100,7 @@ export const defaultModelPlugin = createRoutes('Default Model', [
         schema: {
             summary: 'Mark Default Model as Discontinued. Also, remove it from all current user carts.',
             params: {
-                id: Type.String()
+                id: Type.Object({ message: Type.String() })
             },
             response: {
                 200: Type.String()

diff --git a/src/routes/apis/userModel.plugin.ts b/src/routes/apis/userModel.plugin.ts
@@ -56,6 +56,7 @@ export const userModelPlugin = createRoutes('User Model', [
         onRequest: [verifyToken],
         schema: {
             summary: 'Delete the user model with the specified id',
+            response: { 200: Type.Object({ message: Type.String() }) },
             params: {
                 id: Type.String()
             }
@@ -69,6 +70,7 @@ export const userModelPlugin = createRoutes('User Model', [
         schema: {
             summary: 'Update a user model',
             description: 'Only the customer can do this',
+            response: { 200: Type.Object({ message: Type.String() }) },
             params: {
                 id: Type.String()
             },

diff --git a/src/routes/auth/index.ts b/src/routes/auth/index.ts
@@ -47,7 +47,7 @@ export const authPlugin = createRoutes('Auth', [
             },
             body: VerifyOTPInputDto,
             response: {
-                200: Type.String(),
+                200: Type.Object({ message: Type.String() }),
                 404: Type.Null()
             }
         },
@@ -62,7 +62,7 @@ export const authPlugin = createRoutes('Auth', [
                 userId: Type.String()
             },
             response: {
-                200: Type.String(),
+                200: Type.Object({ message: Type.String() }),
                 400: Type.String()
             }
         },