fix: Only use occurreddate to filter events in exporter [DHIS2-17732] (…

…#19363) * fix: Only use occurreddate to filter events in exporter [DHIS2-17732] * Fix review comments
dhis2 · Dec 11, 2024 · 73feab1 · 73feab1
1 parent 57f4ddd
commit 73feab1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 20 deletions.
diff --git a/...vices/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JdbcEventStore.java b/...vices/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JdbcEventStore.java
@@ -1287,25 +1287,13 @@ private StringBuilder getFromWhereClause(
     if (params.getStartDate() != null) {
       mapSqlParameterSource.addValue("startDate", params.getStartDate(), Types.TIMESTAMP);
 
-      fromBuilder
-          .append(hlp.whereAnd())
-          .append(" (psi.executiondate >= ")
-          .append(":startDate")
-          .append(" or (psi.executiondate is null and psi.duedate >= ")
-          .append(":startDate")
-          .append(" )) ");
+      fromBuilder.append(hlp.whereAnd()).append(" psi.executiondate >= :startDate ");
     }
 
     if (params.getEndDate() != null) {
       mapSqlParameterSource.addValue("endDate", params.getEndDate(), Types.TIMESTAMP);
 
-      fromBuilder
-          .append(hlp.whereAnd())
-          .append(" (psi.executiondate < ")
-          .append(":endDate")
-          .append(" or (psi.executiondate is null and psi.duedate < ")
-          .append(":endDate")
-          .append(" )) ");
+      fromBuilder.append(hlp.whereAnd()).append(" psi.executiondate < :endDate ");
     }
 
     if (params.getProgramType() != null) {

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
@@ -255,12 +255,6 @@ private ProgramStageInstance from(
       assignedUser.ifPresent(programStageInstance::setAssignedUser);
     }
 
-    if (program.isRegistration()
-        && programStageInstance.getDueDate() == null
-        && programStageInstance.getExecutionDate() != null) {
-      programStageInstance.setDueDate(programStageInstance.getExecutionDate());
-    }
-
     for (DataValue dataValue : event.getDataValues()) {
       EventDataValue eventDataValue = new EventDataValue();
       eventDataValue.setValue(dataValue.getValue());