fix: Remove event end enrollment checks for TE tables [DHIS2-16705] (#…

…19444)
dhis2 · Dec 11, 2024 · a76d1ee · a76d1ee
1 parent ecbacc1
commit a76d1ee
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 20 deletions.
diff --git a/...s/src/main/java/org/hisp/dhis/analytics/table/JdbcTrackedEntityAnalyticsTableManager.java b/...s/src/main/java/org/hisp/dhis/analytics/table/JdbcTrackedEntityAnalyticsTableManager.java
@@ -325,12 +325,6 @@ public void populateTable(AnalyticsTableUpdateParams params, AnalyticsTableParti
             """
             \swhere te.trackedentitytypeid = ${tetId} \
             and te.lastupdated < '${startTime}' \
-            and exists (select 1 from ${enrollment} en \
-                where en.trackedentityid = te.trackedentityid \
-                and exists (select 1 from ${event} ev \
-                where ev.enrollmentid = en.enrollmentid \
-                and ev.status in (${statuses}) \
-                and ev.deleted = false)) \
             and te.created is not null \
             and te.deleted = false""",
             Map.of(

diff --git a/...java/org/hisp/dhis/analytics/table/JdbcTrackedEntityEnrollmentsAnalyticsTableManager.java b/...java/org/hisp/dhis/analytics/table/JdbcTrackedEntityEnrollmentsAnalyticsTableManager.java
@@ -171,11 +171,6 @@ public JdbcTrackedEntityEnrollmentsAnalyticsTableManager(
     this.trackedEntityTypeService = trackedEntityTypeService;
   }
 
-  /**
-   * Returns the {@link AnalyticsTableType} of analytics table which this manager handles.
-   *
-   * @return type of analytics table.
-   */
   @Override
   public AnalyticsTableType getAnalyticsTableType() {
     return TRACKED_ENTITY_INSTANCE_ENROLLMENTS;
@@ -239,10 +234,7 @@ public void populateTable(AnalyticsTableUpdateParams params, AnalyticsTableParti
             and te.lastupdated < '${startTime}' \
             left join ${program} p on en.programid=p.programid \
             left join analytics_rs_orgunitstructure ous on en.organisationunitid=ous.organisationunitid \
-            where exists (select 1 from ${event} ev where ev.deleted = false \
-            and ev.enrollmentid = en.enrollmentid \
-            and ev.status in (${statuses})) \
-            and en.occurreddate is not null \
+            where en.occurreddate is not null \
             and en.deleted = false\s""",
             Map.of(
                 "trackedEntityTypeId", valueOf(tetId),

diff --git a/...main/java/org/hisp/dhis/analytics/table/JdbcTrackedEntityEventsAnalyticsTableManager.java b/...main/java/org/hisp/dhis/analytics/table/JdbcTrackedEntityEventsAnalyticsTableManager.java
@@ -203,11 +203,6 @@ public JdbcTrackedEntityEventsAnalyticsTableManager(
     this.analyticsSqlBuilder = analyticsSqlBuilder;
   }
 
-  /**
-   * Returns the {@link AnalyticsTableType} of analytics table which this manager handles.
-   *
-   * @return type of analytics table.
-   */
   @Override
   public AnalyticsTableType getAnalyticsTableType() {
     return TRACKED_ENTITY_INSTANCE_EVENTS;