error message in the extractor has been updated

Author: julianxcarter

src/extractors/CSVCancerDiseaseStatusExtractor.js

@@ -16,7 +16,7 @@ class CSVCancerDiseaseStatusExtractor {
     logger.debug('Reformatting disease status data from CSV into template format');
     // Check the shape of the data
     arrOfDiseaseStatusData.forEach((record) => {
-      if (!(record.mrn && record.conditionId && record.diseaseStatusCode && record.dateOfObservation)) {
+      if (!record.mrn || !record.conditionId || (!record.diseaseStatusCode && record.observationStatus !== 'not-evaluated') || !record.dateOfObservation) {
         throw new Error('DiseaseStatusData missing an expected property: mrn, conditionId, diseaseStatusCode, and dateOfObservation are required.');
       }
     });

test/extractors/CSVCancerDiseaseStatusExtractor.test.js

@@ -36,6 +36,13 @@ describe('CSVCancerDiseaseStatusExtractor', () => {
       // Only including required properties is valid
       expect(csvCancerDiseaseStatusExtractor.joinAndReformatData(localData)).toEqual(expect.anything());
 
+      // Excluding diseaseStatusCode with an obseervationStatus of 'not-evaluated' should be valid
+      localData[0].observationStatus = 'not-evaluated';
+      localData[0].diseaseStatusCode = '';
+      expect(csvCancerDiseaseStatusExtractor.joinAndReformatData(localData)).toEqual(expect.anything());
+
+      localData[0].observationStatus = '';
+
       const requiredProperties = ['mrn', 'conditionId', 'diseaseStatusCode', 'dateOfObservation'];
 
       // Removing each required property should throw an error