feat: Filter events by existing data element [DHIS2-15954] #19760
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
approved these changes
Jan 24, 2025
teleivo
approved these changes
Jan 28, 2025
| EventQueryParams params = new EventQueryParams(); | ||
|
|
||
| params.orderBy(de1, SortDirection.ASC); | ||
|
|
||
| assertEquals(List.of(new Order(de1, SortDirection.ASC)), params.getOrder()); | ||
| assertEquals(Map.of(de1, List.of()), params.getDataElements()); | ||
| assertTrue(params.getDataElements().isEmpty()); |
There was a problem hiding this comment.
this is a Map, not a Collection, that's why I didn't use it
I didn't deem it necessary to create a helper method for this one
...es/dhis-service-tracker/src/main/java/org/hisp/dhis/tracker/export/event/JdbcEventStore.java
Show resolved
Hide resolved
...es/dhis-service-tracker/src/main/java/org/hisp/dhis/tracker/export/event/JdbcEventStore.java
Outdated
Show resolved
Hide resolved
...his-test-integration/src/test/java/org/hisp/dhis/tracker/export/event/EventExporterTest.java
Outdated
Show resolved
Hide resolved
|
This was referenced Jan 29, 2025
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.
Part 1
Requesting events with a filter like
filter={DE_UID}doesn't work as expected, events are returned regardless of the DEs they contain. This PR aims to fix this issue.The DEs are stored in a map that uses the UID as the key and a
List<QueryFilter>as the value. In this case, the value list is always empty. The issue is that this map is also used when sorting. Even though the DEs are present in the order list, we are still using the DE map to add fields to the select clause.I am changing this in favor of the same approach we use when sorting TEAs, using the order list to add any DE to the select statement.
Next
This fix will allow users to filter for events containing a value in a given DE.
The next PR will enable filtering for events not containing a value in a given DE.