Fix loopbackio#1795 - Count issue with related models using though model

Author: regevbr

lib/scope.js

@@ -500,10 +500,49 @@ function defineScope(cls, targetClass, name, params, methods, options) {
       options = {};
     }
     options = options || {};
+    // If there is a through model
+    // run another query to apply filter on relatedModel(targetModel)
+    // see github.com/strongloop/loopback-datasource-juggler/issues/1795
+    let scopeOnRelatedModel = false;
+    let queryRelated;
+    if (this._scope && this._scope.collect &&
+      filter && filter.where !== null && typeof filter.where === 'object') {
+      queryRelated = {
+        relation: this._scope.collect,
+        scope: filter,
+      };
+      filter = {};
+      scopeOnRelatedModel = true;
+    }
     const targetModel = definition.targetModel(this._receiver);
     const scoped = (this._scope && this._scope.where) || {};
     filter = mergeQuery({where: scoped}, filter || {});
-    return targetModel.findOne(filter, options, cb);
+    if (!scopeOnRelatedModel) {
+      return targetModel.findOne(filter, options, cb);
+    }
+    return targetModel.find(filter, options, function(err, data) {
+      const relatedModel = targetModel.relations[queryRelated.relation].modelTo;
+      const keyFrom = targetModel.relations[queryRelated.relation].keyFrom;
+      const IdKey = idName(relatedModel);
+
+      // Merge queryRelated filter and targetId filter
+      const buildWhere = function() {
+        return {
+          and: [
+            {
+              [IdKey]: collectTargetIds(data, keyFrom || IdKey),
+            },
+            queryRelated.scope.where],
+        };
+      };
+      if (queryRelated.scope.where !== undefined) {
+        queryRelated.scope.where = buildWhere();
+      } else {
+        queryRelated.scope.where = {};
+        queryRelated.scope.where[IdKey] = collectTargetIds(data, keyFrom || IdKey);
+      }
+      return relatedModel.findOne(queryRelated.scope, options, cb);
+    });
   }
 
   function count(where, options, cb) {

test/relations.test.js

@@ -633,6 +633,37 @@ describe('relations', function() {
       }
     });
 
+    it('should find one scoped record with promises based on related model properties', function(done) {
+      let id;
+      Physician.create()
+        .then(function(physician) {
+          return physician.patients.create({name: 'a'})
+            .then(function(ch) {
+              id = ch.id;
+              return physician.patients.create({name: 'z'});
+            })
+            .then(function() {
+              return physician.patients.create({name: 'c'});
+            })
+            .then(function() {
+              return verify(physician);
+            });
+        }).catch(done);
+
+      function verify(physician) {
+        return physician.patients.findOne({
+          where: {
+            name: 'a',
+          },
+        }, function(err, patient) {
+          if (err) return done(err);
+          should.exist(patient);
+          patient.name.should.equal('a');
+          done();
+        });
+      }
+    });
+
     it('should build record on scope', function(done) {
       Physician.create(function(err, physician) {
         const patient = physician.patients.build();