fix: Get environment from expected function #134
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Balcan
approved these changes
May 13, 2024
vgarciabnz
reviewed
May 13, 2024
| package org.hisp.dhis.rules | ||
|
|
||
| actual fun getEnvironment(): String { | ||
| return "ANDROIDCLIENT" |
There was a problem hiding this comment.
This is not right, the Android client uses the JVM target. Native is for native builds (linux, ios, etc)
| @@ -0,0 +1,3 @@ | |||
| package org.hisp.dhis.rules | |||
|
|
|||
| expect fun getEnvironment(): String | |||
There was a problem hiding this comment.
The return type could directly be TriggerEnvironment to avoid the valueOf methods.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
TriggerEnvironmentis hardcoded toSERVERin rule-engine and this is an issue as it is used to calculate the value of theProgramRuleVariable#{environment}that can be used in expressions.This was always an issue between
ServerandAndroidbut not forWebas rule-engine wasn't a shared library.Now we need to make it work correctly.
In this PR, I created an expected function to calculate the correct environment that is implemented in all the different platforms
Js,JvmandNative.We cannot really assume the client from the
platformthey are using as a server can be implemented in JavaScript andJvmlibrary can be importer by Android.Next step could be to have the
TriggerEnvironmentas an optional value that if not defined will be set to the current environment?