fixed orgmembers with searchMemberName and searchGroupId

dragonpoo · ludomikula · commit 4cf2c1d85118 · 2025-06-17T08:56:21.000+02:00
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrgApiService.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrgApiService.java
@@ -53,5 +53,7 @@ public interface OrgApiService {
     Mono<ConfigView> getOrganizationConfigs(String orgId);
 
     Mono<Long> getApiUsageCount(String orgId, Boolean lastMonthOnly);
+
+    Mono<OrgMemberListView> getOrganizationMembersForSearch(String orgId, String searchMemberName, String searchGroupId, Integer pageNum, Integer pageSize);
 }
 
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrgApiServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrgApiServiceImpl.java
@@ -40,6 +40,9 @@
 import org.springframework.http.codec.multipart.Part;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Mono;
+import reactor.core.publisher.Flux;
+import org.lowcoder.domain.group.service.GroupMemberService;
+import org.lowcoder.domain.group.model.GroupMember;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -49,6 +52,8 @@
 import static org.lowcoder.sdk.util.ExceptionUtils.deferredError;
 import static org.lowcoder.sdk.util.ExceptionUtils.ofError;
 import static org.lowcoder.sdk.util.StreamUtils.collectSet;
+import reactor.util.function.Tuple2;
+import reactor.util.function.Tuples;
 
 @Slf4j
 @Service
