Fixed pagination for myorg endpoint.

Author: Thomasr

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/repository/OrganizationRepository.java

@@ -6,6 +6,8 @@
 import org.lowcoder.domain.organization.model.OrganizationState;
 import org.springframework.data.mongodb.repository.ReactiveMongoRepository;
 import org.springframework.stereotype.Repository;
+import org.springframework.data.domain.Pageable;
+import java.util.List;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -31,4 +33,7 @@ public interface OrganizationRepository extends ReactiveMongoRepository<Organiza
 
     Flux<Organization> findByOrganizationDomainIsNotNull();
     Mono<Boolean> existsBySlug(String slug);
+
+    Flux<Organization> findByIdInAndNameContainingIgnoreCase(List<String> ids, String name, Pageable pageable);
+    Mono<Long> countByIdInAndNameContainingIgnoreCase(List<String> ids, String name);
 }

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrganizationService.java

@@ -8,6 +8,7 @@
 import org.lowcoder.infra.annotation.NonEmptyMono;
 import org.lowcoder.infra.annotation.PossibleEmptyMono;
 import org.springframework.http.codec.multipart.Part;
+import org.springframework.data.domain.Pageable;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -52,4 +53,7 @@ public interface OrganizationService {
     Mono<Boolean> updateCommonSettings(String orgId, String key, Object value);
 
     Mono<Organization> updateSlug(String organizationId, String newSlug);
+
+    Flux<Organization> findUserOrgs(String userId, String orgName, Pageable pageable);
+    Mono<Long> countUserOrgs(String userId, String orgName);
 }

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrganizationServiceImpl.java

@@ -18,6 +18,8 @@
 import org.lowcoder.domain.user.repository.UserRepository;
 import org.lowcoder.domain.util.SlugUtils;
 import org.lowcoder.infra.annotation.PossibleEmptyMono;
+import org.lowcoder.infra.birelation.BiRelationService;
+import org.lowcoder.infra.birelation.BiRelation;
 import org.lowcoder.infra.mongo.MongoUpsertHelper;
 import org.lowcoder.sdk.config.CommonConfig;
 import org.lowcoder.sdk.config.dynamic.Conf;
@@ -31,6 +33,7 @@
 import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.http.codec.multipart.Part;
 import org.springframework.stereotype.Service;
+import org.springframework.data.domain.Pageable;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -41,6 +44,7 @@
 import static org.lowcoder.domain.organization.model.OrganizationState.DELETED;
 import static org.lowcoder.domain.util.QueryDslUtils.fieldName;
 import static org.lowcoder.sdk.exception.BizError.UNABLE_TO_FIND_VALID_ORG;
+import static org.lowcoder.infra.birelation.BiRelationBizType.ORG_MEMBER;
 import static org.lowcoder.sdk.util.ExceptionUtils.deferredError;
 import static org.lowcoder.sdk.util.ExceptionUtils.ofError;
 import static org.lowcoder.sdk.util.LocaleUtils.getLocale;
@@ -62,6 +66,7 @@ public class OrganizationServiceImpl implements OrganizationService {
     private final ApplicationContext applicationContext;
     private final CommonConfig commonConfig;
     private final ConfigCenter configCenter;
+    private final BiRelationService biRelationService;
 
     @PostConstruct
     private void init()
@@ -315,4 +320,31 @@ public Mono<Organization> updateSlug(String organizationId, String newSlug) {
                     });
         });
     }
+
+    @Override
+    public Flux<Organization> findUserOrgs(String userId, String orgName, Pageable pageable) {
+        return biRelationService.getByTargetId(ORG_MEMBER, userId)
+                .map(BiRelation::getSourceId)
+                .collectList()
+                .flatMapMany(orgIds -> {
+                    if (orgIds.isEmpty()) {
+                        return Flux.empty();
+                    }
+                    return repository.findByIdInAndNameContainingIgnoreCase(orgIds, orgName, pageable);
+                });
+    }
+
+    @Override
+    public Mono<Long> countUserOrgs(String userId, String orgName) {
+        String filter = orgName == null ? "" : orgName;
+        return biRelationService.getByTargetId(ORG_MEMBER, userId)
+                .map(BiRelation::getSourceId)
+                .collectList()
+                .flatMap(orgIds -> {
+                    if (orgIds.isEmpty()) {
+                        return Mono.just(0L);
+                    }
+                    return repository.countByIdInAndNameContainingIgnoreCase(orgIds, filter);
+                });
+    }
 }

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/UserController.java

@@ -27,6 +27,9 @@
 import org.springframework.http.codec.multipart.Part;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.server.ServerWebExchange;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.PageRequest;
+
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -77,20 +80,15 @@ public Mono<ResponseView<?>> getUserOrgs(ServerWebExchange exchange,
                                              @RequestParam(required = false, defaultValue = "10") Integer pageSize) {
         return sessionUserService.getVisitor()
                 .flatMap(user -> {
-                    Flux<OrgMember> orgMemberFlux = orgMemberService.getAllActiveOrgs(user.getId());
-
-                    Flux<OrgView> orgViewFlux = orgMemberFlux
-                            .flatMap(orgMember -> organizationService.getById(orgMember.getOrgId()))
-                            .filter(org -> StringUtils.isBlank(orgName) || StringUtils.containsIgnoreCase(org.getName(), orgName))
-                            .map(OrgView::new);
-
-                    return orgViewFlux.collectList().map(orgs -> {
-                        int total = orgs.size();
-                        int fromIndex = Math.max((pageNum - 1) * pageSize, 0);
-                        int toIndex = Math.min(fromIndex + pageSize, total);
-                        List<OrgView> pagedOrgs = fromIndex < toIndex ? orgs.subList(fromIndex, toIndex) : List.of();
-                        return PageResponseView.success(pagedOrgs, pageNum, pageSize, total);
-                    });
+                    Pageable pageable = PageRequest.of(pageNum - 1, pageSize);
+                    String filter = orgName == null ? "" : orgName;
+                    return organizationService.findUserOrgs(user.getId(), filter, pageable)
+                            .map(OrgView::new)
+                            .collectList()
+                            .zipWith(organizationService.countUserOrgs(user.getId(), filter))
+                            .map(tuple -> PageResponseView.success(
+                                    tuple.getT1(), pageNum, pageSize, tuple.getT2().intValue()
+                            ));
                 })
                 .map(ResponseView::success);
     }