maskAll flag added to maskPatientData, unit test added

Author: julianxcarter

src/extractors/CSVPatientExtractor.js

@@ -9,26 +9,6 @@ const { getEmptyBundle } = require('../helpers/fhirUtils');
 const { CSVPatientSchema } = require('../helpers/schemas/csv');
 const logger = require('../helpers/logger');
 
-const ALL_SUPPORTED_MASK_FIELDS = [
-  'gender',
-  'mrn',
-  'name',
-  'address',
-  'birthDate',
-  'language',
-  'ethnicity',
-  'birthsex',
-  'race',
-  'telecom',
-  'multipleBirth',
-  'photo',
-  'contact',
-  'generalPractitioner',
-  'managingOrganization',
-  'link',
-];
-
-
 function joinAndReformatData(patientData) {
   logger.debug('Reformatting patient data from CSV into template format');
   // No join needed, just a reformatting
@@ -109,7 +89,7 @@ class CSVPatientExtractor extends BaseCSVExtractor {
 
     // mask specified fields in the patient data
     if (typeof this.mask === 'string' && this.mask === 'all') {
-      maskPatientData(bundle, ALL_SUPPORTED_MASK_FIELDS);
+      maskPatientData(bundle, [], true);
     } else if (this.mask.length > 0) maskPatientData(bundle, this.mask);
     return bundle;
   }

src/extractors/FHIRPatientExtractor.js

@@ -1,25 +1,6 @@
 const { BaseFHIRExtractor } = require('./BaseFHIRExtractor');
 const { maskPatientData } = require('../helpers/patientUtils.js');
 
-const ALL_SUPPORTED_MASK_FIELDS = [
-  'gender',
-  'mrn',
-  'name',
-  'address',
-  'birthDate',
-  'language',
-  'ethnicity',
-  'birthsex',
-  'race',
-  'telecom',
-  'multipleBirth',
-  'photo',
-  'contact',
-  'generalPractitioner',
-  'managingOrganization',
-  'link',
-];
-
 class FHIRPatientExtractor extends BaseFHIRExtractor {
   constructor({ baseFhirUrl, requestHeaders, version, mask = [] }) {
     super({ baseFhirUrl, requestHeaders, version });
@@ -39,7 +20,7 @@ class FHIRPatientExtractor extends BaseFHIRExtractor {
     const bundle = await super.get(argumentObject);
     // mask specified fields in the patient data
     if (typeof this.mask === 'string' && this.mask === 'all') {
-      maskPatientData(bundle, ALL_SUPPORTED_MASK_FIELDS);
+      maskPatientData(bundle, [], true);
     } else if (this.mask.length > 0) maskPatientData(bundle, this.mask);
     return bundle;
   }

src/helpers/patientUtils.js

@@ -81,8 +81,9 @@ function getPatientName(name) {
  * 'gender','mrn','name','address','birthDate','language','ethnicity','birthsex',
  * 'race', 'telecom', 'multipleBirth', 'photo', 'contact', 'generalPractitioner',
  * 'managingOrganization', and 'link'
+ * @param {Boolean} maskAll indicates that all supported fields should be masked, defaults to false
  */
-function maskPatientData(bundle, mask) {
+function maskPatientData(bundle, mask, maskAll = false) {
   // get Patient resource from bundle
   const patient = fhirpath.evaluate(
     bundle,
@@ -109,7 +110,9 @@ function maskPatientData(bundle, mask) {
   ];
   const masked = extensionArr(dataAbsentReasonExtension('masked'));
 
-  mask.forEach((field) => {
+  const maskingFields = maskAll ? validFields : mask;
+
+  maskingFields.forEach((field) => {
     if (!validFields.includes(field)) {
       throw Error(`'${field}' is not a field that can be masked. Patient will only be extracted if all mask fields are valid. Valid fields include: Valid fields include: ${validFields.join(', ')}`);
     }

test/helpers/patientUtils.test.js

@@ -113,6 +113,12 @@ describe('PatientUtils', () => {
       expect(bundle).toEqual(exampleMaskedPatient);
     });
 
+    test('bundle should be modified to have dataAbsentReason for all fields when the maskAll flag is provided', () => {
+      const bundle = _.cloneDeep(examplePatient);
+      maskPatientData(bundle, [], true);
+      expect(bundle).toEqual(exampleMaskedPatient);
+    });
+
     test('should mask gender even if it only had an extension', () => {
       const bundle = _.cloneDeep(examplePatient);
       delete bundle.entry[0].resource.gender;