@@ -72,9 +77,10 @@ public class OrgApiServiceImpl implements OrgApiService {
     private GroupService groupService;
     @Autowired
     private AuthenticationService authenticationService;
-
     @Autowired
     private ServerLogService serverLogService;
+    @Autowired
+    private GroupMemberService groupMemberService;
 
     @Override
     public Mono<OrgMemberListView> getOrganizationMembers(String orgId, int page, int count) {
@@ -84,6 +90,78 @@ public Mono<OrgMemberListView> getOrganizationMembers(String orgId, int page, in
                 .then(getOrgMemberListView(orgId, page, count));
     }
 
+// Update getOrgMemberListViewForSearch to filter by group membership
+private Mono<OrgMemberListView> getOrgMemberListViewForSearch(String orgId, String searchMemberName, String searchGroupId, Integer page, Integer pageSize) {
+    return orgMemberService.getOrganizationMembers(orgId)
+            .collectList()
+            .flatMap(orgMembers -> {
+                List<String> userIds = orgMembers.stream()
+                        .map(OrgMember::getUserId)
+                        .collect(Collectors.toList());
+                Mono<Map<String, User>> users = userService.getByIds(userIds);
+
+                // If searchGroupId is provided, fetch group members
+                Mono<Set<String>> groupUserIdsMono = StringUtils.isBlank(searchGroupId)
+                        ? Mono.just(Collections.emptySet())
+                        : groupMemberService.getGroupMembers(searchGroupId)
+                        .map(list -> list.stream()
+                        .map(GroupMember::getUserId)
+                        .collect(Collectors.toSet()));
+
+                return Mono.zip(users, groupUserIdsMono)
+                        .map(tuple -> {
+                            Map<String, User> userMap = tuple.getT1();
+                            Set<String> groupUserIds = tuple.getT2();
+
+                            var list = orgMembers.stream()
+                                    .map(orgMember -> {
+                                        User user = userMap.get(orgMember.getUserId());
+                                        if (user == null) {
+                                            log.warn("user {} not exist and will be removed from the result.", orgMember.getUserId());
+                                            return null;
+                                        }
+                                        return buildOrgMemberView(user, orgMember);
+                                    })
+                                    .filter(Objects::nonNull)
+                                    .filter(orgMemberView -> {
+                                        // Filter by name
+                                        boolean matchesName = StringUtils.isBlank(searchMemberName) ||
+                                                StringUtils.containsIgnoreCase(orgMemberView.getName(), searchMemberName);
+
+                                        // Filter by group
+                                        boolean matchesGroup = StringUtils.isBlank(searchGroupId) ||
+                                                groupUserIds.contains(orgMemberView.getUserId());
+
+                                        return matchesName && matchesGroup;
+                                    })
+                                    .collect(Collectors.toList());
+                            var pageTotal = list.size();
+                            list = list.subList((page - 1) * pageSize, pageSize == 0 ? pageTotal : Math.min(page * pageSize, pageTotal));
+                            return Pair.of(list, pageTotal);
+                        });
+            })
+            .zipWith(sessionUserService.getVisitorOrgMemberCache())
+            .map(tuple -> {
+                List<OrgMemberView> memberViews = tuple.getT1().getLeft();
+                var pageTotal = tuple.getT1().getRight();
+                OrgMember orgMember = tuple.getT2();
+                return OrgMemberListView.builder()
+                        .members(memberViews)
+                        .total(pageTotal)
+                        .pageNum(page)
+                        .pageSize(pageSize)
+                        .visitorRole(orgMember.getRole().getValue())
+                        .build();
+            });
+    }
+    @Override
+    public  Mono<OrgMemberListView> getOrganizationMembersForSearch(String orgId, String searchMemberName, String searchGroupId, Integer page, Integer pageSize) {
+        return sessionUserService.getVisitorId()
+                .flatMap(visitorId -> orgMemberService.getOrgMember(orgId, visitorId))
+                .switchIfEmpty(deferredError(BizError.NOT_AUTHORIZED, "NOT_AUTHORIZED"))
+                .then(getOrgMemberListViewForSearch(orgId, searchMemberName, searchGroupId, page, pageSize));
+    }
+
     private Mono<OrgMemberListView> getOrgMemberListView(String orgId, int page, int count) {
         return orgMemberService.getOrganizationMembers(orgId)
                 .collectList()
@@ -136,6 +214,17 @@ protected OrgMemberView build(User user, OrgMember orgMember) {
                 .rawUserInfos(findRawUserInfos(user, orgId))
                 .build();
     }
+    protected OrgMemberView buildOrgMemberView(User user, OrgMember orgMember) {
+        String orgId = orgMember.getOrgId();
+        return OrgMemberView.builder()
+                .name(user.getName())
+                .userId(user.getId())
+                .role(orgMember.getRole().getValue())
+                .avatarUrl(user.getAvatarUrl())
+                .joinTime(orgMember.getJoinTime())
+                .rawUserInfos(findRawUserInfos(user, orgId))
+                .build();
+    }
 
     protected Map<String, Map<String, Object>> findRawUserInfos(User user, String orgId) {
         return SetUtils.emptyIfNull(user.getConnections())
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrganizationController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrganizationController.java
@@ -12,6 +12,7 @@
 import org.lowcoder.api.usermanagement.view.UpdateRoleRequest;
 import org.lowcoder.api.util.BusinessEventPublisher;
 import org.lowcoder.api.util.GidService;
+import org.lowcoder.domain.organization.model.OrgMember;
 import org.lowcoder.domain.organization.model.Organization;
 import org.lowcoder.domain.organization.model.Organization.OrganizationCommonSettings;
 import org.lowcoder.domain.organization.service.OrgMemberService;
@@ -117,6 +118,16 @@ public Mono<ResponseView<OrgMemberListView>> getOrgMembers(@PathVariable String
             orgApiService.getOrganizationMembers(id, pageNum, pageSize)
                 .map(ResponseView::success));
     }
+    @Override
+    public Mono<ResponseView<OrgMemberListView>> getOrgMembersForSearch(@PathVariable String orgId,
+            @PathVariable String searchMemberName,
+            @PathVariable String searchGroupId,
+            @RequestParam(required = false, defaultValue = "1") int pageNum,
+            @RequestParam(required = false, defaultValue = "1000") int pageSize) {
+        return gidService.convertOrganizationIdToObjectId(orgId).flatMap(id ->
+            orgApiService.getOrganizationMembersForSearch(id, searchMemberName, searchGroupId, pageNum, pageSize)
+                .map(ResponseView::success));
+    }
 
     @Override
     public Mono<ResponseView<Boolean>> updateRoleForMember(@RequestBody UpdateRoleRequest updateRoleRequest,
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrganizationEndpoints.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrganizationEndpoints.java
@@ -98,6 +98,13 @@ public Mono<ResponseView<OrgMemberListView>> getOrgMembers(@PathVariable String
             @RequestParam(required = false, defaultValue = "1") int pageNum,
             @RequestParam(required = false, defaultValue = "1000") int pageSize);
 
+	@GetMapping("/{orgId}/{searchMemberName}/{searchGroupId}/members")
+	public Mono<ResponseView<OrgMemberListView>> getOrgMembersForSearch(@PathVariable String orgId,
+		   @PathVariable String searchMemberName,
+		   @PathVariable String searchGroupId,
+		   @RequestParam(required = false, defaultValue = "1") int pageNum,
+		   @RequestParam(required = false, defaultValue = "1000") int pageSize);
+
 	@Operation(
 			tags = TAG_ORGANIZATION_MEMBERS,
 		    operationId = "updateOrganizationMemberRole",

Original file line number	Diff line number	Diff line change
`@@ -53,5 +53,7 @@ public interface OrgApiService {`
`53`	`53`	`Mono<ConfigView> getOrganizationConfigs(String orgId);`
`54`	`54`
`55`	`55`	`Mono<Long> getApiUsageCount(String orgId, Boolean lastMonthOnly);`
	`56`	`+`
	`57`	`+ Mono<OrgMemberListView> getOrganizationMembersForSearch(String orgId, String searchMemberName, String searchGroupId, Integer pageNum, Integer pageSize);`
`56`	`58`	`}`
`57`	`59`