add pagination to groupmember, orgmember

Thomasr · ludomikula · commit 82c64d7548ef · 2024-11-18T09:43:34.000+01:00
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/group/service/GroupMemberService.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/group/service/GroupMemberService.java
@@ -12,7 +12,7 @@
 
 public interface GroupMemberService {
 
-    Mono<List<GroupMember>> getGroupMembers(String groupId, int page, int count);
+    Mono<List<GroupMember>> getGroupMembers(String groupId);
 
     Mono<Boolean> addMember(String orgId, String groupId, String userId, MemberRole memberRole);
 
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/group/service/GroupMemberServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/group/service/GroupMemberServiceImpl.java
@@ -29,7 +29,7 @@ public class GroupMemberServiceImpl implements GroupMemberService {
     private final MongoUpsertHelper mongoUpsertHelper;
 
     @Override
-    public Mono<List<GroupMember>> getGroupMembers(String groupId, int page, int count) {
+    public Mono<List<GroupMember>> getGroupMembers(String groupId) {
         return biRelationService.getBySourceId(GROUP_MEMBER, groupId)
                 .map(GroupMember::from)
                 .collectList();
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/solution/SuggestAppAdminSolutionServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/solution/SuggestAppAdminSolutionServiceImpl.java
@@ -63,7 +63,7 @@ private Mono<List<String>> getSuggestAdminIds(int limit, List<ResourcePermission
 
         Set<String> adminUserIdSet = newHashSet(adminUserIds);
         return Flux.fromIterable(adminGroupIds)
-                .flatMap(groupId -> groupMemberService.getGroupMembers(groupId, 1, 100))
+                .flatMap(groupMemberService::getGroupMembers)
                 .flatMapIterable(list -> list)
                 .map(GroupMember::getUserId)
                 .filter(it -> !adminUserIdSet.contains(it))
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/bizthreshold/AbstractBizThresholdChecker.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/bizthreshold/AbstractBizThresholdChecker.java
@@ -98,7 +98,7 @@ private boolean orgAppCountBelowThreshold(String orgId, long orgAppCount) {
 
     public Mono<Void> checkMaxDeveloperCount(String orgId, String developGroupId, String userId) {
         return orgMemberService.getAllOrgAdmins(orgId)
-                .zipWith(groupMemberService.getGroupMembers(developGroupId, 1, 100))
+                .zipWith(groupMemberService.getGroupMembers(developGroupId))
                 .zipWith(getMaxDeveloperCount(), TupleUtils::merge)
                 .flatMap(tuple -> {
                     List<OrgMember> t1 = tuple.getT1();
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/GroupApiServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/GroupApiServiceImpl.java
@@ -16,6 +16,7 @@
 
 import com.github.f4b6a3.uuid.UuidCreator;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.tuple.Pair;
 import org.lowcoder.api.bizthreshold.AbstractBizThresholdChecker;
 import org.lowcoder.api.home.SessionUserService;
 import org.lowcoder.api.usermanagement.view.CreateGroupRequest;
@@ -77,16 +78,16 @@ public Mono<GroupMemberAggregateView> getGroupMembers(String groupId, int page,
         return groupAndOrgMemberInfo
                 .filter(this::hasReadPermission)
                 .switchIfEmpty(deferredError(BizError.NOT_AUTHORIZED, NOT_AUTHORIZED))
-                .flatMap(groupMember -> groupMemberService.getGroupMembers(groupId, page, count))
-                .<List<GroupMemberView>> flatMap(members -> {
+                .flatMap(groupMember -> groupMemberService.getGroupMembers(groupId))
+                .<Pair<List<GroupMemberView>, Integer>> flatMap(members -> {
                     if (members.isEmpty()) {
-                        return Mono.just(emptyList());
+                        return Mono.just(Pair.of(emptyList(), 0));
                     }
 
                     List<String> userIds = collectList(members, GroupMember::getUserId);
                     Mono<Map<String, User>> userMapMono = userService.getByIds(userIds);
-                    return userMapMono.map(map ->
-                            members.stream()
+                    return userMapMono.map(map -> {
+                            var list = members.stream()
                                     .map(orgMember -> {
                                         User user = map.get(orgMember.getUserId());
                                         if (user == null) {
@@ -95,13 +96,20 @@ public Mono<GroupMemberAggregateView> getGroupMembers(String groupId, int page,
                                         return new GroupMemberView(orgMember, user);
                                     })
                                     .filter(Objects::nonNull)
-                                    .toList());
+                                    .toList();
+                            var pageTotal = list.size();
+                            list = list.subList(page * count, Math.min(page * count + count, pageTotal));
+                            return Pair.of(list, pageTotal);
+                    });
                 })
                 .zipWith(visitorRoleMono)
                 .map(tuple -> {
-                    List<GroupMemberView> t1 = tuple.getT1();
+                    Pair<List<GroupMemberView>, Integer> t1 = tuple.getT1();
                     return GroupMemberAggregateView.builder()
-                            .members(t1)
+                            .members(t1.getLeft())
+                            .total(t1.getRight())
+                            .pageNum(page)
+                            .pageSize(count)
                             .visitorRole(tuple.getT2().getValue())
                             .build();
                 });
@@ -196,7 +204,7 @@ public Mono<List<GroupView>> getGroups() {
                                     }
                                     return groupService.getByOrgId(orgId)
                                             .sort()
-                                            .flatMapSequential(group -> groupMemberService.getGroupMembers(group.getId(), 0, -1)
+                                            .flatMapSequential(group -> groupMemberService.getGroupMembers(group.getId())
                                                 .zipWith(orgAdminsMono)
                                                 .flatMap(tuple -> {
                                                     var users = tuple.getT1().stream().filter(user ->  user.getRole() != MemberRole.SUPER_ADMIN).toList();
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/GroupController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/GroupController.java
@@ -84,7 +84,7 @@ public Mono<GroupListResponseView<List<GroupView>>> getOrgGroups(@RequestParam(r
                 .map(OrgMember::getOrgId)
                 .flatMap(orgId -> orgMemberService.getOrganizationMembers(orgId)
                     .collectList()
-                    .zipWith(groupService.getDevGroup(orgId).flatMap(devGroup -> groupMemberService.getGroupMembers(devGroup.getId(), 0, -1)))
+                    .zipWith(groupService.getDevGroup(orgId).flatMap(devGroup -> groupMemberService.getGroupMembers(devGroup.getId())))
                     .map(tuple -> {
                         List<OrgMember> orgMembers = tuple.getT1();
                         List<GroupMember> devMembers = tuple.getT2();
@@ -119,7 +119,7 @@ public Mono<GroupListResponseView<List<GroupView>>> getOrgGroups(@RequestParam(r
 
     @Override
     public Mono<ResponseView<GroupMemberAggregateView>> getGroupMembers(@PathVariable String groupId,
-            @RequestParam(name = "page", required = false, defaultValue = "1") int page,
+            @RequestParam(name = "page", required = false, defaultValue = "0") int page,
             @RequestParam(name = "count", required = false, defaultValue = "100") int count) {
         String objectId = gidService.convertGroupIdToObjectId(groupId);
         return groupApiService.getGroupMembers(objectId, page, count)
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/GroupEndpoints.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/GroupEndpoints.java
@@ -74,7 +74,7 @@ public Mono<GroupListResponseView<List<GroupView>>> getOrgGroups(@RequestParam(r
 	)
     @GetMapping("/{groupId}/members")
     public Mono<ResponseView<GroupMemberAggregateView>> getGroupMembers(@PathVariable String groupId,
-            @RequestParam(name = "page", required = false, defaultValue = "1") int page,
+            @RequestParam(name = "page", required = false, defaultValue = "0") int page,
             @RequestParam(name = "count", required = false, defaultValue = "100") int count);
 
 	@Operation(
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
@@ -3,6 +3,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.SetUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.Pair;
 import org.lowcoder.api.authentication.dto.OrganizationDomainCheckResult;
 import org.lowcoder.api.bizthreshold.AbstractBizThresholdChecker;
 import org.lowcoder.api.config.ConfigView;
@@ -92,7 +93,8 @@ private Mono<OrgMemberListView> getOrgMemberListView(String orgId, int page, int
                             .collect(Collectors.toList());
                     Mono<Map<String, User>> users = userService.getByIds(userIds);
 
-                    return users.map(map -> orgMembers.stream()
+                    return users.map(map -> {
+                        var list = orgMembers.stream()
                             .map(orgMember -> {
                                 User user = map.get(orgMember.getUserId());
                                 if (user == null) {
@@ -102,15 +104,22 @@ private Mono<OrgMemberListView> getOrgMemberListView(String orgId, int page, int
                                 return build(user, orgMember);
                             })
                             .filter(Objects::nonNull)
-                            .collect(Collectors.toList())
-                    );
+                            .collect(Collectors.toList());
+                        var pageTotal = list.size();
+                        list = list.subList(page * count, Math.min(page * count + count, pageTotal));
+                        return Pair.of(list, pageTotal);
+                    });
                 })
                 .zipWith(sessionUserService.getVisitorOrgMemberCache())
                 .map(tuple -> {
-                    List<OrgMemberView> orgMemberViews = tuple.getT1();
+                    List<OrgMemberView> orgMemberViews = tuple.getT1().getLeft();
+                    var pageTotal = tuple.getT1().getRight();
                     OrgMember orgMember = tuple.getT2();
                     return OrgMemberListView.builder()
                             .members(orgMemberViews)
+                            .total(pageTotal)
+                            .pageNum(page)
+                            .pageSize(count)
                             .visitorRole(orgMember.getRole().getValue())
                             .build();
                 });
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/GroupMemberAggregateView.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/GroupMemberAggregateView.java
@@ -10,4 +10,7 @@
 public class GroupMemberAggregateView {
     private String visitorRole;
     private List<GroupMemberView> members;
+    private Integer total;
+    private Integer pageNum;
+    private Integer pageSize;
 }
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/OrgMemberListView.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/OrgMemberListView.java
@@ -13,6 +13,9 @@ public class OrgMemberListView {
 
     private String visitorRole;
     private List<OrgMemberView> members;
+    private Integer total;
+    private Integer pageNum;
+    private Integer pageSize;
 
     @Getter
     @SuperBuilder

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public Mono<GroupListResponseView<List<GroupView>>> getOrgGroups(@RequestParam(r`
`74`	`74`	`)`
`75`	`75`	`@GetMapping("/{groupId}/members")`
`76`	`76`	`public Mono<ResponseView<GroupMemberAggregateView>> getGroupMembers(@PathVariable String groupId,`
`77`		`- @RequestParam(name = "page", required = false, defaultValue = "1") int page,`
	`77`	`+ @RequestParam(name = "page", required = false, defaultValue = "0") int page,`
`78`	`78`	`@RequestParam(name = "count", required = false, defaultValue = "100") int count);`
`79`	`79`
`80`	`80`	`@Operation(`
Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,7 @@`
`10`	`10`	`public class GroupMemberAggregateView {`
`11`	`11`	`private String visitorRole;`
`12`	`12`	`private List<GroupMemberView> members;`
	`13`	`+ private Integer total;`
	`14`	`+ private Integer pageNum;`
	`15`	`+ private Integer pageSize;`
`13`	`16`	`}`