wip: evaluate decision with imported decision

camunda · Jun 27, 2023 · caf6088 · caf6088
1 parent f84fe71
commit caf6088
Show file tree

Hide file tree

Showing 6 changed files with 256 additions and 130 deletions.
diff --git a/src/main/scala/org/camunda/dmn/evaluation/DecisionEvaluator.scala b/src/main/scala/org/camunda/dmn/evaluation/DecisionEvaluator.scala
@@ -42,21 +42,37 @@ class DecisionEvaluator(
         evalRequiredKnowledge(decision.requiredBkms, context)
           .flatMap(functions => {
 
-            // todo: replace the hack to wrap the imported BKMs into a context, maybe move to the BKM evaluation logic
+            val isImported: ((String, Val)) => Boolean = {
+              case (name, _) => name.contains(".")
+            }
+
+            // todo: replace the hack to wrap the imported BKMs and decisions into a context, maybe move to the BKM evaluation logic
             val importedFunctions = functions
-              .filter { case (name, _) => name.contains(".") }
+              .filter(isImported)
               .map { case (name, function) =>
                 val Array(prefix: String, functionName: String) = name.split('.')
                 prefix -> ValContext(StaticContext(
                   variables = Map.empty,
                   functions = Map(functionName -> List(function))
                 ))
               }
+            val embeddedFunctions = functions.filterNot(isImported)
 
-            val embeddedFunctions = functions.filterNot { case (name, _) => name.contains(".") }
+            val importedDecisions = decisionResults
+              .filter(isImported)
+              .map { case (name, decisionResult) =>
+                val Array(prefix: String, decisionName: String) = name.split('.')
+                prefix -> ValContext(StaticContext(
+                  variables = Map(decisionName -> decisionResult),
+                  functions = Map.empty
+                ))
+              }
+            val embeddedDecisions = decisionResults.filterNot(isImported)
 
             val decisionEvaluationContext = context.copy(
-              variables = context.variables ++ decisionResults ++ embeddedFunctions ++ importedFunctions,
+              variables = context.variables
+                ++ embeddedDecisions ++ importedDecisions
+                ++ embeddedFunctions ++ importedFunctions,
               currentElement = decision)
 
             eval(decision.logic, decisionEvaluationContext)