Merge branch 'main' of https://github.com/Modarb-Ai-Trainer/modarb-backend

package-lock.json

@@ -31,6 +31,7 @@
         "@types/express": "^4.17.21",
         "nodemon": "^3.0.2",
         "ts-node": "^10.9.2",
+        "ts-node-dev": "^2.0.0",
         "tsconfig-paths": "^4.2.0",
         "typescript": "^5.3.3"
       }
@@ -414,6 +415,18 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha512-xevGOReSYGM7g/kUBZzPqCrR/KYAo+F0yiPc85WFTJa0MSLtyFTVTU6cJu/aV4mid7IffDIWqo69THF2o4JiEQ==",
+      "dev": true
+    },
+    "node_modules/@types/strip-json-comments": {
+      "version": "0.0.30",
+      "resolved": "https://registry.npmjs.org/@types/strip-json-comments/-/strip-json-comments-0.0.30.tgz",
+      "integrity": "sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ==",
+      "dev": true
+    },
     "node_modules/@types/webidl-conversions": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.3.tgz",
@@ -603,6 +616,12 @@
       "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
       "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA=="
     },
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true
+    },
     "node_modules/bytes": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
@@ -858,6 +877,15 @@
         "url": "https://github.com/motdotla/dotenv?sponsor=1"
       }
     },
+    "node_modules/dynamic-dedupe": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/dynamic-dedupe/-/dynamic-dedupe-0.3.0.tgz",
+      "integrity": "sha512-ssuANeD+z97meYOqd50e04Ze5qp4bPqo8cCkI4TRjZkzAUgIDTrXV1R8QCdINpiI+hw14+rYazvTRdQrz0/rFQ==",
+      "dev": true,
+      "dependencies": {
+        "xtend": "^4.0.0"
+      }
+    },
     "node_modules/eastasianwidth": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
@@ -1431,6 +1459,18 @@
         "node": ">=8"
       }
     },
+    "node_modules/is-core-module": {
+      "version": "2.13.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
+      "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
+      "dev": true,
+      "dependencies": {
+        "hasown": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-extglob": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -4800,6 +4840,12 @@
         "node": ">=8"
       }
     },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true
+    },
     "node_modules/path-scurry": {
       "version": "1.10.1",
       "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz",
@@ -4965,6 +5011,23 @@
         "node": ">=8.10.0"
       }
     },
+    "node_modules/resolve": {
+      "version": "1.22.8",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+      "dev": true,
+      "dependencies": {
+        "is-core-module": "^2.13.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/reusify": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
@@ -5208,6 +5271,25 @@
         "node": ">=8"
       }
     },
+    "node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-support": {
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "dev": true,
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
     "node_modules/sparse-bitfield": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz",
@@ -5291,6 +5373,15 @@
         "node": ">=4"
       }
     },
+    "node_modules/strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/supports-color": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -5303,6 +5394,18 @@
         "node": ">=4"
       }
     },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/tar": {
       "version": "6.2.0",
       "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz",
@@ -5361,6 +5464,15 @@
         "node": ">=12"
       }
     },
+    "node_modules/tree-kill": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
+      "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
+      "dev": true,
+      "bin": {
+        "tree-kill": "cli.js"
+      }
+    },
     "node_modules/ts-node": {
       "version": "10.9.2",
       "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
@@ -5404,6 +5516,72 @@
         }
       }
     },
+    "node_modules/ts-node-dev": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ts-node-dev/-/ts-node-dev-2.0.0.tgz",
+      "integrity": "sha512-ywMrhCfH6M75yftYvrvNarLEY+SUXtUvU8/0Z6llrHQVBx12GiFk5sStF8UdfE/yfzk9IAq7O5EEbTQsxlBI8w==",
+      "dev": true,
+      "dependencies": {
+        "chokidar": "^3.5.1",
+        "dynamic-dedupe": "^0.3.0",
+        "minimist": "^1.2.6",
+        "mkdirp": "^1.0.4",
+        "resolve": "^1.0.0",
+        "rimraf": "^2.6.1",
+        "source-map-support": "^0.5.12",
+        "tree-kill": "^1.2.2",
+        "ts-node": "^10.4.0",
+        "tsconfig": "^7.0.0"
+      },
+      "bin": {
+        "ts-node-dev": "lib/bin.js",
+        "tsnd": "lib/bin.js"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "*",
+        "typescript": "*"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/ts-node-dev/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/ts-node-dev/node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
     "node_modules/tsc-alias": {
       "version": "1.8.8",
       "resolved": "https://registry.npmjs.org/tsc-alias/-/tsc-alias-1.8.8.tgz",
@@ -5420,6 +5598,18 @@
         "tsc-alias": "dist/bin/index.js"
       }
     },
