feat: Import one object in test[DHIS2-18474]

dhis2 · Nov 27, 2024 · 1f4131d · 1f4131d
1 parent f801ff3
commit 1f4131d
Show file tree

Hide file tree

Showing 6 changed files with 76 additions and 906 deletions.
diff --git a/...tegration/src/test/java/org/hisp/dhis/tracker/export/event/EventChangeLogServiceTest.java b/...tegration/src/test/java/org/hisp/dhis/tracker/export/event/EventChangeLogServiceTest.java
@@ -446,51 +446,77 @@ private void updateDataValue(String event, String dataElementUid, String newValu
     trackerObjects.getEvents().stream()
         .filter(e -> e.getEvent().getValue().equalsIgnoreCase(event))
         .findFirst()
-        .flatMap(
-            e ->
-                e.getDataValues().stream()
-                    .filter(
-                        dv -> dv.getDataElement().getIdentifier().equalsIgnoreCase(dataElementUid))
-                    .findFirst())
-        .ifPresent(dv -> dv.setValue(newValue));
-    assertNoErrors(trackerImportService.importTracker(importParams, trackerObjects));
+        .ifPresent(
+            e -> {
+              e.getDataValues().stream()
+                  .filter(
+                      dv -> dv.getDataElement().getIdentifier().equalsIgnoreCase(dataElementUid))
+                  .findFirst()
+                  .ifPresent(dv -> dv.setValue(newValue));
+
+              assertNoErrors(
+                  trackerImportService.importTracker(
+                      importParams, TrackerObjects.builder().events(List.of(e)).build()));
+            });
   }
 
   private void updateEventDates(UID event, Instant newDate) throws IOException {
     TrackerObjects trackerObjects = fromJson("tracker/event_and_enrollment.json");
+
     trackerObjects.getEvents().stream()
         .filter(e -> e.getEvent().equals(event))
         .findFirst()
         .ifPresent(
             e -> {
               e.setOccurredAt(newDate);
               e.setScheduledAt(newDate);
+
+              assertNoErrors(
+                  trackerImportService.importTracker(
+                      importParams, TrackerObjects.builder().events(List.of(e)).build()));
             });
-    assertNoErrors(trackerImportService.importTracker(importParams, trackerObjects));
   }
 
   private void deleteScheduledAtDate(UID event) {
     trackerObjects.getEvents().stream()
         .filter(e -> e.getEvent().equals(event))
         .findFirst()
-        .ifPresent(e -> e.setScheduledAt(null));
-    assertNoErrors(trackerImportService.importTracker(importParams, trackerObjects));
+        .ifPresent(
+            e -> {
+              e.setScheduledAt(null);
+
+              assertNoErrors(
+                  trackerImportService.importTracker(
+                      importParams, TrackerObjects.builder().events(List.of(e)).build()));
+            });
   }
 
   private void updateEventGeometry(UID event, Geometry newGeometry) {
     trackerObjects.getEvents().stream()
         .filter(e -> e.getEvent().equals(event))
         .findFirst()
-        .ifPresent(e -> e.setGeometry(newGeometry));
-    assertNoErrors(trackerImportService.importTracker(importParams, trackerObjects));
+        .ifPresent(
+            e -> {
+              e.setGeometry(newGeometry);
+
+              assertNoErrors(
+                  trackerImportService.importTracker(
+                      importParams, TrackerObjects.builder().events(List.of(e)).build()));
+            });
   }
 
   private void deleteEventGeometry(UID event) {
     trackerObjects.getEvents().stream()
         .filter(e -> e.getEvent().equals(event))
         .findFirst()
-        .ifPresent(e -> e.setGeometry(null));
-    assertNoErrors(trackerImportService.importTracker(importParams, trackerObjects));
+        .ifPresent(
+            e -> {
+              e.setGeometry(null);
+
+              assertNoErrors(
+                  trackerImportService.importTracker(
+                      importParams, TrackerObjects.builder().events(List.of(e)).build()));
+            });
   }
 
   private String getDataElement(String uid) {

diff --git a/...on/src/test/java/org/hisp/dhis/tracker/export/event/OrderAndFilterEventChangeLogTest.java b/...on/src/test/java/org/hisp/dhis/tracker/export/event/OrderAndFilterEventChangeLogTest.java
@@ -330,27 +330,35 @@ private void updateDataValue(String event, String dataElementUid, String newValu
     trackerObjects.getEvents().stream()
         .filter(e -> e.getEvent().getValue().equalsIgnoreCase(event))
         .findFirst()
-        .flatMap(
-            e ->
-                e.getDataValues().stream()
-                    .filter(
-                        dv -> dv.getDataElement().getIdentifier().equalsIgnoreCase(dataElementUid))
-                    .findFirst())
-        .ifPresent(dv -> dv.setValue(newValue));
-    assertNoErrors(trackerImportService.importTracker(importParams, trackerObjects));
+        .ifPresent(
+            e -> {
+              e.getDataValues().stream()
+                  .filter(
+                      dv -> dv.getDataElement().getIdentifier().equalsIgnoreCase(dataElementUid))
+                  .findFirst()
+                  .ifPresent(dataValue -> dataValue.setValue(newValue));
+
+              assertNoErrors(
+                  trackerImportService.importTracker(
+                      importParams, TrackerObjects.builder().events(List.of(e)).build()));
+            });
   }
 
   private void updateEventDates(UID event, Instant newDate) throws IOException {
     TrackerObjects trackerObjects = fromJson("tracker/event_and_enrollment.json");
+
     trackerObjects.getEvents().stream()
         .filter(e -> e.getEvent().equals(event))
         .findFirst()
         .ifPresent(
             e -> {
               e.setOccurredAt(newDate);
               e.setScheduledAt(newDate);
+
+              assertNoErrors(
+                  trackerImportService.importTracker(
+                      importParams, TrackerObjects.builder().events(List.of(e)).build()));
             });
-    assertNoErrors(trackerImportService.importTracker(importParams, trackerObjects));
   }
 
   private Event getEvent(String uid) {

diff --git a/...st/java/org/hisp/dhis/tracker/export/trackedentity/TrackedEntityChangeLogServiceTest.java b/...st/java/org/hisp/dhis/tracker/export/trackedentity/TrackedEntityChangeLogServiceTest.java
@@ -319,27 +319,23 @@ private void assertUser(User user, TrackedEntityChangeLog changeLog) {
 
   private void updateAttributeValue(
       String trackedEntity, String trackedEntityAttribute, String newValue) {
-    List<org.hisp.dhis.tracker.imports.domain.TrackedEntity> trackedEntities =
-        trackerObjects.getTrackedEntities().stream()
-            .filter(t -> t.getTrackedEntity().getValue().equalsIgnoreCase(trackedEntity))
-            .findFirst()
-            .stream()
-            .toList();
-
-    trackedEntities.stream()
-        .flatMap(
-            t ->
-                t.getAttributes().stream()
-                    .filter(
-                        tea ->
-                            tea.getAttribute()
-                                .getIdentifier()
-                                .equalsIgnoreCase(trackedEntityAttribute)))
+    trackerObjects.getTrackedEntities().stream()
+        .filter(t -> t.getTrackedEntity().getValue().equalsIgnoreCase(trackedEntity))
         .findFirst()
-        .ifPresent(tea -> tea.setValue(newValue));
-
-    assertNoErrors(
-        trackerImportService.importTracker(
-            importParams, TrackerObjects.builder().trackedEntities(trackedEntities).build()));
+        .ifPresent(
+            t -> {
+              t.getAttributes().stream()
+                  .filter(
+                      tea ->
+                          tea.getAttribute()
+                              .getIdentifier()
+                              .equalsIgnoreCase(trackedEntityAttribute))
+                  .findFirst()
+                  .ifPresent(attribute -> attribute.setValue(newValue));
+
+              assertNoErrors(
+                  trackerImportService.importTracker(
+                      importParams, TrackerObjects.builder().trackedEntities(List.of(t)).build()));
+            });
   }
 }
diff --git a/...t/java/org/hisp/dhis/tracker/imports/bundle/TrackedEntityAttributeValueChangeLogTest.java b/...t/java/org/hisp/dhis/tracker/imports/bundle/TrackedEntityAttributeValueChangeLogTest.java