fix: eliminate use of user-tenants on tenant enablement (#917)

viacheslavkol · web-flow · commit 2c3622f3c9c2 · 2026-03-19T13:15:16.000+01:00
Use passed centralTenantId parameter instead for all tenant-dependant calls
diff --git a/NEWS.md b/NEWS.md
@@ -88,6 +88,7 @@
 * Change spring-kafka-test scope from compile to test ([MSEARCH-1148](https://folio-org.atlassian.net/browse/MSEARCH-1148))
 * Fix race condition in shouldIndexInstanceCallNumber\_createNewDocument\_onItemCreate ([MSEARCH-1149](https://folio-org.atlassian.net/browse/MSEARCH-1149))
 * Use GitHub Workflows for builds ([MSEARCH-1158](https://folio-org.atlassian.net/browse/MSEARCH-1158))
+* Eliminate use of user-tenants on tenant enablement to avoid invalid caches
 
 ### Dependencies
 * Bump `LIB_NAME` from `OLD_VERSION` to `NEW_VERSION`
diff --git a/src/main/java/org/folio/search/service/IndexService.java b/src/main/java/org/folio/search/service/IndexService.java
@@ -31,11 +31,13 @@
 import org.folio.search.service.es.SearchSettingsHelper;
 import org.folio.search.service.metadata.ResourceDescriptionService;
 import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
+import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 import tools.jackson.databind.JsonNode;
 import tools.jackson.databind.node.ObjectNode;
 
 @Log4j2
+@Primary
 @Service
 @RequiredArgsConstructor
 public class IndexService {
diff --git a/src/main/java/org/folio/search/service/LanguageConfigService.java b/src/main/java/org/folio/search/service/LanguageConfigService.java
@@ -16,22 +16,19 @@
 import org.folio.search.domain.dto.LanguageConfig;
 import org.folio.search.domain.dto.LanguageConfigs;
 import org.folio.search.exception.ValidationException;
-import org.folio.search.model.config.LanguageConfigEntity;
 import org.folio.search.repository.LanguageConfigRepository;
 import org.folio.search.service.metadata.LocalSearchFieldProvider;
-import org.folio.spring.service.SystemUserScopedExecutionService;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
 @Log4j2
 @Service
 @AllArgsConstructor
-public class LanguageConfigService {
+public class LanguageConfigService implements LanguageConfigServiceI {
 
   private final LanguageConfigRepository configRepository;
   private final LocalSearchFieldProvider searchFieldProvider;
-  private final SystemUserScopedExecutionService executionService;
   private final SearchConfigurationProperties searchConfiguration;
 
   /**
@@ -126,17 +123,4 @@ public Set<String> getAllLanguageCodes() {
       .map(LanguageConfig::getCode)
       .collect(Collectors.toSet());
   }
-
-  /**
-   * Returns all supported language codes for tenant.
-   *
-   * @param tenant tenant id as {@link String} object
-   * @return {@link Set} with language configuration codes.
-   */
-  public Set<String> getAllLanguagesForTenant(String tenant) {
-    return executionService.executeSystemUserScoped(tenant,
-      () -> configRepository.findAll().stream()
-        .map(LanguageConfigEntity::getCode)
-        .collect(Collectors.toSet()));
-  }
 }
diff --git a/src/main/java/org/folio/search/service/LanguageConfigServiceI.java b/src/main/java/org/folio/search/service/LanguageConfigServiceI.java
@@ -0,0 +1,17 @@
+package org.folio.search.service;
+
+import java.util.Set;
+import org.folio.search.domain.dto.LanguageConfig;
+import org.folio.search.domain.dto.LanguageConfigs;
+
+public interface LanguageConfigServiceI {
+  LanguageConfig create(LanguageConfig languageConfig);
+
+  LanguageConfig update(String code, LanguageConfig languageConfig);
+
+  void delete(String code);
+
+  LanguageConfigs getAll();
+
+  Set<String> getAllLanguageCodes();
+}
diff --git a/src/main/java/org/folio/search/service/TenantInitIndexService.java b/src/main/java/org/folio/search/service/TenantInitIndexService.java
@@ -0,0 +1,40 @@
+package org.folio.search.service;
+
+import org.folio.search.client.ResourceReindexClient;
+import org.folio.search.repository.IndexNameProvider;
+import org.folio.search.repository.IndexRepository;
+import org.folio.search.service.consortium.SimpleTenantProvider;
+import org.folio.search.service.es.SearchSettingsHelper;
+import org.folio.search.service.es.TenantInitMappingsHelper;
+import org.folio.search.service.metadata.ResourceDescriptionService;
+import org.springframework.stereotype.Service;
+
+/**
+ * A {@link IndexService} variant used during tenant initialization.
+ * Uses {@link TenantInitMappingsHelper} (which injects {@link LanguageConfigService} directly
+ * instead of the consortium decorator) and an {@link IndexNameProvider} backed by
+ * {@link SimpleTenantProvider} (which returns the tenant id as-is without consortium lookup).
+ * This prevents consortium tenant executor calls and cached cross-tenant responses
+ * during tenant initialization index creation.
+ */
+@Service
+public class TenantInitIndexService extends IndexService {
+
+  public TenantInitIndexService(IndexRepository indexRepository,
+                                TenantInitMappingsHelper mappingHelper,
+                                SearchSettingsHelper settingsHelper,
+                                ResourceReindexClient resourceReindexClient,
+                                ResourceDescriptionService resourceDescriptionService,
+                                SimpleTenantProvider simpleTenantProvider,
+                                LocationService locationService) {
+    super(indexRepository,
+      mappingHelper,
+      settingsHelper,
+      resourceReindexClient,
+      resourceDescriptionService,
+      new IndexNameProvider(simpleTenantProvider),
+      simpleTenantProvider,
+      locationService);
+  }
+}
+
diff --git a/src/main/java/org/folio/search/service/consortium/ConsortiumTenantProvider.java b/src/main/java/org/folio/search/service/consortium/ConsortiumTenantProvider.java
@@ -1,8 +1,10 @@
 package org.folio.search.service.consortium;
 
 import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Component;
 
+@Primary
 @Component
 @RequiredArgsConstructor
 public class ConsortiumTenantProvider implements TenantProvider {
diff --git a/src/main/java/org/folio/search/service/consortium/ConsortiumTenantService.java b/src/main/java/org/folio/search/service/consortium/ConsortiumTenantService.java
@@ -77,7 +77,7 @@ public List<String> getConsortiumTenants(String tenantId) {
         .map(this::getTenantsList)
         .orElse(Collections.emptyList());
     } catch (Exception e) {
-      log.debug("Unexpected exception occurred while trying to get consortium tenants", e);
+      log.warn("Unexpected exception occurred while trying to get consortium tenants", e);
       throw new FolioIntegrationException("Failed to retrieve consortium tenants", e);
     }
   }
diff --git a/src/main/java/org/folio/search/service/consortium/LanguageConfigServiceDecorator.java b/src/main/java/org/folio/search/service/consortium/LanguageConfigServiceDecorator.java
@@ -5,11 +5,14 @@
 import org.folio.search.domain.dto.LanguageConfig;
 import org.folio.search.domain.dto.LanguageConfigs;
 import org.folio.search.service.LanguageConfigService;
+import org.folio.search.service.LanguageConfigServiceI;
+import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Component;
 
+@Primary
 @Component
 @RequiredArgsConstructor
-public class LanguageConfigServiceDecorator {
+public class LanguageConfigServiceDecorator implements LanguageConfigServiceI {
 
   private final ConsortiumTenantExecutor consortiumTenantExecutor;
   private final LanguageConfigService languageConfigService;
@@ -33,8 +36,4 @@ public LanguageConfigs getAll() {
   public Set<String> getAllLanguageCodes() {
     return consortiumTenantExecutor.execute(languageConfigService::getAllLanguageCodes);
   }
-
-  public Set<String> getAllLanguagesForTenant(String tenant) {
-    return languageConfigService.getAllLanguagesForTenant(tenant);
-  }
 }
diff --git a/src/main/java/org/folio/search/service/consortium/SimpleTenantProvider.java b/src/main/java/org/folio/search/service/consortium/SimpleTenantProvider.java
@@ -0,0 +1,18 @@
+package org.folio.search.service.consortium;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * A simple {@link TenantProvider} implementation that returns the tenant id as-is,
+ * without any consortium lookup. Used during tenant initialization to avoid
+ * consortium-related caching and executor side-effects.
+ */
+@Component
+public class SimpleTenantProvider implements TenantProvider {
+
+  @Override
+  public String getTenant(String tenantId) {
+    return tenantId;
+  }
+}
+
diff --git a/src/main/java/org/folio/search/service/es/SearchMappingsHelper.java b/src/main/java/org/folio/search/service/es/SearchMappingsHelper.java
@@ -20,15 +20,17 @@
 import org.folio.search.model.metadata.ObjectFieldDescription;
 import org.folio.search.model.metadata.PlainFieldDescription;
 import org.folio.search.model.types.ResourceType;
-import org.folio.search.service.consortium.LanguageConfigServiceDecorator;
+import org.folio.search.service.LanguageConfigServiceI;
 import org.folio.search.service.metadata.ResourceDescriptionService;
 import org.folio.search.service.metadata.SearchFieldProvider;
 import org.folio.search.utils.JsonConverter;
+import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 import tools.jackson.databind.JsonNode;
 import tools.jackson.databind.node.ObjectNode;
 
 @Log4j2
+@Primary
 @Service
 @RequiredArgsConstructor
 public class SearchMappingsHelper {
@@ -37,7 +39,7 @@ public class SearchMappingsHelper {
 
   private final JsonConverter jsonConverter;
   private final SearchFieldProvider searchFieldProvider;
-  private final LanguageConfigServiceDecorator languageConfigService;
+  private final LanguageConfigServiceI languageConfigService;
   private final ResourceDescriptionService resourceDescriptionService;
 
   /**
diff --git a/src/main/java/org/folio/search/service/es/TenantInitMappingsHelper.java b/src/main/java/org/folio/search/service/es/TenantInitMappingsHelper.java
@@ -0,0 +1,27 @@
+package org.folio.search.service.es;
+
+import lombok.extern.log4j.Log4j2;
+import org.folio.search.service.LanguageConfigService;
+import org.folio.search.service.metadata.ResourceDescriptionService;
+import org.folio.search.service.metadata.SearchFieldProvider;
+import org.folio.search.utils.JsonConverter;
+import org.springframework.stereotype.Service;
+
+/**
+ * A {@link SearchMappingsHelper} variant used during tenant initialization.
+ * Injects {@link LanguageConfigService} directly instead of the consortium decorator,
+ * to avoid consortium tenant executor calls and cached cross-tenant responses.
+ */
+@Log4j2
+@Service
+public class TenantInitMappingsHelper extends SearchMappingsHelper {
+
+  public TenantInitMappingsHelper(JsonConverter jsonConverter,
+                                  SearchFieldProvider searchFieldProvider,
+                                  LanguageConfigService languageConfigService,
+                                  ResourceDescriptionService resourceDescriptionService) {
+    super(jsonConverter, searchFieldProvider, languageConfigService, resourceDescriptionService);
+  }
+}
+
+
diff --git a/src/main/java/org/folio/search/service/system/SearchTenantService.java b/src/main/java/org/folio/search/service/system/SearchTenantService.java
@@ -5,8 +5,8 @@
 import org.folio.search.configuration.properties.SearchConfigurationProperties;
 import org.folio.search.domain.dto.LanguageConfig;
 import org.folio.search.model.entity.TenantEntity;
-import org.folio.search.service.IndexService;
-import org.folio.search.service.consortium.LanguageConfigServiceDecorator;
+import org.folio.search.service.LanguageConfigService;
+import org.folio.search.service.TenantInitIndexService;
 import org.folio.search.service.metadata.ResourceDescriptionService;
 import org.folio.search.service.reindex.jdbc.TenantRepository;
 import org.folio.spring.FolioExecutionContext;
@@ -26,19 +26,19 @@ public class SearchTenantService extends TenantService {
 
   private static final String CENTRAL_TENANT_ID_PARAM_NAME = "centralTenantId";
 
-  private final IndexService indexService;
+  private final TenantInitIndexService indexService;
   private final KafkaAdminService kafkaAdminService;
   private final OkapiSystemUserService okapiSystemUserService;
-  private final LanguageConfigServiceDecorator languageConfigService;
+  private final LanguageConfigService languageConfigService;
   private final ResourceDescriptionService resourceDescriptionService;
   private final SearchConfigurationProperties searchConfigurationProperties;
   private final TenantRepository tenantRepository;
 
   public SearchTenantService(JdbcTemplate jdbcTemplate, FolioExecutionContext context,
                              FolioSpringLiquibase folioSpringLiquibase, KafkaAdminService kafkaAdminService,
-                             IndexService indexService,
+                             TenantInitIndexService indexService,
                              OkapiSystemUserService okapiSystemUserService,
-                             LanguageConfigServiceDecorator languageConfigService,
+                             LanguageConfigService languageConfigService,
                              ResourceDescriptionService resourceDescriptionService,
                              SearchConfigurationProperties searchConfigurationProperties,
                              TenantRepository tenantRepository) {
@@ -161,7 +161,8 @@ private void baseAfterTenantDeletion(String tenantId) {
 
   private void createIndexes() {
     var resourceNames = resourceDescriptionService.getResourceTypes();
-    resourceNames.forEach(resourceName -> indexService.createIndexIfNotExist(resourceName, context.getTenantId()));
+    resourceNames.forEach(resourceName ->
+      indexService.createIndexIfNotExist(resourceName, context.getTenantId()));
   }
 
   private void createLanguages() {
diff --git a/src/test/java/org/folio/search/service/LanguageConfigServiceTest.java b/src/test/java/org/folio/search/service/LanguageConfigServiceTest.java
@@ -1,29 +1,23 @@
 package org.folio.search.service;
 
-import static org.folio.support.TestConstants.TENANT_ID;
 import static org.folio.support.utils.TestUtils.languageConfig;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import jakarta.persistence.EntityNotFoundException;
-import java.util.List;
 import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.Callable;
 import org.folio.search.configuration.properties.SearchConfigurationProperties;
 import org.folio.search.domain.dto.LanguageConfig;
 import org.folio.search.exception.ValidationException;
 import org.folio.search.model.config.LanguageConfigEntity;
 import org.folio.search.repository.LanguageConfigRepository;
 import org.folio.search.service.metadata.LocalSearchFieldProvider;
 import org.folio.search.utils.SearchUtils;
-import org.folio.spring.service.SystemUserScopedExecutionService;
 import org.folio.spring.testing.type.UnitTest;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -45,8 +39,6 @@ class LanguageConfigServiceTest {
   @Mock
   private LocalSearchFieldProvider searchFieldProvider;
   @Mock
-  private SystemUserScopedExecutionService executionService;
-  @Mock
   private SearchConfigurationProperties searchConfigurationProperties;
 
   @Test
@@ -123,14 +115,4 @@ void update_negative_diffLanguageCodes() {
     var languageConfig = languageConfig(SUPPORTED_LANGUAGE_CODE);
     assertThrows(ValidationException.class, () -> configService.update(UNSUPPORTED_LANGUAGE_CODE, languageConfig));
   }
-
-  @Test
-  void getAllLanguagesForTenant_positive() {
-    var entities = List.of(new LanguageConfigEntity("eng", null), new LanguageConfigEntity("kor", "nori"));
-    when(configRepository.findAll()).thenReturn(entities);
-    when(executionService.executeSystemUserScoped(eq(TENANT_ID), any()))
-      .then(inv -> inv.<Callable<Set<String>>>getArgument(1).call());
-    var actual = configService.getAllLanguagesForTenant(TENANT_ID);
-    assertThat(actual, is(Set.of("eng", "kor")));
-  }
 }
diff --git a/src/test/java/org/folio/search/service/consortium/LanguageConfigServiceDecoratorTest.java b/src/test/java/org/folio/search/service/consortium/LanguageConfigServiceDecoratorTest.java
@@ -1,10 +1,8 @@
 package org.folio.search.service.consortium;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.folio.support.TestConstants.TENANT_ID;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 import java.util.Set;
@@ -93,16 +91,4 @@ void getAllLanguageCodes() {
     verify(service).getAllLanguageCodes();
     verify(consortiumTenantExecutor).execute(any());
   }
-
-  @Test
-  void getAllLanguagesForTenant() {
-    var expected = Set.of("test");
-    when(service.getAllLanguagesForTenant(TENANT_ID)).thenReturn(expected);
-
-    var actual = decorator.getAllLanguagesForTenant(TENANT_ID);
-
-    assertThat(actual).isEqualTo(expected);
-    verify(service).getAllLanguagesForTenant(TENANT_ID);
-    verifyNoInteractions(consortiumTenantExecutor);
-  }
 }
diff --git a/src/test/java/org/folio/search/service/system/SearchTenantServiceTest.java b/src/test/java/org/folio/search/service/system/SearchTenantServiceTest.java
@@ -17,8 +17,8 @@
 import org.folio.search.configuration.properties.SearchConfigurationProperties;
 import org.folio.search.domain.dto.LanguageConfig;
 import org.folio.search.model.entity.TenantEntity;
-import org.folio.search.service.IndexService;
-import org.folio.search.service.consortium.LanguageConfigServiceDecorator;
+import org.folio.search.service.LanguageConfigService;
+import org.folio.search.service.TenantInitIndexService;
 import org.folio.search.service.metadata.ResourceDescriptionService;
 import org.folio.search.service.reindex.jdbc.TenantRepository;
 import org.folio.spring.FolioExecutionContext;
@@ -56,13 +56,13 @@ public String getDBSchemaName(String tenantId) {
   @InjectMocks
   private SearchTenantService searchTenantService;
   @Mock
-  private IndexService indexService;
+  private TenantInitIndexService indexService;
   @Mock
   private FolioExecutionContext context;
   @Mock
   private OkapiSystemUserService okapiSystemUserService;
   @Mock
-  private LanguageConfigServiceDecorator languageConfigService;
+  private LanguageConfigService languageConfigService;
   @Mock
   private ResourceDescriptionService resourceDescriptionService;
   @Mock
diff --git a/src/test/java/org/folio/support/base/BaseIntegrationTest.java b/src/test/java/org/folio/support/base/BaseIntegrationTest.java

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public List<String> getConsortiumTenants(String tenantId) {`
`77`	`77`	`.map(this::getTenantsList)`
`78`	`78`	`.orElse(Collections.emptyList());`
`79`	`79`	`} catch (Exception e) {`
`80`		`- log.debug("Unexpected exception occurred while trying to get consortium tenants", e);`
	`80`	`+ log.warn("Unexpected exception occurred while trying to get consortium tenants", e);`
`81`	`81`	`throw new FolioIntegrationException("Failed to retrieve consortium tenants", e);`
`82`	`82`	`}`
`83`	`83`	`}`