fix: return count with tree_associated filter applied

Greenstand · Feb 4, 2022 · 865fb74 · 865fb74
1 parent 604172b
commit 865fb74
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/server/__tests__/integration/capture/capture.spec.js b/server/__tests__/integration/capture/capture.spec.js
@@ -162,12 +162,14 @@ describe('/captures', () => {
     it('should get only captures with tree associated', async () => {
       const result = await request(app).get(`/captures?tree_associated=true`).expect(200);
       expect(result.body.captures.length).to.eql(1);
+      expect(result.body.count).to.eql(1);
       expect(result.body.captures[0].id).to.eql("c02a5ae6-3727-11ec-8d3d-0242ac130003");
     });
 
     it('should get only captures without tree associated', async () => {
       const result = await request(app).get(`/captures?tree_associated=false`).expect(200);
       expect(result.body.captures.length).to.eql(1);
+      expect(result.body.count).to.eql(1);
       expect(result.body.captures[0].id).to.eql("d2c69205-b13f-4ab6-bb5e-33dc504fa0c2");
     });
 

diff --git a/server/infra/repositories/CaptureRepository.js b/server/infra/repositories/CaptureRepository.js
@@ -23,17 +23,16 @@ class CaptureRepository extends BaseRepository {
       delete filterCriteria.tree_associated;
     }
 
+    const countWhere = where.clone();
+
     const captures = await where.where({ ...filterCriteria})
       .select('*')
       .from('capture')
       .orderBy('created_at', 'desc')
       .limit(Number(options.limit))
       .offset(Number(options.offset));
 
-    const { count } = await this._session
-      .getDB()
-      .where({ ...filterCriteria })
-      .whereNot({ status: 'deleted' })
+    const { count } = await countWhere
       .count('*')
       .from('capture')
       .first();