Add pagination to group, org, bundle

dragonpoo · dragonpoo · commit c9329051c908 · 2024-11-14T12:13:32.000-05:00
diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/FluxHelper.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/FluxHelper.java
@@ -1,7 +1,10 @@
 package org.lowcoder.infra.util;
 
+import org.jetbrains.annotations.NotNull;
 import org.springframework.data.domain.Pageable;
+import org.springframework.web.bind.annotation.RequestParam;
 import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 public class FluxHelper {
 
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/bundle/BundleController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/bundle/BundleController.java
@@ -1,9 +1,11 @@
 package org.lowcoder.api.bundle;
 
 import lombok.RequiredArgsConstructor;
+import org.jetbrains.annotations.NotNull;
 import org.lowcoder.api.bundle.view.BundleInfoView;
 import org.lowcoder.api.bundle.view.BundlePermissionView;
 import org.lowcoder.api.bundle.view.MarketplaceBundleInfoView;
+import org.lowcoder.api.framework.view.PageResponseView;
 import org.lowcoder.api.framework.view.ResponseView;
 import org.lowcoder.api.home.UserHomeApiService;
 import org.lowcoder.api.util.BusinessEventPublisher;
@@ -18,10 +20,12 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import java.util.List;
 
+import static org.lowcoder.api.util.Pagination.fluxToPageResponseView;
 import static org.lowcoder.sdk.exception.BizError.INVALID_PARAMETER;
 import static org.lowcoder.sdk.util.ExceptionUtils.ofError;
 
@@ -100,12 +104,13 @@ public Mono<ResponseView<List<BundleInfoView>>> getRecycledBundles() {
      * get all files under bundle
      */
     @Override
-    public Mono<ResponseView<List<?>>> getElements(@PathVariable String bundleId,
-            @RequestParam(value = "applicationType", required = false) ApplicationType applicationType) {
+    public Mono<PageResponseView<?>> getElements(@PathVariable String bundleId,
+                                                   @RequestParam(value = "applicationType", required = false) ApplicationType applicationType,
+                                                   @RequestParam(required = false, defaultValue = "0") Integer pageNum,
+                                                   @RequestParam(required = false, defaultValue = "0") Integer pageSize) {
         String objectId = gidService.convertBundleIdToObjectId(bundleId);
-        return bundleApiService.getElements(objectId, applicationType)
-                .collectList()
-                .map(ResponseView::success);
+        var flux = bundleApiService.getElements(objectId, applicationType).cache();
+        return fluxToPageResponseView(pageNum, pageSize, flux);
     }
 
     @Override
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/bundle/BundleEndpoints.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/bundle/BundleEndpoints.java
@@ -7,6 +7,7 @@
 import org.lowcoder.api.bundle.view.BundleInfoView;
 import org.lowcoder.api.bundle.view.BundlePermissionView;
 import org.lowcoder.api.bundle.view.MarketplaceBundleInfoView;
+import org.lowcoder.api.framework.view.PageResponseView;
 import org.lowcoder.api.framework.view.ResponseView;
 import org.lowcoder.domain.application.model.ApplicationType;
 import org.lowcoder.domain.bundle.model.Bundle;
@@ -120,8 +121,10 @@ public interface BundleEndpoints
 		    description = "Retrieve the contents of an Bundle Bundle within Lowcoder, including Bundles."
 	)
     @GetMapping("/{bundleId}/elements")
-    public Mono<ResponseView<List<?>>> getElements(@PathVariable String bundleId,
-            @RequestParam(value = "applicationType", required = false) ApplicationType applicationType);
+    public Mono<PageResponseView<?>> getElements(@PathVariable String bundleId,
+												 @RequestParam(value = "applicationType", required = false) ApplicationType applicationType,
+												 @RequestParam(required = false, defaultValue = "0") Integer pageNum,
+												 @RequestParam(required = false, defaultValue = "0") Integer pageSize);
 
 	@Operation(
 			tags = TAG_BUNDLE_MANAGEMENT,
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
@@ -75,10 +75,11 @@ public Mono<ResponseView<Boolean>> delete(@PathVariable String groupId) {
     }
 
     @Override
-    public Mono<GroupListResponseView<List<GroupView>>> getOrgGroups() {
+    public Mono<GroupListResponseView<List<GroupView>>> getOrgGroups(@RequestParam(required = false, defaultValue = "0") Integer pageNum,
+            @RequestParam(required = false, defaultValue = "0") Integer pageSize) {
         return groupApiService.getGroups().flatMap(groupList -> {
             if(groupList.isEmpty()) return Mono.just(new GroupListResponseView<>(ResponseView.SUCCESS,
-                    "", List.of(), 0, 0, 0, 0));
+                    "", List.of(), 0, 0, 0, 0, 0, pageNum, pageSize));
             return sessionUserService.getVisitorOrgMemberCache()
                 .map(OrgMember::getOrgId)
                 .flatMap(orgId -> orgMemberService.getOrganizationMembers(orgId)
@@ -98,13 +99,17 @@ public Mono<GroupListResponseView<List<GroupView>>> getOrgGroups() {
                             .filter(orgMember -> !orgMember.isAdmin() && !orgMember.isSuperAdmin() &&
                                 devMembers.stream().noneMatch(devMember -> devMember.getUserId().equals(orgMember.getUserId()))).toList().size();
 
+                        var subList = groupList.subList(pageNum * pageSize, pageSize <= 0?(groupList.size() + 1):pageNum * pageSize + pageSize);
                         return new GroupListResponseView<>(ResponseView.SUCCESS,
                             "",
-                            groupList,
+                            subList,
                             totalAdmins,
                             totalAdminsAndDevelopers,
                             totalDevelopersOnly,
-                            totalOtherMembers);
+                            totalOtherMembers,
+                            subList.size(),
+                            pageNum,
+                            pageSize);
                     })
                 );
             }
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
@@ -63,7 +63,8 @@ public Mono<ResponseView<Boolean>> update(@PathVariable String groupId,
 		    description = "Retrieve a list of User Groups within Lowcoder, providing an overview of available groups, based on the access rights of the currently impersonated User."
 	)
     @GetMapping("/list")
-    public Mono<GroupListResponseView<List<GroupView>>> getOrgGroups();
+    public Mono<GroupListResponseView<List<GroupView>>> getOrgGroups(@RequestParam(required = false, defaultValue = "0") Integer pageNum,
+			@RequestParam(required = false, defaultValue = "0") Integer pageSize);
 
 	@Operation(
 			tags = TAG_GROUP_MEMBERS,
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
@@ -4,6 +4,7 @@
 import jakarta.validation.Valid;
 import org.apache.commons.lang.StringUtils;
 import org.lowcoder.api.authentication.dto.OrganizationDomainCheckResult;
+import org.lowcoder.api.framework.view.PageResponseView;
 import org.lowcoder.api.framework.view.ResponseView;
 import org.lowcoder.api.usermanagement.view.OrgMemberListView;
 import org.lowcoder.api.usermanagement.view.OrgView;
@@ -26,6 +27,8 @@
 
 import java.util.List;
 
+import static org.lowcoder.api.util.Pagination.fluxToPageResponseView;
+
 @RestController
 public class OrganizationController implements OrganizationEndpoints
 {
@@ -46,12 +49,13 @@ public class OrganizationController implements OrganizationEndpoints
     private UserService userService;
 
     @Override
-    public Mono<ResponseView<List<OrgView>>> getOrganizationByUser(@PathVariable String email) {
-        return userService.findByEmailDeep(email).flux().flatMap(user -> orgMemberService.getAllActiveOrgs(user.getId()))
+    public Mono<PageResponseView<?>> getOrganizationByUser(@PathVariable String email,
+                                                           @RequestParam(required = false, defaultValue = "0") Integer pageNum,
+                                                           @RequestParam(required = false, defaultValue = "0") Integer pageSize) {
+        var flux = userService.findByEmailDeep(email).flux().flatMap(user -> orgMemberService.getAllActiveOrgs(user.getId()))
                 .flatMap(orgMember -> organizationService.getById(orgMember.getOrgId()))
-                .map(OrgView::new)
-                .collectList()
-                .map(ResponseView::success);
+                .map(OrgView::new).cache();
+        return fluxToPageResponseView(pageNum, pageSize, flux);
     }
 
     @Override
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
@@ -4,6 +4,7 @@
 
 import jakarta.validation.Valid;
 
+import org.lowcoder.api.framework.view.PageResponseView;
 import org.lowcoder.api.framework.view.ResponseView;
 import org.lowcoder.api.usermanagement.view.OrgMemberListView;
 import org.lowcoder.api.usermanagement.view.OrgView;
@@ -44,7 +45,9 @@ public interface OrganizationEndpoints
 		    description = "Get a list of specified user's organization"
 	)
     @GetMapping("/byuser/{email}")
-    public Mono<ResponseView<List<OrgView>>> getOrganizationByUser(@PathVariable String email);
+    public Mono<PageResponseView<?>> getOrganizationByUser(@PathVariable String email,
+														   @RequestParam(required = false, defaultValue = "0") Integer pageNum,
+														   @RequestParam(required = false, defaultValue = "0") Integer pageSize);
 
 	@Operation(
 			tags = TAG_ORGANIZATION_MANAGEMENT,
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/GroupListResponseView.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/GroupListResponseView.java
@@ -12,11 +12,17 @@ public class GroupListResponseView<T> extends ResponseView<T> {
     private final int totalDevelopersOnly;
     private final int totalAdmins;
     private final int totalOtherMembers;
-    public GroupListResponseView(int code, String message, T data, int totalAdmins, int totalAdminsAndDevelopers, int totalDevelopersOnly, int totalOtherMembers) {
+    private final int total;
+    private final int pageNum;
+    private final int pageSize;
+    public GroupListResponseView(int code, String message, T data, int totalAdmins, int totalAdminsAndDevelopers, int totalDevelopersOnly, int totalOtherMembers, int total, int pageNum, int pageSize) {
         super(code, message, data);
         this.totalAdmins = totalAdmins;
         this.totalDevelopersOnly = totalDevelopersOnly;
         this.totalAdminsAndDevelopers = totalAdminsAndDevelopers;
         this.totalOtherMembers = totalOtherMembers;
+        this.total = total;
+        this.pageNum = pageNum;
+        this.pageSize = pageSize;
     }
 }
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/util/Pagination.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/util/Pagination.java
@@ -2,8 +2,13 @@
 
 import static org.lowcoder.sdk.exception.BizError.INVALID_PARAMETER;
 
+import org.jetbrains.annotations.NotNull;
+import org.lowcoder.api.framework.view.PageResponseView;
 import org.lowcoder.sdk.exception.BizException;
 import org.springframework.data.domain.PageRequest;
+import org.springframework.web.bind.annotation.RequestParam;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 public class Pagination {
 
@@ -55,4 +60,13 @@ public int page() {
     public int size() {
         return Math.min(Math.max(MIN_SIZE, size), maxSize);
     }
+
+    @NotNull
+    public static Mono<PageResponseView<?>> fluxToPageResponseView(Integer pageNum, Integer pageSize, Flux<?> flux) {
+        var countMono = flux.count();
+        var flux1 = flux.skip((long) pageNum * pageSize);
+        if(pageSize > 0) flux1 = flux1.take(pageSize);
+        return flux1.collectList().zipWith(countMono)
+                .map(tuple -> PageResponseView.success(tuple.getT1(), pageNum, pageSize, Math.toIntExact(tuple.getT2())));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,8 @@ public Mono<ResponseView<Boolean>> update(@PathVariable String groupId,`
`63`	`63`	`description = "Retrieve a list of User Groups within Lowcoder, providing an overview of available groups, based on the access rights of the currently impersonated User."`
`64`	`64`	`)`
`65`	`65`	`@GetMapping("/list")`
`66`		`- public Mono<GroupListResponseView<List<GroupView>>> getOrgGroups();`
	`66`	`+ public Mono<GroupListResponseView<List<GroupView>>> getOrgGroups(@RequestParam(required = false, defaultValue = "0") Integer pageNum,`
	`67`	`+ @RequestParam(required = false, defaultValue = "0") Integer pageSize);`
`67`	`68`
`68`	`69`	`@Operation(`
`69`	`70`	`tags = TAG_GROUP_MEMBERS,`