fix: default option should be url when empty options passed

cqframework · Apr 16, 2024 · 6168999 · 6168999
1 parent 6caa0df
commit 6168999
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 9 deletions.
diff --git a/src/svs.js b/src/svs.js
@@ -84,13 +84,9 @@ function parseVSACXML(xmlString, vsDB = {}, options = { svsCodeSystemType: 'url'
     const systemOid = `urn:oid:${system}`;
     const systemUri = getVSACCodeSystem(vsacCS, system);
 
-    // Replace oid system with the url system, if one exists
-    if (options.svsCodeSystemType === 'url') {
-      if (systemUri !== null) {
-        system = systemUri.uri;
-      } else {
-        system = systemOid;
-      }
+    if (options.svsCodeSystemType === 'oid') {
+      // Keep the oid system as is
+      system = systemOid;
     } else if (options.svsCodeSystemType === 'both') {
       // Optionally include both if they exist
       if (systemUri !== null) {
@@ -99,8 +95,12 @@ function parseVSACXML(xmlString, vsDB = {}, options = { svsCodeSystemType: 'url'
       // Include the standard oid system
       system = systemOid;
     } else {
-      // Keep the oid system as is
-      system = systemOid;
+      // Replace oid system with the url system, if one exists
+      if (systemUri !== null) {
+        system = systemUri.uri;
+      } else {
+        system = systemOid;
+      }
     }
 
     codeList.push({ code, system, version });

diff --git a/test/svs-test.js b/test/svs-test.js
@@ -136,6 +136,52 @@ describe('SVS', () => {
       );
     });
 
+    it('should merge value sets into the value set database, using default url options when empty options is included', async () => {
+      nock('https://vsac.nlm.nih.gov')
+        .get('/vsac/svs/RetrieveValueSet')
+        .basicAuth({ user: 'apikey', pass: 'testkey' })
+        .query({
+          id: '2.16.840.1.113883.3.526.3.1032'
+        })
+        .replyWithFile(200, path.join(__dirname, 'fixtures', '2.16.840.1.113883.3.526.3.1032.xml'))
+        .get('/vsac/svs/RetrieveValueSet')
+        .basicAuth({ user: 'apikey', pass: 'testkey' })
+        .query({
+          id: '2.16.840.1.113883.3.600.2390'
+        })
+        .replyWithFile(200, path.join(__dirname, 'fixtures', '2.16.840.1.113883.3.600.2390.xml'));
+
+      const vsDB = {};
+      await Promise.all([
+        svs.downloadValueSet(
+          'testkey',
+          '2.16.840.1.113883.3.526.3.1032',
+          undefined,
+          tmpCache,
+          vsDB,
+          true,
+          {}
+        ),
+        svs.downloadValueSet(
+          'testkey',
+          '2.16.840.1.113883.3.600.2390',
+          undefined,
+          tmpCache,
+          vsDB,
+          true,
+          {}
+        )
+      ]);
+      // Should add the results to the VS DB
+      Object.keys(vsDB).should.have.length(2);
+      vsDB['2.16.840.1.113883.3.526.3.1032'].should.eql(
+        SYSTOLIC_VS_DB['2.16.840.1.113883.3.526.3.1032']
+      );
+      vsDB['2.16.840.1.113883.3.600.2390'].should.eql(
+        TOBACCO_VS_DB['2.16.840.1.113883.3.600.2390']
+      );
+    });
+
     it('should merge value sets into the value set database while maintaining original system', async () => {
       nock('https://vsac.nlm.nih.gov')
         .get('/vsac/svs/RetrieveValueSet')