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

Commit461be6a

Browse files
Thomasludomikula
Thomas
authored andcommitted
Create a bundle create test
1 parent7b86625 commit461be6a

File tree

4 files changed

+79
-2
lines changed

4 files changed

+79
-2
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,12 @@ public class BundleApiServiceImpl implements BundleApiService {
8989
@Override
9090
publicMono<BundleInfoView>create(CreateBundleRequestcreateBundleRequest) {
9191
Bundlebundle =Bundle.builder()
92+
.organizationId(createBundleRequest.organizationId())
9293
.name(createBundleRequest.name())
9394
.image(createBundleRequest.image())
9495
.title(createBundleRequest.title())
9596
.description(createBundleRequest.description())
96-
.category(createBundleRequest.description())
97+
.category(createBundleRequest.category())
9798
.bundleStatus(NORMAL)
9899
.publicToAll(false)
99100
.publicToMarketplace(false)
@@ -118,7 +119,7 @@ public Mono<BundleInfoView> create(CreateBundleRequest createBundleRequest) {
118119
returnbundleService.create(bundle);
119120
})
120121
.delayUntil(created ->autoGrantPermissionsByFolderDefault(created.getId(),createBundleRequest.folderId()))
121-
.delayUntil(created ->folderApiService.move(created.getId(),
122+
.delayUntil(created ->folderApiService.moveBundle(created.getId(),
122123
createBundleRequest.folderId()))
123124
.flatMap(f ->buildBundleInfoView(f,true,true,createBundleRequest.folderId()));
124125
}
@@ -587,6 +588,7 @@ public Mono<BundleInfoView> buildBundleInfoView(Bundle bundle, boolean visible,
587588
.map(user ->BundleInfoView.builder()
588589
.userId(bundle.getCreatedBy())
589590
.bundleId(bundle.getId())
591+
.title(bundle.getTitle())
590592
.name(bundle.getName())
591593
.description(bundle.getDescription())
592594
.category(bundle.getCategory())

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ public interface FolderApiService {
2323
Mono<FolderInfoView>update(Folderfolder);
2424

2525
Mono<Void>move(StringapplicationLikeId,@NullableStringtargetFolderId);
26+
Mono<Void>moveBundle(StringbundleId,@NullableStringtargetFolderId);
2627

2728
Mono<Void>upsertLastViewTime(@NullableStringfolderId);
2829

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,26 @@ public Mono<Void> move(String applicationLikeId, @Nullable String targetFolderId
196196
.then();
197197
}
198198

199+
/**
200+
* @param targetFolderId null means root folder
201+
*/
202+
@Override
203+
publicMono<Void>moveBundle(StringbundleId,@NullableStringtargetFolderId) {
204+
returnsessionUserService.getVisitorId()
205+
// check permissions
206+
.delayUntil(userId ->resourcePermissionService.checkResourcePermissionWithError(userId,bundleId,
207+
ResourceAction.MANAGE_BUNDLES))
208+
// remove old relations
209+
.then(folderElementRelationService.deleteByElementId(bundleId))
210+
.flatMap(b -> {
211+
if (StringUtils.isBlank(targetFolderId)) {
212+
returnMono.empty();
213+
}
214+
returnfolderElementRelationService.create(targetFolderId,bundleId);
215+
})
216+
.then();
217+
}
218+
199219
@Override
200220
publicMono<Void>upsertLastViewTime(@NullableStringfolderId) {
201221
if (StringUtils.isBlank(folderId)) {
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
packageorg.lowcoder.api.bundle;
2+
3+
importorg.junit.Test;
4+
importorg.junit.runner.RunWith;
5+
importorg.lowcoder.api.bundle.view.BundleInfoView;
6+
importorg.lowcoder.api.home.SessionUserServiceImpl;
7+
importorg.lowcoder.domain.organization.model.MemberRole;
8+
importorg.lowcoder.domain.organization.model.OrgMember;
9+
importorg.springframework.beans.factory.annotation.Autowired;
10+
importorg.springframework.boot.test.context.SpringBootTest;
11+
importorg.springframework.boot.test.mock.mockito.MockBean;
12+
importorg.springframework.test.context.junit4.SpringRunner;
13+
importreactor.core.publisher.Mono;
14+
importreactor.test.StepVerifier;
15+
16+
importstaticorg.junit.jupiter.api.Assertions.*;
17+
importstaticorg.mockito.Mockito.when;
18+
19+
@SpringBootTest
20+
@RunWith(SpringRunner.class)
21+
publicclassBundleApiServiceImplTest {
22+
@Autowired
23+
BundleApiServiceImplbundleApiService;
24+
@MockBean
25+
SessionUserServiceImplsessionUserService;
26+
27+
@Test
28+
publicvoidcreateBundleTest() {
29+
when(sessionUserService.getVisitorId()).thenReturn(Mono.just("user01"));
30+
when(sessionUserService.getVisitorOrgMemberCache()).thenReturn(Mono.just(newOrgMember("org01","user01",MemberRole.ADMIN,"NORMAL",0)));
31+
Mono<BundleInfoView>bundleInfoViewMono =bundleApiService.create(newBundleEndpoints.CreateBundleRequest(
32+
"org01",
33+
"name",
34+
"title",
35+
"description",
36+
"category",
37+
"image",
38+
null));
39+
StepVerifier.create(bundleInfoViewMono)
40+
.assertNext(bundleInfoView -> {
41+
assertNotNull(bundleInfoView.getBundleId());
42+
assertEquals("name",bundleInfoView.getName());
43+
assertEquals("title",bundleInfoView.getTitle());
44+
assertEquals("description",bundleInfoView.getDescription());
45+
assertEquals("category",bundleInfoView.getCategory());
46+
assertEquals("image",bundleInfoView.getImage());
47+
assertFalse(bundleInfoView.getPublicToAll());
48+
assertFalse(bundleInfoView.getPublicToMarketplace());
49+
assertFalse(bundleInfoView.getAgencyProfile());
50+
assertNull(bundleInfoView.getFolderId());
51+
})
52+
.verifyComplete();
53+
}
54+
}

0 commit comments

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