fix get alerts alertState query filter (#1064)

Signed-off-by: Surya Sashank Nistala <[email protected]> (cherry picked from commit 3ad1365)
opensearch-project · Aug 2, 2023 · 8b45f72 · 8b45f72
1 parent f3818fc
commit 8b45f72
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/alerting/src/main/kotlin/org/opensearch/alerting/transport/TransportGetAlertsAction.kt b/alerting/src/main/kotlin/org/opensearch/alerting/transport/TransportGetAlertsAction.kt
@@ -103,8 +103,7 @@ class TransportGetAlertsAction @Inject constructor(
             // and only be shown in "associated alerts" field under get workflow_alerts API.
             // But if the API is called with query_params: state=AUDIT,monitor_id=<123>,workflow_id=<abc>, this api
             // will return audit alerts generated by delegate monitor <123> in workflow <abc>
-            QueryBuilders.boolQuery()
-                .filter(QueryBuilders.boolQuery().mustNot(QueryBuilders.termsQuery(Alert.STATE_FIELD, Alert.State.AUDIT.name)))
+            queryBuilder.filter(QueryBuilders.boolQuery().mustNot(QueryBuilders.termsQuery(Alert.STATE_FIELD, Alert.State.AUDIT.name)))
         } else {
             queryBuilder.filter(QueryBuilders.termQuery("state", getAlertsRequest.alertState))
         }

diff --git a/alerting/src/test/kotlin/org/opensearch/alerting/resthandler/WorkflowRestApiIT.kt b/alerting/src/test/kotlin/org/opensearch/alerting/resthandler/WorkflowRestApiIT.kt
@@ -1113,11 +1113,11 @@ class WorkflowRestApiIT : AlertingRestTestCase() {
         val associatedAlerts = getWorkflowAlerts["associatedAlerts"] as List<HashMap<String, Any>>
         assertEquals(associatedAlerts.size, 2)
 
-        val getAlertsRes = getAlerts(java.util.Map.of("workflowIds", listOf(workflowId)))
+        val getAlertsRes = getAlerts()
         val getAlertsMap = getAlertsRes.asMap()
         Assert.assertTrue(getAlertsMap.containsKey("alerts"))
-        val getAlertsAlerts = getWorkflowAlerts["alerts"] as List<HashMap<String, Any>>
-        assertEquals(alerts.size, 1)
+        val getAlertsAlerts = (getAlertsMap["alerts"] as ArrayList<HashMap<String, Any>>)
+        assertEquals(getAlertsAlerts.size, 1)
         Assert.assertEquals(getAlertsAlerts[0]["execution_id"], executionId)
         Assert.assertEquals(getAlertsAlerts[0]["workflow_id"], workflowId)
         Assert.assertEquals(getAlertsAlerts[0]["monitor_id"], "")