Use ExpressionEvaluator to evaluate cqf-calculatedValue expressions

google · Nov 2, 2023 · 6ae9c5e · 6ae9c5e
1 parent c26f654
commit 6ae9c5e
Show file tree

Hide file tree

Showing 18 changed files with 167 additions and 30 deletions.
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
@@ -717,7 +717,10 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
         QuestionnaireResponseItemValidator.validate(
           questionnaireItem,
           questionnaireResponseItem.answer,
-          this@QuestionnaireViewModel.getApplication(),
+          expressionEvaluator = {
+            expressionEvaluator.evaluateExpression(questionnaireItem, questionnaireResponseItem, it)
+          },
+          context = this@QuestionnaireViewModel.getApplication(),
         )
       } else {
         NotValidated
@@ -761,6 +764,13 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
                     questionnaireResponseItem,
                   )
               },
+            expressionEvaluator = {
+              expressionEvaluator.evaluateExpression(
+                questionnaireItem,
+                questionnaireResponseItem,
+                it,
+              )
+            },
             questionViewTextConfiguration =
               QuestionTextConfiguration(
                 showAsterisk = showAsterisk,

diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreTypes.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreTypes.kt
@@ -23,6 +23,7 @@ import com.google.android.fhir.datacapture.views.factories.localDate
 import com.google.android.fhir.datacapture.views.factories.localTime
 import com.google.android.fhir.getLocalizedText
 import org.hl7.fhir.r4.model.Attachment
+import org.hl7.fhir.r4.model.Base
 import org.hl7.fhir.r4.model.BooleanType
 import org.hl7.fhir.r4.model.CodeType
 import org.hl7.fhir.r4.model.Coding
@@ -124,13 +125,16 @@ internal fun Coding.toCodeType(): CodeType {
   return CodeType(code)
 }
 
-fun Type.valueOrCalculateValue(): Type {
+fun Type.valueOrCalculateValue(
+  expressionEvaluator: (Expression) -> List<Base> = {
+    fhirPathEngine.evaluate(this, it.expression)
+  },
+): Type {
   return if (this.hasExtension()) {
     this.extension
       .firstOrNull { it.url == EXTENSION_CQF_CALCULATED_VALUE_URL }
       ?.let { extension ->
-        val expression = (extension.value as Expression).expression
-        fhirPathEngine.evaluate(this, expression).singleOrNull()?.let { it as Type }
+        expressionEvaluator.invoke(extension.value as Expression).singleOrNull()?.let { it as Type }
       }
       ?: this
   } else {

diff --git a/...src/main/java/com/google/android/fhir/datacapture/validation/AnswerConstraintValidator.kt b/...src/main/java/com/google/android/fhir/datacapture/validation/AnswerConstraintValidator.kt
@@ -17,6 +17,8 @@
 package com.google.android.fhir.datacapture.validation
 
 import android.content.Context
+import org.hl7.fhir.r4.model.Base
+import org.hl7.fhir.r4.model.Expression
 import org.hl7.fhir.r4.model.Questionnaire
 import org.hl7.fhir.r4.model.QuestionnaireResponse
 
@@ -38,6 +40,7 @@ internal interface AnswerConstraintValidator {
   fun validate(
     questionnaireItem: Questionnaire.QuestionnaireItemComponent,
     answer: QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent,
+    expressionEvaluator: (Expression) -> List<Base>,
     context: Context,
   ): Result
 

diff --git a/...java/com/google/android/fhir/datacapture/validation/AnswerExtensionConstraintValidator.kt b/...java/com/google/android/fhir/datacapture/validation/AnswerExtensionConstraintValidator.kt
@@ -17,6 +17,8 @@
 package com.google.android.fhir.datacapture.validation
 
 import android.content.Context
+import org.hl7.fhir.r4.model.Base
+import org.hl7.fhir.r4.model.Expression
 import org.hl7.fhir.r4.model.Extension
 import org.hl7.fhir.r4.model.Questionnaire
 import org.hl7.fhir.r4.model.QuestionnaireResponse
@@ -35,17 +37,22 @@ import org.hl7.fhir.r4.model.QuestionnaireResponse
 internal open class AnswerExtensionConstraintValidator(
   val url: String,
   val predicate:
-    (Extension, QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent) -> Boolean,
+    (
+      Extension,
+      QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent,
+      expressionEvaluator: (Expression) -> List<Base>,
+    ) -> Boolean,
   val messageGenerator: (Extension, Context) -> String,
 ) : AnswerConstraintValidator {
   override fun validate(
     questionnaireItem: Questionnaire.QuestionnaireItemComponent,
     answer: QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent,
+    expressionEvaluator: (Expression) -> List<Base>,
     context: Context,
   ): AnswerConstraintValidator.Result {
     if (questionnaireItem.hasExtension(url)) {
       val extension = questionnaireItem.getExtensionByUrl(url)
-      if (predicate(extension, answer)) {
+      if (predicate(extension, answer, expressionEvaluator)) {
         return AnswerConstraintValidator.Result(false, messageGenerator(extension, context))
       }
     }

diff --git a/...src/main/java/com/google/android/fhir/datacapture/validation/MaxDecimalPlacesValidator.kt b/...src/main/java/com/google/android/fhir/datacapture/validation/MaxDecimalPlacesValidator.kt
@@ -25,6 +25,8 @@ package com.google.android.fhir.datacapture.validation
  */
 import android.content.Context
 import com.google.android.fhir.datacapture.R
+import org.hl7.fhir.r4.model.Base
+import org.hl7.fhir.r4.model.Expression
 import org.hl7.fhir.r4.model.Extension
 import org.hl7.fhir.r4.model.IntegerType
 import org.hl7.fhir.r4.model.QuestionnaireResponse
@@ -35,6 +37,7 @@ internal object MaxDecimalPlacesValidator :
     predicate = {
       extension: Extension,
       answer: QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent,
+      _: (Expression) -> List<Base>,
       ->
       val maxDecimalPlaces = (extension.value as? IntegerType)?.value
       answer.hasValueDecimalType() &&

diff --git a/...apture/src/main/java/com/google/android/fhir/datacapture/validation/MaxLengthValidator.kt b/...apture/src/main/java/com/google/android/fhir/datacapture/validation/MaxLengthValidator.kt
@@ -18,6 +18,8 @@ package com.google.android.fhir.datacapture.validation
 
 import android.content.Context
 import com.google.android.fhir.datacapture.extensions.asStringValue
+import org.hl7.fhir.r4.model.Base
+import org.hl7.fhir.r4.model.Expression
 import org.hl7.fhir.r4.model.Questionnaire
 import org.hl7.fhir.r4.model.QuestionnaireResponse
 
@@ -31,6 +33,7 @@ internal object MaxLengthValidator : AnswerConstraintValidator {
   override fun validate(
     questionnaireItem: Questionnaire.QuestionnaireItemComponent,
     answer: QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent,
+    expressionEvaluator: (Expression) -> List<Base>,
     context: Context,
   ): AnswerConstraintValidator.Result {
     if (

diff --git a/...capture/src/main/java/com/google/android/fhir/datacapture/validation/MaxValueValidator.kt b/...capture/src/main/java/com/google/android/fhir/datacapture/validation/MaxValueValidator.kt
@@ -21,6 +21,8 @@ import com.google.android.fhir.compareTo
 import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.extensions.getValueAsString
 import com.google.android.fhir.datacapture.extensions.valueOrCalculateValue
+import org.hl7.fhir.r4.model.Base
+import org.hl7.fhir.r4.model.Expression
 import org.hl7.fhir.r4.model.Extension
 import org.hl7.fhir.r4.model.Questionnaire
 import org.hl7.fhir.r4.model.QuestionnaireResponse
@@ -35,8 +37,9 @@ internal object MaxValueValidator :
     predicate = {
       extension: Extension,
       answer: QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent,
+      expressionEvaluator: (Expression) -> List<Base>,
       ->
-      answer.value > extension.value?.valueOrCalculateValue()!!
+      answer.value > extension.value?.valueOrCalculateValue(expressionEvaluator)!!
     },
     messageGenerator = { extension: Extension, context: Context ->
       context.getString(
@@ -46,9 +49,12 @@ internal object MaxValueValidator :
     },
   ) {
 
-  fun getMaxValue(questionnaireItemComponent: Questionnaire.QuestionnaireItemComponent): Type? {
+  fun getMaxValue(
+    expressionEvaluator: (Expression) -> List<Base>,
+    questionnaireItemComponent: Questionnaire.QuestionnaireItemComponent,
+  ): Type? {
     return questionnaireItemComponent.extension
       .firstOrNull { it.url == MAX_VALUE_EXTENSION_URL }
-      ?.let { it.value?.valueOrCalculateValue() }
+      ?.let { it.value?.valueOrCalculateValue(expressionEvaluator) }
   }
 }
diff --git a/...apture/src/main/java/com/google/android/fhir/datacapture/validation/MinLengthValidator.kt b/...apture/src/main/java/com/google/android/fhir/datacapture/validation/MinLengthValidator.kt
@@ -37,7 +37,7 @@ import org.hl7.fhir.r4.model.PrimitiveType
 internal object MinLengthValidator :
   AnswerExtensionConstraintValidator(
     url = MIN_LENGTH_EXTENSION_URL,
-    predicate = { extension, answer ->
+    predicate = { extension, answer, _ ->
       answer.value.isPrimitive &&
         (answer.value as PrimitiveType<*>).asStringValue().length <
           (extension.value as IntegerType).value

diff --git a/...capture/src/main/java/com/google/android/fhir/datacapture/validation/MinValueValidator.kt b/...capture/src/main/java/com/google/android/fhir/datacapture/validation/MinValueValidator.kt
@@ -21,6 +21,8 @@ import com.google.android.fhir.compareTo
 import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.extensions.getValueAsString
 import com.google.android.fhir.datacapture.extensions.valueOrCalculateValue
+import org.hl7.fhir.r4.model.Base
+import org.hl7.fhir.r4.model.Expression
 import org.hl7.fhir.r4.model.Extension
 import org.hl7.fhir.r4.model.Questionnaire
 import org.hl7.fhir.r4.model.QuestionnaireResponse
@@ -35,8 +37,9 @@ internal object MinValueValidator :
     predicate = {
       extension: Extension,
       answer: QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent,
+      expressionEvaluator: (Expression) -> List<Base>,
       ->
-      answer.value < extension.value?.valueOrCalculateValue()!!
+      answer.value < extension.value?.valueOrCalculateValue(expressionEvaluator)!!
     },
     messageGenerator = { extension: Extension, context: Context ->
       context.getString(
@@ -47,10 +50,11 @@ internal object MinValueValidator :
   ) {
 
   internal fun getMinValue(
+    expressionEvaluator: (Expression) -> List<Base>,
     questionnaireItemComponent: Questionnaire.QuestionnaireItemComponent,
   ): Type? {
     return questionnaireItemComponent.extension
       .firstOrNull { it.url == MIN_VALUE_EXTENSION_URL }
-      ?.let { it.value?.valueOrCalculateValue() }
+      ?.let { it.value?.valueOrCalculateValue(expressionEvaluator) }
   }
 }
diff --git a/...java/com/google/android/fhir/datacapture/validation/QuestionnaireResponseItemValidator.kt b/...java/com/google/android/fhir/datacapture/validation/QuestionnaireResponseItemValidator.kt
@@ -18,6 +18,8 @@ package com.google.android.fhir.datacapture.validation
 
 import android.content.Context
 import com.google.android.fhir.datacapture.extensions.isHidden
+import org.hl7.fhir.r4.model.Base
+import org.hl7.fhir.r4.model.Expression
 import org.hl7.fhir.r4.model.Questionnaire
 import org.hl7.fhir.r4.model.QuestionnaireResponse
 
@@ -44,6 +46,7 @@ internal object QuestionnaireResponseItemValidator {
   fun validate(
     questionnaireItem: Questionnaire.QuestionnaireItemComponent,
     answers: List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>,
+    expressionEvaluator: (Expression) -> List<Base>,
     context: Context,
   ): ValidationResult {
     if (questionnaireItem.isHidden) return NotValidated
@@ -54,7 +57,9 @@ internal object QuestionnaireResponseItemValidator {
       }
     val questionnaireResponseItemAnswerConstraintValidationResult =
       answerConstraintValidators.flatMap { validator ->
-        answers.map { answer -> validator.validate(questionnaireItem, answer, context) }
+        answers.map { answer ->
+          validator.validate(questionnaireItem, answer, expressionEvaluator, context)
+        }
       }
 
     return if (

diff --git a/...ain/java/com/google/android/fhir/datacapture/validation/QuestionnaireResponseValidator.kt b/...ain/java/com/google/android/fhir/datacapture/validation/QuestionnaireResponseValidator.kt
@@ -19,6 +19,9 @@ package com.google.android.fhir.datacapture.validation
 import android.content.Context
 import com.google.android.fhir.datacapture.enablement.EnablementEvaluator
 import com.google.android.fhir.datacapture.extensions.packRepeatedGroups
+import com.google.android.fhir.datacapture.fhirpath.ExpressionEvaluator
+import org.hl7.fhir.r4.model.Base
+import org.hl7.fhir.r4.model.Expression
 import org.hl7.fhir.r4.model.Questionnaire
 import org.hl7.fhir.r4.model.QuestionnaireResponse
 import org.hl7.fhir.r4.model.Resource
@@ -69,6 +72,13 @@ object QuestionnaireResponseValidator {
     }
 
     val linkIdToValidationResultMap = mutableMapOf<String, MutableList<ValidationResult>>()
+    val expressionEvaluator =
+      ExpressionEvaluator(
+        questionnaire,
+        questionnaireResponse,
+        questionnaireItemParentMap,
+        launchContextMap,
+      )
 
     validateQuestionnaireResponseItems(
       questionnaire.item,
@@ -80,6 +90,13 @@ object QuestionnaireResponseValidator {
         questionnaireItemParentMap,
         launchContextMap,
       ),
+      { questionnaireItemComponent, questionnaireResponseItemComponent, expression ->
+        expressionEvaluator.evaluateExpression(
+          questionnaireItemComponent,
+          questionnaireResponseItemComponent,
+          expression,
+        )
+      },
       linkIdToValidationResultMap,
     )
 
@@ -91,6 +108,12 @@ object QuestionnaireResponseValidator {
     questionnaireResponseItemList: List<QuestionnaireResponse.QuestionnaireResponseItemComponent>,
     context: Context,
     enablementEvaluator: EnablementEvaluator,
+    expressionEvaluator:
+      (
+        Questionnaire.QuestionnaireItemComponent,
+        QuestionnaireResponse.QuestionnaireResponseItemComponent,
+        Expression,
+      ) -> List<Base>,
     linkIdToValidationResultMap: MutableMap<String, MutableList<ValidationResult>>,
   ): Map<String, List<ValidationResult>> {
     val questionnaireItemListIterator = questionnaireItemList.iterator()
@@ -118,6 +141,13 @@ object QuestionnaireResponseValidator {
           questionnaireResponseItem,
           context,
           enablementEvaluator,
+          { questionnaireItemComponent, questionnaireResponseItemComponent, expression ->
+            expressionEvaluator.invoke(
+              questionnaireItemComponent,
+              questionnaireResponseItemComponent,
+              expression,
+            )
+          },
           linkIdToValidationResultMap,
         )
       }
@@ -130,6 +160,12 @@ object QuestionnaireResponseValidator {
     questionnaireResponseItem: QuestionnaireResponse.QuestionnaireResponseItemComponent,
     context: Context,
     enablementEvaluator: EnablementEvaluator,
+    expressionEvaluator:
+      (
+        Questionnaire.QuestionnaireItemComponent,
+        QuestionnaireResponse.QuestionnaireResponseItemComponent,
+        Expression,
+      ) -> List<Base>,
     linkIdToValidationResultMap: MutableMap<String, MutableList<ValidationResult>>,
   ): Map<String, List<ValidationResult>> {
     when (checkNotNull(questionnaireItem.type) { "Questionnaire item must have type" }) {
@@ -143,6 +179,7 @@ object QuestionnaireResponseValidator {
           questionnaireResponseItem.item,
           context,
           enablementEvaluator,
+          expressionEvaluator,
           linkIdToValidationResultMap,
         )
       else -> {
@@ -156,6 +193,7 @@ object QuestionnaireResponseValidator {
             it.item,
             context,
             enablementEvaluator,
+            expressionEvaluator,
             linkIdToValidationResultMap,
           )
         }
@@ -165,6 +203,7 @@ object QuestionnaireResponseValidator {
           QuestionnaireResponseItemValidator.validate(
             questionnaireItem,
             questionnaireResponseItem.answer,
+            { expressionEvaluator.invoke(questionnaireItem, questionnaireResponseItem, it) },
             context,
           ),
         )

diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/validation/RegexValidator.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/validation/RegexValidator.kt
@@ -21,6 +21,8 @@ import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.extensions.asStringValue
 import java.util.regex.Pattern
 import java.util.regex.PatternSyntaxException
+import org.hl7.fhir.r4.model.Base
+import org.hl7.fhir.r4.model.Expression
 import org.hl7.fhir.r4.model.Extension
 import org.hl7.fhir.r4.model.PrimitiveType
 import org.hl7.fhir.r4.model.QuestionnaireResponse
@@ -39,6 +41,7 @@ internal object RegexValidator :
       predicate@{
         extension: Extension,
         answer: QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent,
+        _: (Expression) -> List<Base>,
         ->
         if (!extension.value.isPrimitive || !answer.value.isPrimitive) {
           return@predicate false

diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireViewItem.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireViewItem.kt
@@ -26,6 +26,8 @@ import com.google.android.fhir.datacapture.extensions.toSpanned
 import com.google.android.fhir.datacapture.validation.NotValidated
 import com.google.android.fhir.datacapture.validation.Valid
 import com.google.android.fhir.datacapture.validation.ValidationResult
+import org.hl7.fhir.r4.model.Base
+import org.hl7.fhir.r4.model.Expression
 import org.hl7.fhir.r4.model.Questionnaire
 import org.hl7.fhir.r4.model.QuestionnaireResponse
 
@@ -72,6 +74,7 @@ data class QuestionnaireViewItem(
       List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>,
       Any?,
     ) -> Unit,
+  val expressionEvaluator: (expression: Expression) -> List<Base> = { emptyList() },
   val enabledAnswerOptions: List<Questionnaire.QuestionnaireItemAnswerOptionComponent> =
     questionnaireItem.answerOption.ifEmpty { emptyList() },
   val draftAnswer: Any? = null,