Fix charts getting wrong service during reindex (#26011)

* Fix charts getting wrong service during reindex

* address feedback from gitar bot

* Fix explore tree spec

---------

Co-authored-by: Aniket Katkar <aniketkatkar97@gmail.com>

Author: 2 people

openmetadata-integration-tests/src/test/java/org/openmetadata/it/tests/ChartResourceIT.java

@@ -931,4 +931,66 @@ protected CreateChart createInvalidRequestForBulk(TestNamespace ns) {
     request.setName(ns.prefix("invalid_chart"));
     return request;
   }
+
+  @Test
+  void test_bulkListChartsFromDifferentServices_maintainsCorrectServiceReference(TestNamespace ns) {
+    // Regression test for bug where bulk loading charts incorrectly set all charts
+    // to the first chart's service. This was caused by ChartRepository.fetchAndSetServices()
+    // assuming all charts in a batch belong to the same service.
+
+    // Create two different dashboard services
+    DashboardService metabaseService = DashboardServiceTestFactory.createMetabase(ns);
+    DashboardService lookerService = DashboardServiceTestFactory.createLooker(ns);
+
+    // Create charts under different services
+    CreateChart metabaseChartRequest = new CreateChart();
+    metabaseChartRequest.setName(ns.prefix("bulk_test_metabase_chart"));
+    metabaseChartRequest.setService(metabaseService.getFullyQualifiedName());
+    metabaseChartRequest.setChartType(ChartType.Bar);
+
+    CreateChart lookerChartRequest = new CreateChart();
+    lookerChartRequest.setName(ns.prefix("bulk_test_looker_chart"));
+    lookerChartRequest.setService(lookerService.getFullyQualifiedName());
+    lookerChartRequest.setChartType(ChartType.Line);
+
+    Chart metabaseChart = createEntity(metabaseChartRequest);
+    Chart lookerChart = createEntity(lookerChartRequest);
+
+    // Verify initial service assignments
+    assertEquals(
+        metabaseService.getFullyQualifiedName(),
+        metabaseChart.getService().getFullyQualifiedName());
+    assertEquals(
+        lookerService.getFullyQualifiedName(), lookerChart.getService().getFullyQualifiedName());
+
+    // List all charts (this uses bulk loading internally via setFieldsInBulk)
+    ListParams params = new ListParams();
+    params.setLimit(1000);
+    params.setFields("service");
+    ListResponse<Chart> allCharts = listEntities(params);
+
+    // Find our test charts in the bulk-loaded list
+    Chart foundMetabaseChart =
+        allCharts.getData().stream()
+            .filter(c -> c.getName().equals(metabaseChartRequest.getName()))
+            .findFirst()
+            .orElseThrow(() -> new AssertionError("Metabase chart not found in list"));
+
+    Chart foundLookerChart =
+        allCharts.getData().stream()
+            .filter(c -> c.getName().equals(lookerChartRequest.getName()))
+            .findFirst()
+            .orElseThrow(() -> new AssertionError("Looker chart not found in list"));
+
+    // This assertion would fail before the fix - all charts got the first chart's service
+    assertEquals(
+        metabaseService.getFullyQualifiedName(),
+        foundMetabaseChart.getService().getFullyQualifiedName(),
+        "Chart created under Metabase should retain Metabase as its service after bulk list");
+
+    assertEquals(
+        lookerService.getFullyQualifiedName(),
+        foundLookerChart.getService().getFullyQualifiedName(),
+        "Chart created under Looker should retain Looker as its service after bulk list");
+  }
 }

openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ChartRepository.java

@@ -58,7 +58,9 @@ public ChartRepository() {
 
     // Register bulk field fetchers for efficient database operations
     fieldFetchers.put("dashboards", this::fetchAndSetDashboards);
-    fieldFetchers.put("service", this::fetchAndSetServices);
+    // NOTE: "service" field is NOT registered here because:
+    // - For bulk operations: fetchAndSetDefaultService() in setFieldsInBulk handles it correctly
+    // - For single entity: setFields() already sets service via getContainer()
   }
 
   @Override
@@ -154,17 +156,6 @@ private void fetchAndSetDashboards(List<Chart> charts, Fields fields) {
     setFieldFromMap(true, charts, batchFetchDashboards(charts), Chart::setDashboards);
   }
 
-  private void fetchAndSetServices(List<Chart> charts, Fields fields) {
-    if (!fields.contains("service") || charts == null || charts.isEmpty()) {
-      return;
-    }
-    // For charts, all should have the same service (dashboard service)
-    EntityReference service = getContainer(charts.get(0).getId());
-    for (Chart chart : charts) {
-      chart.setService(service);
-    }
-  }
-
   @Override
   public void clearFields(Chart chart, Fields fields) {
     /* Nothing to do */

openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/ExploreTree.spec.ts

@@ -12,6 +12,7 @@
  */
 import test, { expect } from '@playwright/test';
 import { get } from 'lodash';
+import { PLAYWRIGHT_SAMPLE_DATA_TAG_OBJ } from '../../constant/config';
 import { DATA_ASSETS } from '../../constant/explore';
 import { SidebarItem } from '../../constant/sidebar';
 import { DataProduct } from '../../support/domain/DataProduct';
@@ -52,7 +53,6 @@ import {
   verifyDatabaseAndSchemaInExploreTree,
 } from '../../utils/explore';
 import { sidebarClick } from '../../utils/sidebar';
-import { PLAYWRIGHT_SAMPLE_DATA_TAG_OBJ } from '../../constant/config';
 
 // use the admin user to login
 test.use({
@@ -412,6 +412,8 @@ test.describe('Explore page', PLAYWRIGHT_SAMPLE_DATA_TAG_OBJ, () => {
       state: 'detached',
     });
 
+    const serviceName = dashboard.serviceResponseData.name;
+
     const dashboardNode = page.getByTestId('explore-tree-title-Dashboards');
     await expect(dashboardNode).toBeVisible();
 
@@ -443,14 +445,14 @@ test.describe('Explore page', PLAYWRIGHT_SAMPLE_DATA_TAG_OBJ, () => {
       .locator('.ant-tree-switcher')
       .click();
 
-    const sampleSupersetNode = page.getByTestId(
-      'explore-tree-title-sample_superset'
+    const dashboardServiceNode = page.getByTestId(
+      `explore-tree-title-${serviceName}`
     );
-    await expect(sampleSupersetNode).toBeVisible();
+    await expect(dashboardServiceNode).toBeVisible();
 
     await page
       .locator('.ant-tree-treenode', {
-        has: page.getByTestId('explore-tree-title-sample_superset'),
+        has: page.getByTestId(`explore-tree-title-${serviceName}`),
       })
       .locator('.ant-tree-switcher')
       .click();
@@ -462,12 +464,12 @@ test.describe('Explore page', PLAYWRIGHT_SAMPLE_DATA_TAG_OBJ, () => {
     const searchInput = page.getByTestId('searchBox');
     await searchInput.click();
     await searchInput.clear();
-    await searchInput.fill(chart.entityResponseData.name);
+    await searchInput.fill(dashboard.chartsResponseData.name);
     await searchInput.press('Enter');
 
     const searchResults = page.getByTestId('search-results');
     const chartCard = searchResults.getByTestId(
-      `table-data-card_${chart.entityResponseData.fullyQualifiedName}`
+      `table-data-card_${dashboard.chartsResponseData.fullyQualifiedName}`
     );
 
     await expect(chartCard).toBeVisible();