fix: Fix continuous event analytics export (2.43) (#23859)

* fix: Fix continuous event analytics export

* Invert skipPrograms ternary in getRegularAnalyticsTables (was
  returning all programs when skip list was set, filtering when not)
* Use getMainName() in removeUpdatedData so continuous updates delete
  from the live table, not the staging table

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* test: pin relativePeriodDate in validateProgramStatusWithEnrollmentOu

Without an anchor, LAST_12_MONTHS resolves relative to today, causing
202504 to fall outside the window as time passes. Pin to 2026-04-01
to match the expected metadata (same fix already on master).

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

---------

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: jason-p-pickering

dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEventAnalyticsTableManager.java

@@ -178,10 +178,10 @@ private List<AnalyticsTable> getRegularAnalyticsTables(
 
     List<Program> programs =
         params.isSkipPrograms()
-            ? idObjectManager.getAllNoAcl(Program.class)
-            : idObjectManager.getAllNoAcl(Program.class).stream()
+            ? idObjectManager.getAllNoAcl(Program.class).stream()
                 .filter(p -> !params.getSkipPrograms().contains(p.getUid()))
-                .toList();
+                .toList()
+            : idObjectManager.getAllNoAcl(Program.class);
 
     Integer firstDataYear = availableDataYears.get(0);
     Integer latestDataYear = availableDataYears.get(availableDataYears.size() - 1);
@@ -376,7 +376,7 @@ where ax.event in ( \
                     and ev.lastupdated >= '${startDate}' \
                     and ev.lastupdated < '${endDate}');""",
                 Map.of(
-                    "tableName", sqlBuilder.qualifyTable(table.getName()),
+                    "tableName", sqlBuilder.qualifyTable(table.getMainName()),
                     "programId", String.valueOf(program.getId()),
                     "startDate", toLongDate(partition.getStartDate()),
                     "endDate", toLongDate(partition.getEndDate())));
@@ -401,15 +401,15 @@ where ax.event in ( \
                     and ev.lastupdated >= '${startDate}' \
                     and ev.lastupdated < '${endDate}');""",
                   Map.of(
-                      "tableName", sqlBuilder.qualifyTable(table.getName()),
+                      "tableName", sqlBuilder.qualifyTable(table.getMainName()),
                       "programStageId", String.valueOf(programStageId),
                       "startDate", toLongDate(partition.getStartDate()),
                       "endDate", toLongDate(partition.getEndDate())));
         }
       }
 
       if (isNotBlank(sql)) {
-        invokeTimeAndLog(sql, "Remove updated events for table: '{}'", table.getName());
+        invokeTimeAndLog(sql, "Remove updated events for table: '{}'", table.getMainName());
       }
     }
   }

dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/table/JdbcEventAnalyticsTableManagerTest.java

@@ -34,8 +34,10 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hisp.dhis.db.model.DataType.BIGINT;
 import static org.hisp.dhis.db.model.DataType.CHARACTER_11;
@@ -112,6 +114,7 @@
 import org.hisp.dhis.trackedentity.TrackedEntityAttribute;
 import org.joda.time.DateTime;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
@@ -1091,6 +1094,77 @@ void verifyTeaTypeOrgUnitFetchesOuNameWhenPopulatingEventAnalyticsTable() {
     assertThat(sql.getValue(), containsString(ouNameQuery));
   }
 
