Remove bundleposition from application api

Fix bundle reordering

Author: Thomas

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/bundle/model/BundleApplication.java

@@ -0,0 +1,6 @@
+package org.lowcoder.domain.bundle.model;
+
+import org.lowcoder.domain.application.model.Application;
+
+public record BundleApplication(Application application, long position) {
+}

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/bundle/model/BundleElement.java

@@ -1,4 +1,4 @@
 package org.lowcoder.domain.bundle.model;
 
-public record BundleElement(String bundleId, String elementId, int position) {
+public record BundleElement(String bundleId, String elementId, long position) {
 }

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/bundle/service/BundleElementRelationServiceImpl.java

@@ -6,6 +6,7 @@
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
+import reactor.core.scheduler.Schedulers;
 
 import java.util.List;
 import java.util.Objects;
@@ -59,6 +60,8 @@ public Flux<BundleElement> getByElementIds(List<String> elementIds) {
     public Mono<Void> updateElementPos(String bundleId, String elementId, long position) {
         return biRelationService.getBiRelation(BUNDLE_ELEMENT, bundleId, elementId)
                 .doOnNext(biRelation -> biRelation.setExtParam1(String.valueOf(position)))
+                .publishOn(Schedulers.boundedElastic())
+                .mapNotNull(biRelation -> biRelationService.upsert(biRelation).block())
                 .then();
     }
 }

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/view/ApplicationInfoView.java

@@ -36,7 +36,6 @@ public class ApplicationInfoView {
     private final boolean publicToAll;
     private final boolean publicToMarketplace;
     private final boolean agencyProfile;
-    private final int bundlePosition;
 
     public long getLastViewTime() {
         return lastViewTime == null ? 0 : lastViewTime.toEpochMilli();

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/bundle/BundleApiServiceImpl.java

@@ -18,13 +18,11 @@
 import org.lowcoder.api.usermanagement.OrgDevChecker;
 import org.lowcoder.domain.application.model.ApplicationStatus;
 import org.lowcoder.domain.application.model.ApplicationType;
-import org.lowcoder.domain.bundle.model.Bundle;
-import org.lowcoder.domain.bundle.model.BundleRequestType;
-import org.lowcoder.domain.bundle.model.BundleStatus;
+import org.lowcoder.domain.application.service.ApplicationServiceImpl;
+import org.lowcoder.domain.bundle.model.*;
 import org.lowcoder.domain.bundle.service.BundleElementRelationService;
 import org.lowcoder.domain.bundle.service.BundleNode;
 import org.lowcoder.domain.bundle.service.BundleService;
-import org.lowcoder.domain.bundle.model.BundleElement;
 import org.lowcoder.domain.bundle.service.*;
 import org.lowcoder.domain.group.service.GroupService;
 import org.lowcoder.domain.organization.model.OrgMember;
@@ -34,12 +32,17 @@
 import org.lowcoder.domain.permission.service.ResourcePermissionService;
 import org.lowcoder.domain.user.model.User;
 import org.lowcoder.domain.user.service.UserService;
+import org.lowcoder.infra.birelation.BiRelation;
+import org.lowcoder.infra.birelation.BiRelationBizType;
+import org.lowcoder.infra.birelation.BiRelationServiceImpl;
 import org.lowcoder.sdk.exception.BizError;
 import org.lowcoder.sdk.exception.BizException;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
+import reactor.core.scheduler.Schedulers;
 
 import java.util.*;
 import java.util.function.Function;
@@ -55,24 +58,7 @@
 @RequiredArgsConstructor
 @Service
 public class BundleApiServiceImpl implements BundleApiService {
-
-    private static final Comparator<Node<ApplicationInfoView, BundleInfoView>> DEFAULT_COMPARATOR =
-            // compare by last view time reversed.
-            Comparator.comparingLong((ToLongFunction<Node<ApplicationInfoView, BundleInfoView>>) node -> {
-                        if (node instanceof ElementNode<ApplicationInfoView, BundleInfoView> elementNode) {
-                            return elementNode.getSelf().getBundlePosition();
-                        }
-                        return ((BundleNode<ApplicationInfoView, BundleInfoView>) node).getSelf().getCreateTime();
-                    })
-                    .reversed()
-                    // compare by name.
-                    .thenComparing(node -> {
-                        if (node instanceof ElementNode<ApplicationInfoView, BundleInfoView> elementNode) {
-                            return elementNode.getSelf().getName();
-                        }
-                        return ((BundleNode<ApplicationInfoView, BundleInfoView>) node).getSelf().getName();
-                    });
-
+    private final BiRelationServiceImpl biRelationService;
     private final BundleService bundleService;
     private final SessionUserService sessionUserService;
     private final OrgDevChecker orgDevChecker;
@@ -85,6 +71,7 @@ public class BundleApiServiceImpl implements BundleApiService {
     private final UserService userService;
     private final OrganizationService organizationService;
     private final FolderApiService folderApiService;
+    private final ApplicationServiceImpl applicationServiceImpl;
 
     @Override
     public Mono<BundleInfoView> create(CreateBundleRequest createBundleRequest) {
@@ -331,45 +318,15 @@ public Mono<Void> reorder(String bundleId, List<String> elementIds) {
      */
     @Override
     public Flux<?> getElements(@Nullable String bundleId, @Nullable ApplicationType applicationType) {
-        return buildApplicationInfoViewTree(applicationType)
-                .flatMap(tree -> {
-                    BundleNode<ApplicationInfoView, BundleInfoView> bundleNode = tree.get(bundleId);
-                    if (bundleNode == null) {
-                        return Mono.error(new BizException(BUNDLE_NOT_EXIST, "BUNDLE_NOT_EXIST", bundleId));
-                    }
-                    return Mono.just(bundleNode);
-                })
-                .zipWith(Mono.zip(sessionUserService.getVisitorOrgMemberCache(), orgDevChecker.isCurrentOrgDev()))
-                .doOnNext(tuple -> {
-                    BundleNode<ApplicationInfoView, BundleInfoView> node = tuple.getT1();
-                    OrgMember orgMember = tuple.getT2().getT1();
-                    boolean devOrAdmin = tuple.getT2().getT2();
-                    // father bundle's visibility depends on child nodes
-                    node.postOrderIterate(n -> {
-                        if (n instanceof BundleNode<ApplicationInfoView, BundleInfoView> bundleNode) {
-                            BundleInfoView bundleInfoView = bundleNode.getSelf();
-                            if (bundleInfoView == null) {
-                                return;
-                            }
-                            bundleInfoView.setManageable(orgMember.isAdmin() || orgMember.isSuperAdmin() ||  orgMember.getUserId().equals(bundleInfoView.getCreateBy()));
-                            bundleInfoView.setSubApplications(bundleNode.getElementChildren());
-                            bundleInfoView.setVisible(devOrAdmin || isNotEmpty(bundleInfoView.getSubApplications()));
-                        }
-                    });
-                })
-                .flatMapIterable(tuple -> tuple.getT1().getChildren())
-                .map(node -> {
-                    if (node instanceof ElementNode<ApplicationInfoView, BundleInfoView> elementNode) {
-                        return elementNode.getSelf();
-                    }
-                    return ((BundleNode<ApplicationInfoView, BundleInfoView>) node).getSelf();
-                });
-    }
-
-    private Mono<Tree<Object, Bundle>> buildBundleTree(String userId) {
-        return bundleService.findByUserId(userId)
-                .collectList()
-                .map(bundles -> new Tree<>(bundles, Bundle::getId, __ -> null, Collections.emptyList(), null, null));
+        return biRelationService.getBySourceId(BiRelationBizType.BUNDLE_ELEMENT, bundleId)
+                .sort((o1, o2) -> {
+                    var pos1 = Integer.parseInt(o1.getExtParam1());
+                    var pos2 = Integer.parseInt(o2.getExtParam1());
+                    return pos1 - pos2;
+                }).map(bi -> applicationServiceImpl.findById(bi.getTargetId()))
+                .index()
+                .publishOn(Schedulers.boundedElastic())
+                .map(tuple -> new BundleApplication(tuple.getT2().block(), tuple.getT1()));
     }
 
     @Override
@@ -440,62 +397,6 @@ public Mono<ResourcePermission> checkBundlePermissionWithReadableErrorMsg(String
                 });
     }
 
-    private Mono<Tree<ApplicationInfoView, BundleInfoView>> buildApplicationInfoViewTree(@Nullable ApplicationType applicationType) {
-
-        Mono<OrgMember> orgMemberMono = sessionUserService.getVisitorOrgMemberCache()
-                .cache();
-
-        Flux<ApplicationInfoView> applicationInfoViewFlux =
-                userHomeApiService.getAllAuthorisedApplications4CurrentOrgMember(applicationType, ApplicationStatus.NORMAL, false)
-                        .cache();
-
-        Mono<Map<String, String>> application2BundleMapMono = applicationInfoViewFlux
-                .map(ApplicationInfoView::getApplicationId)
-                .collectList()
-                .flatMapMany(applicationIds -> bundleElementRelationService.getByElementIds(applicationIds))
-                .collectMap(BundleElement::elementId, BundleElement::bundleId);
-
-        Flux<Bundle> bundleFlux = orgMemberMono.flatMapMany(orgMember -> bundleService.findByUserId(orgMember.getUserId()))
-                .cache();
-
-        Mono<Map<String, User>> userMapMono = bundleFlux
-                .flatMap(bundle -> emptyIfNull(bundle.getCreatedBy()))
-                .collectList()
-                .flatMap(list -> userService.getByIds(list))
-                .cache();
-
-        Flux<BundleInfoView> bundleInfoViewFlux = bundleFlux
-                .flatMap(bundle -> Mono.zip(orgMemberMono, userMapMono)
-                        .map(tuple -> {
-                            OrgMember orgMember = tuple.getT1();
-                            Map<String, User> userMap = tuple.getT2();
-                            User creator = userMap.get(bundle.getCreatedBy());
-                            return BundleInfoView.builder()
-                                    .userId(orgMember.getUserId())
-                                    .bundleId(bundle.getId())
-                                    .name(bundle.getName())
-                                    .createAt(bundle.getCreatedAt().toEpochMilli())
-                                    .createBy(creator == null ? null : creator.getName())
-                                    .createTime(bundle.getCreatedAt())
-                                    .build();
-                        }));
-
-        return Mono.zip(applicationInfoViewFlux.collectList(),
-                        application2BundleMapMono,
-                        bundleInfoViewFlux.collectList())
-                .map(tuple -> {
-                    List<ApplicationInfoView> applicationInfoViews = tuple.getT1();
-                    Map<String, String> application2BundleMap = tuple.getT2();
-                    List<BundleInfoView> bundleInfoViews = tuple.getT3();
-                    return new Tree<>(bundleInfoViews,
-                            BundleInfoView::getBundleId,
-                            __ -> null,
-                            applicationInfoViews,
-                            application -> application2BundleMap.get(application.getApplicationId()),
-                            DEFAULT_COMPARATOR);
-                });
-    }
-
     /**
      * only bundle creator has manage permissions
      */

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/UserHomeApiServiceImpl.java

@@ -244,10 +244,10 @@ public Flux<ApplicationInfoView> getAllAuthorisedApplications4CurrentOrgMember(@
 
                                 return bundleElementRelationServiceImpl.getByElementIds(List.of(Objects.requireNonNull(application.getId())))
                                         .mapNotNull(BundleElement::position)
-                                        .defaultIfEmpty(0)
+                                        .defaultIfEmpty(0L)
                                         .collectList()
                                         .flatMap(positions -> {
-                                            int position = positions.isEmpty() ? 0 : positions.get(0);
+                                            long position = positions.isEmpty() ? 0 : positions.get(0);
                                             ResourceRole resourceRole = resourcePermissionMap.get(application.getId()).getResourceRole();
                                             return Mono.just(buildView(application, resourceRole, userMap, applicationLastViewTimeMap.get(application.getId()),
                                                     position, withContainerSize));
@@ -556,7 +556,7 @@ public Flux<MarketplaceBundleInfoView> getAllAgencyProfileBundles() {
     }
 
     private ApplicationInfoView buildView(Application application, ResourceRole maxRole, Map<String, User> userMap, @Nullable Instant lastViewTime,
-                                          Integer bundlePosition, boolean withContainerSize) {
+                                          Long bundlePosition, boolean withContainerSize) {
         ApplicationInfoViewBuilder applicationInfoViewBuilder = ApplicationInfoView.builder()
                 .applicationId(application.getId())
                 .orgId(application.getOrganizationId())
@@ -570,7 +570,6 @@ private ApplicationInfoView buildView(Application application, ResourceRole maxR
                 .applicationStatus(application.getApplicationStatus())
                 .lastModifyTime(application.getUpdatedAt())
                 .lastViewTime(lastViewTime)
-                .bundlePosition(bundlePosition)
                 .publicToAll(application.isPublicToAll())
                 .publicToMarketplace(application.isPublicToMarketplace())
                 .agencyProfile(application.agencyProfile());