Merge pull request #20 from Modarb-Ai-Trainer:refactors

src/helpers/async-handler.ts

@@ -0,0 +1,9 @@
+export function asyncHandler(fn) {
+  return async function (req, res, next) {
+    try {
+      await fn(req, res, next);
+    } catch (err) {
+      next(err);
+    }
+  };
+}

src/lib/decorators/controller-middleware.decorator.ts

@@ -0,0 +1,21 @@
+import { BaseController } from "../controllers/controller.base";
+
+/**
+ * Decorator that adds a prefix to a controller's path.
+ * @param prefix - The prefix to be added.
+ * @returns A decorator function.
+ */
+export const ControllerMiddleware = (middleware: any) => {
+  return (target: typeof BaseController) => {
+    const originalConstructor = target;
+    const newConstructor: any = function (...args: any[]) {
+      const instance: BaseController = new (originalConstructor as any)(
+        ...args
+      );
+      instance.router.use(middleware);
+      return instance;
+    };
+    newConstructor.prototype = originalConstructor.prototype;
+    return newConstructor;
+  };
+};

src/{modules/common → lib}/decorators/prefix.decorator.ts

@@ -1,4 +1,4 @@
-import { BaseController } from "../../../lib/controllers/controller.base";
+import { BaseController } from "../controllers/controller.base";
 
 export const Prefix = (prefix: string) => {
   return (target: typeof BaseController) => {

src/lib/env/env.ts

@@ -0,0 +1,28 @@
+import dotenv from "dotenv";
+dotenv.config();
+
+export class EnvValue {
+  constructor(public value: string | number | boolean) {}
+
+  toString(): string {
+    return String(this.value);
+  }
+  toNumber(): number {
+    return Number(this.value);
+  }
+  toBoolean(): boolean {
+    return this.value === "true";
+  }
+}
+
+export class Env {
+  static get(key: string, defaultValue?: string | number | boolean): EnvValue {
+    const value = process.env[key] || defaultValue;
+
+    if (!value) {
+      throw new Error(`Environment variable ${key} not found`);
+    }
+
+    return new EnvValue(value);
+  }
+}

src/lib/responses/json-response.ts

@@ -0,0 +1,26 @@
+export class JsonResponse {
+  public status: number;
+  public message: string;
+  public data: Record<string, any> | Record<string, any>[];
+  public meta?: {
+    total: number;
+    page: number;
+    perPage: number;
+  };
+
+  constructor(props: {
+    status?: number;
+    message?: string;
+    data?: Record<string, any> | Record<string, any>[];
+    meta?: {
+      total: number;
+      page: number;
+      perPage: number;
+    };
+  }) {
+    this.status = props.status || 200;
+    this.message = props.message || "Success";
+    this.data = props.data || {};
+    this.meta = props.meta;
+  }
+}

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

@@ -1,28 +1,37 @@
 import { Request, Response, Router } from "express";
 import { BaseController } from "../../../../lib/controllers/controller.base";
-import { Prefix } from "../../../common/decorators/prefix.decorator";
 import { AdminsService } from "../services/admins.service";
 import { createAdminSchema } from "../validations/create-admin.validation";
 import {
   bodyValidator,
   paramsValidator,
 } from "../../../../helpers/validation.helper";
+import { asyncHandler } from "../../../../helpers/async-handler";
+import { Prefix } from "../../../../lib/decorators/prefix.decorator";
 
 @Prefix("/console/admins")
 export class AdminsController extends BaseController {
   private adminsService = new AdminsService();
 
   setRoutes() {
-    this.router.get("/", this.list);
-    this.router.get("/:id", paramsValidator("id"), this.get);
-    this.router.post("/", bodyValidator(createAdminSchema), this.create);
+    this.router.get("/", asyncHandler(this.list));
+    this.router.get("/:id", paramsValidator("id"), asyncHandler(this.get));
+    this.router.post(
+      "/",
+      bodyValidator(createAdminSchema),
+      asyncHandler(this.create)
+    );
     this.router.patch(
       "/:id",
       paramsValidator("id"),
       bodyValidator(createAdminSchema),
-      this.update
+      asyncHandler(this.update)
+    );
+    this.router.delete(
+      "/:id",
+      paramsValidator("id"),
+      asyncHandler(this.delete)
     );
-    this.router.delete("/:id", paramsValidator("id"), this.delete);
   }
 
   list = (_, res: Response) => {

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

@@ -1,7 +1,8 @@
+import { asyncHandler } from "../../../../helpers/async-handler";
 import { jwtHelper } from "../../../../helpers/jwt.helper";
 import { bodyValidator } from "../../../../helpers/validation.helper";
 import { BaseController } from "../../../../lib/controllers/controller.base";
-import { Prefix } from "../../../common/decorators/prefix.decorator";
+import { Prefix } from "../../../../lib/decorators/prefix.decorator";
 import { userRegisterValidation } from "../../../common/users/validation/user-register.validation";
 import { UsersService } from "../services/users.service";
 
@@ -16,7 +17,7 @@ export class AdminUsersController extends BaseController {
       "/create",
       jwtHelper.verifyToken(allowedRoles),
       bodyValidator(userRegisterValidation),
-      this.create
+      asyncHandler(this.create)
     );
   }
 

src/modules/user/auth/controllers/auth.controller.ts

@@ -1,10 +1,11 @@
 import { UsersService } from "../services/users.service";
 import { jwtHelper } from "../../../../helpers/jwt.helper";
 import { BaseController } from "../../../../lib/controllers/controller.base";
-import { Prefix } from "../../../common/decorators/prefix.decorator";
 import { bodyValidator } from "../../../../helpers/validation.helper";
 import { userRegisterValidation } from "../../../common/users/validation/user-register.validation";
 import { loginValidation } from "../validation/user.Validation";
+import { asyncHandler } from "../../../../helpers/async-handler";
+import { Prefix } from "../../../../lib/decorators/prefix.decorator";
 
 @Prefix("/user/auth")
 export class AuthController extends BaseController {
@@ -14,9 +15,13 @@ export class AuthController extends BaseController {
     this.router.post(
       "/register",
       bodyValidator(userRegisterValidation),
-      this.register
+      asyncHandler(this.register)
+    );
+    this.router.post(
+      "/login",
+      bodyValidator(loginValidation),
+      asyncHandler(this.login)
     );
-    this.router.post("/login", bodyValidator(loginValidation), this.login);
   }
 
   register = async (req, res) => {