Fixed count for queries with $modify query operator

Author: Dekel Barzilay

src/index.js

@@ -266,6 +266,14 @@ class Service extends AdapterService {
     return optionRelations.merge(paramRelations);
   }
 
+  modifyQuery (query, modify) {
+    if (typeof modify === 'string') {
+      if (modify[0] === '[' && modify[modify.length - 1] === ']') { query.modify(...JSON.parse(modify)); } else { query.modify(modify.split(',')); }
+    } else {
+      query.modify(...modify);
+    }
+  }
+
   _createQuery (params = {}) {
     const trx = params.transaction ? params.transaction.trx : null;
     return this.Model.query(trx);
@@ -322,11 +330,7 @@ class Service extends AdapterService {
     }
 
     if (query && query.$modify) {
-      if (typeof query.$modify === 'string') {
-        if (query.$modify[0] === '[' && query.$modify[query.$modify.length - 1] === ']') { q.modify(...JSON.parse(query.$modify)); } else { q.modify(query.$modify.split(',')); }
-      } else {
-        q.modify(...query.$modify);
-      }
+      this.modifyQuery(q, query.$modify);
 
       delete query.$modify;
     }
@@ -422,6 +426,10 @@ class Service extends AdapterService {
           countQuery.count({ total: idColumns });
         }
 
+        if (query && query.$modify) {
+          this.modifyQuery(countQuery, query.$modify);
+        }
+
         this.objectify(countQuery, query, null, null, query.$allowRefs);
 
         return countQuery

test/index.test.js

@@ -1716,6 +1716,10 @@ describe('Feathers Objection Service', () => {
         ]);
     });
 
+    afterEach(async () => {
+      companies.options.paginate = {};
+    });
+
     after(async () => {
       await companies.remove(null);
     });
@@ -1727,6 +1731,19 @@ describe('Feathers Objection Service', () => {
       });
     });
 
+    it('allow $modify query with paginate', () => {
+      companies.options.paginate = {
+        default: 1,
+        max: 2
+      };
+
+      return companies.find({ query: { $modify: ['google'] } }).then(data => {
+        expect(data.total).to.be.equal(1);
+        expect(data.data.length).to.be.equal(1);
+        expect(data.data[0].name).to.be.equal('Google');
+      });
+    });
+
     it('allow $modify query as string', () => {
       return companies.find({ query: { $modify: 'google' } }).then(data => {
         expect(data.length).to.be.equal(1);