From 9aa85b37bee7c249ed17ac1b344a9f55c1b6eb5c Mon Sep 17 00:00:00 2001
From: sonika-shah <58761340+sonika-shah@users.noreply.github.com>
Date: Fri, 31 May 2024 17:13:14 +0530
Subject: [PATCH] Fix #16493 :User Deletion Error in Search - Adding
 Conditional Check (#16492)

* Fix User Deletion Error in Search - Adding Conditional Check

* Fix User Deletion Error in Search - Adding Conditional Check
---
 .../org/openmetadata/service/search/SearchRepository.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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 ea151540200..a0ce011ad02 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
@@ -586,9 +586,11 @@ public class SearchRepository {
             List.of(new ImmutablePair<>("service.id", docId)));
       }
       default -> {
-        searchClient.deleteEntityByFields(
-            indexMapping.getChildAliases(clusterAlias),
-            List.of(new ImmutablePair<>(entityType + ".id", docId)));
+        List<String> indexNames = indexMapping.getChildAliases(clusterAlias);
+        if (!indexNames.isEmpty()) {
+          searchClient.deleteEntityByFields(
+              indexNames, List.of(new ImmutablePair<>(entityType + ".id", docId)));
+        }
       }
     }
   }