Support for unfiltered count

openfoodfacts · Oct 9, 2023 · c24d55b · c24d55b
1 parent c203ab0
commit c24d55b
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 15 deletions.
diff --git a/src/app.controller.ts b/src/app.controller.ts
@@ -1,4 +1,4 @@
-import { Body, Controller, Get, Post, Query } from '@nestjs/common';
+import { Body, Controller, Get, Post, Query, All } from '@nestjs/common';
 import { ImportService } from './domain/services/import.service';
 import { QueryService } from './domain/services/query.service';
 
@@ -27,7 +27,7 @@ export class AppController {
     return await this.queryService.aggregate(body);
   }
 
-  @Post('count')
+  @All('count')
   async count(@Body() body: any) {
     return await this.queryService.count(body);
   }

diff --git a/src/domain/services/query.service.spec.ts b/src/domain/services/query.service.spec.ts
@@ -89,6 +89,15 @@ describe('count', () => {
       expect(response).toBe(1);
     });
   });
+  it('should cope with no filters', async () => {
+    await createTestingModule([DomainModule], async (app) => {
+      const { originValue, aminoValue, neucleotideValue } =
+        await createTestTags(app);
+      const queryService = app.get(QueryService);
+      const response = await queryService.count(null);
+      expect(response).toBeGreaterThan(2);
+    });
+  });
 });
 
 describe('aggregate', () => {

diff --git a/src/domain/services/query.service.ts b/src/domain/services/query.service.ts
@@ -89,29 +89,31 @@ export class QueryService {
     const start = Date.now();
     this.logger.debug(body);
 
-    const tags = Object.keys(body);
-    const tag = tags[0];
+    const tags = Object.keys(body ?? {});
+    const tag = tags?.[0];
     const { entity, column } = this.getEntityAndColumn(tag);
     const qb = this.em.createQueryBuilder(entity, 'pt');
     qb.select(`count(*) count`);
     qb.where('not pt.obsolete');
 
-    let matchValue = body[tag];
-    const not = matchValue?.['$ne'];
-    if (not) {
-      matchValue = not;
+    let whereLog = [];
+    if (tag) {
+      let matchValue = body[tag];
+      const not = matchValue?.['$ne'];
+      whereLog.push(`${tag} ${not ? '!=' : '=='} ${matchValue}`);
+      if (not) {
+        matchValue = not;
+      }
+      qb.andWhere(`${not ? 'NOT ' : ''}pt.${column} = ?`, [matchValue]);
+      delete body[tag];
+      whereLog.push(...this.addMatches(body, qb));
     }
-    qb.andWhere(`${not ? 'NOT ' : ''}pt.${column} = ?`, [matchValue]);
-    delete body[tag];
-    const whereLog = this.addMatches(body, qb);
 
     this.logger.debug(qb.getFormattedQuery());
     const results = await qb.execute();
     const response = results[0].count;
     this.logger.log(
-      `Processed ${tag} ${not ? '!=' : '=='} ${matchValue}${
-        whereLog.length ? ` and ${whereLog.join(' and ')}` : ''
-      } in ${Date.now() - start} ms. Count: ${response}`,
+      `Processed ${whereLog.join(' and ')} in ${Date.now() - start} ms. Count: ${response}`,
     );
     return parseInt(response);
   }
@@ -136,7 +138,7 @@ export class QueryService {
   private getEntityAndColumn(tag: any) {
     let entity: EntityName<object>;
     let column = 'value';
-    if (MAPPED_FIELDS.includes(tag)) {
+    if (!tag || MAPPED_FIELDS.includes(tag)) {
       entity = Product;
       column = tag;
     } else {