Fixed adding superadmin to created workspace realtime

Thomasr · ludomikula · commit db0357ea6d00 · 2024-09-09T12:10:43.000+02:00
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrganizationServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrganizationServiceImpl.java
@@ -153,12 +153,12 @@ private Mono<Organization> onOrgCreated(String userId, Organization newOrg, bool
         return groupService.createAllUserGroup(newOrg.getId())
                 .then(groupService.createDevGroup(newOrg.getId()))
                 .then(setOrgAdmin(userId, newOrg, isSuperAdmin))
-                .then(userRepository.findAll().filter(User::getSuperAdmin).last().map(superAdminUser -> {
+                .then(userRepository.findBySuperAdminIsTrue().flatMap(superAdminUser -> {
                     if(!userId.equals(superAdminUser.getId())) {
                         return setOrgSuperAdmin(superAdminUser.getId(), newOrg);
                     }
                     return Mono.empty();
-                }))
+                }).then())
                 .thenReturn(newOrg);
     }
 
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/repository/UserRepository.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/repository/UserRepository.java
@@ -13,6 +13,7 @@
 public interface UserRepository extends ReactiveMongoRepository<User, String> {
 
     Flux<User> findByIdIn(Collection<String> ids);
+    Mono<User> findBySuperAdminIsTrue();
 
     Mono<User> findByConnections_SourceAndConnections_RawId(String source, String rawId);
 

Original file line number	Diff line number	Diff line change
`@@ -153,12 +153,12 @@ private Mono<Organization> onOrgCreated(String userId, Organization newOrg, bool`
`153`	`153`	`return groupService.createAllUserGroup(newOrg.getId())`
`154`	`154`	`.then(groupService.createDevGroup(newOrg.getId()))`
`155`	`155`	`.then(setOrgAdmin(userId, newOrg, isSuperAdmin))`
`156`		`- .then(userRepository.findAll().filter(User::getSuperAdmin).last().map(superAdminUser -> {`
	`156`	`+ .then(userRepository.findBySuperAdminIsTrue().flatMap(superAdminUser -> {`
`157`	`157`	`if(!userId.equals(superAdminUser.getId())) {`
`158`	`158`	`return setOrgSuperAdmin(superAdminUser.getId(), newOrg);`
`159`	`159`	`}`
`160`	`160`	`return Mono.empty();`
`161`		`- }))`
	`161`	`+ }).then())`
`162`	`162`	`.thenReturn(newOrg);`
`163`	`163`	`}`
`164`	`164`