set from param in associated alerts search request

Signed-off-by: Surya Sashank Nistala <[email protected]>
opensearch-project · Aug 2, 2023 · b210e70 · b210e70
1 parent 3a9ef51
commit b210e70
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/...ing/src/main/kotlin/org/opensearch/alerting/transport/TransportGetWorkflowAlertsAction.kt b/...ing/src/main/kotlin/org/opensearch/alerting/transport/TransportGetWorkflowAlertsAction.kt
@@ -243,7 +243,7 @@ class TransportGetWorkflowAlertsAction @Inject constructor(
                 if (!tableProp.missing.isNullOrBlank()) {
                     sortBuilder.missing(tableProp.missing)
                 }
-                searchRequest.source().sort(sortBuilder).size(tableProp.size)
+                searchRequest.source().sort(sortBuilder).size(tableProp.size).from(tableProp.startIndex)
             }
             queryBuilder.must(QueryBuilders.termsQuery("_id", associatedAlertIds))
             queryBuilder.must(QueryBuilders.termQuery(Alert.STATE_FIELD, Alert.State.AUDIT))

diff --git a/alerting/src/test/kotlin/org/opensearch/alerting/MonitorDataSourcesIT.kt b/alerting/src/test/kotlin/org/opensearch/alerting/MonitorDataSourcesIT.kt
@@ -5696,22 +5696,27 @@ class MonitorDataSourcesIT : AlertingSingleNodeTestCase() {
             workflowId = workflowId,
             alertIds = listOf(res.alerts[0].id),
             table = Table("asc", "monitor_id", null, 100, 100, null)
-
         )
         Assert.assertEquals(res100to200.associatedAlerts.size, 100)
         var res200to300 = getWorkflowAlerts(
             workflowId = workflowId,
             alertIds = listOf(res.alerts[0].id),
-            table = Table("asc", "monitor_id", null, 200, 100, null)
-
+            table = Table("asc", "monitor_id", null, 100, 201, null)
         )
-        Assert.assertEquals(res100to200.associatedAlerts.size, 100)
+        Assert.assertEquals(res200to300.associatedAlerts.size, 100)
         var res0to99 = getWorkflowAlerts(
             workflowId = workflowId,
             alertIds = listOf(res.alerts[0].id),
             table = Table("asc", "monitor_id", null, 100, 0, null)
-
         )
         Assert.assertEquals(res0to99.associatedAlerts.size, 100)
+
+        val ids100to200 = res100to200.associatedAlerts.stream().map { it.id }.collect(Collectors.toSet())
+        val idsSet0to99 = res0to99.associatedAlerts.stream().map { it.id }.collect(Collectors.toSet())
+        val idsSet200to300 = res200to300.associatedAlerts.stream().map { it.id }.collect(Collectors.toSet())
+
+        Assert.assertTrue(idsSet0to99.all { it !in ids100to200 })
+        Assert.assertTrue(idsSet0to99.all { it !in idsSet200to300 })
+        Assert.assertTrue(ids100to200.all { it !in idsSet200to300 })
     }
 }