System matching now required on VS checks

Author: julianxcarter

src/helpers/valueSetUtils.js

@@ -50,20 +50,14 @@ const checkCodeInVs = (code, codeSystem, valueSetFilePath, typeOfVS = vsTypes.js
   if (valueSet.expansion) {
     // If valueSet has expansion, we only need to check these codes
     inVSExpansion = valueSet.expansion.contains.some((containsItem) => {
-      if (!code || !containsItem) return false;
-      if (containsItem.system) {
-        return code === containsItem.code && codeSystem === containsItem.codeSystem;
-      }
-      return code === containsItem.code;
+      if (!code || !codeSystem || !containsItem || !containsItem.system) return false;
+      return code === containsItem.code && codeSystem === containsItem.system;
     });
   } else {
     // Checks if code is in any of the valueSet.compose.include arrays
     inVSCompose = valueSet.compose.include.some((includeItem) => {
-      if (!code || !includeItem || !includeItem.concept) return false;
-      if (includeItem.system) {
-        return includeItem.system === codeSystem && includeItem.concept.map((concept) => concept.code).includes(code);
-      }
-      return includeItem.concept.map((concept) => concept.code).includes(code);
+      if (!code || !codeSystem || !includeItem || !includeItem.system || !includeItem.concept) return false;
+      return includeItem.system === codeSystem && includeItem.concept.map((concept) => concept.code).includes(code);
     });
   }
   return inVSCompose || inVSExpansion;

test/helpers/fixtures/valueset-with-expansion.json

@@ -17,10 +17,6 @@
   "expansion": {
     "timestamp": "2020-04-02T12:54:59-0400",
     "contains": [
-      {
-        "code": "C00.0",
-        "display": "Malignant neoplasm of external upper lip"
-      },
       {
         "code": "C00.1",
         "display": "Malignant neoplasm of external lower lip"

test/helpers/fixtures/valueset-without-expansion.json

@@ -11,6 +11,14 @@
             "display": "Malignant neoplasm of external upper lip"
           }
         ]
+      },
+      {
+        "concept": [
+          {
+            "code": "C00.1",
+            "display": "Malignant neoplasm of external upper lip"
+          }
+        ]
       }
     ]
   }

test/helpers/valueSetUtils.test.js

@@ -46,7 +46,7 @@ describe('valueSetUtils', () => {
 
   describe('checkCodeInVs', () => {
     const includesCode = 'C00.0';
-    const expansionCode = 'C00.1';
+    const expansionCodeWithoutSystem = 'C00.1';
     const expansionCodeWithSystem = 'C00.2';
     const missingCode = 'C12.34';
     const icd10System = 'http://hl7.org/fhir/sid/icd-10-cm';
@@ -65,13 +65,25 @@ describe('valueSetUtils', () => {
       expect(checkCodeInVs(includesCode, icd10System, vsPath, vsTypes.json)).toBeTruthy();
     });
     test('Should return false if the code is not in the VS includes', () => {
-      expect(checkCodeInVs(expansionCode, icd10System, vsPath, vsTypes.json)).toBeFalsy();
+      expect(checkCodeInVs(expansionCodeWithSystem, icd10System, vsPath, vsTypes.json)).toBeFalsy();
     });
     test('Should return false if the code is in the VS includes but the systems do not match', () => {
       expect(checkCodeInVs(includesCode, snomedSystem, vsPath, vsTypes.json)).toBeFalsy();
     });
-    test('Should return true if the code is in the VS expansion', () => {
-      expect(checkCodeInVs(expansionCode, icd10System, vsWithExpansionPath, vsTypes.json)).toBeTruthy();
+    test('Should return false if the code is in the VS includes but the coding lacks a system', () => {
+      expect(checkCodeInVs(expansionCodeWithoutSystem, snomedSystem, vsPath, vsTypes.json)).toBeFalsy();
+    });
+    test('Should return false if the code is in the VS includes but a system was not included as an argument', () => {
+      expect(checkCodeInVs(expansionCodeWithoutSystem, undefined, vsPath, vsTypes.json)).toBeFalsy();
+    });
+    test('Should return true if the code is in the VS expansion and systems match', () => {
+      expect(checkCodeInVs(expansionCodeWithSystem, icd10System, vsWithExpansionPath, vsTypes.json)).toBeTruthy();
+    });
+    test('Should return false if the code is in the VS expansion but the coding lacks a system', () => {
+      expect(checkCodeInVs(expansionCodeWithoutSystem, icd10System, vsWithExpansionPath, vsTypes.json)).toBeFalsy();
+    });
+    test('Should return false if the code is in the VS expansion but a system was not included as an argument', () => {
+      expect(checkCodeInVs(expansionCodeWithSystem, undefined, vsWithExpansionPath, vsTypes.json)).toBeFalsy();
     });
     test('Should return false if the code is in the VS expansion but the systems do not match', () => {
       expect(checkCodeInVs(expansionCodeWithSystem, snomedSystem, vsWithExpansionPath, vsTypes.json)).toBeFalsy();
@@ -83,7 +95,7 @@ describe('valueSetUtils', () => {
     });
     test('Should check against a json valueSet when no type is provided', () => {
       expect(checkCodeInVs(includesCode, icd10System, vsPath)).toBeTruthy();
-      expect(checkCodeInVs(expansionCode, icd10System, vsWithExpansionPath)).toBeTruthy();
+      expect(checkCodeInVs(expansionCodeWithSystem, icd10System, vsWithExpansionPath)).toBeTruthy();
       expect(checkCodeInVs(missingCode, icd10System, vsPath)).toBeFalsy();
     });
   });