fix: Use createdAt as secundary sorting param [DHIS2-18093] #18736
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
enricocolasante
force-pushed
the
DHIS2-18093-to-backport
branch
from
524b69a to
1024c8c
Compare
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
...cker/src/main/java/org/hisp/dhis/tracker/imports/converter/EventTrackerConverterService.java
Dismissed
Show dismissed
Hide dismissed
enricocolasante
force-pushed
the
DHIS2-18093-to-backport
branch
2 times, most recently
from
ff7eec0 to
b8f4bcb
Compare
teleivo
approved these changes
Oct 4, 2024
enricocolasante
force-pushed
the
DHIS2-18093-to-backport
branch
from
b8f4bcb to
77d421c
Compare
|
enricocolasante
added a commit
that referenced
this pull request
Oct 4, 2024
enricocolasante
added a commit
that referenced
this pull request
Oct 7, 2024
enricocolasante
added a commit
that referenced
this pull request
Oct 7, 2024
This was referenced Oct 16, 2024
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.
Upgrade rule-engine library and change mapping to rule-engine model in order to comply with API changes.
createdDatefield. Here that is fixed hardcoding the rightcreatedDatecoming from the preheat event if it is an UPDATE. If it is a CREATE, everything works fine.A more comprehensive fix will come later as this PR needs to be backported and it is enough to fix the issue.
Next steps
There are too many mappings between models and some logic is not correct. These mappings were necessary before, when rule-engine logic was in a different module, now we can just directly mapping from our tracker model (
org.hisp.dhis.tracker.imports.domain) to rule-engine model (org.hisp.dhis.rules.models) without passing through API model (org.hisp.dhis.program) .