+    "node_modules/tsconfig": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/tsconfig/-/tsconfig-7.0.0.tgz",
+      "integrity": "sha512-vZXmzPrL+EmC4T/4rVlT2jNVMWCi/O4DIiSj3UHg1OE5kCKbk4mfrXc6dZksLgRM/TZlKnousKH9bbTazUWRRw==",
+      "dev": true,
+      "dependencies": {
+        "@types/strip-bom": "^3.0.0",
+        "@types/strip-json-comments": "0.0.30",
+        "strip-bom": "^3.0.0",
+        "strip-json-comments": "^2.0.0"
+      }
+    },
     "node_modules/tsconfig-paths": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz",
@@ -5658,6 +5848,15 @@
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
     },
+    "node_modules/xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
     "node_modules/yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",

package.json

@@ -5,7 +5,7 @@
   "main": "dist/index.js",
   "scripts": {
     "start": "rimraf dist && tsc && tsc-alias && node dist/index.js",
-    "start:dev": "nodemon -r tsconfig-paths/register src/index.ts",
+    "start:dev": "ts-node-dev -r tsconfig-paths/register src/index.ts",
     "build": "tsc",
     "lint": "eslint . --ext .ts"
   },
@@ -15,6 +15,7 @@
     "@types/express": "^4.17.21",
     "nodemon": "^3.0.2",
     "ts-node": "^10.9.2",
+    "ts-node-dev": "^2.0.0",
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5.3.3"
   },

src/common/models/user.model.ts

@@ -1,4 +1,4 @@
-import mongoose from "mongoose";
+import mongoose, { UpdateQuery } from "mongoose";
 import bcrypt from "bcrypt";
 import { AuthenticatableType } from "@common/enums/authenticatable-type.enum";
 import { FitnessGoal } from "@common/enums/fitness-goal.enum";
@@ -93,10 +93,33 @@ const userSchema = new Schema({
 });
 
 userSchema.pre("save", async function (next) {
-  this.password = await bcrypt.hash(this.password, saltrounds);
+  if (this.isModified("password")) {
+    this.password = await bcrypt.hash(this.password, saltrounds);
+  }
+  if (this.isModified("email")) {
+    this.email = this.email.toLowerCase();
+  }
   next();
 });
 
+userSchema.pre(["updateOne", "findOneAndUpdate"], async function () {
+  const data = this.getUpdate() as UpdateQuery<IUser>;
+  if (data.password) {
+    data.password = await bcrypt.hash(data.password, saltrounds);
+  }
+  if (data.email) {
+    data.email = data.email.toLowerCase();
+  }
+});
+
+// pre find make email case insensitive
+userSchema.pre(["find", "findOne"], function () {
+  const query = this.getQuery();
+  if (query.email) {
+    query.email = query.email.toLowerCase();
+  }
+});
+
 export type UserDocument = IUser & mongoose.Document;
 
 export const User = mongoose.model<UserDocument>("users", userSchema);

src/common/validations/user-register.validation.ts

