Merge pull request #53 from RobinBuschmann/bugfix-43

Bugfix 43; resolves #43

Author: RobinBuschmann

lib/services/association.ts

@@ -141,10 +141,16 @@ export function setAssociations(target: any, associations: ISequelizeAssociation
 }
 
 export function getAssociationsByRelation(target: any, relatedClass: any): ISequelizeAssociation[] {
-
   const associations = getAssociations(target);
 
-  return (associations || []).filter(association => association.relatedClassGetter() === relatedClass);
+  return (associations || []).filter(association => {
+    const _relatedClass = association.relatedClassGetter();
+    return (
+      _relatedClass.prototype === relatedClass.prototype || // v3 + v4
+      /* istanbul ignore next */
+      relatedClass.prototype instanceof _relatedClass // v4 (for child classes)
+    );
+  });
 }
 
 /**

test/models/Manufacturer.ts

@@ -1,13 +1,22 @@
-import {Table, Model, Column, HasMany} from "../../index";
+import {Table, Model, Column, HasMany, Scopes} from "../../index";
 import {ShoeWithScopes} from "./ShoeWithScopes";
 
-
+@Scopes({
+  brandOnly: {
+    attributes: {
+      exclude: ['notInScopeBrandOnly']
+    }
+  }
+})
 @Table
 export class Manufacturer extends Model<Manufacturer> {
 
   @Column
   brand: string;
 
+  @Column
+  notInScopeBrandOnly: string;
+
   @HasMany(() => ShoeWithScopes)
   shoes: ShoeWithScopes[];
 }

test/models/ShoeWithScopes.ts

@@ -12,6 +12,12 @@ export const SHOE_SCOPES = {
   },
   yellow: {
     where: {primaryColor: 'yellow'}
+  },
+  red: {
+    where: {primaryColor: 'red'}
+  },
+  manufacturerWithScope: {
+    include: [() => Manufacturer.scope('brandOnly')]
   }
 };
 

test/specs/scopes.spec.ts

@@ -41,7 +41,8 @@ describe('scopes', () => {
         secondaryColor: 'blue',
         producedAt: new Date(),
         manufacturer: {
-          brand: BRAND
+          brand: BRAND,
+          notInScopeBrandOnly: 'invisible :)',
         },
         owner: {
           name: OWNER
@@ -78,7 +79,7 @@ describe('scopes', () => {
         .unscoped()
         .findOne()
         .then(shoe => {
-          expect(shoe).to.have.property('secretKey').which.is.not.null;
+          expect(shoe).to.have.property('secretKey').which.is.a('string');
         })
     );
 
@@ -140,6 +141,61 @@ describe('scopes', () => {
           })
       );
 
+      describe('with using scoped included model', () => {
+
+        it('should consider scope of included model (without own scope)', () =>
+          ShoeWithScopes
+            .findOne({
+              include: [Manufacturer.scope('brandOnly')]
+            })
+            .then(shoe => {
+              expect(shoe).to.have.property('manufacturer')
+                .that.have.property('notInScopeBrandOnly')
+                .which.is.undefined;
+            })
+        );
+
+        it('should consider scope of included model (with own scope)', () =>
+          ShoeWithScopes
+            .scope('red')
+            .findOne({
+              include: [Manufacturer.scope('brandOnly')]
+            })
+            .then(shoe => {
+              expect(shoe).to.have.property('manufacturer')
+                .that.have.property('notInScopeBrandOnly')
+                .which.is.undefined;
+            })
+        );
+
+      });
+
+    });
+
+    describe('with nested scope', () => {
+
+      it('should consider nested scope', () =>
+        ShoeWithScopes
+          .scope('manufacturerWithScope')
+          .findOne()
+          .then(shoe => {
+            expect(shoe).to.have.property('manufacturer')
+              .that.have.property('notInScopeBrandOnly')
+              .which.is.undefined;
+          })
+      );
+
+      it('should not consider nested scope', () =>
+        ShoeWithScopes
+          .scope('full')
+          .findOne()
+          .then(shoe => {
+            expect(shoe).to.have.property('manufacturer')
+              .that.have.property('notInScopeBrandOnly')
+              .which.is.a('string');
+          })
+      );
+
     });
 
   });