Merge pull request #17 from beda-software/0.3.24

Support both mapping URLs when convert from FCE to FHIR

Author: ruscoder

src/converter/__tests__/resources/questionnaire_fce/allergies.json

@@ -1,7 +1,7 @@
 {
     "subjectType": ["Encounter", "Patient"],
     "meta": {
-        "profile": ["https://beda.software/beda-emr-questionnaire"],
+        "profile": ["https://emr-core.beda.software/StructureDefinition/fhir-emr-questionnaire"],
         "lastUpdated": "2023-04-10T03:43:34.792167Z",
         "createdAt": "2023-04-05T05:22:35.752466Z",
         "versionId": "694"

src/converter/__tests__/resources/questionnaire_fhir/allergies.json

@@ -1,7 +1,7 @@
 {
     "subjectType": ["Encounter", "Patient"],
     "meta": {
-        "profile": ["https://beda.software/beda-emr-questionnaire"],
+        "profile": ["https://emr-core.beda.software/StructureDefinition/fhir-emr-questionnaire"],
         "lastUpdated": "2023-04-10T03:43:34.792167Z",
         "versionId": "694",
         "extension": [
@@ -416,7 +416,7 @@
             ]
         },
         {
-            "url": "http://beda.software/fhir-extensions/questionnaire-mapper",
+            "url": "https://emr-core.beda.software/StructureDefinition/questionnaire-mapper",
             "valueReference": {
                 "reference": "Mapping/allergy-extract"
             }

src/converter/constants.ts

@@ -0,0 +1,4 @@
+export const legacyQuestionnaireProfileUrl = 'https://beda.software/beda-emr-questionnaire';
+export const questionnaireProfileUrl = 'https://emr-core.beda.software/StructureDefinition/fhir-emr-questionnaire';
+export const legacyMappingExtensionUrl = 'http://beda.software/fhir-extensions/questionnaire-mapper';
+export const mappingExtensionUrl = 'https://emr-core.beda.software/StructureDefinition/questionnaire-mapper';

src/converter/fceToFhir/questionnaire/processExtensions.ts

@@ -1,6 +1,7 @@
 import { Extension as FHIRExtension, Questionnaire as FHIRQuestionnaire } from 'fhir/r4b';
 
 import { Questionnaire as FCEQuestionnaire } from '@beda.software/aidbox-types';
+import { legacyMappingExtensionUrl, legacyQuestionnaireProfileUrl, mappingExtensionUrl } from '../../constants';
 
 export function processExtensions(questionnaire: FCEQuestionnaire): FHIRQuestionnaire {
     const { launchContext, mapping, sourceQueries, targetStructureMap, assembledFrom, ...fhirQuestionnaire } =
@@ -39,10 +40,13 @@ export function processExtensions(questionnaire: FCEQuestionnaire): FHIRQuestion
     }
 
     if (mapping) {
+        const extensionUrl =
+            questionnaire.meta?.profile?.[0] === legacyQuestionnaireProfileUrl
+                ? legacyMappingExtensionUrl
+                : mappingExtensionUrl;
         extensions = extensions.concat(
             mapping.map((m) => ({
-                // url: 'https://emr.beda.software/StructureDefinition/questionnaire-mapper',
-                url: 'http://beda.software/fhir-extensions/questionnaire-mapper',
+                url: extensionUrl,
                 valueReference: {
                     reference: `Mapping/${m.id}`,
                 },

src/converter/fhirToFce/questionnaire/processExtensions.ts

@@ -1,4 +1,5 @@
 import { canonical } from '@beda.software/aidbox-types';
+import { legacyMappingExtensionUrl, mappingExtensionUrl } from '../../constants';
 import { Questionnaire as FHIRQuestionnaire } from 'fhir/r4b';
 
 export function processExtensions(fhirQuestionnaire: FHIRQuestionnaire): {
@@ -70,9 +71,7 @@ export function processLaunchContext(fhirQuestionnaire: FHIRQuestionnaire): any[
 
 function processMapping(fhirQuestionnaire: FHIRQuestionnaire): any[] | undefined {
     const mapperExtensions = fhirQuestionnaire.extension?.filter(
-        (ext: any) =>
-            ext.url === 'http://beda.software/fhir-extensions/questionnaire-mapper' ||
-            ext.url === 'https://emr.beda.software/StructureDefinition/questionnaire-mapper',
+        (ext: any) => ext.url === legacyMappingExtensionUrl || ext.url === mappingExtensionUrl,
     );
 
     if (!mapperExtensions) {

src/converter/fhirToFce/utils.ts

@@ -1,12 +1,12 @@
+import { legacyQuestionnaireProfileUrl, questionnaireProfileUrl } from '../constants';
 import { Questionnaire as FHIRQuestionnaire } from 'fhir/r4b';
 
 export function checkFhirQuestionnaireProfile(fhirQuestionnaire: FHIRQuestionnaire): void {
     if (
         !(
             (fhirQuestionnaire.meta?.profile?.length ?? 0) === 1 &&
-            (fhirQuestionnaire.meta?.profile?.[0] === 'https://beda.software/beda-emr-questionnaire' ||
-                fhirQuestionnaire.meta?.profile?.[0] ===
-                    'https://emr-core.beda.software/StructureDefinition/fhir-emr-questionnaire')
+            (fhirQuestionnaire.meta?.profile?.[0] === legacyQuestionnaireProfileUrl ||
+                fhirQuestionnaire.meta?.profile?.[0] === questionnaireProfileUrl)
         )
     ) {
         throw new Error('Only beda emr questionanire supported');