From 3c5db773ed7723098bf4b806ea3b47dbcf7bd3c2 Mon Sep 17 00:00:00 2001
From: teleivo <teleivo@users.noreply.github.com>
Date: Wed, 15 Jan 2025 11:28:07 +0100
Subject: [PATCH] test: finally

---
 .../DefaultTrackedEntityService.java          | 45 +++++++++----------
 .../TrackedEntityServiceTest.java             |  2 -
 2 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/tracker/export/trackedentity/DefaultTrackedEntityService.java b/dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/tracker/export/trackedentity/DefaultTrackedEntityService.java
index f20cbbe073c4..c0e191468601 100644
--- a/dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/tracker/export/trackedentity/DefaultTrackedEntityService.java
+++ b/dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/tracker/export/trackedentity/DefaultTrackedEntityService.java
@@ -297,10 +297,10 @@ private TrackedEntity getTrackedEntity(
     result.setCreatedByUserInfo(trackedEntity.getCreatedByUserInfo());
     result.setLastUpdatedByUserInfo(trackedEntity.getLastUpdatedByUserInfo());
     result.setGeometry(trackedEntity.getGeometry());
-    setRelationshipItems(result, trackedEntity, params, includeDeleted);
     if (params.isIncludeEnrollments()) {
       result.setEnrollments(getEnrollments(trackedEntity, user, includeDeleted, program));
     }
+    setRelationshipItems(result, trackedEntity, params, includeDeleted);
     if (params.isIncludeProgramOwners()) {
       result.setProgramOwners(getTrackedEntityProgramOwners(trackedEntity, program));
     }
@@ -437,34 +437,33 @@ private void setRelationshipItems(
   }
 
   private void setRelationshipItems(
-      TrackedEntity target,
-      TrackedEntity source,
+      TrackedEntity targetTrackedEntity,
+      TrackedEntity sourceTrackedEntity,
       TrackedEntityParams params,
       boolean includeDeleted)
       throws NotFoundException {
     if (params.isIncludeRelationships()) {
-      target.setRelationshipItems(getRelationshipItems(source, includeDeleted));
+      targetTrackedEntity.setRelationshipItems(
+          getRelationshipItems(sourceTrackedEntity, includeDeleted));
     }
     if (params.getEnrollmentParams().isIncludeRelationships()) {
-      for (Enrollment enrollment : source.getEnrollments()) {
-        enrollment.setRelationshipItems(getRelationshipItems(enrollment, source, includeDeleted));
-      }
-    }
-    if (params.getEventParams().isIncludeRelationships()) {
-      for (Enrollment enrollment : source.getEnrollments()) {
-        for (Event event : enrollment.getEvents()) {
-          Set<RelationshipItem> relationshipItems =
-              getRelationshipItems(event, source, includeDeleted);
-          //          target.getEnrollments().stream()
-          //              .filter(e -> e.getUid().equals(enrollment.getUid()))
-          //              .findFirst()
-          //              .orElseThrow(() -> new NotFoundException(Enrollment.class,
-          // enrollment.getUid()))
-          //              .getEvents().stream()
-          //              .filter(ev->ev.getUid().equals(event.getUid()))
-          //              .findFirst().orElseThrow(() -> new NotFoundException(Enrollment.class,
-          // enrollment.getUid()));
-          event.setRelationshipItems(relationshipItems);
+      for (Enrollment sourceEnrollment : sourceTrackedEntity.getEnrollments()) {
+        for (Enrollment targetEnrollment : targetTrackedEntity.getEnrollments()) {
+          if (sourceEnrollment.getUid().equals(targetEnrollment.getUid())) {
+            targetEnrollment.setRelationshipItems(
+                getRelationshipItems(sourceEnrollment, sourceTrackedEntity, includeDeleted));
+
+            if (params.getEventParams().isIncludeRelationships()) {
+              for (Event sourceEvent : sourceEnrollment.getEvents()) {
+                for (Event targetEvent : targetEnrollment.getEvents()) {
+                  if (targetEvent.getUid().equals(sourceEvent.getUid())) {
+                    targetEvent.setRelationshipItems(
+                        getRelationshipItems(sourceEvent, sourceTrackedEntity, includeDeleted));
+                  }
+                }
+              }
+            }
+          }
         }
       }
     }
diff --git a/dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/tracker/export/trackedentity/TrackedEntityServiceTest.java b/dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/tracker/export/trackedentity/TrackedEntityServiceTest.java
index 4dc01faf7fd7..1ead5c13e1b2 100644
--- a/dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/tracker/export/trackedentity/TrackedEntityServiceTest.java
+++ b/dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/tracker/export/trackedentity/TrackedEntityServiceTest.java
@@ -1686,8 +1686,6 @@ void shouldReturnTrackedEntityRelationshipsWithTe2Event()
             .trackedEntityParams(params)
             .build();
 
-    System.out.println(trackedEntityA.getUid());
-    System.out.println(eventA.getUid());
     List<TrackedEntity> trackedEntities = trackedEntityService.getTrackedEntities(operationParams);
 
     TrackedEntity trackedEntity = trackedEntities.get(0);