Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Allow evaluate in progress events [DHIS2-18631] #145

Merged
merged 11 commits into from
Jan 27, 2025
+257 −81
Merged

fix: Allow evaluate in progress events [DHIS2-18631] #145

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2cc1265
fix: Allow evaluate in progress events [DHIS2-18631]
enricocolasante Dec 13, 2024
0a324eb
Bump version
enricocolasante Dec 13, 2024
26b1015
fix: Assing distant future date to events without date [DHIS2-18631]
enricocolasante Dec 16, 2024
593491c
Add null environment variables to map
enricocolasante Dec 18, 2024
929f60c
Merge remote-tracking branch 'origin/master' into DHIS2-18631
enricocolasante Dec 18, 2024
3df73fb
Add null environment variables to map
enricocolasante Dec 18, 2024
c611da6
Fix tests
enricocolasante Dec 18, 2024
eaad7ae
Add default value test
enricocolasante Dec 19, 2024
4c00a48
Merge remote-tracking branch 'origin/master' into DHIS2-18631
enricocolasante Jan 24, 2025
2f4c056
fix: Use eventDate as fallback for event_id variable
enricocolasante Jan 24, 2025
bf8014c
Fix review comments
enricocolasante Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add null environment variables to map
@enricocolasante
enricocolasante committed Dec 18, 2024
commit 3df73fbcffcf678b8e797b86321987a5d64d507d
48 changes: 17 additions & 31 deletions src/commonMain/kotlin/org/hisp/dhis/rules/engine/RuleVariableValueMapBuilder.kt
View file
Original file line number Diff line number Diff line change
@@ -135,49 +135,35 @@ internal class RuleVariableValueMapBuilder {
currentDate: LocalDate,
): Map<String, RuleVariableValue> {
val valueMap: MutableMap<String, RuleVariableValue> = HashMap()
if (ruleEvent.eventDate < Instant.DISTANT_FUTURE ){
val eventDate =
if (ruleEvent.eventDate < Instant.DISTANT_FUTURE )
ruleEvent.eventDate
.toLocalDateTime(TimeZone.currentSystemDefault())
.date
.toString()
else null
valueMap[RuleEngineUtils.ENV_VAR_EVENT_DATE] =
RuleVariableValue(
RuleValueType.TEXT,
eventDate,
listOf(eventDate),
if(eventDate == null) listOf() else listOf(eventDate),
currentDate.toString(),
)
} else {
valueMap[RuleEngineUtils.ENV_VAR_EVENT_DATE] =
RuleVariableValue(
RuleValueType.TEXT,
null,
listOf(),
currentDate.toString(),
);
}
if (ruleEvent.dueDate != null) {
val dueDate = ruleEvent.dueDate
valueMap[RuleEngineUtils.ENV_VAR_DUE_DATE] =
RuleVariableValue(
RuleValueType.TEXT,
dueDate.toString(),
listOf(dueDate.toString()),
currentDate.toString(),
)
}
if (ruleEvent.completedDate != null) {
val completedDate = ruleEvent.completedDate
valueMap[RuleEngineUtils.ENV_VAR_COMPLETED_DATE] =
RuleVariableValue(
RuleValueType.TEXT,
completedDate.toString(),
listOf(completedDate.toString()),
currentDate.toString(),
)
}

valueMap[RuleEngineUtils.ENV_VAR_DUE_DATE] =
RuleVariableValue(
RuleValueType.TEXT,
ruleEvent.dueDate?.toString(),
if(ruleEvent.dueDate == null) listOf() else listOf(ruleEvent.dueDate.toString()),
currentDate.toString(),
)
valueMap[RuleEngineUtils.ENV_VAR_COMPLETED_DATE] =
RuleVariableValue(
RuleValueType.TEXT,
ruleEvent.completedDate?.toString(),
if(ruleEvent.completedDate == null) listOf() else listOf(ruleEvent.completedDate.toString()),
currentDate.toString(),
)
val eventCount = ruleEvents.size.toString()
valueMap[RuleEngineUtils.ENV_VAR_EVENT_COUNT] =
RuleVariableValue(