Merge pull request #41 from Modarb-Ai-Trainer:MoWafy001/issue35

src/lib/services/crud.service.ts

@@ -11,14 +11,26 @@ export const CrudService = <ModelDoc extends Document>(
       return this.model.create(data);
     }
 
-    async update(
+    async updateOne(
       filter: FilterQuery<ModelDoc>,
       data: AnyKeys<ModelDoc>
     ): Promise<ModelDoc> {
-      return this.model.findOneAndUpdate(filter, data, { new: true });
+      await this.existsOrThrow(filter);
+      await this.model.updateOne(filter, data);
+      return this.findOneOrFail(filter);
     }
 
-    async delete(filter: FilterQuery<ModelDoc>): Promise<ModelDoc> {
+    async updateMany(
+      filter: FilterQuery<ModelDoc>,
+      data: AnyKeys<ModelDoc>
+    ): Promise<ModelDoc[]> {
+      await this.existsOrThrow(filter);
+      await this.model.updateMany(filter, data);
+      return this.model.find(filter);
+    }
+
+    async deleteOne(filter: FilterQuery<ModelDoc>): Promise<ModelDoc> {
+      await this.existsOrThrow(filter);
       return this.model.findOneAndDelete(filter);
     }
 
@@ -59,10 +71,16 @@ export const CrudService = <ModelDoc extends Document>(
     }
 
     async findOneOrFail(filter: FilterQuery<ModelDoc>): Promise<ModelDoc> {
+      await this.existsOrThrow(filter);
       const document = await this.findOne(filter);
-      if (!document) throw new HttpError(404, "No Matching Result Found.");
 
       return document;
     }
+
+    private async existsOrThrow(filter: FilterQuery<ModelDoc>) {
+      if (!(await this.model.exists(filter))) {
+        throw new HttpError(404, "No Matching Result Found.");
+      }
+    }
   };
 };

src/middlewares/error-handler.middleware.ts

@@ -0,0 +1,59 @@
+import { JsonResponse } from "@lib/responses/json-response";
+import { NextFunction, Request, Response } from "express";
+import { Error as MongooseError } from "mongoose";
+
+export const errorHandlerMiddleware = (
+  err: MongooseError | any,
+  req: Request,
+  res: Response,
+  next: NextFunction
+) => {
+  let errorMessage = err.message;
+  let status = err.status || 500;
+  console.log("errorHandlerMiddleware -> err", err);
+
+  if (err.code === 11000) {
+    // Handle validation errors
+    const errors = [];
+    try {
+      const errorInKeys = Object.keys(err.keyValue);
+      errorInKeys.forEach((key) => {
+        errors.push(`${key} already exists`);
+      });
+    } catch (error) {
+      errors.push("Duplicate key error");
+    }
+    return JsonResponse.validationError(
+      {
+        errors,
+      },
+      res
+    );
+  } else if (err.code === 66) {
+    // Handle cast errors
+    status = 400;
+    if (err.path) {
+      errorMessage = `Invalid ${err.path}`;
+    } else {
+      errorMessage = "Invalid data";
+    }
+  } else if (err.code === 2) {
+    // Handle other mongoose errors
+    status = 400;
+    if (err.message) {
+      errorMessage = err.message;
+    } else {
+      errorMessage = "Invalid data";
+    }
+  }
+
+  JsonResponse.error(
+    {
+      error: errorMessage,
+      status,
+    },
+    res
+  );
+
+  console.error(err.message, err.stack);
+};

src/modules/console/modules/admins/controllers/admins.controller.ts

@@ -81,7 +81,7 @@ export class AdminsController extends BaseController {
   };
 
   update = async (req: Request, res: Response): Promise<Response> => {
-    const admin = await this.adminsService.update(
+    const admin = await this.adminsService.updateOne(
       {
         _id: req.params.id,
       },
@@ -97,7 +97,7 @@ export class AdminsController extends BaseController {
   };
 
   delete = async (req: Request, res: Response): Promise<Response> => {
-    const admin = await this.adminsService.delete({
+    const admin = await this.adminsService.deleteOne({
       _id: req.params.id,
     });
 

src/modules/console/modules/workouts/controllers/workouts.controller.ts

@@ -78,7 +78,7 @@ export class WorkoutController extends BaseController {
     };
 
     update = async (req: Request, res: Response) => {
-        const data = await this.workoutsService.update(
+        const data = await this.workoutsService.updateOne(
             { _id: req.params.id },
             req.body
         );
@@ -91,7 +91,7 @@ export class WorkoutController extends BaseController {
     };
 
     delete = async (req: Request, res: Response) => {
-        const data = await this.workoutsService.delete({ _id: req.params.id });
+        const data = await this.workoutsService.deleteOne({ _id: req.params.id });
         return JsonResponse.success(
             {
                 data: serialize(data.toJSON(), WorkoutSerialization),

src/routes.ts

@@ -5,6 +5,7 @@ import path from "path";
 import { BaseController } from "./lib/controllers/controller.base";
 import { validationErrorHandler } from "./helpers/validation.helper";
 import { JsonResponse } from "@lib/responses/json-response";
+import { errorHandlerMiddleware } from "middlewares/error-handler.middleware";
 
 /**
  * Sets the routes for the Express app.
@@ -54,21 +55,7 @@ const setCustomRoutes = (router: Router) => {
   });
 
   // Error handler
-  router.use((err, req, res, next) => {
-    try {
-      err.message = JSON.parse(err.message);
-    } catch (error) {}
-
-    JsonResponse.error(
-      {
-        error: err.message || "Internal Server Error",
-        status: err.status || 500,
-      },
-      res
-    );
-
-    console.error(err.message, err.stack);
-  });
+  router.use(errorHandlerMiddleware);
 };
 
 /* importing all controllers */