Merge pull request #76 from virtualidentityag/staging

Staging
virtualidentityag · Jul 18, 2024 · 64d2064 · 64d2064
2 parents 06db779 + 7a79013
commit 64d2064
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -46,3 +46,4 @@ weblate.config.api-key=
 weblate.config.web=
 weblate.config.use.custom.resources.path=false
 weblate.config.custom.resources.path=
+spring.main.allow-circular-references=true
diff --git a/src/main/resources/migrations/changeset/0029_merge_tenants/0029_merge_tenants.xml b/src/main/resources/migrations/changeset/0029_merge_tenants/0029_merge_tenants.xml
@@ -5,7 +5,8 @@
 
   <changeSet author="tkuzynow" id="mergeTenants">
     <customChange class="com.vi.migrationtool.tenantservice.MergeTenantsMigrationTask">
-      <param name="tenantMigrationConfiguration" value='[]'/>
+      <param name="tenantMigrationConfiguration" value='[{"sourceTenantId" : 24, "targetTenantId": 2, "deleteSourceTenant": true},
+                  {"sourceTenantId" : 4, "targetTenantId": 3, "deleteSourceTenant": true}]'/>
 
     </customChange>
   </changeSet>

diff --git a/src/main/resources/migrations/master-diakonie.xml b/src/main/resources/migrations/master-diakonie.xml
@@ -26,4 +26,5 @@
     <include file="migrations/changeset/0023_create_jitsi_technical_user/0023_create_jitsi_technical_user.xml"/>
     <include file="migrations/changeset/0024_create_weblate_project/0024_create_weblate_project.xml"/>
     <include file="migrations/changeset/0028_fix_consultant_and_user_tenant_id_in_keycloak_based_on_consultant_agency_tenant_id/0028_fix_consultant_and_user_tenant_id_in_keycloak_based_on_consultant_agency_tenant_id.xml"/>
+    <include file="migrations/changeset/0029_merge_tenants/0029_merge_tenants.xml"/>
 </databaseChangeLog>