From 0fb2b9c36dc837df4f973bed62cc15c3828e62ce Mon Sep 17 00:00:00 2001
From: sonika-shah <58761340+sonika-shah@users.noreply.github.com>
Date: Fri, 13 Jun 2025 03:17:54 +0530
Subject: [PATCH] Fix #21653 - Remove recently added delete param field in
 searchByField api (#21723)

(cherry picked from commit 66d2ef2c8b8d68b00b43f8d6b8ee32bc2c972b8c)
---
 .../service/resources/search/SearchResource.java          | 8 ++------
 .../org/openmetadata/service/search/SearchClient.java     | 3 +--
 .../org/openmetadata/service/search/SearchRepository.java | 4 ++--
 .../service/search/elasticsearch/ElasticSearchClient.java | 8 ++------
 .../service/search/opensearch/OpenSearchClient.java       | 8 ++------
 5 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/search/SearchResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/search/SearchResource.java
index bee12b59222..eb2baa7de3e 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/search/SearchResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/search/SearchResource.java
@@ -409,14 +409,10 @@ public class SearchResource {
       @Parameter(description = "Search Index name, defaults to table_search_index")
           @DefaultValue("table_search_index")
           @QueryParam("index")
-          String index,
-      @Parameter(description = "Filter documents by deleted param. By default deleted is false")
-          @DefaultValue("false")
-          @QueryParam("deleted")
-          boolean deleted)
+          String index)
       throws IOException {
 
-    return searchRepository.searchByField(fieldName, fieldValue, index, deleted);
+    return searchRepository.searchByField(fieldName, fieldValue, index);
   }
 
   @GET
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/SearchClient.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/SearchClient.java
index 68717133caf..796f3450ff2 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/search/SearchClient.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/SearchClient.java
@@ -257,8 +257,7 @@ public interface SearchClient {
         Response.Status.NOT_IMPLEMENTED, NOT_IMPLEMENTED_ERROR_TYPE, NOT_IMPLEMENTED_METHOD);
   }
 
-  Response searchByField(String fieldName, String fieldValue, String index, Boolean deleted)
-      throws IOException;
+  Response searchByField(String fieldName, String fieldValue, String index) throws IOException;
 
   Response aggregate(AggregationRequest request) throws IOException;
 
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/SearchRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/SearchRepository.java
index 97d847fff14..904a880e521 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/search/SearchRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/SearchRepository.java
@@ -1160,9 +1160,9 @@ public class SearchRepository {
             .withIsConnectedVia(isConnectedVia(entityType)));
   }
 
-  public Response searchByField(String fieldName, String fieldValue, String index, Boolean deleted)
+  public Response searchByField(String fieldName, String fieldValue, String index)
       throws IOException {
-    return searchClient.searchByField(fieldName, fieldValue, index, deleted);
+    return searchClient.searchByField(fieldName, fieldValue, index);
   }
 
   public Response aggregate(AggregationRequest request) throws IOException {
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ElasticSearchClient.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ElasticSearchClient.java
index 4a1904a810f..96b5c4b0e44 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ElasticSearchClient.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ElasticSearchClient.java
@@ -1308,17 +1308,13 @@ public class ElasticSearchClient implements SearchClient {
   }
 
   @Override
-  public Response searchByField(String fieldName, String fieldValue, String index, Boolean deleted)
+  public Response searchByField(String fieldName, String fieldValue, String index)
       throws IOException {
     es.org.elasticsearch.action.search.SearchRequest searchRequest =
         new es.org.elasticsearch.action.search.SearchRequest(
             Entity.getSearchRepository().getIndexOrAliasName(index));
     SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
-    BoolQueryBuilder query =
-        QueryBuilders.boolQuery()
-            .must(QueryBuilders.wildcardQuery(fieldName, fieldValue))
-            .filter(QueryBuilders.termQuery("deleted", deleted));
-    searchSourceBuilder.query(query);
+    searchSourceBuilder.query(QueryBuilders.wildcardQuery(fieldName, fieldValue));
     searchRequest.source(searchSourceBuilder);
     String response = client.search(searchRequest, RequestOptions.DEFAULT).toString();
     return Response.status(OK).entity(response).build();
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OpenSearchClient.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OpenSearchClient.java
index 4427e6b1ff8..0fd88166453 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OpenSearchClient.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OpenSearchClient.java
@@ -1382,17 +1382,13 @@ public class OpenSearchClient implements SearchClient {
   }
 
   @Override
-  public Response searchByField(String fieldName, String fieldValue, String index, Boolean deleted)
+  public Response searchByField(String fieldName, String fieldValue, String index)
       throws IOException {
     os.org.opensearch.action.search.SearchRequest searchRequest =
         new os.org.opensearch.action.search.SearchRequest(
             Entity.getSearchRepository().getIndexOrAliasName(index));
     SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
-    BoolQueryBuilder query =
-        QueryBuilders.boolQuery()
-            .must(QueryBuilders.wildcardQuery(fieldName, fieldValue))
-            .filter(QueryBuilders.termQuery("deleted", deleted));
-    searchSourceBuilder.query(query);
+    searchSourceBuilder.query(QueryBuilders.wildcardQuery(fieldName, fieldValue));
     searchRequest.source(searchSourceBuilder);
     String response = client.search(searchRequest, RequestOptions.DEFAULT).toString();
     return Response.status(OK).entity(response).build();