Merge branch 'release' into staging

virtualidentityag · May 13, 2024 · cdbdce1 · cdbdce1
2 parents e27ff41 + 6158bd4
commit cdbdce1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/src/main/java/com/vi/migrationtool/keycloak/KeycloakService.java b/src/main/java/com/vi/migrationtool/keycloak/KeycloakService.java
@@ -38,6 +38,7 @@ public class KeycloakService {
 
   private static final String SEARCH_PARAM = "search";
   private static final short USER_PAGE_SIZE = 500;
+  private static final String MAX_USERS_TO_MIGRATE = "850";
   private static final String PROVIDED_ROLE_DOESNT_EXISTS_IN_KEYCLOAK_MSG =
       "The provided role {} doesn't exists in keycloak, please create it first";
   private final KeycloakConfig keycloakConfig;

diff --git a/src/main/resources/migrations/master-digi.xml b/src/main/resources/migrations/master-digi.xml
@@ -21,6 +21,7 @@
 
   <!-- skip 0014_import_dioceses_from_agency_to_tenant_service"/>-->
   <include file="migrations/changeset/0015_create_jitsi_technical_keycloak_role/0015_create_jitsi_technical_keycloak_role.xml"/>
+  <include file="migrations/changeset/0015_add_groupchat_role_for_consultants/0015_add_groupchat_role_for_consultants.xml"/>
   <!-- skip 0016_migrate_consulting_types_description_to_topic/0016_migrate_consulting_types_description_to_topic.xml"/>-->
   <include file="migrations/changeset/0017_migrate_agency_default_counselling_relations/0017_migrate_agency_default_counselling_relations.xml"/>
   <include file="migrations/changeset/0019_add_counselling_relation_release_toggle/0019_add_counselling_relation_release_toggle.xml"/>