Revert "Fix itemConstraint profile"

This reverts commit 87a3d36.
beda-software · Dec 5, 2024 · df3ef2d · df3ef2d
1 parent 500af67
commit df3ef2d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/sdc-qrf/src/converter/__tests__/resources/questionnaire_fce/constraint.json b/sdc-qrf/src/converter/__tests__/resources/questionnaire_fce/constraint.json
@@ -15,15 +15,16 @@
                     "requirements": "Req first",
                     "severity": "error",
                     "human": "Human first",
-                    "expression": { "language": "text/fhirpath", "expression": "false" }
+                    "expression": "false"
                 },
                 {
                     "key": "second",
                     "requirements": "Req second",
                     "severity": "error",
                     "human": "Human second",
-                    "expression": { "language": "text/fhirpath", "expression": "true" }
+                    "expression": "true"
                 }
+
             ]
         }
     ]

diff --git a/sdc-qrf/src/converter/__tests__/resources/questionnaire_fhir/constraint.json b/sdc-qrf/src/converter/__tests__/resources/questionnaire_fhir/constraint.json
@@ -21,7 +21,7 @@
                         },
                         {
                             "url": "expression",
-                            "valueExpression": { "language": "text/fhirpath", "expression": "false" }
+                            "valueString": "false"
                         },
                         {
                             "url": "requirements",
@@ -46,7 +46,7 @@
                         },
                         {
                             "url": "expression",
-                            "valueExpression": { "language": "text/fhirpath", "expression": "true" }
+                            "valueString": "true"
                         },
                         {
                             "url": "requirements",

diff --git a/sdc-qrf/src/converter/extensions.ts b/sdc-qrf/src/converter/extensions.ts
@@ -195,7 +195,7 @@ export const extensionTransformers: ExtensionTransformer = {
                                 .valueString!,
                             expression: itemConstraintExtension.find(
                                 (obj) => obj.url === 'expression',
-                            )!.valueExpression!,
+                            )!.valueString!,
                         };
                     }),
                 };
@@ -223,7 +223,7 @@ export const extensionTransformers: ExtensionTransformer = {
                             },
                             {
                                 url: 'expression',
-                                valueExpression: itemConstraint.expression,
+                                valueString: itemConstraint.expression,
                             },
                         ],
                     }));

diff --git a/shared/src/contrib/aidbox/index.ts b/shared/src/contrib/aidbox/index.ts
@@ -14514,7 +14514,7 @@ export interface QuestionnaireItemChoiceColumn {
 
 export interface QuestionnaireItemConstraint {
     /** NOTE: from extension expression */
-    expression: Expression;
+    expression: string;
     /** NOTE: from extension human */
     human: string;
     /** NOTE: from extension key */