add pagination to library query

Thomasr · ludomikula · commit 9c8900bfff24 · 2024-11-18T09:43:34.000+01:00
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryController.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import org.lowcoder.api.framework.view.PageResponseView;
 import org.lowcoder.api.framework.view.ResponseView;
 import org.lowcoder.api.query.view.LibraryQueryAggregateView;
 import org.lowcoder.api.query.view.LibraryQueryPublishRequest;
@@ -19,8 +20,11 @@
 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 static org.lowcoder.api.util.Pagination.fluxToPageResponseView;
+
 @RestController
 public class LibraryQueryController implements LibraryQueryEndpoints
 {
@@ -41,9 +45,12 @@ public Mono<ResponseView<List<LibraryQueryAggregateView>>> dropDownList(@Request
     }
 
     @Override
-    public Mono<ResponseView<List<LibraryQueryView>>> list(@RequestParam(required = false, defaultValue = "") String name) {
-        return libraryQueryApiService.listLibraryQueries(name)
-                .map(ResponseView::success);
+    public Mono<PageResponseView<?>> list(@RequestParam(required = false, defaultValue = "") String name,
+                                                               @RequestParam(required = false, defaultValue = "0") int pageNum,
+                                                               @RequestParam(required = false, defaultValue = "100") int pageSize) {
+        var flux = libraryQueryApiService.listLibraryQueries(name)
+                .flatMapMany(Flux::fromIterable);
+        return fluxToPageResponseView(pageNum, pageSize, flux);
     }
 
     @Override
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryEndpoints.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryEndpoints.java
@@ -4,6 +4,7 @@
 
 import java.util.List;
 
+import org.lowcoder.api.framework.view.PageResponseView;
 import org.lowcoder.api.framework.view.ResponseView;
 import org.lowcoder.api.query.view.LibraryQueryAggregateView;
 import org.lowcoder.api.query.view.LibraryQueryPublishRequest;
@@ -38,7 +39,9 @@ public interface LibraryQueryEndpoints
 		    description = "Retrieve a list of Library Queries for a specific Organization within Lowcoder."
 	)
     @GetMapping("/listByOrg")
-    public Mono<ResponseView<List<LibraryQueryView>>> list(@RequestParam(required = false, defaultValue = "") String name);
+    public Mono<PageResponseView<?>> list(@RequestParam(required = false, defaultValue = "") String name,
+															   @RequestParam(required = false, defaultValue = "0") int pageNum,
+															   @RequestParam(required = false, defaultValue = "100") int pageSize);
 
 	@Operation(
 			tags = TAG_LIBRARY_QUERY_MANAGEMENT,
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryRecordController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryRecordController.java
@@ -3,6 +3,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.lowcoder.api.framework.view.PageResponseView;
 import org.lowcoder.api.framework.view.ResponseView;
 import org.lowcoder.api.query.view.LibraryQueryRecordMetaView;
 import org.lowcoder.domain.query.model.LibraryQueryCombineId;
@@ -11,8 +12,11 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import lombok.RequiredArgsConstructor;
+import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
+import static org.lowcoder.api.util.Pagination.fluxToPageResponseView;
+
 @RequiredArgsConstructor
 @RestController
 public class LibraryQueryRecordController implements LibraryQueryRecordEndpoints 
@@ -25,9 +29,10 @@ public Mono<Void> delete(@PathVariable String libraryQueryRecordId) {
     }
 
     @Override
-    public Mono<ResponseView<List<LibraryQueryRecordMetaView>>> getByLibraryQueryId(@RequestParam(name = "libraryQueryId") String libraryQueryId) {
-        return libraryQueryRecordApiService.getByLibraryQueryId(libraryQueryId)
-                .map(ResponseView::success);
+    public Mono<PageResponseView<?>> getByLibraryQueryId(@RequestParam(name = "libraryQueryId") String libraryQueryId,
+                                                         @RequestParam(required = false, defaultValue = "0") int pageNum,
+                                                         @RequestParam(required = false, defaultValue = "100") int pageSize) {
+        return fluxToPageResponseView(pageNum, pageSize, libraryQueryRecordApiService.getByLibraryQueryId(libraryQueryId).flatMapMany(Flux::fromIterable));
     }
 
     @Override
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryRecordEndpoints.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryRecordEndpoints.java
@@ -5,6 +5,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.lowcoder.api.framework.view.PageResponseView;
 import org.lowcoder.api.framework.view.ResponseView;
 import org.lowcoder.api.query.view.LibraryQueryRecordMetaView;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -39,7 +40,9 @@ public interface LibraryQueryRecordEndpoints
 		    description = "Retrieve a specific Library Query Record within Lowcoder using the associated library query ID."
 	)
     @GetMapping("/listByLibraryQueryId")
-    public Mono<ResponseView<List<LibraryQueryRecordMetaView>>> getByLibraryQueryId(@RequestParam(name = "libraryQueryId") String libraryQueryId);
+    public Mono<PageResponseView<?>> getByLibraryQueryId(@RequestParam(name = "libraryQueryId") String libraryQueryId,
+														 @RequestParam(required = false, defaultValue = "0") int pageNum,
+														 @RequestParam(required = false, defaultValue = "100") int pageSize);
 
 	@Operation(
 			tags = TAG_LIBRARY_QUERY_RECORDS,
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
@@ -119,10 +119,10 @@ public Mono<GroupListResponseView<List<GroupView>>> getOrgGroups(@RequestParam(r
 
     @Override
     public Mono<ResponseView<GroupMemberAggregateView>> getGroupMembers(@PathVariable String groupId,
-            @RequestParam(name = "page", required = false, defaultValue = "0") int page,
-            @RequestParam(name = "count", required = false, defaultValue = "100") int count) {
+            @RequestParam(required = false, defaultValue = "0") int pageNum,
+            @RequestParam(required = false, defaultValue = "100") int pageSize) {
         String objectId = gidService.convertGroupIdToObjectId(groupId);
-        return groupApiService.getGroupMembers(objectId, page, count)
+        return groupApiService.getGroupMembers(objectId, pageNum, pageSize)
                 .map(ResponseView::success);
     }
 
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,8 +74,8 @@ 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 = "0") int page,
-            @RequestParam(name = "count", required = false, defaultValue = "100") int count);
+            @RequestParam(required = false, defaultValue = "0") int pageNum,
+            @RequestParam(required = false, defaultValue = "100") int 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
@@ -90,10 +90,10 @@ public Mono<ResponseView<Boolean>> deleteLogo(@PathVariable String orgId) {
 
     @Override
     public Mono<ResponseView<OrgMemberListView>> getOrgMembers(@PathVariable String orgId,
-            @RequestParam(name = "page", required = false, defaultValue = "0") int page,
-            @RequestParam(name = "count", required = false, defaultValue = "1000") int count) {
+            @RequestParam(required = false, defaultValue = "0") int pageNum,
+            @RequestParam(required = false, defaultValue = "1000") int pageSize) {
         String id = gidService.convertOrganizationIdToObjectId(orgId);
-        return orgApiService.getOrganizationMembers(id, page, count)
+        return orgApiService.getOrganizationMembers(id, pageNum, pageSize)
                 .map(ResponseView::success);
     }
 
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
@@ -95,8 +95,8 @@ public Mono<ResponseView<Boolean>> uploadLogo(@PathVariable String orgId,
 	)
     @GetMapping("/{orgId}/members")
     public Mono<ResponseView<OrgMemberListView>> getOrgMembers(@PathVariable String orgId,
-            @RequestParam(name = "page", required = false, defaultValue = "0") int page,
-            @RequestParam(name = "count", required = false, defaultValue = "1000") int count);
+            @RequestParam(required = false, defaultValue = "0") int pageNum,
+            @RequestParam(required = false, defaultValue = "1000") int pageSize);
 
 	@Operation(
 			tags = TAG_ORGANIZATION_MEMBERS,
