Add superadmin to all organizations with superadmin role.

Thomasr · ludomikula · commit 7a0f859153e4 · 2024-09-09T12:10:43.000+02:00
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrgMemberServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrgMemberServiceImpl.java
@@ -263,10 +263,10 @@ public Mono<Void> bulkAddToOrgs(Collection<String> orgIds, String userId, Member
 
     @Override
     public Mono<Void> addToAllOrgAsAdminIfNot(String userId) {
-        List<String> oldOrgIds = getAllActiveOrgs(userId).map(OrgMember::getOrgId).toStream().toList();
-        List<String> allOrgIds = organizationService.getAllActive().map(HasIdAndAuditing::getId).toStream().toList();
-        List<String> newOrgIds = allOrgIds.stream().filter(orgId -> !oldOrgIds.contains(orgId)).toList();
-        return bulkAddToOrgs(newOrgIds, userId, MemberRole.SUPER_ADMIN).then();
+        Flux<String> oldOrgIdsFlux = getAllActiveOrgs(userId).map(OrgMember::getOrgId);
+        Flux<String> allOrgIdsFlux = organizationService.getAllActive().map(HasIdAndAuditing::getId);
+        Flux<String> newOrgIdsMono = oldOrgIdsFlux.collectList().flatMapMany(oldList -> allOrgIdsFlux.filter(item -> !oldList.contains(item)));
+        return newOrgIdsMono.collectList().flatMapMany(newOrgIds -> bulkAddToOrgs(newOrgIds, userId, MemberRole.SUPER_ADMIN)).then();
     }
 
     private Mono<Void> bulkAddToAllUserGroup(String orgId, Collection<String> userIds) {
@@ -279,9 +279,8 @@ private Mono<Void> bulkAddToAllUserGroup(String orgId, Collection<String> userId
     }
 
     private Mono<Void> bulkAddToAllUserGroup(Collection<String> orgIds, String userId, MemberRole memberRole) {
-        return Mono.just(orgIds.stream().map(orgId -> groupService.getAllUsersGroup(orgId)
-                .flatMap(group -> groupMemberService.addMember(orgId, group.getId(), userId, memberRole)).block()).toList())
-                .then();
+        return Flux.fromIterable(orgIds).flatMap(orgId -> groupService.getAllUsersGroup(orgId)
+                .flatMap(group -> groupMemberService.addMember(orgId, group.getId(), userId, memberRole))).then();
     }
 
     @Override
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/job/AddSuperAdminUserImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/job/AddSuperAdminUserImpl.java
@@ -33,13 +33,11 @@ public class AddSuperAdminUserImpl implements AddSuperAdminUser {
     private final CommonConfig commonConfig;
     private final UserService userService;
     private final OrgMemberService orgMemberService;
-    private final OrganizationService organizationService;
 
     @Override
     public void addOrUpdateSuperAdmin() {
 
         AuthUser authUser = formulateAuthUser();
-
         authenticationApiService.updateOrCreateUser(authUser, false, true)
                 .delayUntil(user -> {
                     if (user.getIsNewUser()) {
@@ -49,7 +47,7 @@ public void addOrUpdateSuperAdmin() {
                 })
                 .delayUntil(user -> userService.setPassword(user.getId(), ((FormAuthRequestContext)authUser.getAuthContext()).getPassword()))
                 .delayUntil(user -> orgMemberService.addToAllOrgAsAdminIfNot(user.getId()))
-                .block();
+                .subscribe();
     }
 
     private AuthUser formulateAuthUser() {
