fhirsmith 0.4.2 → 0.5.0

package/tx/workers/lookup.js

@@ -44,9 +44,9 @@ class LookupWorker extends TerminologyWorker {
     try {
       await this.handleTypeLevelLookup(req, res);
     } catch (error) {
-      console.log(error);
-      req.logInfo = this.usedSources.join("|")+" - error"+(error.msgId  ? " "+error.msgId : "");
       this.log.error(error);
+      this.debugLog(error);
+      req.logInfo = this.usedSources.join("|")+" - error"+(error.msgId  ? " "+error.msgId : "");
       const statusCode = error.statusCode || 500;
       const issueCode = error.issueCode || 'exception';
       return res.status(statusCode).json({
@@ -71,8 +71,9 @@ class LookupWorker extends TerminologyWorker {
     try {
       await this.handleInstanceLevelLookup(req, res);
     } catch (error) {
-      req.logInfo = this.usedSources.join("|")+" - error"+(error.msgId  ? " "+error.msgId : "");
       this.log.error(error);
+      this.debugLog(error);
+      req.logInfo = this.usedSources.join("|")+" - error"+(error.msgId  ? " "+error.msgId : "");
       const issueCode = error.issueCode || 'exception';
       return res.status(400).json({
         resourceType: 'OperationOutcome',
@@ -126,7 +127,8 @@ class LookupWorker extends TerminologyWorker {
 
       } else if (params.has('system') && params.has('code')) {
         // system + code parameters
-        csProvider = await this.findCodeSystem(params.get('system'), params.get('version') || '', txp, ['complete', 'fragment'], true);
+        csProvider = await this.findCodeSystem(params.get('system'), params.get('version') || '', txp, ['complete', 'fragment'],
+          null, true, false, false, txp.supplements);
         this.seeSourceProvider(csProvider, params.get('system'));
         code = params.get('code');
 
@@ -141,15 +143,24 @@ class LookupWorker extends TerminologyWorker {
         const msg = versionStr
           ? `CodeSystem not found: ${systemUrl} version ${versionStr}`
           : `CodeSystem not found: ${systemUrl}`;
-        return res.status(404).json(this.operationOutcome('error', 'not-found', msg));
+        return res.status(422).json(this.operationOutcome('error', 'not-found', msg));
+      }
+
+      // check supplements
+      const used = new Set();
+      this.checkSupplements(csProvider, null, txp.supplements, used);
+      const unused = new Set([...txp.supplements].filter(s => !used.has(s)));
+      if (unused.size > 0) {
+        throw new Issue('error', 'not-found', null, 'VALUESET_SUPPLEMENT_MISSING', this.i18n.translatePlural(unused.size, 'VALUESET_SUPPLEMENT_MISSING', txp.HTTPLanguages, [[...unused].join(',')]), 'not-found').handleAsOO(400);
       }
 
       // Perform the lookup
       const result = await this.doLookup(csProvider, code, txp);
       return res.status(200).json(result);
     } catch (error) {
-      req.logInfo = this.usedSources.join("|")+" - error"+(error.msgId  ? " "+error.msgId : "");
       this.log.error(error);
+      this.debugLog(error);
+      req.logInfo = this.usedSources.join("|")+" - error"+(error.msgId  ? " "+error.msgId : "");
       if (error instanceof Issue) {
         let oo = new OperationOutcome();
         oo.addIssue(error);
@@ -202,7 +213,7 @@ class LookupWorker extends TerminologyWorker {
       }
 
       // Load any supplements
-      const supplements = this.loadSupplements(codeSystem.url, codeSystem.version);
+      const supplements = this.loadSupplements(codeSystem.url, codeSystem.version, txp.supplements);
 
       // Create a FhirCodeSystemProvider for this CodeSystem
       const csProvider = new FhirCodeSystemProvider(this.opContext, codeSystem, supplements);
@@ -211,8 +222,9 @@ class LookupWorker extends TerminologyWorker {
       const result = await this.doLookup(csProvider, code, txp);
       return res.status(200).json(result);
     } catch (error) {
-      req.logInfo = this.usedSources.join("|")+" - error"+(error.msgId  ? " "+error.msgId : "");
       this.log.error(error);
+      this.debugLog(error);
+      req.logInfo = this.usedSources.join("|")+" - error"+(error.msgId  ? " "+error.msgId : "");
       if (error instanceof Issue) {
         let oo = new OperationOutcome();
         oo.addIssue(error);
@@ -234,6 +246,8 @@ class LookupWorker extends TerminologyWorker {
   async doLookup(csProvider, code, params) {
     this.deadCheck('doLookup');
 
+    await this.checkSupplements(csProvider, null, params.supplements);
+
     // Helper to check if a property should be included
     const hasProp = (name, defaultValue = true) => {
       if (!params.properties || params.properties.length === 0) {
@@ -249,8 +263,10 @@ class LookupWorker extends TerminologyWorker {
     const locateResult = await csProvider.locate(code);
 
     if (!locateResult || !locateResult.context) {
-      const message = locateResult?.message ||
-        `Unable to find code '${code}' in ${csProvider.system()} version ${csProvider.version() || 'unknown'}`;
+      let message = `Unable to find code '${code}' in ${csProvider.system()} version ${csProvider.version() || 'unknown'}`
+      if (locateResult?.message) {
+        message += ' ('+locateResult.message+')';
+      }
       throw new Issue('error', 'not-found', null, null, message, null, 404);
     }
 
@@ -285,9 +301,13 @@ class LookupWorker extends TerminologyWorker {
 
     // display (required)
     const display = await csProvider.display(ctxt);
+    const designations = new Designations(this.languages);
+    await csProvider.designations(ctxt, designations);
+    const pd = designations.preferredDesignation(params.workingLanguages());
+    const disp = pd ? pd.value : undefined;
     responseParams.push({
       name: 'display',
-      valueString: display || code
+      valueString: disp || display || code
     });
 
     // definition (optional) - top-level parameter
@@ -359,7 +379,7 @@ class LookupWorker extends TerminologyWorker {
     }
 
     // Let the provider add additional properties
-    await csProvider.extendLookup(ctxt, params.property || [], responseParams);
+    await csProvider.extendLookup(ctxt, params.properties || [], responseParams);
 
     return {
       resourceType: 'Parameters',
@@ -384,7 +404,6 @@ class LookupWorker extends TerminologyWorker {
     });
   }
 
-
   /**
    * Build an OperationOutcome
    * @param {string} severity - error, warning, information
@@ -398,7 +417,7 @@ class LookupWorker extends TerminologyWorker {
       issue: [{
         severity,
         code,
-        diagnostics: message
+        details: {text : message}
       }]
     };
   }

package/tx/workers/metadata.js

@@ -37,13 +37,13 @@ class MetadataHandler {
     if (mode === 'terminology') {
       this.logInfo = 'termcaps';
       const tc = new TerminologyCapabilities(await this.buildTerminologyCapabilities(endpoint, provider));
-      return res.json(tc.toJSON(endpoint.fhirVersion));
+      return res.json(tc.jsonObj);
     }
     this.logInfo = 'metadata';
 
     // Default: return CapabilityStatement
     const cs = new CapabilityStatement(this.buildCapabilityStatement(endpoint, provider));
-    return res.json(cs.toJSON(endpoint.fhirVersion));
+    return res.json(cs.jsonObj);
   }
 
   /**

package/tx/workers/read.js

@@ -66,8 +66,9 @@ class ReadWorker extends TerminologyWorker {
           });
       }
     } catch (error) {
-      req.logInfo = this.usedSources.join("|")+" - error"+(error.msgId  ? " "+error.msgId : "");
       this.log.error(error);
+      this.debugLog(error);
+      req.logInfo = this.usedSources.join("|")+" - error"+(error.msgId  ? " "+error.msgId : "");
       return res.status(500).json({
         resourceType: 'OperationOutcome',
         issue: [{
@@ -104,7 +105,7 @@ class ReadWorker extends TerminologyWorker {
           json.version = cs.version();
         }
         if (cs.iteratable()) {
-          json.content =  "conplete",
+          json.content =  "complete",
           json.concept = [];
           let csp = cs.build(this.opContext, []);
           let iter = await csp.iteratorAll();