From acd8f4369b6f1147fe725ec2f9b0f7817dad4045 Mon Sep 17 00:00:00 2001 From: Ali Oezyetimoglu Date: Tue, 12 Sep 2023 13:30:21 +0200 Subject: [PATCH] RED-7175: changed TenantContext.getTenantId() to tenantRequest.getTenantId() to fix wrong index prefix when creating a new tenant with empty index prefix --- .../tenantusermanagement/service/TenantManagementService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/knecon/fforesight/tenantusermanagement/service/TenantManagementService.java b/src/main/java/com/knecon/fforesight/tenantusermanagement/service/TenantManagementService.java index 58d1845..d822457 100644 --- a/src/main/java/com/knecon/fforesight/tenantusermanagement/service/TenantManagementService.java +++ b/src/main/java/com/knecon/fforesight/tenantusermanagement/service/TenantManagementService.java @@ -120,7 +120,7 @@ public class TenantManagementService implements TenantProvider { .password(encryptionService.encrypt(tenantRequest.getSearchConnection().getPassword())) .numberOfShards(tenantRequest.getSearchConnection().getNumberOfShards()) .numberOfReplicas(tenantRequest.getSearchConnection().getNumberOfReplicas()) - .indexPrefix(indexPrefix != null ? indexPrefix : TenantContext.getTenantId()) + .indexPrefix(indexPrefix != null ? indexPrefix : tenantRequest.getTenantId()) .build()) .build(); @@ -416,7 +416,7 @@ public class TenantManagementService implements TenantProvider { .password(encryptionService.encrypt(searchConnection.getPassword())) .numberOfShards(searchConnection.getNumberOfShards()) .numberOfReplicas(searchConnection.getNumberOfReplicas()) - .indexPrefix(indexPrefix != null ? indexPrefix : TenantContext.getTenantId()) + .indexPrefix(indexPrefix != null ? indexPrefix : tenantRequest.getTenantId()) .build()); }