chore: Use EventService in EnrollmentService [DHIS2-18791]

dhis2 · Jan 17, 2025 · f3e5728 · f3e5728
1 parent 2f1e9ee
commit f3e5728
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 20 deletions.
diff --git a/...acker/src/main/java/org/hisp/dhis/tracker/export/enrollment/DefaultEnrollmentService.java b/...acker/src/main/java/org/hisp/dhis/tracker/export/enrollment/DefaultEnrollmentService.java
@@ -53,6 +53,9 @@
 import org.hisp.dhis.tracker.acl.TrackerOwnershipManager;
 import org.hisp.dhis.tracker.export.Page;
 import org.hisp.dhis.tracker.export.PageParams;
+import org.hisp.dhis.tracker.export.event.EventOperationParams;
+import org.hisp.dhis.tracker.export.event.EventParams;
+import org.hisp.dhis.tracker.export.event.EventService;
 import org.hisp.dhis.user.UserDetails;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -63,6 +66,8 @@
 class DefaultEnrollmentService implements EnrollmentService {
   private final EnrollmentStore enrollmentStore;
 
+  private final EventService eventService;
+
   private final TrackerOwnershipManager trackerOwnershipAccessManager;
 
   private final TrackedEntityAttributeService trackedEntityAttributeService;
@@ -130,7 +135,9 @@ private Enrollment getEnrollment(
     result.setDeleted(enrollment.isDeleted());
     result.setNotes(enrollment.getNotes());
     if (params.isIncludeEvents()) {
-      result.setEvents(getEvents(user, enrollment, includeDeleted));
+      result.setEvents(
+          getEvents(
+              enrollment, params.getEnrollmentEventsParams().getEventParams(), includeDeleted));
     }
     if (params.isIncludeRelationships()) {
       result.setRelationshipItems(getRelationshipItems(user, enrollment, includeDeleted));
@@ -145,8 +152,7 @@ private Enrollment getEnrollment(
   }
 
   @Override
-  public RelationshipItem getEnrollmentInRelationshipItem(
-      @Nonnull UID uid, @Nonnull EnrollmentParams params, boolean includeDeleted)
+  public RelationshipItem getEnrollmentInRelationshipItem(@Nonnull UID uid, boolean includeDeleted)
       throws NotFoundException {
 
     RelationshipItem relationshipItem = new RelationshipItem();
@@ -162,20 +168,29 @@ public RelationshipItem getEnrollmentInRelationshipItem(
       return null;
     }
 
-    relationshipItem.setEnrollment(getEnrollment(enrollment, params, includeDeleted, currentUser));
+    relationshipItem.setEnrollment(
+        getEnrollment(
+            enrollment,
+            EnrollmentParams.FALSE.withIncludeAttributes(true),
+            includeDeleted,
+            currentUser));
     return relationshipItem;
   }
 
-  private Set<Event> getEvents(UserDetails user, Enrollment enrollment, boolean includeDeleted) {
-    Set<Event> events = new HashSet<>();
-
-    for (Event event : enrollment.getEvents()) {
-      if ((includeDeleted || !event.isDeleted())
-          && trackerAccessManager.canRead(user, event, true).isEmpty()) {
-        events.add(event);
-      }
+  private Set<Event> getEvents(
+      Enrollment enrollment, EventParams eventParams, boolean includeDeleted) {
+    EventOperationParams eventOperationParams =
+        EventOperationParams.builder()
+            .enrollments(Set.of(UID.of(enrollment)))
+            .eventParams(eventParams)
+            .includeDeleted(includeDeleted)
+            .build();
+    try {
+      return Set.copyOf(eventService.getEvents(eventOperationParams));
+    } catch (BadRequestException | ForbiddenException e) {
+      throw new IllegalArgumentException(
+          "this must be a bug in how the EventOperationParams are built");
     }
-    return events;
   }
 
   private Set<RelationshipItem> getRelationshipItems(

diff --git a/...vice-tracker/src/main/java/org/hisp/dhis/tracker/export/enrollment/EnrollmentService.java b/...vice-tracker/src/main/java/org/hisp/dhis/tracker/export/enrollment/EnrollmentService.java
@@ -45,8 +45,8 @@ public interface EnrollmentService {
   Enrollment getEnrollment(UID uid, EnrollmentParams params, boolean includeDeleted)
       throws NotFoundException, ForbiddenException;
 
-  RelationshipItem getEnrollmentInRelationshipItem(
-      UID uid, EnrollmentParams params, boolean includeDeleted) throws NotFoundException;
+  RelationshipItem getEnrollmentInRelationshipItem(UID uid, boolean includeDeleted)
+      throws NotFoundException;
 
   /** Get all enrollments matching given params. */
   @Nonnull

diff --git a/...service-tracker/src/main/java/org/hisp/dhis/tracker/export/event/DefaultEventService.java b/...service-tracker/src/main/java/org/hisp/dhis/tracker/export/event/DefaultEventService.java
@@ -238,13 +238,15 @@ private Event getEvent(
     return event;
   }
 
+  @Nonnull
   @Override
   public List<Event> getEvents(@Nonnull EventOperationParams operationParams)
       throws BadRequestException, ForbiddenException {
     EventQueryParams queryParams = paramsMapper.map(operationParams, getCurrentUserDetails());
     return eventStore.getEvents(queryParams);
   }
 
+  @Nonnull
   @Override
   public Page<Event> getEvents(
       @Nonnull EventOperationParams operationParams, @Nonnull PageParams pageParams)

diff --git a/...ervice-tracker/src/main/java/org/hisp/dhis/tracker/export/event/EventOperationParams.java b/...ervice-tracker/src/main/java/org/hisp/dhis/tracker/export/event/EventOperationParams.java
@@ -71,7 +71,8 @@ public class EventOperationParams {
 
   private UID orgUnit;
 
-  private OrganisationUnitSelectionMode orgUnitMode;
+  @Builder.Default
+  private OrganisationUnitSelectionMode orgUnitMode = OrganisationUnitSelectionMode.ACCESSIBLE;
 
   private AssignedUserSelectionMode assignedUserMode;
 

diff --git a/...src/main/java/org/hisp/dhis/tracker/export/trackedentity/DefaultTrackedEntityService.java b/...src/main/java/org/hisp/dhis/tracker/export/trackedentity/DefaultTrackedEntityService.java
@@ -71,7 +71,6 @@
 import org.hisp.dhis.tracker.export.FileResourceStream;
 import org.hisp.dhis.tracker.export.Page;
 import org.hisp.dhis.tracker.export.PageParams;
-import org.hisp.dhis.tracker.export.enrollment.EnrollmentParams;
 import org.hisp.dhis.tracker.export.enrollment.EnrollmentService;
 import org.hisp.dhis.tracker.export.event.EventParams;
 import org.hisp.dhis.tracker.export.event.EventService;
@@ -543,9 +542,7 @@ private RelationshipItem getRelationshipItem(
     } else if (item.getEnrollment() != null) {
       result =
           enrollmentService.getEnrollmentInRelationshipItem(
-              UID.of(item.getEnrollment()),
-              EnrollmentParams.TRUE.withIncludeRelationships(false),
-              includeDeleted);
+              UID.of(item.getEnrollment()), includeDeleted);
     } else if (item.getEvent() != null) {
       result =
           eventService.getEventInRelationshipItem(