Merge pull request #72 from Onlineberatung/DIAKONIE-352-merge-tenant-…

…logic chore: merge logic
virtualidentityag · Jul 18, 2024 · 82ef075 · 82ef075
2 parents 185a5b6 + 9656891
commit 82ef075
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 16 deletions.
diff --git a/src/main/java/com/vi/migrationtool/keycloak/TenantUpdateService.java b/src/main/java/com/vi/migrationtool/keycloak/TenantUpdateService.java
@@ -15,7 +15,8 @@ public class TenantUpdateService {
 
   private static final int USER_PAGE_SIZE = 300;
   private static final String TENANT_ID = "tenantId";
-  private static final String SUCCESSFULLY_SET_TENANT_ID_FOR_WITH_ID_TO = "Successfully set tenantId for {} with id {} to {}";
+  private static final String SUCCESSFULLY_SET_TENANT_ID_FOR_WITH_ID_TO =
+      "Successfully set tenantId for {} with id {} to {}";
 
   private final KeycloakUserService keycloakUserService;
 
@@ -48,10 +49,7 @@ public void updateAdviceSeekersTenant(List<UserTenant> adviceSeekerToTargetTenan
           adviceSeekerTenant.getTenantId());
 
       keycloakUserService.updateUserCustomAttributeWithoutLogin(
-          TENANT_ID,
-          adviceSeekerTenant.getTenantId(),
-          adviceSeekerTenant.getUserId(),
-          httpHeaders);
+          TENANT_ID, adviceSeekerTenant.getTenantId(), adviceSeekerTenant.getUserId(), httpHeaders);
 
       updateTables(adviceSeekerTenant);
       log.info(

diff --git a/src/main/java/com/vi/migrationtool/tenantservice/MergeTenantsMigrationTask.java b/src/main/java/com/vi/migrationtool/tenantservice/MergeTenantsMigrationTask.java
@@ -37,7 +37,6 @@ public void execute(Database database) {
     var agencyServiceJdbcTemplate =
         BeanAwareSpringLiquibase.getNamedBean("agencyServiceJdbcTemplate", JdbcTemplate.class);
 
-
     this.keycloakLoginService =
         BeanAwareSpringLiquibase.getNamedBean("keycloakLoginService", KeycloakLoginService.class);
 
@@ -57,7 +56,8 @@ public void execute(Database database) {
     performMigrations(migrations, tenantMigrationService);
   }
 
-  private void performMigrations(List<TenantMigrationConfiguration> migrations,
+  private void performMigrations(
+      List<TenantMigrationConfiguration> migrations,
       TenantMigrationService tenantMigrationService) {
     migrations.stream()
         .forEach(

diff --git a/src/main/java/com/vi/migrationtool/tenantservice/TenantMigrationService.java b/src/main/java/com/vi/migrationtool/tenantservice/TenantMigrationService.java
@@ -1,6 +1,5 @@
 package com.vi.migrationtool.tenantservice;
 
-import com.vi.migrationtool.keycloak.KeycloakUserService;
 import com.vi.migrationtool.keycloak.TenantUpdateService;
 import com.vi.migrationtool.keycloak.UserTenant;
 import java.util.List;
@@ -51,7 +50,6 @@ private void updateAgencyServiceTenantId(TenantMigrationConfiguration migration)
             migration.getSourceTenantId());
 
     log.info(UPDATED + updatedRows + " rows in agency postcode range tables");
-
   }
 
   private void updateUserServiceTenantId(TenantMigrationConfiguration migration) {
@@ -68,8 +66,11 @@ private void deleteSourceTenant(TenantMigrationConfiguration migration) {
 
   private void updateUsersInKeycloakAndDatabase(TenantMigrationConfiguration migration) {
 
-    log.info("Step: attempt to find and update adviceseekers in keycloak and database. "
-        + SOURCE_TENANT_TARGET_TENANT, migration.getSourceTenantId(), migration.getTargetTenantId());
+    log.info(
+        "Step: attempt to find and update adviceseekers in keycloak and database. "
+            + SOURCE_TENANT_TARGET_TENANT,
+        migration.getSourceTenantId(),
+        migration.getTargetTenantId());
     List<UserTenant> adviceSeekerTargetTenants =
         userServiceJdbcTemplate.query(
             "select u.user_id \n"
@@ -83,9 +84,11 @@ private void updateUsersInKeycloakAndDatabase(TenantMigrationConfiguration migra
 
     tenantUpdateService.updateAdviceSeekersTenant(adviceSeekerTargetTenants);
 
-
-    log.info("Step: attempt to find and update consultants in keycloak and database. "
-        + SOURCE_TENANT_TARGET_TENANT, migration.getSourceTenantId(), migration.getTargetTenantId());
+    log.info(
+        "Step: attempt to find and update consultants in keycloak and database. "
+            + SOURCE_TENANT_TARGET_TENANT,
+        migration.getSourceTenantId(),
+        migration.getTargetTenantId());
     List<UserTenant> consultantTargetTenants =
         userServiceJdbcTemplate.query(
             "select consultant_id \n"
@@ -99,8 +102,11 @@ private void updateUsersInKeycloakAndDatabase(TenantMigrationConfiguration migra
 
     tenantUpdateService.updateConsultantsTenant(consultantTargetTenants);
 
-    log.info("Step: attempt to find and update admins in keycloak and database. "
-        + SOURCE_TENANT_TARGET_TENANT, migration.getSourceTenantId(), migration.getTargetTenantId());
+    log.info(
+        "Step: attempt to find and update admins in keycloak and database. "
+            + SOURCE_TENANT_TARGET_TENANT,
+        migration.getSourceTenantId(),
+        migration.getTargetTenantId());
     List<UserTenant> adminTargetTenants =
         userServiceJdbcTemplate.query(
             "select admin_id \n"