Use new context util function

Author: jafeltra

src/client/BaseClient.js

@@ -39,6 +39,7 @@ class BaseClient {
     });
   }
 
+  // NOTE: Async because in other clients that extend this, we need async helper functions (ex. auth)
   async init() {
     return this.initializeExtractors(this.extractorConfig, this.commonExtractorArgs);
   }

src/extractors/BaseFHIRExtractor.js

@@ -1,13 +1,9 @@
 const { Extractor } = require('./Extractor');
 const { BaseFHIRModule } = require('../modules');
-const { determineVersion, mapFHIRVersions, isBundleEmpty, getBundleResourcesByType } = require('../helpers/fhirUtils');
+const { determineVersion, mapFHIRVersions, isBundleEmpty } = require('../helpers/fhirUtils');
+const { getPatientFromContext } = require('../helpers/contextUtils');
 const logger = require('../helpers/logger');
 
-function parseContextForPatientId(context) {
-  const patientInContext = getBundleResourcesByType(context, 'Patient', {}, true);
-  return patientInContext ? patientInContext.id : undefined;
-}
-
 class BaseFHIRExtractor extends Extractor {
   constructor({ baseFhirUrl, requestHeaders, version, resourceType }) {
     super();
@@ -22,14 +18,9 @@ class BaseFHIRExtractor extends Extractor {
 
   /* eslint-disable class-methods-use-this */
   // Use context to get PatientId by default; common need across almost all extractors
-  async parametrizeArgsForFHIRModule({ context }) {
-    const idFromContext = parseContextForPatientId(context);
-    if (idFromContext) {
-      logger.debug('Patient found in context');
-      return { patient: idFromContext };
-    }
-
-    throw new Error('BaseFHIRExtractor could not find Patient resource in context. Use an extractor to get a Patient resource first.');
+  async parametrizeArgsForFHIRModule({ mrn, context }) {
+    const patient = getPatientFromContext(mrn, context);
+    return { patient: patient.id };
   }
   /* eslint-enable class-methods-use-this */
 

test/extractors/BaseFHIRExtractor.test.js

@@ -1,11 +1,8 @@
 const { when } = require('jest-when');
-const rewire = require('rewire');
 const { BaseFHIRExtractor } = require('../../src/extractors');
 const examplePatientBundle = require('./fixtures/patient-bundle.json');
 const exampleConditionBundle = require('./fixtures/condition-bundle.json');
 
-const BaseFHIRExtractorRewired = rewire('../../src/extractors/BaseFHIRExtractor.js');
-
 // Constants for mock tests
 const MOCK_URL = 'http://localhost';
 const MOCK_REQUEST_HEADERS = {
@@ -44,33 +41,22 @@ describe('BaseFhirExtractor', () => {
     expect(moduleRequestHeadersSpy).toHaveBeenCalledWith(MOCK_REQUEST_HEADERS);
   });
 
-  const parseContextForPatientId = BaseFHIRExtractorRewired.__get__('parseContextForPatientId');
-  test('parseContextForPatientId returns undefined when no context is provided', () => {
-    const emptyValue = parseContextForPatientId({});
-    expect(emptyValue).toBeUndefined();
-  });
-
-  test('parseContextForPatientId returns the patient ID when one exists on the contextBundle', () => {
-    const idValue = parseContextForPatientId(MOCK_CONTEXT);
-    expect(idValue).toEqual(MOCK_CONTEXT.entry[0].resource.id);
-  });
-
   test('parametrizeArgsForFHIRModule parses data off of context if available', async () => {
     baseFHIRModuleSearchSpy.mockClear();
-    const paramsBasedOnContext = await baseFHIRExtractor.parametrizeArgsForFHIRModule({ context: MOCK_CONTEXT });
+    const paramsBasedOnContext = await baseFHIRExtractor.parametrizeArgsForFHIRModule({ mrn: MOCK_PATIENT_MRN, context: MOCK_CONTEXT });
     expect(baseFHIRModuleSearchSpy).not.toHaveBeenCalled();
     expect(paramsBasedOnContext).toHaveProperty('patient');
     expect(paramsBasedOnContext.patient).toEqual(MOCK_CONTEXT.entry[0].resource.id);
   });
 
   test('parametrizeArgsForFHIRModule throws an error if context has no relevant ID', async () => {
     baseFHIRModuleSearchSpy.mockClear();
-    await expect(baseFHIRExtractor.parametrizeArgsForFHIRModule({})).rejects.toThrowError('BaseFHIRExtractor could not find Patient resource in context.');
+    await expect(baseFHIRExtractor.parametrizeArgsForFHIRModule({ mrn: MOCK_PATIENT_MRN, context: {} })).rejects.toThrow();
     expect(baseFHIRModuleSearchSpy).not.toHaveBeenCalled();
   });
 
   test('get should return a condition resource', async () => {
-    const data = await baseFHIRExtractor.get({ context: MOCK_CONTEXT });
+    const data = await baseFHIRExtractor.get({ mrn: MOCK_PATIENT_MRN, context: MOCK_CONTEXT });
     expect(data.resourceType).toEqual('Bundle');
     expect(data.entry).toBeDefined();
     expect(data.entry.length).toBeGreaterThan(0);