fix: IN filter now works with org units data elements [DHIS2-18845] #19727
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
Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com>
Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com>
Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com>
Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com>
… into DHIS2-18845_IN_with_ORG_UNIT_DE
gnespolino
requested review from
luciano-fiandesio,
larshelge and
maikelarabori
Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com>
|
maikelarabori
approved these changes
Jan 20, 2025
...-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DimensionalObjectProvider.java
Show resolved
Hide resolved
luciano-fiandesio
approved these changes
Jan 22, 2025
gnespolino
added a commit
that referenced
this pull request
Jan 22, 2025
…19727) * fix: quotes ouIds for IN filter, resolve ou uids [DHIS2-18845] Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com> * test: added e2e test [DHIS2-18845] Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com> * fix: quotes ouIds for IN filter, resolve ou uids [DHIS2-18845] Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com> * test: added e2e test [DHIS2-18845] Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com> * test: added e2e test [DHIS2-18845] Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com> --------- Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com> (cherry picked from commit d2c87f6)
gnespolino
added a commit
that referenced
this pull request
Jan 22, 2025
…19727) * fix: quotes ouIds for IN filter, resolve ou uids [DHIS2-18845] Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com> * test: added e2e test [DHIS2-18845] Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com> * fix: quotes ouIds for IN filter, resolve ou uids [DHIS2-18845] Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com> * test: added e2e test [DHIS2-18845] Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com> * test: added e2e test [DHIS2-18845] Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com> --------- Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com> (cherry picked from commit d2c87f6) Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com>
gnespolino
added a commit
that referenced
this pull request
Jan 24, 2025
…2.40] (#19745) * fix: IN filter now works with org units data elements [DHIS2-18845] (#19727) * fix: quotes ouIds for IN filter, resolve ou uids [DHIS2-18845] Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com> * test: added e2e test [DHIS2-18845] Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com> * fix: quotes ouIds for IN filter, resolve ou uids [DHIS2-18845] Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com> * test: added e2e test [DHIS2-18845] Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com> * test: added e2e test [DHIS2-18845] Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com> --------- Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com> (cherry picked from commit d2c87f6) Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com> * fix: conflicts [DHIS2-18845] Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com> * fix: e2e [DHIS2-18845] Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com> --------- Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com>
gnespolino
added a commit
that referenced
this pull request
Jan 24, 2025
…19727) (#19744) * fix: quotes ouIds for IN filter, resolve ou uids [DHIS2-18845] Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com> * test: added e2e test [DHIS2-18845] Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com> * fix: quotes ouIds for IN filter, resolve ou uids [DHIS2-18845] Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com> * test: added e2e test [DHIS2-18845] Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com> * test: added e2e test [DHIS2-18845] Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com> --------- Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com> (cherry picked from commit d2c87f6) Co-authored-by: Maikel Arabori <51713408+maikelarabori@users.noreply.github.com>
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.
This pull request will fix a small bug with IN query operator, making it properly quotes values when needed (it was only quoting
TEXTvalue types before).Moreover, it will properly support Data Elements of type ORG_UNIT, by replacing the filter values with org unit UIDs when needed