fix: Use correct value type for dates [DHIS2-15891]

dhis2 · Dec 23, 2024 · 8994518 · 8994518
1 parent efccebc
commit 8994518
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 48 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,7 +9,7 @@ repositories {
     maven { url = uri("https://oss.sonatype.org/content/repositories/snapshots") }
 }
 
-version = "3.2.1-SNAPSHOT"
+version = "3.2.2-SNAPSHOT"
 group = "org.hisp.dhis.rules"
 
 if (project.hasProperty("removeSnapshotSuffix")) {

diff --git a/src/commonMain/kotlin/org/hisp/dhis/rules/engine/RuleVariableValueMapBuilder.kt b/src/commonMain/kotlin/org/hisp/dhis/rules/engine/RuleVariableValueMapBuilder.kt
@@ -103,7 +103,7 @@ internal class RuleVariableValueMapBuilder {
         val valueMap: MutableMap<String, RuleVariableValue> = HashMap()
         valueMap[RuleEngineUtils.ENV_VAR_CURRENT_DATE] =
             RuleVariableValue(
-                RuleValueType.TEXT,
+                RuleValueType.DATE,
                 currentDate.toString(),
                 listOf(currentDate.toString()),
                 currentDate.toString(),
@@ -140,7 +140,7 @@ internal class RuleVariableValueMapBuilder {
                 .toString()
         valueMap[RuleEngineUtils.ENV_VAR_EVENT_DATE] =
             RuleVariableValue(
-                RuleValueType.TEXT,
+                RuleValueType.DATE,
                 eventDate,
                 listOf(eventDate),
                 currentDate.toString(),
@@ -149,7 +149,7 @@ internal class RuleVariableValueMapBuilder {
             val dueDate = ruleEvent.dueDate
             valueMap[RuleEngineUtils.ENV_VAR_DUE_DATE] =
                 RuleVariableValue(
-                    RuleValueType.TEXT,
+                    RuleValueType.DATE,
                     dueDate.toString(),
                     listOf(dueDate.toString()),
                     currentDate.toString(),
@@ -159,7 +159,7 @@ internal class RuleVariableValueMapBuilder {
             val completedDate = ruleEvent.completedDate
             valueMap[RuleEngineUtils.ENV_VAR_COMPLETED_DATE] =
                 RuleVariableValue(
-                    RuleValueType.TEXT,
+                    RuleValueType.DATE,
                     completedDate.toString(),
                     listOf(completedDate.toString()),
                     currentDate.toString(),
@@ -231,15 +231,15 @@ internal class RuleVariableValueMapBuilder {
         val enrollmentDate = ruleEnrollment.enrollmentDate
         valueMap[RuleEngineUtils.ENV_VAR_ENROLLMENT_DATE] =
             RuleVariableValue(
-                RuleValueType.TEXT,
+                RuleValueType.DATE,
                 enrollmentDate.toString(),
                 listOf(enrollmentDate.toString()),
                 currentDate.toString(),
             )
         val incidentDate = ruleEnrollment.incidentDate
         valueMap[RuleEngineUtils.ENV_VAR_INCIDENT_DATE] =
             RuleVariableValue(
-                RuleValueType.TEXT,
+                RuleValueType.DATE,
                 incidentDate.toString(),
                 listOf(incidentDate.toString()),
                 currentDate.toString(),