+  @Test
+  @DisplayName("removeUpdatedData deletes from the live table, not the staging table")
+  void removeUpdatedDataTargetsLiveTable() {
+    ArgumentCaptor<String> sql = ArgumentCaptor.forClass(String.class);
+    Program program = createProgram('A');
+    program.setProgramType(WITH_REGISTRATION);
+
+    Date lastFullTableUpdate = new DateTime(2019, 3, 1, 2, 0).toDate();
+    Date lastLatestPartitionUpdate = new DateTime(2019, 3, 1, 9, 0).toDate();
+    Date startTime = new DateTime(2019, 3, 1, 10, 0).toDate();
+
+    AnalyticsTableUpdateParams params =
+        AnalyticsTableUpdateParams.newBuilder().startTime(startTime).build().withLatestPartition();
+
+    List<Map<String, Object>> queryResp = new ArrayList<>();
+    queryResp.add(Map.of("eventid", 1));
+
+    when(settings.getLastSuccessfulAnalyticsTablesUpdate()).thenReturn(lastFullTableUpdate);
+    when(settings.getLastSuccessfulLatestAnalyticsPartitionUpdate())
+        .thenReturn(lastLatestPartitionUpdate);
+    when(jdbcTemplate.queryForList(Mockito.anyString())).thenReturn(queryResp);
+    when(idObjectManager.getAllNoAcl(Program.class)).thenReturn(List.of(program));
+    whenConfigurationPeriodSettings();
+
+    List<AnalyticsTable> tables = subject.getAnalyticsTables(params);
+    assertThat(tables, hasSize(1));
+
+    subject.removeUpdatedData(tables);
+
+    verify(jdbcTemplate).execute(sql.capture());
+
+    String mainTableName = TABLE_PREFIX + program.getUid().toLowerCase();
+    assertThat(sql.getValue(), containsString(quote(mainTableName)));
+    assertThat(sql.getValue(), not(containsString(quote(mainTableName + STAGING_TABLE_SUFFIX))));
+  }
+
+  @Test
+  @DisplayName("getRegularAnalyticsTables excludes programs listed in skipPrograms")
+  void getRegularAnalyticsTablesExcludesSkippedPrograms() {
+    Program prA = createProgram('A');
+    Program prB = createProgram('B');
+    Program prC = createProgram('C');
+    Program prD = createProgram('D');
+
+    Set<String> skipPrograms = new HashSet<>();
+    skipPrograms.add(prC.getUid());
+    skipPrograms.add(prD.getUid());
+
+    AnalyticsTableUpdateParams params =
+        AnalyticsTableUpdateParams.newBuilder()
+            .lastYears(2)
+            .startTime(START_TIME)
+            .today(today)
+            .skipPrograms(skipPrograms)
+            .build();
+
+    when(idObjectManager.getAllNoAcl(Program.class)).thenReturn(List.of(prA, prB, prC, prD));
+    mockPeriodYears(List.of(2018, 2019, now().getYear()));
+    whenConfigurationPeriodSettings();
+    when(jdbcTemplate.queryForList(Mockito.anyString(), Mockito.eq(Integer.class)))
+        .thenReturn(List.of(2018, 2019));
+
+    List<AnalyticsTable> tables = subject.getAnalyticsTables(params);
+
+    assertThat(tables, hasSize(2));
+
+    List<String> programUids = tables.stream().map(t -> t.getProgram().getUid()).toList();
+    assertThat(programUids, not(hasItem(prC.getUid())));
+    assertThat(programUids, not(hasItem(prD.getUid())));
+  }
+
   private String toSelectExpression(String template, String uid) {
     return String.format(template, uid, uid, uid);
   }

dhis-2/dhis-test-e2e/src/test/java/org/hisp/dhis/analytics/event/query/EventsQuery3AutoTest.java

@@ -310,7 +310,9 @@ public void validateProgramStatusWithEnrollmentOu() throws JSONException {
             .add("pageSize=100")
             .add("page=1")
             .add("dimension=ENROLLMENT_OU:O6uvpzGd5pu,PROGRAM_STATUS:ACTIVE")
-            .add("desc=eventdate,lastupdated");
+            .add("desc=eventdate,lastupdated")
+            .add("eventDate=LAST_12_MONTHS")
+            .add("relativePeriodDate=2026-04-01");
 
     // When
     ApiResponse response = actions.query().get("IpHINAT79UW", JSON, JSON, params);