Add tests for subQuestionnaire and simplify convertor

Author: alexlipovka

package.json

@@ -1,7 +1,7 @@
 {
   "name": "sdc-qrf",
   "license": "MIT",
-  "version": "1.0.0-beta.15",
+  "version": "1.0.0-beta.16",
   "scripts": {
     "test": "vitest --watch=false",
     "test:watch": "vitest --watch",

src/converter/__tests__/fce.test.ts

@@ -28,6 +28,7 @@ import fce_source_queries from './resources/questionnaire_fce/source_queries.jso
 import fce_unit_option from './resources/questionnaire_fce/unit-option.json';
 import fce_vitals from './resources/questionnaire_fce/vitals.json';
 import fce_variable from './resources/questionnaire_fce/variable.json';
+import fce_sub_questionnaire from './resources/questionnaire_fce/sub-questionnaire.json';
 // fhir questionnaire
 import fhir_allergies from './resources/questionnaire_fhir/allergies.json';
 import fhir_beverages from './resources/questionnaire_fhir/beverages.json';
@@ -55,6 +56,7 @@ import fhir_source_queries from './resources/questionnaire_fhir/source_queries.j
 import fhir_unit_option from './resources/questionnaire_fhir/unit-option.json';
 import fhir_vitals from './resources/questionnaire_fhir/vitals.json';
 import fhir_variable from './resources/questionnaire_fhir/variable.json';
+import fhir_sub_questionnaire from './resources/questionnaire_fhir/sub-questionnaire.json';
 import { FCEQuestionnaire } from '../../fce.types';
 
 import { toFirstClassExtension, fromFirstClassExtension } from '../../converter';
@@ -88,6 +90,7 @@ describe('Questionanire and QuestionnaireResponses transformation', () => {
         [fhir_constraint, fce_constraint],
         [fhir_unit_option, fce_unit_option],
         [fhir_variable, fce_variable],
+        [fhir_sub_questionnaire, fce_sub_questionnaire],
     ])('Each FHIR Questionnaire should convert to FCE', async (fhir_questionnaire, fce_questionnaire) => {
         expect(toFirstClassExtension(fhir_questionnaire as FHIRQuestionnaire)).toStrictEqual(fce_questionnaire);
     });
@@ -119,6 +122,7 @@ describe('Questionanire and QuestionnaireResponses transformation', () => {
         [fce_constraint, fhir_constraint],
         [fce_unit_option, fhir_unit_option],
         [fce_variable, fhir_variable],
+        [fce_sub_questionnaire, fhir_sub_questionnaire],
     ])('Each FCE Questionnaire should convert to FHIR', async (fce_questionnaire, fhir_questionnaire) => {
         expect(sortExtensionsList(fromFirstClassExtension(fce_questionnaire as FCEQuestionnaire))).toStrictEqual(
             sortExtensionsList(fhir_questionnaire),

src/converter/__tests__/resources/questionnaire_fce/sub-questionnaire.json

@@ -0,0 +1,22 @@
+{
+    "subjectType": ["Encounter", "Patient"],
+    "meta": {
+        "profile": ["https://emr-core.beda.software/StructureDefinition/fhir-emr-questionnaire"],
+        "lastUpdated": "2023-04-10T03:43:34.792167Z",
+        "versionId": "694"
+    },
+    "name": "SubQuestionnaire",
+    "item": [
+        {
+            "text": "SubQuestionnaire",
+            "type": "group",
+            "linkId": "sub-questionnaire",
+            "subQuestionnaire": "allergies"
+        }
+    ],
+    "assembledFrom": "sub-questionnaire",
+    "resourceType": "Questionnaire",
+    "status": "active",
+    "id": "sub-questionnaire",
+    "url": "https://aidbox.emr.beda.software/ui/console#/entities/Questionnaire/sub-questionnaire"
+}

src/converter/__tests__/resources/questionnaire_fhir/sub-questionnaire.json

@@ -0,0 +1,32 @@
+{
+    "subjectType": ["Encounter", "Patient"],
+    "meta": {
+        "profile": ["https://emr-core.beda.software/StructureDefinition/fhir-emr-questionnaire"],
+        "lastUpdated": "2023-04-10T03:43:34.792167Z",
+        "versionId": "694"
+    },
+    "name": "SubQuestionnaire",
+    "item": [
+        {
+            "text": "SubQuestionnaire",
+            "type": "group",
+            "extension": [
+                {
+                    "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
+                    "valueCanonical": "allergies"
+                }
+            ],
+            "linkId": "sub-questionnaire"
+        }
+    ],
+    "resourceType": "Questionnaire",
+    "extension": [
+        {
+            "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
+            "valueCanonical": "sub-questionnaire"
+        }
+    ],
+    "status": "active",
+    "id": "sub-questionnaire",
+    "url": "https://aidbox.emr.beda.software/ui/console#/entities/Questionnaire/sub-questionnaire"
+}

src/converter/extensions.ts

@@ -90,6 +90,9 @@ export const extensionTransformers: ExtensionTransformer = {
     [ExtensionIdentifier.ColsNumber]: {
         path: { extension: 'valueInteger', questionnaire: 'colsNumber' },
     },
+    [ExtensionIdentifier.SubQuestionnaire]: {
+        path: { extension: 'valueCanonical', questionnaire: 'subQuestionnaire' },
+    },
     [ExtensionIdentifier.ReferenceResource]: {
         transform: {
             fromExtensions: (extensions) => {
@@ -305,26 +308,4 @@ export const extensionTransformers: ExtensionTransformer = {
     [ExtensionIdentifier.Macro]: {
         path: { extension: 'valueString', questionnaire: 'macro' },
     },
-    [ExtensionIdentifier.SubQuestionnaire]: {
-        transform: {
-            fromExtensions: (extensions) => ({ subQuestionnaire: extensions[0]!.valueCanonical }),
-            toExtensions: (item) => {
-                if (item.subQuestionnaire) {
-                    return [
-                        {
-                            url: ExtensionIdentifier.SubQuestionnaire,
-                            extension: [
-                                {
-                                    url: ExtensionIdentifier.SubQuestionnaire,
-                                    valueCanonical: item.subQuestionnaire,
-                                },
-                            ],
-                        },
-                    ];
-                }
-
-                return [];
-            },
-        },
-    },
 };