fix: decorator method case confict fix

expressots · Jun 11, 2024 · cdf0fbd · cdf0fbd
1 parent 55359bf
commit cdf0fbd
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 10 deletions.
diff --git a/src/adapter-express/express-utils/decorators.ts b/src/adapter-express/express-utils/decorators.ts
@@ -45,8 +45,13 @@ export function controller(path: string, ...middleware: Array<Middleware>) {
 
     for (const key in pathMetadata) {
       if (statusCodeMetadata && statusCodeMetadata[key]) {
-        const realPath = pathMetadata[key] === "/" ? path : `${path}${pathMetadata[key]}`;
-        statusCodePathMapping[realPath] = statusCodeMetadata[key];
+        let realPath = pathMetadata[key]["path"] === "/" ? path : `${path}${pathMetadata[key]["path"]}`;
+
+        if (statusCodePathMapping[realPath]) {
+          statusCodePathMapping[`${realPath}/-${pathMetadata[key]["method"].toLowerCase()}`] = statusCodeMetadata[key];
+        } else {
+          statusCodePathMapping[realPath] = statusCodeMetadata[key];
+        }
       }
     }
 
@@ -181,10 +186,16 @@ function enhancedHttpMethod(
     let pathMetadata = Reflect.getOwnMetadata(HTTP_CODE_METADATA.path, Reflect);
 
     if (pathMetadata) {
-      pathMetadata[key] = path;
+      pathMetadata[key] = {
+        path,
+        method
+      };
     } else {
       pathMetadata = {};
-      pathMetadata[key] = path;
+      pathMetadata[key] = {
+        path,
+        method
+      };
     }
 
     Reflect.defineMetadata(HTTP_CODE_METADATA.path, pathMetadata, Reflect);
@@ -238,10 +249,16 @@ export function httpMethod(
     let pathMetadata = Reflect.getOwnMetadata(HTTP_CODE_METADATA.path, Reflect);
 
     if (pathMetadata) {
-      pathMetadata[key] = path;
+      pathMetadata[key] = {
+        path,
+        method
+      };
     } else {
       pathMetadata = {};
-      pathMetadata[key] = path;
+      pathMetadata[key] = {
+        path,
+        method
+      };
     }
 
     Reflect.defineMetadata(HTTP_CODE_METADATA.path, pathMetadata, Reflect);

diff --git a/src/adapter-express/express-utils/http-status-middleware.ts b/src/adapter-express/express-utils/http-status-middleware.ts
@@ -12,21 +12,39 @@ export class HttpStatusCodeMiddleware extends ExpressoMiddleware {
   use(req: Request, res: Response, next: NextFunction): void | Promise<void> {
     const statusCodeMapping = Reflect.getMetadata(HTTP_CODE_METADATA.httpCode, Reflect);
     let path = req.path.endsWith("/") ? req.path.slice(0, -1) : req.path;
-
+    console.log("status code mapping: ", statusCodeMapping);
     if (path === "/" || path === "") {
       path = "/";
     }
-    // branch
-    const statusCode = statusCodeMapping[path];
+
+    const statusCode = statusCodeMapping[`${path}/-${req.method.toLowerCase()}`] |  statusCodeMapping[path];
 
     if (statusCode) {
       res.status(statusCode);
     } else {
-      this.setDefaultStatusCode(req, res);
+      const patternMatchStatusCode = this.findMatchingParameterPath(path, statusCodeMapping, req.method.toLowerCase());
+
+      if (patternMatchStatusCode) {
+        res.status(patternMatchStatusCode);
+      } else {
+        this.setDefaultStatusCode(req, res);
+      }
     }
     next();
   }
 
+  private findMatchingParameterPath(path, mapping, method) {
+    for (let pathCode in mapping) {
+      const patternCheck = new RegExp('^' + pathCode.replace(/:[^\s/]+/g, '([^/]+)') + '$');
+
+      if (patternCheck.test(path)) {
+        return mapping[`${pathCode}/-${method}`] || mapping[pathCode];
+      }
+    }
+
+    return null;
+  }
+
   private setDefaultStatusCode(req: Request, res: Response): void {
     switch (req.method.toLowerCase()) {
       case "get":