Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit8b8eeac

Browse files
authored
Merge pull requestlowcoder-org#953 from th37rose/feature/bundle
Feature/bundle
2 parents1493cf9 +4a6f4c5 commit8b8eeac

File tree

11 files changed

+575
-65
lines changed

11 files changed

+575
-65
lines changed

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
importlombok.NoArgsConstructor;
77
importlombok.Setter;
88
importlombok.experimental.SuperBuilder;
9+
importorg.apache.commons.lang3.BooleanUtils;
910
importorg.lowcoder.sdk.models.HasIdAndAuditing;
1011
importorg.springframework.data.mongodb.core.mapping.Document;
1112

@@ -32,4 +33,16 @@ public class Bundle extends HasIdAndAuditing {
3233

3334
privateMap<String,Object>editingBundleDSL;
3435
privateMap<String,Object>publishedBundleDSL;
36+
37+
publicbooleanisPublicToAll() {
38+
returnBooleanUtils.toBooleanDefaultIfNull(publicToAll,false);
39+
}
40+
41+
publicbooleanisPublicToMarketplace() {
42+
returnBooleanUtils.toBooleanDefaultIfNull(publicToMarketplace,false);
43+
}
44+
45+
publicbooleanagencyProfile() {
46+
returnBooleanUtils.toBooleanDefaultIfNull(agencyProfile,false);
47+
}
3548
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,25 @@
99
importreactor.core.publisher.Mono;
1010

1111
importjava.util.Collection;
12+
importjava.util.Map;
1213
importjava.util.Set;
1314

1415
publicinterfaceBundleService {
1516
Mono<Boolean>updateById(Stringid,Bundleresource);
1617

1718
Mono<Bundle>findById(Stringid);
1819

20+
Mono<Bundle>findByIdWithoutDsl(Stringid);
21+
1922
Mono<Bundle>create(Bundlebundle,StringuserId);
2023

2124
Flux<Bundle>findByUserId(StringbundleId);
2225

2326
Mono<Void>deleteAllById(Collection<String>ids);
2427

2528
Mono<Boolean>exist(Stringid);
29+
Mono<Bundle>publish(StringbundleId);
30+
Mono<Boolean>updatePublishedBundleDSL(StringbundleId,Map<String,Object>bundleDSL);
2631

2732
@NonEmptyMono
2833
@SuppressWarnings("ReactiveStreamsNullableInLambdaInTransform")

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

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
importlombok.RequiredArgsConstructor;
44
importorg.apache.commons.lang3.StringUtils;
5-
importorg.lowcoder.domain.application.model.Application;
6-
importorg.lowcoder.domain.application.model.ApplicationRequestType;
75
importorg.lowcoder.domain.bundle.model.Bundle;
86
importorg.lowcoder.domain.bundle.model.BundleRequestType;
97
importorg.lowcoder.domain.bundle.repository.BundleRepository;
@@ -54,6 +52,16 @@ public Mono<Bundle> findById(String id) {
5452
.switchIfEmpty(Mono.error(newBizException(BizError.NO_RESOURCE_FOUND,"BUNDLE_NOT_FOUND",id)));
5553
}
5654

55+
@Override
56+
publicMono<Bundle>findByIdWithoutDsl(Stringid) {
57+
if (id ==null) {
58+
returnMono.error(newBizException(BizError.INVALID_PARAMETER,"INVALID_PARAMETER",FieldName.ID));
59+
}
60+
61+
returnrepository.findById(id)
62+
.switchIfEmpty(Mono.error(newBizException(BizError.NO_RESOURCE_FOUND,"CANT_FIND_BUNDLE",id)));
63+
}
64+
5765
@Override
5866
publicMono<Bundle>create(Bundlenewbundle,StringvisitorId) {
5967
returnrepository.save(newbundle)
@@ -82,10 +90,24 @@ public Mono<Boolean> exist(String id) {
8290
});
8391
}
8492

93+
@Override
94+
publicMono<Bundle>publish(StringbundleId) {
95+
returnfindById(bundleId)
96+
.flatMap(newBundle -> {// copy editingApplicationDSL to publishedApplicationDSL
97+
Map<String,Object>editingBundleDSL =newBundle.getEditingBundleDSL();
98+
returnupdatePublishedBundleDSL(bundleId,editingBundleDSL)
99+
.thenReturn(newBundle);
100+
});
101+
}
102+
103+
@Override
104+
publicMono<Boolean>updatePublishedBundleDSL(StringbundleId,Map<String,Object>bundleDSL) {
105+
Bundlebundle =Bundle.builder().publishedBundleDSL(bundleDSL).build();
106+
returnmongoUpsertHelper.updateById(bundle,bundleId);
107+
}
85108

86109
@Override
87110
@NonEmptyMono
88-
@SuppressWarnings("ReactiveStreamsNullableInLambdaInTransform")
89111
publicMono<Set<String>>getFilteredPublicBundleIds(BundleRequestTyperequestType,Collection<String>bundleIds,StringuserId,BooleanisPrivateMarketplace) {
90112
booleanisAnonymous =StringUtils.isBlank(userId);
91113
switch(requestType)
@@ -149,7 +171,7 @@ public Mono<Set<String>> getPrivateBundleIds(Collection<String> bundleIds, Strin
149171
@SuppressWarnings("ReactiveStreamsNullableInLambdaInTransform")
150172
publicMono<Set<String>>getPublicMarketplaceBundleIds(Collection<String>bundleIds,booleanisAnonymous,booleanisPrivateMarketplace) {
151173

152-
if ((isAnonymous&& !isPrivateMarketplace)|| !isAnonymous)
174+
if (!isAnonymous || !isPrivateMarketplace)
153175
{
154176
returnrepository.findByPublicToAllIsTrueAndPublicToMarketplaceIsTrueAndIdIn(bundleIds)
155177
.map(HasIdAndAuditing::getId)

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/service/ResourcePermissionService.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ Mono<Map<String, Collection<ResourcePermission>>> getByResourceTypeAndResourceId
2323

2424
@NonEmptyMono
2525
Mono<List<ResourcePermission>>getByApplicationId(StringapplicationId);
26+
@NonEmptyMono
27+
Mono<List<ResourcePermission>>getByBundleId(StringbundleId);
2628

2729
@NonEmptyMono
2830
Mono<List<ResourcePermission>>getByDataSourceId(StringdataSourceId);

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/service/ResourcePermissionServiceImpl.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,12 @@ public Mono<List<ResourcePermission>> getByApplicationId(String applicationId) {
5757
returngetByResourceTypeAndResourceId(ResourceType.APPLICATION,applicationId);
5858
}
5959

60+
@Override
61+
@NonEmptyMono
62+
publicMono<List<ResourcePermission>>getByBundleId(StringbundleId) {
63+
returngetByResourceTypeAndResourceId(ResourceType.BUNDLE,bundleId);
64+
}
65+
6066
@Override
6167
@NonEmptyMono
6268
publicMono<List<ResourcePermission>>getByDataSourceId(StringdataSourceId) {

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,18 @@ public interface BundleApiService {
2323

2424
Mono<Void>checkBundleCurrentUser(Bundlebundle,StringcurrentOrgId);
2525
Mono<BundleInfoView>getPublishedBundle(StringbundleId,BundleRequestTyperequestType);
26+
Mono<BundleInfoView>getEditingBundle(StringbundleId);
2627

2728
Mono<Bundle>delete(@NonnullStringbundleId);
2829

2930
Mono<Boolean>recycle(StringbundleId);
3031

3132
Mono<Boolean>restore(StringbundleId);
3233
Flux<BundleInfoView>getRecycledBundles();
34+
Mono<BundlePermissionView>getBundlePermissions(StringbundleId);
3335

3436
Mono<BundleInfoView>update(Bundlebundle);
37+
Mono<BundleInfoView>publish(StringbundleId);
3538

3639
Mono<Void>moveApp(StringapplicationId,StringfromBundled,StringtoBundleId);
3740

@@ -41,12 +44,14 @@ public interface BundleApiService {
4144

4245
@Nonnull
4346
Mono<ResourcePermission>checkBundlePermissionWithReadableErrorMsg(StringbundleId,ResourceActionaction,BundleRequestTyperequestType);
47+
@Nonnull
48+
Mono<ResourcePermission>checkPermissionWithReadableErrorMsg(StringbundleId,ResourceActionaction);
4449

45-
Mono<Void>grantPermission(StringbundleId,Set<String>userIds,Set<String>groupIds,ResourceRolerole);
50+
Mono<Boolean>grantPermission(StringbundleId,Set<String>userIds,Set<String>groupIds,ResourceRolerole);
4651

47-
Mono<Void>updatePermission(StringbundleId,StringpermissionId,ResourceRolerole);
52+
Mono<Boolean>updatePermission(StringbundleId,StringpermissionId,ResourceRolerole);
4853

49-
Mono<Void>removePermission(StringbundleId,StringpermissionId);
54+
Mono<Boolean>removePermission(StringbundleId,StringpermissionId);
5055

5156
Mono<BundlePermissionView>getPermissions(StringbundleId);
5257

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp