Added a check on result when using $modify with pagination

feathersjs-ecosystem · Jun 19, 2020 · 0da171b · 0da171b
1 parent de3f17e
commit 0da171b
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/src/index.js b/src/index.js
@@ -433,7 +433,7 @@ class Service extends AdapterService {
         this.objectify(countQuery, query, null, null, query.$allowRefs);
 
         return countQuery
-          .then(count => parseInt(count[0].total, 10))
+          .then(count => count && count.length ? parseInt(count[0].total, 10) : 0)
           .then(executeQuery)
           .catch(errorHandler);
       }

diff --git a/test/company.js b/test/company.js
@@ -38,7 +38,8 @@ export default class Company extends Model {
       builder.orderBy('name');
     },
     google: (builder, hasCeo) => {
-      builder.where('name', 'Google');
+      builder.where('name', 'Google')
+        .groupBy(['name']);
 
       if (hasCeo) { builder.whereNot('ceo', null); }
     },

diff --git a/test/index.test.js b/test/index.test.js
@@ -1706,7 +1706,8 @@ describe('Feathers Objection Service', () => {
         .create([
           {
             name: 'Google',
-            ceo: 1
+            ceo: 1,
+            size: 'medium'
           },
           {
             name: 'Apple',
@@ -1744,6 +1745,18 @@ describe('Feathers Objection Service', () => {
       });
     });
 
+    it('allow $modify query with paginate and no results', () => {
+      companies.options.paginate = {
+        default: 1,
+        max: 2
+      };
+
+      return companies.find({ query: { $modify: ['google'], size: 'small' } }).then(data => {
+        expect(data.total).to.be.equal(0);
+        expect(data.data.length).to.be.equal(0);
+      });
+    });
+
     it('allow $modify query as string', () => {
       return companies.find({ query: { $modify: 'google' } }).then(data => {
         expect(data.length).to.be.equal(1);