@@ -170,7 +170,7 @@ export const userRegisterKeys = {
     .required()
     .items(
       joi.string().valid(...Object.values(Injury))
-        .empty().required().messages({
+        .empty().optional().messages({
           "string.base": "please enter a valid injuries",
           "any.required": "injuries must be entered",
           "string.empty": "injuries cannot be empty",

src/lib/services/crud.service.ts

@@ -12,14 +12,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);
     }
 
@@ -65,10 +77,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/common/models/admin.model.ts

@@ -1,4 +1,4 @@
-import mongoose from "mongoose";
+import mongoose, { UpdateQuery } from "mongoose";
 import bcrypt from "bcrypt";
 import { config } from "../../../../configs/config";
 import { Role } from "@common/enums/role.enum";
@@ -29,10 +29,33 @@ const AdminSchema = new Schema({
 });
 
 AdminSchema.pre("save", async function (next) {
-  this.password = await bcrypt.hash(this.password, config.saltRounds);
+  if (this.isModified("password")) {
+    this.password = await bcrypt.hash(this.password, saltrounds);
+  }
+  if (this.isModified("email")) {
+    this.email = this.email.toLowerCase();
+  }
   next();
 });
 
+AdminSchema.pre(["updateOne", "findOneAndUpdate"], async function () {
+  const data = this.getUpdate() as UpdateQuery<IAdmin>;
+  if (data.password) {
+    data.password = await bcrypt.hash(data.password, saltrounds);
+  }
+  if (data.email) {
+    data.email = data.email.toLowerCase();
+  }
+});
+
+// pre find make email case insensitive
+AdminSchema.pre(["find", "findOne"], function () {
+  const query = this.getQuery();
+  if (query.email) {
+    query.email = query.email.toLowerCase();
+  }
+});
+
 export type AdminDocument = mongoose.Document & IAdmin;
 
 export const Admin = mongoose.model<AdminDocument>("admins", AdminSchema);

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

@@ -14,7 +14,7 @@ import { serialize } from "@helpers/serialize";
 import { AdminSerialization } from "modules/console/common/serializers/admin.serialization";
 
 @Prefix("/console/admins")
-// @ControllerMiddleware(AdminGuardMiddleware({ roles: [Role.SUPER_ADMIN] }))
+@ControllerMiddleware(AdminGuardMiddleware({ roles: [Role.SUPER_ADMIN] }))
 export class AdminsController extends BaseController {
   private adminsService = new AdminsService();
 
@@ -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/auth/services/auth.service.ts

@@ -7,12 +7,13 @@ import { JwtHelper } from "@helpers/jwt.helper";
 
 export class ConsoleAuthService extends CrudService(Admin) {
   async login(loginRequest: ILogin) {
-    const admin = await this.findOneOrFail({ email: loginRequest.email });
+    const admin = await this.findOne({ email: loginRequest.email });
+    if (!admin) throw new HttpError(401, "Invalid Credentials");
     const isPasswordCorrect = await bcrypt.compare(
       loginRequest.password,
       admin.password
     );
-    if (!isPasswordCorrect) throw new HttpError(401, "Incorrect Password");
+    if (!isPasswordCorrect) throw new HttpError(401, "Invalid Credentials");
     const token = JwtHelper.generateToken({
       id: admin._id,
       email: admin.email,

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

@@ -14,8 +14,7 @@ import { ControllerMiddleware } from "@lib/decorators/controller-middleware.deco
 import { AdminGuardMiddleware } from "modules/console/common/guards/admins.guard";
 
 @Prefix("/console/workouts")
-// @ControllerMiddleware(AdminGuardMiddleware())
-
+@ControllerMiddleware(AdminGuardMiddleware({}))
 export class WorkoutController extends BaseController {
     private workoutsService = new WorkoutService();
 
@@ -78,7 +77,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 +90,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/modules/users/modules/auth/controllers/auth.controller.ts

@@ -1,4 +1,3 @@
-import { UsersAuthService } from "../services/users.service";
 import { loginValidationSchema } from "../validation/login.validation";
 import { Request, Response } from "express";
 import { JsonResponse } from "@lib/responses/json-response";
@@ -12,6 +11,7 @@ import { BaseController } from "@lib/controllers/controller.base";
 import { Prefix } from "@lib/decorators/prefix.decorator";
 import { serialize } from "@helpers/serialize";
 import { UserSerialization } from "@common/serializers/user.serialization";
+import { UsersAuthService } from "../services/users-auth.service";
 
 @Prefix("/users/auth")
 export class UsersAuthController extends BaseController {

src/modules/users/modules/auth/services/users-auth.service.ts

@@ -12,12 +12,14 @@ export class UsersAuthService extends CrudService(User) {
   }
 
   async login(loginRequest: ILogin) {
-    const user = await this.findOneOrFail({ email: loginRequest.email });
+    const user = await this.findOne({ email: loginRequest.email });
+    if (!user) throw new HttpError(401, "Invalid Credentials");
+    
     const isPasswordCorrect = await bcrypt.compare(
       loginRequest.password,
       user.password
     );
-    if (!isPasswordCorrect) throw new HttpError(401, "Incorrect Password");
+    if (!isPasswordCorrect) throw new HttpError(401, "Invalid Credentials");
     const token = JwtHelper.generateToken({
       id: user._id,
       email: user.email,

src/modules/users/modules/auth/services/users.service.ts

@@ -1,29 +0,0 @@
-import bcrypt from "bcrypt";
-import { ILogin } from "../validation/login.validation";
-import { HttpError } from "@lib/error-handling/http-error";
-import { JwtHelper } from "@helpers/jwt.helper";
-import { User } from "@common/models/user.model";
-import { IUserRegister } from "@common/validations/user-register.validation";
-import { CrudService } from "@lib/services/crud.service";
-
-export class UsersAuthService extends CrudService(User) {
-  async register(createParams: IUserRegister) {
-    return this.create(createParams);
-  }
-
-  async login(loginRequest: ILogin) {
-    const user = await this.findOneOrFail({ email: loginRequest.email });
-    const isPasswordCorrect = await bcrypt.compare(
-      loginRequest.password,
-      user.password
-    );
-    if (!isPasswordCorrect) throw new HttpError(401, "Incorrect Password");
-    const token = JwtHelper.generateToken({
-      id: user._id,
-      email: user.email,
-      name: user.name,
-      type: "user",
-    });
-    return { user, token };
-  }
-}

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 */
@@ -96,6 +83,7 @@ const findControllerFiles = (): string[] => {
 const importControllers = async (router: Router) => {
   const files = findControllerFiles();
 
+  console.log("importing controllers...");
   await Promise.all(
     files.map(async (file) => {
       const controllerClass = await importController(file);
@@ -106,6 +94,7 @@ const importControllers = async (router: Router) => {
       router.use(controller.prefix, controller.router);
     })
   );
+  console.log("controllers imported!");
 };
 
 /**