Safe guard filter function and add mocked call to test reference retr…

…ieval
FluxNotes · Oct 16, 2019 · a7c2733 · a7c2733
1 parent 4adb3d6
commit a7c2733
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/src/__test__/backend/dataaccess/DataAccess.test.js b/src/__test__/backend/dataaccess/DataAccess.test.js
@@ -140,6 +140,12 @@ const mockSmartClient = {
                 };
                 return Promise.resolve({ data });
             },
+            read: function(type, id) {
+                const data = {
+                    entry: hardCodedFHIRPatient.entry.filter(e => e['resource']['resourceType'] === type && e['resource']['id'] === id)
+                };
+                return Promise.resolve({ data });
+            },
             conformance: function(_options) {
                 const data = {
                     rest: [{

diff --git a/src/__test__/backend/dataaccess/McodeV09SmartOnFhirDataSource.test.js b/src/__test__/backend/dataaccess/McodeV09SmartOnFhirDataSource.test.js
@@ -37,6 +37,11 @@ const sampleObservationSearchData = {
     entry: hardCodedFHIRPatient.entry.filter(e => e['resource']['resourceType'] === 'Observation')
 };
 
+const sampleReferenceResult = {
+    resourceType: 'Bundle',
+    entry: hardCodedFHIRPatient.entry.filter(e => e['resource']['resourceType'] === 'Condition')
+}
+
 
 describe('SMART on FHIR data source', function() {
     const originalWindowFHIR = window.FHIR;
@@ -83,7 +88,9 @@ describe('SMART on FHIR data source', function() {
           .get('/fhir/Patient?_id=1078857')
           .reply(200, samplePatientSearchData)
           .get('/fhir/Observation?patient=1078857')
-          .reply(200, sampleObservationSearchData);
+          .reply(200, sampleObservationSearchData)
+          .get('/fhir/Encounter/6a8bc97e-3ba1-4fb5-a478-4b5bd888c793') // reference retrieval
+          .reply(200, sampleReferenceResult);
           // in this case it doesn't need to fetch the metadata since the resourceTypes are manually specified
 
         const dataSource = new McodeV09SmartOnFhirDataSource({ resourceTypes: ['Patient', 'Observation'] });

diff --git a/src/dataaccess/HardCodedFHIRPatient.json b/src/dataaccess/HardCodedFHIRPatient.json
@@ -131,10 +131,10 @@
           "text": "Prediabetes"
         },
         "patient": {
-          "reference": "urn:uuid:eb3cdde1-0f08-4ec3-b926-e071979ec7e1"
+          "reference": "Patient/eb3cdde1-0f08-4ec3-b926-e071979ec7e1"
         },
         "encounter": {
-          "reference": "urn:uuid:6a8bc97e-3ba1-4fb5-a478-4b5bd888c793"
+          "reference": "Encounter/6a8bc97e-3ba1-4fb5-a478-4b5bd888c793"
         },
         "onsetDateTime": "2011-07-12T11:19:32-04:00",
         "dateRecorded": "2011-07-12T11:19:32-04:00",
@@ -175,10 +175,10 @@
           "text": "Body Height"
         },
         "subject": {
-          "reference": "urn:uuid:eb3cdde1-0f08-4ec3-b926-e071979ec7e1"
+          "reference": "Patient/eb3cdde1-0f08-4ec3-b926-e071979ec7e1"
         },
         "encounter": {
-          "reference": "urn:uuid:6a8bc97e-3ba1-4fb5-a478-4b5bd888c793"
+          "reference": "Encounter/6a8bc97e-3ba1-4fb5-a478-4b5bd888c793"
         },
         "effectiveDateTime": "2011-07-12T11:19:32-04:00",
         "issued": "2011-07-12T11:19:32.283-04:00",

diff --git a/src/dataaccess/McodeV09SmartOnFhirDataSource.js b/src/dataaccess/McodeV09SmartOnFhirDataSource.js
@@ -114,7 +114,10 @@ class McodeV09SmartOnFhirDataSource extends IDataSource {
 
     // Filter out resources that can only support searching based on patient/subject. Also include the Patient resource type.
     resourceTypeFilter = (res) => {
-        return res.searchInclude.includes(`${res.type}:patient`) || res.searchInclude.includes(`${res.type}:subject`) || res.type === 'Patient';
+        if (res && res.searchInclude) {
+            return res.searchInclude.includes(`${res.type}:patient`) || res.searchInclude.includes(`${res.type}:subject`) || res.type === 'Patient';
+        }
+        return true;
     }
 
     fetchResources() {