Skip to content

Commit ddcf07f

Browse files
author
Thomas
committed
Remove bundleposition from application api
Fix bundle reordering
1 parent a71e413 commit ddcf07f

File tree

6 files changed

+31
-123
lines changed

6 files changed

+31
-123
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package org.lowcoder.domain.bundle.model;
2+
3+
import org.lowcoder.domain.application.model.Application;
4+
5+
public record BundleApplication(Application application, long position) {
6+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
package org.lowcoder.domain.bundle.model;
22

3-
public record BundleElement(String bundleId, String elementId, int position) {
3+
public record BundleElement(String bundleId, String elementId, long position) {
44
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import org.springframework.stereotype.Service;
77
import reactor.core.publisher.Flux;
88
import reactor.core.publisher.Mono;
9+
import reactor.core.scheduler.Schedulers;
910

1011
import java.util.List;
1112
import java.util.Objects;
@@ -54,6 +55,8 @@ public Flux<BundleElement> getByElementIds(List<String> elementIds) {
5455
public Mono<Void> updateElementPos(String bundleId, String elementId, long position) {
5556
return biRelationService.getBiRelation(BUNDLE_ELEMENT, bundleId, elementId)
5657
.doOnNext(biRelation -> biRelation.setExtParam1(String.valueOf(position)))
58+
.publishOn(Schedulers.boundedElastic())
59+
.mapNotNull(biRelation -> biRelationService.upsert(biRelation).block())
5760
.then();
5861
}
5962
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ public class ApplicationInfoView {
3636
private final boolean publicToAll;
3737
private final boolean publicToMarketplace;
3838
private final boolean agencyProfile;
39-
private final int bundlePosition;
4039

4140
public long getLastViewTime() {
4241
return lastViewTime == null ? 0 : lastViewTime.toEpochMilli();

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

Lines changed: 18 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,11 @@
1919
import org.lowcoder.api.usermanagement.OrgDevChecker;
2020
import org.lowcoder.domain.application.model.ApplicationStatus;
2121
import org.lowcoder.domain.application.model.ApplicationType;
22-
import org.lowcoder.domain.bundle.model.Bundle;
23-
import org.lowcoder.domain.bundle.model.BundleRequestType;
24-
import org.lowcoder.domain.bundle.model.BundleStatus;
22+
import org.lowcoder.domain.application.service.ApplicationServiceImpl;
23+
import org.lowcoder.domain.bundle.model.*;
2524
import org.lowcoder.domain.bundle.service.BundleElementRelationService;
2625
import org.lowcoder.domain.bundle.service.BundleNode;
2726
import org.lowcoder.domain.bundle.service.BundleService;
28-
import org.lowcoder.domain.bundle.model.BundleElement;
2927
import org.lowcoder.domain.bundle.service.*;
3028
import org.lowcoder.domain.group.service.GroupService;
3129
import org.lowcoder.domain.organization.model.OrgMember;
@@ -35,12 +33,17 @@
3533
import org.lowcoder.domain.permission.service.ResourcePermissionService;
3634
import org.lowcoder.domain.user.model.User;
3735
import org.lowcoder.domain.user.service.UserService;
36+
import org.lowcoder.infra.birelation.BiRelation;
37+
import org.lowcoder.infra.birelation.BiRelationBizType;
38+
import org.lowcoder.infra.birelation.BiRelationServiceImpl;
3839
import org.lowcoder.sdk.exception.BizError;
3940
import org.lowcoder.sdk.exception.BizException;
41+
import org.springframework.beans.factory.annotation.Autowired;
4042
import org.springframework.context.annotation.Lazy;
4143
import org.springframework.stereotype.Service;
4244
import reactor.core.publisher.Flux;
4345
import reactor.core.publisher.Mono;
46+
import reactor.core.scheduler.Schedulers;
4447

4548
import java.util.*;
4649
import java.util.function.Function;
@@ -56,24 +59,7 @@
5659
@RequiredArgsConstructor
5760
@Service
5861
public class BundleApiServiceImpl implements BundleApiService {
59-
60-
private static final Comparator<Node<ApplicationInfoView, BundleInfoView>> DEFAULT_COMPARATOR =
61-
// compare by last view time reversed.
62-
Comparator.comparingLong((ToLongFunction<Node<ApplicationInfoView, BundleInfoView>>) node -> {
63-
if (node instanceof ElementNode<ApplicationInfoView, BundleInfoView> elementNode) {
64-
return elementNode.getSelf().getBundlePosition();
65-
}
66-
return ((BundleNode<ApplicationInfoView, BundleInfoView>) node).getSelf().getCreateTime();
67-
})
68-
.reversed()
69-
// compare by name.
70-
.thenComparing(node -> {
71-
if (node instanceof ElementNode<ApplicationInfoView, BundleInfoView> elementNode) {
72-
return elementNode.getSelf().getName();
73-
}
74-
return ((BundleNode<ApplicationInfoView, BundleInfoView>) node).getSelf().getName();
75-
});
76-
62+
private final BiRelationServiceImpl biRelationService;
7763
private final BundleService bundleService;
7864
private final SessionUserService sessionUserService;
7965
private final OrgDevChecker orgDevChecker;
@@ -86,6 +72,7 @@ public class BundleApiServiceImpl implements BundleApiService {
8672
private final UserService userService;
8773
private final OrganizationService organizationService;
8874
private final FolderApiService folderApiService;
75+
private final ApplicationServiceImpl applicationServiceImpl;
8976

9077
@Override
9178
public Mono<BundleInfoView> create(CreateBundleRequest createBundleRequest) {
@@ -308,45 +295,15 @@ public Mono<Void> reorder(String bundleId, List<String> elementIds) {
308295
*/
309296
@Override
310297
public Flux<?> getElements(@Nullable String bundleId, @Nullable ApplicationType applicationType) {
311-
return buildApplicationInfoViewTree(applicationType)
312-
.flatMap(tree -> {
313-
BundleNode<ApplicationInfoView, BundleInfoView> bundleNode = tree.get(bundleId);
314-
if (bundleNode == null) {
315-
return Mono.error(new BizException(BUNDLE_NOT_EXIST, "BUNDLE_NOT_EXIST", bundleId));
316-
}
317-
return Mono.just(bundleNode);
318-
})
319-
.zipWith(Mono.zip(sessionUserService.getVisitorOrgMemberCache(), orgDevChecker.isCurrentOrgDev()))
320-
.doOnNext(tuple -> {
321-
BundleNode<ApplicationInfoView, BundleInfoView> node = tuple.getT1();
322-
OrgMember orgMember = tuple.getT2().getT1();
323-
boolean devOrAdmin = tuple.getT2().getT2();
324-
// father bundle's visibility depends on child nodes
325-
node.postOrderIterate(n -> {
326-
if (n instanceof BundleNode<ApplicationInfoView, BundleInfoView> bundleNode) {
327-
BundleInfoView bundleInfoView = bundleNode.getSelf();
328-
if (bundleInfoView == null) {
329-
return;
330-
}
331-
bundleInfoView.setManageable(orgMember.isAdmin() || orgMember.isSuperAdmin() || orgMember.getUserId().equals(bundleInfoView.getCreateBy()));
332-
bundleInfoView.setSubApplications(bundleNode.getElementChildren());
333-
bundleInfoView.setVisible(devOrAdmin || isNotEmpty(bundleInfoView.getSubApplications()));
334-
}
335-
});
336-
})
337-
.flatMapIterable(tuple -> tuple.getT1().getChildren())
338-
.map(node -> {
339-
if (node instanceof ElementNode<ApplicationInfoView, BundleInfoView> elementNode) {
340-
return elementNode.getSelf();
341-
}
342-
return ((BundleNode<ApplicationInfoView, BundleInfoView>) node).getSelf();
343-
});
344-
}
345-
346-
private Mono<Tree<Object, Bundle>> buildBundleTree(String userId) {
347-
return bundleService.findByUserId(userId)
348-
.collectList()
349-
.map(bundles -> new Tree<>(bundles, Bundle::getId, __ -> null, Collections.emptyList(), null, null));
298+
return biRelationService.getBySourceId(BiRelationBizType.BUNDLE_ELEMENT, bundleId)
299+
.sort((o1, o2) -> {
300+
var pos1 = Integer.parseInt(o1.getExtParam1());
301+
var pos2 = Integer.parseInt(o2.getExtParam1());
302+
return pos1 - pos2;
303+
}).map(bi -> applicationServiceImpl.findById(bi.getTargetId()))
304+
.index()
305+
.publishOn(Schedulers.boundedElastic())
306+
.map(tuple -> new BundleApplication(tuple.getT2().block(), tuple.getT1()));
350307
}
351308

352309
@Override
@@ -417,62 +374,6 @@ public Mono<ResourcePermission> checkBundlePermissionWithReadableErrorMsg(String
417374
});
418375
}
419376

420-
private Mono<Tree<ApplicationInfoView, BundleInfoView>> buildApplicationInfoViewTree(@Nullable ApplicationType applicationType) {
421-
422-
Mono<OrgMember> orgMemberMono = sessionUserService.getVisitorOrgMemberCache()
423-
.cache();
424-
425-
Flux<ApplicationInfoView> applicationInfoViewFlux =
426-
userHomeApiService.getAllAuthorisedApplications4CurrentOrgMember(applicationType, ApplicationStatus.NORMAL, false)
427-
.cache();
428-
429-
Mono<Map<String, String>> application2BundleMapMono = applicationInfoViewFlux
430-
.map(ApplicationInfoView::getApplicationId)
431-
.collectList()
432-
.flatMapMany(applicationIds -> bundleElementRelationService.getByElementIds(applicationIds))
433-
.collectMap(BundleElement::elementId, BundleElement::bundleId);
434-
435-
Flux<Bundle> bundleFlux = orgMemberMono.flatMapMany(orgMember -> bundleService.findByUserId(orgMember.getUserId()))
436-
.cache();
437-
438-
Mono<Map<String, User>> userMapMono = bundleFlux
439-
.flatMap(bundle -> emptyIfNull(bundle.getCreatedBy()))
440-
.collectList()
441-
.flatMap(list -> userService.getByIds(list))
442-
.cache();
443-
444-
Flux<BundleInfoView> bundleInfoViewFlux = bundleFlux
445-
.flatMap(bundle -> Mono.zip(orgMemberMono, userMapMono)
446-
.map(tuple -> {
447-
OrgMember orgMember = tuple.getT1();
448-
Map<String, User> userMap = tuple.getT2();
449-
User creator = userMap.get(bundle.getCreatedBy());
450-
return BundleInfoView.builder()
451-
.userId(orgMember.getUserId())
452-
.bundleId(bundle.getId())
453-
.name(bundle.getName())
454-
.createAt(bundle.getCreatedAt().toEpochMilli())
455-
.createBy(creator == null ? null : creator.getName())
456-
.createTime(bundle.getCreatedAt())
457-
.build();
458-
}));
459-
460-
return Mono.zip(applicationInfoViewFlux.collectList(),
461-
application2BundleMapMono,
462-
bundleInfoViewFlux.collectList())
463-
.map(tuple -> {
464-
List<ApplicationInfoView> applicationInfoViews = tuple.getT1();
465-
Map<String, String> application2BundleMap = tuple.getT2();
466-
List<BundleInfoView> bundleInfoViews = tuple.getT3();
467-
return new Tree<>(bundleInfoViews,
468-
BundleInfoView::getBundleId,
469-
__ -> null,
470-
applicationInfoViews,
471-
application -> application2BundleMap.get(application.getApplicationId()),
472-
DEFAULT_COMPARATOR);
473-
});
474-
}
475-
476377
/**
477378
* only bundle creator has manage permissions
478379
*/

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -244,10 +244,10 @@ public Flux<ApplicationInfoView> getAllAuthorisedApplications4CurrentOrgMember(@
244244

245245
return bundleElementRelationServiceImpl.getByElementIds(List.of(Objects.requireNonNull(application.getId())))
246246
.mapNotNull(BundleElement::position)
247-
.defaultIfEmpty(0)
247+
.defaultIfEmpty(0L)
248248
.collectList()
249249
.flatMap(positions -> {
250-
int position = positions.isEmpty() ? 0 : positions.get(0);
250+
long position = positions.isEmpty() ? 0 : positions.get(0);
251251
ResourceRole resourceRole = resourcePermissionMap.get(application.getId()).getResourceRole();
252252
return Mono.just(buildView(application, resourceRole, userMap, applicationLastViewTimeMap.get(application.getId()),
253253
position, withContainerSize));
@@ -556,7 +556,7 @@ public Flux<MarketplaceBundleInfoView> getAllAgencyProfileBundles() {
556556
}
557557

558558
private ApplicationInfoView buildView(Application application, ResourceRole maxRole, Map<String, User> userMap, @Nullable Instant lastViewTime,
559-
Integer bundlePosition, boolean withContainerSize) {
559+
Long bundlePosition, boolean withContainerSize) {
560560
ApplicationInfoViewBuilder applicationInfoViewBuilder = ApplicationInfoView.builder()
561561
.applicationId(application.getId())
562562
.orgId(application.getOrganizationId())
@@ -570,7 +570,6 @@ private ApplicationInfoView buildView(Application application, ResourceRole maxR
570570
.applicationStatus(application.getApplicationStatus())
571571
.lastModifyTime(application.getUpdatedAt())
572572
.lastViewTime(lastViewTime)
573-
.bundlePosition(bundlePosition)
574573
.publicToAll(application.isPublicToAll())
575574
.publicToMarketplace(application.isPublicToMarketplace())
576575
.agencyProfile(application.agencyProfile());

0 commit comments

Comments
 (0)