Merge branch 'elyesbenabdelkader-feature/request-mapping-decorator'

Author: kamilmysliwiec

packages/common/decorators/http/request-mapping.decorator.ts

@@ -1,6 +1,6 @@
-import { RequestMappingMetadata } from '../../interfaces/request-mapping-metadata.interface';
+import { METHOD_METADATA, PATH_METADATA } from '../../constants';
 import { RequestMethod } from '../../enums/request-method.enum';
-import { PATH_METADATA, METHOD_METADATA } from '../../constants';
+import { RequestMappingMetadata } from '../../interfaces/request-mapping-metadata.interface';
 
 const defaultMetadata = {
   [PATH_METADATA]: '/',
@@ -10,7 +10,8 @@ const defaultMetadata = {
 export const RequestMapping = (
   metadata: RequestMappingMetadata = defaultMetadata,
 ): MethodDecorator => {
-  const path = metadata[PATH_METADATA] || '/';
+  const pathMetadata = metadata[PATH_METADATA];
+  const path = pathMetadata && pathMetadata.length ? pathMetadata : '/';
   const requestMethod = metadata[METHOD_METADATA] || RequestMethod.GET;
 
   return (target, key, descriptor: PropertyDescriptor) => {
@@ -21,7 +22,7 @@ export const RequestMapping = (
 };
 
 const createMappingDecorator = (method: RequestMethod) => (
-  path?: string,
+  path?: string | string[],
 ): MethodDecorator => {
   return RequestMapping({
     [PATH_METADATA]: path,

packages/common/interfaces/request-mapping-metadata.interface.ts

@@ -1,6 +1,6 @@
 import { RequestMethod } from '../enums/request-method.enum';
 
 export interface RequestMappingMetadata {
-  path?: string;
+  path?: string | string[];
   method?: RequestMethod;
 }

packages/common/test/decorators/request-mapping.decorator.spec.ts

@@ -8,36 +8,55 @@ describe('@RequestMapping', () => {
     method: RequestMethod.ALL,
   };
 
+  const requestPropsUsingArray = {
+    path: ['foo', 'bar'],
+    method: RequestMethod.ALL,
+  };
+
   it('should enhance class with expected request metadata', () => {
     class Test {
       @RequestMapping(requestProps)
-      public static test() {}
+      public static test() { }
+
+      @RequestMapping(requestPropsUsingArray)
+      public static testUsingArray() { }
     }
 
     const path = Reflect.getMetadata('path', Test.test);
     const method = Reflect.getMetadata('method', Test.test);
+    const pathUsingArray = Reflect.getMetadata('path', Test.testUsingArray);
+    const methodUsingArray = Reflect.getMetadata('method', Test.testUsingArray);
 
-    expect(method).to.be.eql(requestProps.method);
     expect(path).to.be.eql(requestProps.path);
+    expect(method).to.be.eql(requestProps.method);
+    expect(pathUsingArray).to.be.eql(requestPropsUsingArray.path);
+    expect(methodUsingArray).to.be.eql(requestPropsUsingArray.method);
   });
 
   it('should set request method on GET by default', () => {
     class Test {
       @RequestMapping({ path: '' })
-      public static test() {}
+      public static test() { }
     }
 
     const method = Reflect.getMetadata('method', Test.test);
+
     expect(method).to.be.eql(RequestMethod.GET);
   });
 
   it('should set path on "/" by default', () => {
     class Test {
       @RequestMapping({})
-      public static test() {}
+      public static test() { }
+
+      @RequestMapping({ path: [] })
+      public static testUsingArray() { }
     }
 
-    const method = Reflect.getMetadata('path', Test.test);
-    expect(method).to.be.eql('/');
+    const path = Reflect.getMetadata('path', Test.test);
+    const pathUsingArray = Reflect.getMetadata('path', Test.testUsingArray);
+
+    expect(path).to.be.eql('/');
+    expect(pathUsingArray).to.be.eql('/');
   });
 });