Create a bundle create test

Author: Thomas

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

@@ -89,11 +89,12 @@ public class BundleApiServiceImpl implements BundleApiService {
     @Override
     public Mono<BundleInfoView> create(CreateBundleRequest createBundleRequest) {
         Bundle bundle = Bundle.builder()
+                .organizationId(createBundleRequest.organizationId())
                 .name(createBundleRequest.name())
                 .image(createBundleRequest.image())
                 .title(createBundleRequest.title())
                 .description(createBundleRequest.description())
-                .category(createBundleRequest.description())
+                .category(createBundleRequest.category())
                 .bundleStatus(NORMAL)
                 .publicToAll(false)
                 .publicToMarketplace(false)
@@ -118,7 +119,7 @@ public Mono<BundleInfoView> create(CreateBundleRequest createBundleRequest) {
                     return bundleService.create(bundle);
                 })
                 .delayUntil(created -> autoGrantPermissionsByFolderDefault(created.getId(), createBundleRequest.folderId()))
-                .delayUntil(created -> folderApiService.move(created.getId(),
+                .delayUntil(created -> folderApiService.moveBundle(created.getId(),
                         createBundleRequest.folderId()))
                 .flatMap(f -> buildBundleInfoView(f, true, true, createBundleRequest.folderId()));
     }
@@ -587,6 +588,7 @@ public Mono<BundleInfoView> buildBundleInfoView(Bundle bundle, boolean visible,
                 .map(user -> BundleInfoView.builder()
                         .userId(bundle.getCreatedBy())
                         .bundleId(bundle.getId())
+                        .title(bundle.getTitle())
                         .name(bundle.getName())
                         .description(bundle.getDescription())
                         .category(bundle.getCategory())

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

@@ -23,6 +23,7 @@ public interface FolderApiService {
     Mono<FolderInfoView> update(Folder folder);
 
     Mono<Void> move(String applicationLikeId, @Nullable String targetFolderId);
+    Mono<Void> moveBundle(String bundleId, @Nullable String targetFolderId);
 
     Mono<Void> upsertLastViewTime(@Nullable String folderId);
 

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

@@ -196,6 +196,26 @@ public Mono<Void> move(String applicationLikeId, @Nullable String targetFolderId
                 .then();
     }
 
+    /**
+     * @param targetFolderId null means root folder
+     */
+    @Override
+    public Mono<Void> moveBundle(String bundleId, @Nullable String targetFolderId) {
+        return sessionUserService.getVisitorId()
+                // check permissions
+                .delayUntil(userId -> resourcePermissionService.checkResourcePermissionWithError(userId, bundleId,
+                        ResourceAction.MANAGE_BUNDLES))
+                // remove old relations
+                .then(folderElementRelationService.deleteByElementId(bundleId))
+                .flatMap(b -> {
+                    if (StringUtils.isBlank(targetFolderId)) {
+                        return Mono.empty();
+                    }
+                    return folderElementRelationService.create(targetFolderId, bundleId);
+                })
+                .then();
+    }
+
     @Override
     public Mono<Void> upsertLastViewTime(@Nullable String folderId) {
         if (StringUtils.isBlank(folderId)) {

server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/bundle/BundleApiServiceImplTest.java

@@ -0,0 +1,54 @@
+package org.lowcoder.api.bundle;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.lowcoder.api.bundle.view.BundleInfoView;
+import org.lowcoder.api.home.SessionUserServiceImpl;
+import org.lowcoder.domain.organization.model.MemberRole;
+import org.lowcoder.domain.organization.model.OrgMember;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.junit4.SpringRunner;
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.when;
+
+@SpringBootTest
+@RunWith(SpringRunner.class)
+public class BundleApiServiceImplTest {
+    @Autowired
+    BundleApiServiceImpl bundleApiService;
+    @MockBean
+    SessionUserServiceImpl sessionUserService;
+
+    @Test
+    public void createBundleTest() {
+        when(sessionUserService.getVisitorId()).thenReturn(Mono.just("user01"));
+        when(sessionUserService.getVisitorOrgMemberCache()).thenReturn(Mono.just(new OrgMember("org01", "user01", MemberRole.ADMIN, "NORMAL", 0)));
+        Mono<BundleInfoView> bundleInfoViewMono = bundleApiService.create(new BundleEndpoints.CreateBundleRequest(
+                "org01",
+                "name",
+                "title",
+                "description",
+                "category",
+                "image",
+                null));
+        StepVerifier.create(bundleInfoViewMono)
+                .assertNext(bundleInfoView -> {
+                    assertNotNull(bundleInfoView.getBundleId());
+                    assertEquals("name", bundleInfoView.getName());
+                    assertEquals("title", bundleInfoView.getTitle());
+                    assertEquals("description", bundleInfoView.getDescription());
+                    assertEquals("category", bundleInfoView.getCategory());
+                    assertEquals("image", bundleInfoView.getImage());
+                    assertFalse(bundleInfoView.getPublicToAll());
+                    assertFalse(bundleInfoView.getPublicToMarketplace());
+                    assertFalse(bundleInfoView.getAgencyProfile());
+                    assertNull(bundleInfoView.getFolderId());
+                })
+                .verifyComplete();
+    }
+}