Fix tests

dhis2 · Jan 22, 2025 · 2d84b71 · 2d84b71
1 parent 3223ac4
commit 2d84b71
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/...is-service-tracker/src/main/java/org/hisp/dhis/tracker/export/RelationshipItemMapper.java b/...is-service-tracker/src/main/java/org/hisp/dhis/tracker/export/RelationshipItemMapper.java
@@ -46,22 +46,25 @@
     })
 public interface RelationshipItemMapper {
   @BeanMapping(ignoreByDefault = true)
-  @Mapping(target = "relationship")
-  @Mapping(target = "trackedEntity")
-  @Mapping(target = "enrollment")
-  @Mapping(target = "event")
-  RelationshipItem map(RelationshipItem relationshipItem);
-
-  @BeanMapping(ignoreByDefault = true)
+  @Mapping(target = "uid")
   @Mapping(target = "relationshipType")
+  @Mapping(target = "created")
+  @Mapping(target = "createdAtClient")
+  @Mapping(target = "lastUpdated")
   @Mapping(
       target = "from",
       source = "from",
       qualifiedByName = "mapRelationshipItemWithoutRelationship")
   @Mapping(target = "to", source = "to", qualifiedByName = "mapRelationshipItemWithoutRelationship")
-  @Mapping(source = "uid", target = "uid")
   Relationship map(Relationship relationship);
 
+  @BeanMapping(ignoreByDefault = true)
+  @Mapping(target = "relationship")
+  @Mapping(target = "trackedEntity")
+  @Mapping(target = "enrollment")
+  @Mapping(target = "event")
+  RelationshipItem map(RelationshipItem relationshipItem);
+
   // we need to ignore relationship to break the cycle between relationship and relationshipItem
   @Named("mapRelationshipItemWithoutRelationship")
   @BeanMapping(ignoreByDefault = true)