fix(tests): update TriggerFactoryTest for multi-instance arch; restore table-scoped serverId in ListFilter

Author: yan-3005

openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ListFilter.java

@@ -24,6 +24,7 @@
 
 public class ListFilter extends Filter<ListFilter> {
   public static final String NULL_PARAM = "null";
+  private static final String MCP_EXECUTION_TABLE_NAME = "mcp_execution_entity";
 
   public ListFilter() {
     this(Include.NON_DELETED);
@@ -71,7 +72,7 @@ public String getCondition(String tableName) {
     conditions.add(getAgentTypeCondition());
     conditions.add(getProviderCondition(tableName));
     conditions.add(getEntityStatusCondition(tableName));
-    conditions.add(getServerIdCondition());
+    conditions.add(getServerIdCondition(tableName));
     conditions.add(getScheduleRunIdCondition());
     String condition = addCondition(conditions);
     return condition.isEmpty() ? "WHERE TRUE" : "WHERE " + condition;
@@ -400,9 +401,11 @@ public String getApiCollectionCondition(String apiEndpoint) {
         : getFqnPrefixCondition(apiEndpoint, apiCollection, "apiCollection");
   }
 
-  private String getServerIdCondition() {
+  private String getServerIdCondition(String tableName) {
     String serverId = queryParams.get("serverId");
-    return serverId == null ? "" : "serverId = :serverId";
+    return serverId == null || !MCP_EXECUTION_TABLE_NAME.equals(tableName)
+        ? ""
+        : "serverId = :serverId";
   }
 
   private String getScheduleRunIdCondition() {

openmetadata-service/src/test/java/org/openmetadata/service/governance/workflows/elements/TriggerFactoryTest.java

@@ -16,13 +16,13 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.util.ArrayList;
 import java.util.List;
 import org.flowable.bpmn.model.BpmnModel;
 import org.flowable.bpmn.model.CallActivity;
 import org.flowable.bpmn.model.FlowElement;
+import org.flowable.bpmn.model.MultiInstanceLoopCharacteristics;
 import org.flowable.bpmn.model.Process;
 import org.junit.jupiter.api.Test;
 import org.openmetadata.schema.governance.workflows.WorkflowDefinition;
@@ -60,7 +60,7 @@ void testPeriodicBatchTrigger_CreatesCorrectTriggerType() {
   }
 
   @Test
-  void testPeriodicBatchTrigger_NoMultiInstanceLoop() {
+  void testPeriodicBatchTrigger_MultiInstanceLoop_WhenNoSinkTask() {
     WorkflowDefinition workflow = createWorkflow();
 
     TriggerInterface trigger = TriggerFactory.createTrigger(workflow);
@@ -70,9 +70,13 @@ void testPeriodicBatchTrigger_NoMultiInstanceLoop() {
 
     CallActivity callActivity = findCallActivity(model);
     assertNotNull(callActivity, "CallActivity should exist");
-    assertNull(
-        callActivity.getLoopCharacteristics(),
-        "CallActivity must not have multi-instance loop in batch mode");
+    MultiInstanceLoopCharacteristics loopChars =
+        (MultiInstanceLoopCharacteristics) callActivity.getLoopCharacteristics();
+    assertNotNull(loopChars, "CallActivity should have multi-instance loop when no SinkTask");
+    assertEquals(
+        "${numberOfEntities}",
+        loopChars.getLoopCardinality(),
+        "Cardinality should be ${numberOfEntities} when no SinkTask batch mode");
   }
 
   private CallActivity findCallActivity(BpmnModel model) {