RED-7175: added index name to search connection entity and adapted the code accordingly

build.gradle.kts

@@ -82,7 +82,7 @@ tasks.named<BootBuildImage>("bootBuildImage") {
 
 
 dependencies {
-    implementation("com.knecon.fforesight:keycloak-commons:0.19.0")
+    implementation("com.knecon.fforesight:keycloak-commons:0.20.0")
     implementation("com.knecon.fforesight:swagger-commons:0.5.0")
     implementation("org.postgresql:postgresql:42.5.4")
     implementation("com.google.guava:guava:31.1-jre")

src/main/java/com/knecon/fforesight/tenantusermanagement/dev/DevTestTenantService.java

@@ -81,7 +81,7 @@ public class DevTestTenantService {
                         .username(tenantsDBName)
                         .password(tenantsDBPassword)
                         .build())
-                .searchConnection(SearchConnection.builder().hosts(Set.of("localhost")).port(9200).scheme("http").numberOfShards("1").numberOfReplicas("5").build())
+                .searchConnection(SearchConnection.builder().hosts(Set.of("localhost")).port(9200).scheme("http").numberOfShards("1").numberOfReplicas("5").indexName("indexname").build())
                 .s3StorageConnection(S3StorageConnection.builder().key("minioadmin").secret("minioadmin").bucketName("redaction").endpoint("http://localhost:9000").build())
                 .build();
 

src/main/java/com/knecon/fforesight/tenantusermanagement/entity/SearchConnectionEntity.java

@@ -34,5 +34,7 @@ public class SearchConnectionEntity {
     private String numberOfShards;
     @Column(name = "search_number_of_replicas")
     private String numberOfReplicas;
+    @Column(name = "search_index_name")
+    private String indexName;
 
 }

src/main/java/com/knecon/fforesight/tenantusermanagement/model/TenantRequest.java

@@ -10,7 +10,6 @@ import com.knecon.fforesight.tenantcommons.model.SearchConnection;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.Pattern;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

src/main/java/com/knecon/fforesight/tenantusermanagement/service/TenantManagementService.java

@@ -113,6 +113,7 @@ public class TenantManagementService implements TenantProvider {
                                 .password(encryptionService.encrypt(tenantRequest.getSearchConnection().getPassword()))
                                 .numberOfShards(tenantRequest.getSearchConnection().getNumberOfShards())
                                 .numberOfReplicas(tenantRequest.getSearchConnection().getNumberOfReplicas())
+                                .indexName(tenantRequest.getSearchConnection().getIndexName())
                                 .build())
                         .build();
 
@@ -407,6 +408,7 @@ public class TenantManagementService implements TenantProvider {
                         .password(encryptionService.encrypt(searchConnection.getPassword()))
                         .numberOfShards(searchConnection.getNumberOfShards())
                         .numberOfReplicas(searchConnection.getNumberOfReplicas())
+                        .indexName(searchConnection.getIndexName())
                         .build());
             }
 
@@ -508,6 +510,7 @@ public class TenantManagementService implements TenantProvider {
                         .numberOfShards(entity.getSearchConnection().getNumberOfShards())
                         .numberOfReplicas(entity.getSearchConnection().getNumberOfReplicas())
                         .password(entity.getSearchConnection().getPassword())
+                        .indexName(entity.getSearchConnection().getIndexName())
                         .build())
                 .build();
 

src/main/resources/db/changelog/db.changelog-master.yaml

@@ -7,3 +7,5 @@ databaseChangeLog:
       file: db/changelog/master/4-add-unique-constraint-for-tenants-table.yaml
   - include:
       file: db/changelog/master/5-add-details-column.changelog.yaml
+  - include:
+      file: db/changelog/master/6-add-index-name-column.changelog.yaml

src/main/resources/db/changelog/master/6-add-index-name-column.changelog.yaml

@@ -0,0 +1,11 @@
+databaseChangeLog:
+  - changeSet:
+      id: add-index-name-column-to-tenant
+      author: ali
+      changes:
+        - addColumn:
+            tableName: tenant
+            columns:
+              - column:
+                  name: search_index_name
+                  type: TEXT

src/test/java/com/knecon/fforesight/tests/TenantsTest.java

@@ -78,6 +78,7 @@ public class TenantsTest extends AbstractTenantUserManagementIntegrationTest {
                         .port(123)
                         .username("updated_username")
                         .scheme("updated_scheme")
+                        .indexName("indexname")
                         .build())
                 .databaseConnection(DatabaseConnection.builder()
                         .database("updated_db")

src/test/java/com/knecon/fforesight/utils/TestTenantService.java

@@ -75,7 +75,7 @@ public class TestTenantService {
                         .username(SpringPostgreSQLTestContainer.getInstance().getUsername())
                         .password(SpringPostgreSQLTestContainer.getInstance().getPassword())
                         .build())
-                .searchConnection(SearchConnection.builder().hosts(Set.of("localhost")).port(9200).scheme("http").numberOfShards("1").numberOfReplicas("5").build());
+                .searchConnection(SearchConnection.builder().hosts(Set.of("localhost")).port(9200).scheme("http").numberOfShards("1").numberOfReplicas("5").indexName("indexname").build());
 
         if (withStorage) {
             tenantRequest = tenantRequestBuilder.s3StorageConnection(S3StorageConnection.builder()