feat: Migrate tracker change logs into new table [DHIS2-18014]

dhis2 · Oct 30, 2024 · ebc21c3 · ebc21c3
1 parent 352d583
commit ebc21c3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/...ice-tracker/src/main/java/org/hisp/dhis/tracker/export/event/JdbcEventChangeLogStore.java b/...ice-tracker/src/main/java/org/hisp/dhis/tracker/export/event/JdbcEventChangeLogStore.java
@@ -168,7 +168,7 @@ public void deleteEventChangeLog(Event event) {
   public void deleteEventChangeLog(DataElement dataElement) {
     String sql =
         """
-          DELETE FROM eventchangelog WHERE dataelementio = :dataelementio
+          DELETE FROM eventchangelog WHERE dataelementid = :dataelementio
         """;
     SqlParameterSource params =
         new MapSqlParameterSource().addValue("dataelementio", dataElement.getId());

diff --git a/...rc/main/java/org/hisp/dhis/tracker/imports/bundle/persister/AbstractTrackerPersister.java b/...rc/main/java/org/hisp/dhis/tracker/imports/bundle/persister/AbstractTrackerPersister.java
@@ -128,8 +128,6 @@ public TrackerTypeReport persist(EntityManager entityManager, TrackerBundle bund
         if (isNew(bundle, trackerDto)) {
           entityManager.persist(convertedDto);
           entityManager.flush();
-          // TODO Add this in PR description: Needs to update data values after persisting the
-          // entity, if not the FK constraint to change logs is not satisfied
           updateDataValues(
               entityManager, bundle.getPreheat(), trackerDto, convertedDto, bundle.getUser());
           typeReport.getStats().incCreated();
@@ -141,8 +139,6 @@ public TrackerTypeReport persist(EntityManager entityManager, TrackerBundle bund
             typeReport.getStats().incIgnored();
             // Relationships are not updated. A warning was already added to the report
           } else {
-            // TODO Add this in PR description: Needs to update data values first, if not deleted
-            // values will not be updated in the event object
             updateDataValues(
                 entityManager, bundle.getPreheat(), trackerDto, convertedDto, bundle.getUser());
             updateAttributes(