fix: Return PAs when TE found [DHIS2-14300][2.40] (dhis2#17954) (dhis…

…2#17968) * fix: Return PA when TE found [DHIS2-14300][2.40] * fix: Return PA when TE found [DHIS2-14300][2.39]
DWB-eHealth · Jul 3, 2024 · 57ac524 · 57ac524
1 parent d72b656
commit 57ac524
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 17 deletions.
diff --git a/...in/java/org/hisp/dhis/dxf2/events/trackedentity/AbstractTrackedEntityInstanceService.java b/...in/java/org/hisp/dhis/dxf2/events/trackedentity/AbstractTrackedEntityInstanceService.java
@@ -286,7 +286,7 @@ public TrackedEntityInstance getTrackedEntityInstance(
  }
 
  Set<TrackedEntityAttribute> readableAttributes =
- new HashSet<>(daoTrackedEntityInstance.getTrackedEntityType().getTrackedEntityAttributes());
+ trackedEntityAttributeService.getAllUserReadableTrackedEntityAttributes(user);
 
  return getTei(daoTrackedEntityInstance, readableAttributes, params, user, null);
  }
@@ -305,7 +305,7 @@ public TrackedEntityInstance getTrackedEntityInstanceExcludingACL(
  User user = currentUserService.getCurrentUser();
 
  Set<TrackedEntityAttribute> readableAttributes =
- new HashSet<>(daoTrackedEntityInstance.getTrackedEntityType().getTrackedEntityAttributes());
+ trackedEntityAttributeService.getAllUserReadableTrackedEntityAttributes(user);
  readableAttributes.addAll(program.getTrackedEntityAttributes());
 
  return getTei(daoTrackedEntityInstance, readableAttributes, params, user, program);

diff --git a/...integration/src/test/java/org/hisp/dhis/dxf2/events/TrackedEntityInstanceServiceTest.java b/...integration/src/test/java/org/hisp/dhis/dxf2/events/TrackedEntityInstanceServiceTest.java
@@ -837,27 +837,13 @@ void shouldReturnTrackedEntityTypeAndProgramAttributesWhenSingleTERequestedAndPr
  .collect(Collectors.toList()));
  }
 
- @Test
- void
- shouldReturnTrackedEntityTypeAttributesWhenSingleTERequestedAndProgramSpecifiedButItHasNoProgramAttributes() {
- TrackedEntityInstance trackedEntityInstance =
- trackedEntityInstanceService.getTrackedEntityInstanceExcludingACL(
- maleA.getUid(), new Program(), TrackedEntityInstanceParams.TRUE);
-
- assertContainsOnly(
- List.of(uniqueIdAttribute.getUid()),
- trackedEntityInstance.getAttributes().stream()
- .map(Attribute::getAttribute)
- .collect(Collectors.toList()));
- }
-
  @Test
  void shouldReturnTrackedEntityTypeAttributesWhenSingleTERequestedAndNoProgramSpecified() {
  TrackedEntityInstance trackedEntityInstance =
  trackedEntityInstanceService.getTrackedEntityInstance(maleA);
 
  assertContainsOnly(
- List.of(uniqueIdAttribute.getUid()),
+ List.of(programAttribute.getUid(), uniqueIdAttribute.getUid()),
  trackedEntityInstance.getAttributes().stream()
  .map(Attribute::getAttribute)
  .collect(Collectors.toList()));