fix: remove filtered responses from total count (#63)

* fix: remove filtered responses from total count * fix linting issue * fix NaN tests. * adjust tests to test for totals and properly filter NaN totals
awslabs · Sep 13, 2021 · 82b6ff3 · 82b6ff3
1 parent ae9bf78
commit 82b6ff3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/smartHandler.test.ts b/src/smartHandler.test.ts
@@ -734,6 +734,7 @@ describe('authorizeAndFilterReadResponse', () => {
             lastUpdated: '2020-11-20T11:10:48.034+00:00',
         },
         type: 'searchset',
+        total: 0,
         link: [
             {
                 relation: 'self',
@@ -749,6 +750,7 @@ describe('authorizeAndFilterReadResponse', () => {
     const searchAllEntitiesMatch = {
         ...emptySearchResult,
         entry: [createEntry(validPatient), createEntry(validPatientObservation), createEntry(validPatientEncounter)],
+        total: 3,
     };
 
     const searchSomeEntitiesMatch = {
@@ -760,13 +762,15 @@ describe('authorizeAndFilterReadResponse', () => {
             createEntry({ ...validPatientObservation, subject: 'not-you' }),
             createEntry(validPatientEncounter),
         ],
+        total: 5,
     };
     const searchNoEntitiesMatch = {
         ...emptySearchResult,
         entry: [
             createEntry({ ...validPatient, id: 'not-yours' }),
             createEntry({ ...validPatientObservation, subject: 'not-you' }),
         ],
+        total: 2,
     };
     const cases: (string | ReadResponseAuthorizedRequest | boolean | any)[][] = [
         [
@@ -998,7 +1002,7 @@ describe('authorizeAndFilterReadResponse', () => {
                 readResponse: searchAllEntitiesMatch,
             },
             true,
-            { ...emptySearchResult, entry: [createEntry(validPatientEncounter)] },
+            { ...emptySearchResult, entry: [createEntry(validPatientEncounter)], total: 1 },
         ],
         [
             'SEARCH: user scope; Practitioner able to search and get ALL results',

diff --git a/src/smartHandler.ts b/src/smartHandler.ts
@@ -318,7 +318,7 @@ export class SMARTHandler implements Authorization {
         const { operation, readResponse } = request;
         // If request is a search treat the readResponse as a bundle
         if (SEARCH_OPERATIONS.includes(operation)) {
-            const entries = (readResponse.entry ?? []).filter((entry: { resource: any }) =>
+            const entries: any[] = (readResponse.entry ?? []).filter((entry: { resource: any }) =>
                 hasAccessToResource(
                     fhirUserObject,
                     patientLaunchContext,
@@ -329,7 +329,13 @@ export class SMARTHandler implements Authorization {
                     this.fhirVersion,
                 ),
             );
-            return { ...readResponse, entry: entries };
+            let numTotal: number = readResponse.total;
+            if (!numTotal) {
+                numTotal = entries.length;
+            } else {
+                numTotal -= readResponse.entry.length - entries.length;
+            }
+            return { ...readResponse, entry: entries, total: numTotal };
         }
         // If request is != search treat the readResponse as just a resource
         if (