Merge pull request #741 from ivanproskuryakov/736-inheritance-bugfix-2

fix: Controller inheritance Bugfix #736

Author: jotamorais

src/metadata-builder/MetadataBuilder.ts

@@ -96,15 +96,21 @@ export class MetadataBuilder {
     let target = controller.target;
     const actionsWithTarget: ActionMetadataArgs[] = [];
     while (target) {
-      actionsWithTarget.push(
-        ...getMetadataArgsStorage()
-          .filterActionsWithTarget(target)
-          .filter(action => {
-            return actionsWithTarget.map(a => a.method).indexOf(action.method) === -1;
-          })
-      );
+      const actions = getMetadataArgsStorage()
+        .filterActionsWithTarget(target)
+        .filter(action => {
+          return actionsWithTarget.map(a => a.method).indexOf(action.method) === -1;
+        });
+
+      actions.forEach(a => {
+        a.target = controller.target;
+
+        actionsWithTarget.push(a);
+      });
+
       target = Object.getPrototypeOf(target);
     }
+
     return actionsWithTarget.map(actionArgs => {
       const action = new ActionMetadata(controller, actionArgs, this.options);
       action.options = { ...controller.options, ...actionArgs.options };

test/unit/controller-inheritance.spec.ts

@@ -35,6 +35,18 @@ describe('controller inheritance', () => {
     // Build controllers
     const metadataBuilder = new MetadataBuilder({});
     const meta = metadataBuilder.buildControllerMetadata([DerivativeController]);
+    const storage = getMetadataArgsStorage();
+
+    expect(storage.controllers[0].target).to.be.eq(DerivativeController);
+    expect(storage.controllers[0].route).to.be.eq('/derivative');
+    expect(storage.controllers[1].target).to.be.eq(AutonomousController);
+    expect(storage.controllers[1].route).to.be.eq('/autonomous');
+    expect(storage.actions[0].target).to.be.eq(DerivativeController);
+    expect(storage.actions[0].type).to.be.eq('post');
+    expect(storage.actions[0].method).to.be.eq('create');
+    expect(storage.actions[1].target).to.be.eq(AutonomousController);
+    expect(storage.actions[1].type).to.be.eq('post');
+    expect(storage.actions[1].method).to.be.eq('create');
 
     expect(meta.length).to.be.eq(1);
     expect(meta[0].route).to.be.eq('/derivative');
@@ -65,6 +77,18 @@ describe('controller inheritance', () => {
     // Build controllers
     const metadataBuilder = new MetadataBuilder({});
     const meta = metadataBuilder.buildControllerMetadata([AutonomousController]);
+    const storage = getMetadataArgsStorage();
+
+    expect(storage.controllers[0].target).to.be.eq(DerivativeController);
+    expect(storage.controllers[0].route).to.be.eq('/derivative');
+    expect(storage.controllers[1].target).to.be.eq(AutonomousController);
+    expect(storage.controllers[1].route).to.be.eq('/autonomous');
+    expect(storage.actions[0].target).to.be.eq(AbstractControllerTemplate);
+    expect(storage.actions[0].type).to.be.eq('post');
+    expect(storage.actions[0].method).to.be.eq('create');
+    expect(storage.actions[1].target).to.be.eq(AutonomousController);
+    expect(storage.actions[1].type).to.be.eq('post');
+    expect(storage.actions[1].method).to.be.eq('create');
 
     expect(meta.length).to.be.eq(1);
     expect(meta[0].route).to.be.eq('/autonomous');
@@ -95,6 +119,18 @@ describe('controller inheritance', () => {
     // Build controllers
     const metadataBuilder = new MetadataBuilder({});
     const meta = metadataBuilder.buildControllerMetadata();
+    const storage = getMetadataArgsStorage();
+
+    expect(storage.controllers[0].target).to.be.eq(DerivativeController);
+    expect(storage.controllers[0].route).to.be.eq('/derivative');
+    expect(storage.controllers[1].target).to.be.eq(AutonomousController);
+    expect(storage.controllers[1].route).to.be.eq('/autonomous');
+    expect(storage.actions[0].target).to.be.eq(DerivativeController);
+    expect(storage.actions[0].type).to.be.eq('post');
+    expect(storage.actions[0].method).to.be.eq('create');
+    expect(storage.actions[1].target).to.be.eq(AutonomousController);
+    expect(storage.actions[1].type).to.be.eq('post');
+    expect(storage.actions[1].method).to.be.eq('create');
 
     expect(meta.length).to.be.eq(2);
     expect(meta[0].actions.length).to.be.eq(1);