fix: Minor refactor after PR [TECH-1656]

dhis2 · Nov 27, 2023 · 394858c · 394858c
1 parent a5e1e57
commit 394858c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/...-tracker/src/main/java/org/hisp/dhis/tracker/export/event/EventOperationParamsMapper.java b/...-tracker/src/main/java/org/hisp/dhis/tracker/export/event/EventOperationParamsMapper.java
@@ -27,6 +27,7 @@
  */
 package org.hisp.dhis.tracker.export.event;
 
+import static org.hisp.dhis.security.Authorities.F_TRACKED_ENTITY_INSTANCE_SEARCH_IN_ALL_ORGUNITS;
 import static org.hisp.dhis.tracker.export.OperationsParamsValidator.validateOrgUnitMode;
 
 import java.util.List;
@@ -190,7 +191,9 @@ private void validateUser(
       User user, Program program, ProgramStage programStage, OrganisationUnit requestedOrgUnit)
       throws ForbiddenException {
 
-    if (user == null || user.isSuper()) {
+    if (user == null
+        || user.isSuper()
+        || user.isAuthorized(F_TRACKED_ENTITY_INSTANCE_SEARCH_IN_ALL_ORGUNITS)) {
       return;
     }
     if (program != null && !aclService.canDataRead(user, program)) {

diff --git a/...cker/src/test/java/org/hisp/dhis/tracker/export/event/EventOperationParamsMapperTest.java b/...cker/src/test/java/org/hisp/dhis/tracker/export/event/EventOperationParamsMapperTest.java
@@ -531,9 +531,6 @@ void shouldMapOrgUnitWhenModeAllProgramProvidedAndRequestedOrgUnitInSearchScope(
     when(currentUserService.getCurrentUser()).thenReturn(user);
     when(organisationUnitService.getOrganisationUnit(searchScopeChildOrgUnit.getUid()))
         .thenReturn(searchScopeChildOrgUnit);
-    when(organisationUnitService.isInUserHierarchy(
-            searchScopeChildOrgUnit.getUid(), user.getTeiSearchOrganisationUnitsWithFallback()))
-        .thenReturn(true);
 
     EventOperationParams operationParams =
         eventBuilder

diff --git a/...va/org/hisp/dhis/tracker/export/trackedentity/TrackedEntityOperationParamsMapperTest.java b/...va/org/hisp/dhis/tracker/export/trackedentity/TrackedEntityOperationParamsMapperTest.java
@@ -79,7 +79,6 @@
 import org.hisp.dhis.user.User;
 import org.hisp.dhis.user.UserRole;
 import org.hisp.dhis.webapi.controller.event.mapper.SortDirection;
-import org.junit.Assert;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -688,7 +687,7 @@ void shouldFailWhenGlobalSearchAndNoAttributeSpecified() {
             .build();
 
     Exception IllegalQueryException =
-        Assert.assertThrows(IllegalQueryException.class, () -> mapper.map(operationParams));
+        assertThrows(IllegalQueryException.class, () -> mapper.map(operationParams));
 
     assertEquals(
         "At least 1 attributes should be mentioned in the search criteria.",
@@ -715,7 +714,7 @@ void shouldaFailWhenGlobalSearchAndNoAttributeSpecified() {
             .build();
 
     Exception IllegalQueryException =
-        Assert.assertThrows(IllegalQueryException.class, () -> mapper.map(operationParams));
+        assertThrows(IllegalQueryException.class, () -> mapper.map(operationParams));
 
     assertEquals("maxteicountreached", IllegalQueryException.getMessage());
   }