Merge pull request #52 from RobinBuschmann/bugfix-37

fixes 37#

Author: RobinBuschmann

lib/models/v3/Model.ts

@@ -34,10 +34,26 @@ export const Model: any = (() => {
       if (typeof SeqModelProto[key] === 'function') {
 
         _Model[key] = function(...args: any[]): any {
-          return SeqModelProto[key].call(this.Model || this, ...args);
+
+          let targetModel = this.Model;
+
+          if (this.scoped !== undefined) {
+            // Adds scope info to 'this' context
+            targetModel = Object.create(targetModel);
+            targetModel.$scope = this.$scope;
+            targetModel.scoped = this.scoped;
+          }
+
+          return SeqModelProto[key].call(targetModel, ...args);
         };
       }
     });
 
+  // 'scope' and 'unscoped' need to be called with 'this' context
+  // instead of 'this.Model' context
+  _Model['scope'] = _Model['unscoped'] = function(...args: any[]): any {
+    return SeqModelProto.scope.call(this, ...args);
+  };
+
   return _Model;
 })();

lib/models/v3/Sequelize.ts

@@ -103,7 +103,7 @@ export class Sequelize extends SequelizeOrigin implements BaseSequelize {
       // this initializes some stuff for Instance
       model['refreshAttributes']();
 
-      // copy static fields to class
+      // copy own static fields to class
       Object.keys(model).forEach(key => key !== 'name' && (_class[key] = model[key]));
 
       // the class needs to know its sequelize model

test/models/ShoeWithScopes.ts

@@ -1,6 +1,7 @@
 import {Table, Model, Column, ForeignKey, BelongsTo,
   DefaultScope, Scopes} from "../../index";
 import {Manufacturer} from "./Manufacturer";
+import {Person} from "./Person";
 
 export const SHOE_DEFAULT_SCOPE = {
   attributes: ['id', 'primaryColor', 'secondaryColor', 'producedAt']
@@ -41,4 +42,11 @@ export class ShoeWithScopes extends Model<ShoeWithScopes> {
   @BelongsTo(() => Manufacturer)
   manufacturer: Manufacturer;
 
+  @ForeignKey(() => Person)
+  @Column
+  ownerId: number;
+
+  @BelongsTo(() => Person)
+  owner: Person;
+
 }

test/specs/scopes.spec.ts

@@ -1,8 +1,12 @@
-import {expect} from 'chai';
+import {expect, use} from 'chai';
+import * as chaiAsPromised from 'chai-as-promised';
 import {createSequelize} from "../utils/sequelize";
 import {getScopeOptions} from "../../lib/services/models";
 import {ShoeWithScopes, SHOE_DEFAULT_SCOPE, SHOE_SCOPES} from "../models/ShoeWithScopes";
 import {Manufacturer} from "../models/Manufacturer";
+import {Person} from "../models/Person";
+
+use(chaiAsPromised);
 
 describe('scopes', () => {
 
@@ -28,6 +32,7 @@ describe('scopes', () => {
   describe('find', () => {
 
     const BRAND = 'adiwas';
+    const OWNER = 'bob';
 
     beforeEach(() => ShoeWithScopes
       .create<ShoeWithScopes>({
@@ -37,8 +42,11 @@ describe('scopes', () => {
         producedAt: new Date(),
         manufacturer: {
           brand: BRAND
+        },
+        owner: {
+          name: OWNER
         }
-      }, {include: [Manufacturer]}));
+      }, {include: [Manufacturer, Person]}));
 
     it('should consider default scope', () =>
 
@@ -64,6 +72,76 @@ describe('scopes', () => {
         })
     );
 
+    it('should not consider default scope due to unscoped call', () =>
+
+      ShoeWithScopes
+        .unscoped()
+        .findOne()
+        .then(shoe => {
+          expect(shoe).to.have.property('secretKey').which.is.not.null;
+        })
+    );
+
+    describe('with include options', () => {
+
+      it('should consider scopes and additional included model (object)', () =>
+        expect(ShoeWithScopes
+          .scope('full')
+          .findOne<ShoeWithScopes>({
+            include: [{
+              model: Person,
+            }]
+          })
+          .then(shoe => {
+            expect(shoe).to.have.property('manufacturer').which.is.not.null;
+            expect(shoe).to.have.property('manufacturer').which.have.property('brand', BRAND);
+            expect(shoe).to.have.property('owner').which.is.not.null;
+          })
+        ).not.to.be.rejected
+      );
+
+      it('should consider scopes and additional included model (model)', () =>
+        expect(ShoeWithScopes
+          .scope('full')
+          .findOne({
+            include: [Person]
+          })
+          .then(shoe => {
+            expect(shoe).to.have.property('manufacturer').which.is.not.null;
+            expect(shoe).to.have.property('manufacturer').which.have.property('brand', BRAND);
+            expect(shoe).to.have.property('owner').which.is.not.null;
+          })
+        ).not.to.be.rejected
+      );
+
+      it('should not consider default scope due to unscoped call, but additonal includes (object)', () =>
+
+        ShoeWithScopes
+          .unscoped()
+          .findOne({
+            include: [{model: Person}]
+          })
+          .then(shoe => {
+            expect(shoe).to.have.property('secretKey').which.is.not.null;
+            expect(shoe).to.have.property('owner').which.is.not.null;
+          })
+      );
+
+      it('should not consider default scope due to unscoped call, but additonal includes (model)', () =>
+
+        ShoeWithScopes
+          .unscoped()
+          .findOne({
+            include: [Person]
+          })
+          .then(shoe => {
+            expect(shoe).to.have.property('secretKey').which.is.not.null;
+            expect(shoe).to.have.property('owner').which.is.not.null;
+          })
+      );
+
+    });
+
   });
 
 });