-
Notifications
You must be signed in to change notification settings - Fork 357
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.
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
chore: align fetching a single vs multiple TEs more DHIS2-18541 #19647
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
teleivo
force-pushed
the
DHIS2-18541-pre
branch
from
January 13, 2025 14:16
66f913c
to
5218c20
Compare
teleivo
requested review from
enricocolasante
and removed request for
enricocolasante
January 13, 2025 14:25
teleivo
force-pushed
the
DHIS2-18541-pre
branch
from
January 14, 2025 12:02
5218c20
to
c045e2f
Compare
teleivo
changed the title
chore: align fetching a single vs multiple TEs more
chore: align fetching a single vs multiple TEs more DHIS2-18541
Jan 14, 2025
teleivo
force-pushed
the
DHIS2-18541-pre
branch
from
January 15, 2025 08:56
0100cb9
to
40cfd4a
Compare
teleivo
force-pushed
the
DHIS2-18541-pre
branch
from
January 15, 2025 10:29
ec48ed8
to
276aebf
Compare
...er/src/main/java/org/hisp/dhis/tracker/export/trackedentity/DefaultTrackedEntityService.java
Show resolved
Hide resolved
teleivo
force-pushed
the
DHIS2-18541-pre
branch
from
January 15, 2025 12:44
276aebf
to
3c5db77
Compare
enricocolasante
approved these changes
Jan 15, 2025
Quality Gate failedFailed conditions See analysis details on SonarQube Cloud Catch issues before they fail your Quality Gate with our IDE extension SonarQube for IDE |
This was referenced Jan 15, 2025
muilpp
reviewed
Jan 15, 2025
...er/src/main/java/org/hisp/dhis/tracker/export/trackedentity/DefaultTrackedEntityService.java
Show resolved
Hide resolved
muilpp
approved these changes
Jan 15, 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.
continuing on #19633
The goal is to ultimately use the same code to fetch a single vs multiple TEs. This PR makes another step towards that goal by
RelationshipItem
sTrackedEntityAttributeValue
s./trackedEntities?program=uid
returned all TEAV so far while/trackedEntities/uid?program=uid
only returned TET+program specific TEAV. That behavior was introduced only to/trackedEntities/uid?program=uid
in fix: Return TEA from specified program only [DHIS2-14300] #17572misc
set
and those that map withmap
Open question
https://github.com/dhis2/dhis2-core/pull/19647/files#diff-069b27403f4f267ecb5e14378a2e9c32d339e92acb494e688b821df93de33acbL323-L326
was only applied to relationships of the TE and only on
/trackedEntities/uid
. Should this be applied to all relationships like for exampleTE.enrollments.relationships
? Note theTrackedEntityAggregate
store does not fetch relationships. So relationships are fetched in loops per tracked entity.Next
/trackedEntities/uid
vs/trackedEntities
setCollections
should be applied to both paths.All but the two if statements are already applied with this PR. Adding them makes more tests fail which I'll fix separately.