chore: use EnrollmentService in TE service to get enrollements/events DHIS2-18541 #19723
+406
−1,364
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-uid-enrollmentservice
branch
8 times, most recently
from
eaf76a3 to
c69131d
Compare
enricocolasante
approved these changes
Jan 21, 2025
muilpp
approved these changes
Jan 22, 2025
to get enrollments on /trackedEntities/{uid}?fields=enrollment
chore: wire ids and uids through
chore: use enrollment service in TE aggregate
as these are fetched by the EN service
teleivo
force-pushed
the
DHIS2-18541-uid-enrollmentservice
branch
from
a300de2 to
6aa9c8a
Compare
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
...rvices/dhis-service-tracker/src/main/java/org/hisp/dhis/tracker/export/EnrollmentMapper.java
Fixed
Show fixed
Hide fixed
...is-services/dhis-service-tracker/src/main/java/org/hisp/dhis/tracker/export/EventMapper.java
Fixed
Show fixed
Hide fixed
...ces/dhis-service-tracker/src/main/java/org/hisp/dhis/tracker/export/TrackedEntityMapper.java
Fixed
Show fixed
Hide fixed
|
| @Mapping(target = "createdByUserInfo") | ||
| @Mapping(target = "lastUpdatedByUserInfo") | ||
| @Mapping(target = "status") | ||
| Enrollment map(Enrollment enrollment); |
Check notice
Code scanning / CodeQL
Missing Override annotation Note
| @Mapping(target = "createdByUserInfo") | ||
| @Mapping(target = "lastUpdatedByUserInfo") | ||
| @Mapping(target = "geometry") | ||
| Event map(Event event); |
Check notice
Code scanning / CodeQL
Missing Override annotation Note
| @Mapping(target = "deleted") | ||
| @Mapping(target = "createdByUserInfo") | ||
| @Mapping(target = "lastUpdatedByUserInfo") | ||
| TrackedEntity map(TrackedEntity trackedEntity); |
Check notice
Code scanning / CodeQL
Missing Override annotation Note
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.
EnrollmentServicein TE aggregate to fetch enrollments and events as well as to serve/trackedEntities/uid.JdbcEventStore. This is needed anyway but here its used to eagerly fetch the entities we need later on when there is no hibernate session available. SeeArchitecture challengesfor more.TrackedEntityIdentifierspair from the TE store. This is needed for now so we can pass the TE uids to the enrollment service in the enrollment aggregate. All other aggregate code uses the primary key id. We might be able to untangle the TE aggregate later on.Next
Architecture challenges
Our goal was that every service of an entity depends on its childs service to fetch such nested entities. This assumes an acyclic graph TE -> EN -> EV. This neglects the fact that relationships can add cycles. This is an example graph where relationships add edges causing cycles
We cannot have cycles in our code as Spring would not know how to resolve them unless we resort to some hacks.
This was already true. Up to now it was solved by hibernate fetching relationships. Even in services/stores that use JDBC like hibernate was ultimately responsible for getting relationships
We are going to stick with hibernate being responsible for fetching relationships. The target architecture will be
This will mean that there is one place that is also responsible for ACL of relationships
(trackerAccessManager.canRead(user, relationship). Note that this underneath checks the ACL of TE, EN, EV.