Fixes real JA1 - now unknown codes will result in a code-only method

Author: Dtphelan1

src/templates/snippets/cancerStaging.js

@@ -1,36 +1,34 @@
 const logger = require('../../helpers/logger');
+const { ifSomeArgsObj } = require('../../helpers/templateUtils');
 const { isCancerStagingSystem } = require('../../helpers/cancerStagingUtils');
 const { coding } = require('./coding');
 
-function stagingMethodTemplate({ code }) {
-  if (isCancerStagingSystem(code)) {
-    // NOTE: our general value set lookup should probably return the associate system, since it's available at the VS level
-    return {
+function methodTemplate({ code, system }) {
+  return ifSomeArgsObj(
+    ({ code: code_, system: system_ }) => ({
       method: {
         coding: [
           coding({
-            code,
-            system: 'http://snomed.info/sct',
+            ...(code_ && { code: code_ }),
+            ...(system_ && { system: system_ }),
           }),
         ],
       },
-    };
+    }),
+  )({ code, system });
+}
+
+function stagingMethodTemplate({ code }) {
+  if (isCancerStagingSystem(code)) {
+    // NOTE: our general value set lookup should probably return the associate system, since it's available at the VS level
+    return methodTemplate({ code, system: 'http://snomed.info/sct' });
   } if (code === 'C146985') {
     // TODO: fix this HARDCODED special case as delineated by this VS's description http://hl7.org/fhir/us/mcode/ValueSet-mcode-cancer-staging-system-vs.html
     // System based on http://hl7.org/fhir/us/mcode/Observation-mCODETNMClinicalPrimaryTumorCategoryExample01.json.html
-    return {
-      method: {
-        coding: [
-          coding({
-            code,
-            system: 'http://ncimeta.nci.nih.gov',
-          }),
-        ],
-      },
-    };
+    return methodTemplate({ code, system: 'http://ncimeta.nci.nih.gov' });
   }
-  logger.warn(`stagingMethodTemplate received a code ${code} that is not recognized; code will not be added to the resulting FHIR resource`);
-  return null;
+  logger.debug(`stagingMethodTemplate received a code ${code} that is not recognized; code will not be added to the resulting FHIR resource`);
+  return methodTemplate({ code });
 }
 
 module.exports = {

test/templates/snippets/cancerStaging.test.js

@@ -25,7 +25,6 @@ describe('cancerStaging snippets', () => {
       const stagingMethod = stagingMethodTemplate({ code: stagingCode });
       expect(stagingMethod).toEqual(expectedStagingMethod);
     });
-    // Test that it returns a method when the one hardcoded case is in the VS
     test('Special case: it returns an object with a well defined method property when code is C146985', () => {
       const specialStagingCode = 'C146985';
       const specialStagingCodeSystem = 'http://ncimeta.nci.nih.gov';
@@ -43,10 +42,18 @@ describe('cancerStaging snippets', () => {
       const stagingMethod = stagingMethodTemplate({ code: specialStagingCode });
       expect(stagingMethod).toEqual(expectedSpecialStagingMethod);
     });
-    // Test that it returns null when the one hardcoded case is
-    test('it returns null when provided an unknown code', () => {
+    test('it returns a method with a code and no system when provided an unknown code', () => {
       const unknownStagingCode = 'anything-goes';
-      expect(stagingMethodTemplate({ code: unknownStagingCode })).toBeNull();
+      const unknownStagingMethod = {
+        method: {
+          coding: [
+            {
+              code: unknownStagingCode,
+            },
+          ],
+        },
+      };
+      expect(stagingMethodTemplate({ code: unknownStagingCode })).toEqual(unknownStagingMethod);
     });
   });
 });