fix: Set lastUpdatedBy when creating relationships [DHIS2-18226]

dhis2 · Oct 15, 2024 · 816d287 · 816d287
1 parent 8368128
commit 816d287
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/...er/src/main/java/org/hisp/dhis/tracker/converter/RelationshipTrackerConverterService.java b/...er/src/main/java/org/hisp/dhis/tracker/converter/RelationshipTrackerConverterService.java
@@ -121,14 +121,15 @@ private org.hisp.dhis.relationship.Relationship from(
     org.hisp.dhis.relationship.RelationshipItem toItem =
         new org.hisp.dhis.relationship.RelationshipItem();
 
+    Date now = new Date();
     if (toRelationship == null) {
-      Date now = new Date();
 
       toRelationship = new org.hisp.dhis.relationship.Relationship();
       toRelationship.setUid(fromRelationship.getRelationship());
       toRelationship.setCreated(now);
-      toRelationship.setLastUpdated(now);
     }
+    toRelationship.setLastUpdated(now);
+    toRelationship.setLastUpdatedBy(preheat.getUser());
 
     toRelationship.setRelationshipType(relationshipType);
 

diff --git a/...rc/test/java/org/hisp/dhis/tracker/converter/RelationshipTrackerConverterServiceTest.java b/...rc/test/java/org/hisp/dhis/tracker/converter/RelationshipTrackerConverterServiceTest.java
@@ -45,6 +45,7 @@
 import org.hisp.dhis.tracker.domain.Relationship;
 import org.hisp.dhis.tracker.domain.RelationshipItem;
 import org.hisp.dhis.tracker.preheat.TrackerPreheat;
+import org.hisp.dhis.user.User;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -84,10 +85,13 @@ class RelationshipTrackerConverterServiceTest extends DhisConvenienceTest {
   private TrackerConverterService<Relationship, org.hisp.dhis.relationship.Relationship>
       relationshipConverterService;
 
+  private User user;
+
   @Mock public TrackerPreheat preheat;
 
   @BeforeEach
   protected void setupTest() {
+    user = makeUser("A");
     OrganisationUnit organisationUnit = createOrganisationUnit('A');
     Program program = createProgram('A');
     TrackedEntityType teiType = createTrackedEntityType('A');
@@ -120,6 +124,7 @@ void testConverterFromRelationships() {
     when(preheat.getTrackedEntity(TEI)).thenReturn(tei);
     when(preheat.getEnrollment(ENROLLMENT)).thenReturn(pi);
     when(preheat.getEvent(EVENT)).thenReturn(psi);
+    when(preheat.getUser()).thenReturn(user);
 
     List<org.hisp.dhis.relationship.Relationship> from =
         relationshipConverterService.from(preheat, List.of(relationshipA(), relationshipB()));
@@ -140,6 +145,7 @@ void testConverterFromRelationships() {
           }
           assertNotNull(relationship.getFrom());
           assertNotNull(relationship.getTo());
+          assertEquals(user.getUid(), relationship.getLastUpdatedBy().getUid());
         });
   }