fix: Always use system time for createdAt in events [DHIS2-18252]

dhis2 · Oct 18, 2024 · fe7eac0 · fe7eac0
1 parent e13f862
commit fe7eac0
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/...-service-tracker/src/main/java/org/hisp/dhis/tracker/bundle/persister/EventPersister.java b/...-service-tracker/src/main/java/org/hisp/dhis/tracker/bundle/persister/EventPersister.java
@@ -300,7 +300,7 @@ private ValuesHolder getAuditAndDateParameters(EventDataValue eventDataValue, Da
 
     if (isNewDataValue(eventDataValue, dv)) {
       eventDataValue = new EventDataValue();
-      eventDataValue.setCreated(getFromOrNewDate(dv, DataValue::getCreatedAt));
+      eventDataValue.setCreated(new Date());
       eventDataValue.setLastUpdated(getFromOrNewDate(dv, DataValue::getUpdatedAt));
       persistedValue = dv.getValue();
       auditType = AuditType.CREATE;

diff --git a/...e-tracker/src/main/java/org/hisp/dhis/tracker/converter/EventTrackerConverterService.java b/...e-tracker/src/main/java/org/hisp/dhis/tracker/converter/EventTrackerConverterService.java
@@ -270,7 +270,6 @@ private ProgramStageInstance from(
     for (DataValue dataValue : event.getDataValues()) {
       EventDataValue eventDataValue = new EventDataValue();
       eventDataValue.setValue(dataValue.getValue());
-      eventDataValue.setCreated(DateUtils.fromInstant(dataValue.getCreatedAt()));
       eventDataValue.setLastUpdated(new Date());
       eventDataValue.setProvidedElsewhere(dataValue.isProvidedElsewhere());
       // ensure dataElement is referred to by UID as multiple

diff --git a/dhis-2/dhis-test-e2e/src/test/resources/tracker/importer/events/events.json b/dhis-2/dhis-test-e2e/src/test/resources/tracker/importer/events/events.json
@@ -118,7 +118,6 @@
         },
         {
           "updatedAt": "2019-03-04T15:12:59.209",
-          "createdAt": "2019-03-04T15:01:29.793",
           "dataElement": "z3Z4TD3oBCP",
           "value": "true",
           "providedElsewhere": false