fix(search): Transform _entityType/index output for scroll across entities as well (#8117)

Co-authored-by: Indy Prentice <[email protected]>

Author: iprentic

metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/ESSearchDAO.java

@@ -131,14 +131,20 @@ private AggregationMetadata transformAggregationMetadata(@Nonnull AggregationMet
 
   @VisibleForTesting
   SearchResult transformIndexIntoEntityName(SearchResult result) {
-    AggregationMetadataArray aggArray = result.getMetadata().getAggregations();
+    return result.setMetadata(result.getMetadata().setAggregations(transformIndexIntoEntityName(result.getMetadata().getAggregations())));
+  }
+  private ScrollResult transformIndexIntoEntityName(ScrollResult result) {
+    return result.setMetadata(result.getMetadata().setAggregations(transformIndexIntoEntityName(result.getMetadata().getAggregations())));
+  }
+
+  private AggregationMetadataArray transformIndexIntoEntityName(AggregationMetadataArray aggArray) {
     List<AggregationMetadata> newAggs = new ArrayList<>();
     for (AggregationMetadata aggMeta : aggArray) {
       List<String> aggregateFacets = List.of(aggMeta.getName().split(AGGREGATION_SEPARATOR_CHAR));
       int entityTypeIdx = aggregateFacets.indexOf(INDEX_VIRTUAL_FIELD);
       newAggs.add(transformAggregationMetadata(aggMeta, entityTypeIdx));
     }
-    return result.setMetadata(result.getMetadata().setAggregations(new AggregationMetadataArray(newAggs)));
+    return new AggregationMetadataArray(newAggs);
   }
 
   @Nonnull
@@ -148,10 +154,10 @@ private ScrollResult executeAndExtract(@Nonnull List<EntitySpec> entitySpecs, @N
     try (Timer.Context ignored = MetricUtils.timer(this.getClass(), "executeAndExtract_scroll").time()) {
       final SearchResponse searchResponse = client.search(searchRequest, RequestOptions.DEFAULT);
       // extract results, validated against document model as well
-      return SearchRequestHandler
+      return transformIndexIntoEntityName(SearchRequestHandler
               .getBuilder(entitySpecs, searchConfiguration, customSearchConfiguration)
               .extractScrollResult(searchResponse,
-              filter, scrollId, keepAlive, size, supportsPointInTime());
+              filter, scrollId, keepAlive, size, supportsPointInTime()));
     } catch (Exception e) {
       if (e instanceof ElasticsearchStatusException) {
         final ElasticsearchStatusException statusException = (ElasticsearchStatusException) e;