chore: Use EventService in EnrollmentService [DHIS2-18791]

dhis2 · Jan 16, 2025 · 646eceb · 646eceb
1 parent d4f9382
commit 646eceb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
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
@@ -177,7 +177,9 @@ public RelationshipItem getEnrollmentInRelationshipItem(@Nonnull UID uid, boolea
               includeDeleted,
               currentUser));
     } catch (ForbiddenException e) {
-      return null;
+      throw new IllegalArgumentException(
+          "this must be a bug as enrollment ACL was already checked "
+              + "and events are not included in the request");
     }
     return relationshipItem;
   }

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)