solution to fix integ tests

Signed-off-by: Riya Saxena <[email protected]>
opensearch-project · Mar 11, 2024 · 3813217 · 3813217
1 parent bcaa4e3
commit 3813217
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/alerting/src/main/kotlin/org/opensearch/alerting/resthandler/RestGetFindingsAction.kt b/alerting/src/main/kotlin/org/opensearch/alerting/resthandler/RestGetFindingsAction.kt
@@ -45,8 +45,6 @@ class RestGetFindingsAction : BaseRestHandler() {
         val size = request.paramAsInt("size", 20)
         val startIndex = request.paramAsInt("startIndex", 0)
         val searchString = request.param("searchString", "")
-        val severity: String? = request.param("severity", "ALL")
-        val detectionType: String? = request.param("detectionType", "rules")
 
         val table = Table(
             sortOrder,
@@ -59,9 +57,7 @@ class RestGetFindingsAction : BaseRestHandler() {
 
         val getFindingsSearchRequest = GetFindingsRequest(
             findingID,
-            table,
-            severity,
-            detectionType
+            table
         )
         return RestChannelConsumer {
                 channel ->

diff --git a/alerting/src/main/kotlin/org/opensearch/alerting/transport/TransportGetFindingsAction.kt b/alerting/src/main/kotlin/org/opensearch/alerting/transport/TransportGetFindingsAction.kt
@@ -82,8 +82,6 @@ class TransportGetFindingsSearchAction @Inject constructor(
         val getFindingsRequest = request as? GetFindingsRequest
             ?: recreateObject(request) { GetFindingsRequest(it) }
         val tableProp = getFindingsRequest.table
-        val severity = getFindingsRequest.severity
-        val detectionType = getFindingsRequest.detectionType
         val searchString = tableProp.searchString
 
         val sortBuilder = SortBuilders
@@ -125,7 +123,8 @@ class TransportGetFindingsSearchAction @Inject constructor(
             queryBuilder.filter(timeRangeQuery)
         }
 
-        if (!detectionType.isNullOrBlank()) {
+        if (!getFindingsRequest.detectionType.isNullOrBlank()) {
+            val detectionType = getFindingsRequest.detectionType
             val nestedQueryBuilder = QueryBuilders.nestedQuery(
                 "queries",
                 when {
@@ -161,7 +160,8 @@ class TransportGetFindingsSearchAction @Inject constructor(
                 .minimumShouldMatch(1)
         }
 
-        if (!severity.isNullOrBlank()) {
+        if (!getFindingsRequest.severity.isNullOrBlank()) {
+            val severity = getFindingsRequest.severity
             queryBuilder
                 .must(
                     QueryBuilders.nestedQuery(