Skip to content

fix: d2:hasValue to handle null [DHIS2-18621] #76

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

Merged
merged 4 commits into from
Feb 19, 2025
Merged

fix: d2:hasValue to handle null [DHIS2-18621] #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b01b6b7
fix: d2:hasValue to handle null [DHIS2-18621]
zubaira Feb 18, 2025
f1c14a3
remove error message
zubaira Feb 18, 2025
55900e8
Update build.gradle.kts
zubaira Feb 18, 2025
6928c4f
Merge branch 'main' into DHIS2-18621
zubaira Feb 18, 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
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ repositories {
mavenCentral()
}

version = "1.1.7-SNAPSHOT"
version = "1.1.8-SNAPSHOT"
group = "org.hisp.dhis.lib.expression"

if (project.hasProperty("removeSnapshotSuffix")) {
Expand Down
6 changes: 5 additions & 1 deletion src/commonMain/kotlin/org/hisp/dhis/lib/expression/eval/Calculator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,11 @@ internal class Calculator(
NamedFunction.d2_hasUserRole -> functions.d2_hasUserRole(
evalToString(fn.child(0)),
data.supplementaryValues["USER"])
NamedFunction.d2_hasValue -> functions.d2_hasValue(evalToVar(fn.child(0)))
NamedFunction.d2_hasValue -> try {
functions.d2_hasValue(evalToVar(fn.child(0)))
} catch (e: IllegalExpressionException) {
false
}
NamedFunction.d2_inOrgUnitGroup -> functions.d2_inOrgUnitGroup(
evalToString(fn.child(0)),
data.programRuleVariableValues["org_unit"],
Expand Down
9 changes: 8 additions & 1 deletion src/commonTest/kotlin/org/hisp/dhis/lib/expression/function/HasValueTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,17 @@ import kotlin.test.assertEquals
*/
internal class HasValueTest : AbstractVariableBasedTest() {
@Test
fun return_false_for_non_existing_variable() {
fun return_false_for_non_existing_variable_with_UID() {
// 'nonexisting' is treated as valid UID
assertHasValue("d2:hasValue(#{nonexisting})", mapOf(), false)
}

@Test
fun return_false_for_non_existing_variable_with_name() {
assertHasValue("d2:hasValue(#{variable-name})", mapOf(), false)
}


@Test
fun return_false_for_existing_variable_without_value() {
assertHasValue(
Expand Down
Loading