fix: 🐛 correctly return documents when filtering on a field that is not returned (#413)

Author: ghusse

src/services/resources-getter.js

@@ -28,7 +28,6 @@ function ResourcesGetter(model, opts, params) {
   this.perform = () => getSegmentCondition()
     .then(async (segment) => {
       const jsonQuery = [];
-      await queryBuilder.addProjection(jsonQuery);
       await queryBuilder.addFiltersAndJoins(jsonQuery, segment);
 
       if (params.search) {
@@ -44,6 +43,8 @@ function ResourcesGetter(model, opts, params) {
         queryBuilder.addSortToQuery(jsonQuery);
       }
 
+      await queryBuilder.addProjection(jsonQuery);
+
       queryBuilder.addSkipAndLimitToQuery(jsonQuery);
 
       await queryBuilder.joinAllReferences(jsonQuery);

test/tests/services/resources-getter.test.js

@@ -55,6 +55,7 @@ describe('service > resources-getter', () => {
               type: 'String',
               get: (film) => `${film.title} ${film.duration}`,
             },
+            { field: 'rating', type: 'Number' },
           ],
         },
       },
@@ -78,6 +79,7 @@ describe('service > resources-getter', () => {
           _id: { type: 'ObjectId' },
           title: { type: String },
           duration: { type: Number },
+          rating: { type: Number },
         });
 
         OrderModel = mongoose.model('Order', OrderSchema);
@@ -134,11 +136,13 @@ describe('service > resources-getter', () => {
               _id: '41224d776a326fb40f000011',
               duration: 149,
               title: 'Terminator',
+              rating: 4.5,
             },
             {
               _id: '41224d776a326fb40f000012',
               duration: 360,
               title: 'Titanic',
+              rating: 4,
             },
             {
               _id: '41224d776a326fb40f000013',
@@ -390,5 +394,56 @@ describe('service > resources-getter', () => {
         expect(durations).toHaveLength(0);
       });
     });
+
+    describe('with a condition on a non-filtered field', () => {
+      it('should return filtered results on the rating', async () => {
+        expect.assertions(1);
+
+        const parameters = {
+          fields: { films: 'title' },
+          page: { number: '1', size: '15' },
+          filters: '{"field":"rating","operator":"present","value":null}',
+          timezone: 'Europe/Paris',
+        };
+
+        const result = await new ResourcesGetter(FilmModel, options, parameters).perform();
+
+        expect(result[0]).toHaveLength(2);
+      });
+
+      it('should return sorted results by rating (asc)', async () => {
+        expect.assertions(3);
+
+        const parameters = {
+          fields: { films: 'title' },
+          page: { number: '1', size: '15' },
+          sort: 'rating',
+          timezone: 'Europe/Paris',
+        };
+
+        const result = await new ResourcesGetter(FilmModel, options, parameters).perform();
+
+        expect(result[0]).toHaveLength(3);
+        expect(result[0][0].title).toBe('Matrix');
+        expect(result[0][1].title).toBe('Titanic');
+      });
+
+      it('should return sorted results by rating (desc)', async () => {
+        expect.assertions(3);
+
+        const parameters = {
+          fields: { films: 'title' },
+          page: { number: '1', size: '15' },
+          sort: '-rating',
+          timezone: 'Europe/Paris',
+        };
+
+        const result = await new ResourcesGetter(FilmModel, options, parameters).perform();
+
+        expect(result[0]).toHaveLength(3);
+        expect(result[0][0].title).toBe('Terminator');
+        expect(result[0][1].title).toBe('Titanic');
+      });
+    });
   });
 });