Bucket age ranges in cases list #2670

globaldothealth · Apr 25, 2022 · 8a2165d · 8a2165d
1 parent b38eafc
commit 8a2165d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/data-serving/data-service/src/controllers/case.ts b/data-serving/data-service/src/controllers/case.ts
@@ -75,6 +75,8 @@ const dtoFromCase = async (storedCase: LeanDocument<CaseDocument>) => {
             }
         }
     }
+    delete dto.restrictedNotes;
+
     return dto;
 }
 
@@ -334,9 +336,8 @@ export class CasesController {
                 countQuery,
             ]);
 
-            docs.forEach((aDoc: LeanDocument<CaseDocument>) => {
-                delete aDoc.restrictedNotes;
-            });
+            const dtos = await Promise.all(docs.map(dtoFromCase));
+
             logger.info('got results');
             // total is actually stored in a count index in mongo, so the query is fast.
             // however to maintain existing behaviour, only return the count limit
@@ -345,7 +346,7 @@ export class CasesController {
             // indicating that there is more to fetch on the next page.
             if (total > limit * page) {
                 res.json({
-                    cases: docs,
+                    cases: dtos,
                     nextPage: page + 1,
                     total: reportedTotal,
                 });
@@ -354,7 +355,7 @@ export class CasesController {
             }
             // If we fetched all available data, just return it.
             logger.info('Got one page of results');
-            res.json({ cases: docs, total: reportedTotal });
+            res.json({ cases: dtos, total: reportedTotal });
         } catch (e) {
             if (e instanceof ParsingError) {
                 logger.error(`Parsing error ${e.message}`);

diff --git a/data-serving/data-service/test/controllers/case.test.ts b/data-serving/data-service/test/controllers/case.test.ts
@@ -223,6 +223,18 @@ describe('GET', () => {
                 .expect(200, /got it at work/)
                 .expect('Content-Type', /json/);
         });
+        it('should use age buckets in results', async () => {
+            const c = new Case(minimalCase);
+            const aBucket = await AgeBucket.findOne({});
+            c.demographics.ageBuckets = [aBucket!._id];
+            await c.save();
+            const res = await request(app)
+                .get(`/api/cases?page=1&limit=10`)
+                .expect(200)
+                .expect('Content-Type', /json/);
+            expect(res.body.cases[0].demographics.ageRange.start).toEqual(aBucket!.start);
+            expect(res.body.cases[0].demographics.ageRange.end).toEqual(aBucket!.end);
+        });
         it('should ignore the restricted collection', async () => {
             const r = new RestrictedCase(minimalCase);
             await r.save();