fix: Get environment from expected function

dhis2 · May 13, 2024 · 591ed11 · 591ed11
1 parent 84a66c0
commit 591ed11
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 5 deletions.
diff --git a/src/commonMain/kotlin/org/hisp/dhis/rules/Environment.kt b/src/commonMain/kotlin/org/hisp/dhis/rules/Environment.kt
@@ -0,0 +1,3 @@
+package org.hisp.dhis.rules
+
+expect fun getEnvironment(): String
diff --git a/src/commonMain/kotlin/org/hisp/dhis/rules/engine/DefaultRuleEngine.kt b/src/commonMain/kotlin/org/hisp/dhis/rules/engine/DefaultRuleEngine.kt
@@ -8,14 +8,15 @@ import org.hisp.dhis.lib.expression.spi.ValueType
 import org.hisp.dhis.rules.api.DataItem
 import org.hisp.dhis.rules.api.RuleEngine
 import org.hisp.dhis.rules.api.RuleEngineContext
+import org.hisp.dhis.rules.getEnvironment
 import org.hisp.dhis.rules.models.*
 
 internal class DefaultRuleEngine: RuleEngine {
     override fun evaluate(target: RuleEvent, ruleEnrollment: RuleEnrollment?, ruleEvents: List<RuleEvent>, executionContext: RuleEngineContext): List<RuleEffect> {
         val valueMap = RuleVariableValueMapBuilder.target(target)
             .ruleVariables(executionContext.ruleVariables)
             .ruleEnrollment(ruleEnrollment)
-            .triggerEnvironment(TriggerEnvironment.SERVER)
+            .triggerEnvironment(TriggerEnvironment.valueOf(getEnvironment()))
             .ruleEvents(ruleEvents)
             .constantValueMap(executionContext.constantsValues)
             .build()
@@ -28,7 +29,7 @@ internal class DefaultRuleEngine: RuleEngine {
     override fun evaluate(target: RuleEnrollment, ruleEvents: List<RuleEvent>, executionContext: RuleEngineContext): List<RuleEffect> {
         val valueMap = RuleVariableValueMapBuilder.target(target)
                 .ruleVariables(executionContext.ruleVariables)
-                .triggerEnvironment(TriggerEnvironment.SERVER)
+                .triggerEnvironment(TriggerEnvironment.valueOf(getEnvironment()))
                 .ruleEvents(ruleEvents)
                 .constantValueMap(executionContext.constantsValues)
                 .build()
@@ -42,7 +43,7 @@ internal class DefaultRuleEngine: RuleEngine {
         val valueMap = RuleVariableValueMapBuilder.target()
                 .ruleVariables(executionContext.ruleVariables)
                 .ruleEnrollment(enrollmentTarget)
-                .triggerEnvironment(TriggerEnvironment.SERVER)
+                .triggerEnvironment(TriggerEnvironment.valueOf(getEnvironment()))
                 .ruleEvents(eventsTarget)
                 .constantValueMap(executionContext.constantsValues)
                 .multipleBuild()

diff --git a/src/commonMain/kotlin/org/hisp/dhis/rules/models/TriggerEnvironment.kt b/src/commonMain/kotlin/org/hisp/dhis/rules/models/TriggerEnvironment.kt
@@ -1,4 +1,7 @@
 package org.hisp.dhis.rules.models
+
+import kotlin.js.JsExport
+
 /*
  * Copyright (c) 2004-2018, University of Oslo
  * All rights reserved.
@@ -30,8 +33,10 @@ package org.hisp.dhis.rules.models
 /**
  * @author Zubair Asghar.
  */
+@JsExport
 enum class TriggerEnvironment(val clientName: String) {
     ANDROIDCLIENT("AndroidClient"),
-    SERVER("Server")
+    SERVER("Server"),
+    WEBCLIENT("WebClient")
 
 }
diff --git a/src/commonTest/kotlin/org/hisp/dhis/rules/ProgramRuleVariableTest.kt b/src/commonTest/kotlin/org/hisp/dhis/rules/ProgramRuleVariableTest.kt
@@ -89,7 +89,7 @@ class ProgramRuleVariableTest {
     fun testEnvironmentProgramVariableIsAssigned() {
         val rule = getRule("V{environment}")
         val ruleEffects = callEnrollmentRuleEngine(rule)
-        assertProgramRuleVariableAssignment(ruleEffects, rule, "Server")
+        assertProgramRuleVariableAssignment(ruleEffects, rule, TriggerEnvironment.valueOf(getEnvironment()).clientName)
     }
 
     @Test

diff --git a/src/jsMain/kotlin/org/hisp/dhis/rules/Environment.js.kt b/src/jsMain/kotlin/org/hisp/dhis/rules/Environment.js.kt
@@ -0,0 +1,5 @@
+package org.hisp.dhis.rules
+
+actual fun getEnvironment(): String {
+    return "WEBCLIENT"
+}
diff --git a/src/jvmMain/kotlin/org/hisp/dhis/rules/Environment.jvm.kt b/src/jvmMain/kotlin/org/hisp/dhis/rules/Environment.jvm.kt
@@ -0,0 +1,5 @@
+package org.hisp.dhis.rules
+
+actual fun getEnvironment(): String {
+    return "SERVER"
+}
diff --git a/src/nativeMain/kotlin/org/hisp/dhis/rules/Environment.native.kt b/src/nativeMain/kotlin/org/hisp/dhis/rules/Environment.native.kt
@@ -0,0 +1,5 @@
+package org.hisp.dhis.rules
+
+actual fun getEnvironment(): String {
+    return "ANDROIDCLIENT"
+}