Fix issues add/move app

add test case for getPublishedBundle

Author: Thomas

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

@@ -268,13 +268,15 @@ public Mono<Void> moveApp(String applicationId, String fromBundleId, String toBu
                     if (StringUtils.isBlank(toBundleId)) {
                         return Mono.empty();
                     }
-                    return bundleService.findById(fromBundleId).map(bundle -> {
+                    return bundleService.findById(fromBundleId).flatMap(bundle -> {
                         var map = bundle.getEditingBundleDSL();
                         if(map == null) map = new HashMap<>();
-                        ((List<Application>) map.computeIfAbsent("applications", k-> new ArrayList<>())).removeIf(app -> app.getId() == applicationId);
+                        ((List<Application>) map.computeIfAbsent("applications", k-> new ArrayList<>())).removeIf(app -> app.getId().equals(applicationId));
                         bundle.setEditingBundleDSL(map);
-                        return bundle;
-                    }).map(bundle -> applicationRepository.findById(applicationId)
+                        return bundleRepository.save(bundle);
+                    })
+                        .then(bundleRepository.findById(toBundleId))
+                        .flatMap(bundle -> applicationRepository.findById(applicationId)
                             .flatMap(newapplication -> addAppToBundle(bundle, newapplication)))
                             .then(bundleElementRelationService.create(toBundleId, applicationId));
                 })
@@ -305,7 +307,7 @@ public Mono<Void> addApp(String applicationId, String toBundleId) {
                     if (StringUtils.isBlank(toBundleId)) {
                         return Mono.empty();
                     }
-                    return bundleService.findById(toBundleId).map(bundle -> applicationRepository.findById(applicationId)
+                    return bundleService.findById(toBundleId).flatMap(bundle -> applicationRepository.findById(applicationId)
                                     .flatMap(newapplication-> addAppToBundle(bundle, newapplication)))
                             .then(bundleElementRelationService.create(toBundleId, applicationId));
                 })
@@ -368,7 +370,6 @@ public Mono<BundleInfoView> getPublishedBundle(String bundleId, BundleRequestTyp
                             .category(bundle.getCategory())
                             .description(bundle.getDescription())
                             .image(bundle.getImage())
-//                            .editingBundleDSL(bundle.getEditingBundleDSL())
                             .publishedBundleDSL(bundle.getPublishedBundleDSL())
                             .publicToMarketplace(bundle.getPublicToMarketplace())
                             .publicToAll(bundle.getPublicToAll())

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

@@ -4,6 +4,7 @@
 import org.junit.runner.RunWith;
 import org.lowcoder.api.bundle.view.BundleInfoView;
 import org.lowcoder.api.home.SessionUserServiceImpl;
+import org.lowcoder.domain.bundle.model.BundleRequestType;
 import org.lowcoder.domain.organization.model.MemberRole;
 import org.lowcoder.domain.organization.model.OrgMember;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -117,24 +118,31 @@ public void moveAddAppTest() {
                 "image",
                 null));
 
-        StepVerifier.create(Mono.zip(bundleInfoViewMono, bundleInfoViewMono2))
-                .assertNext(tuple2 -> {
+        Mono<Void> testMono = Mono.zip(bundleInfoViewMono, bundleInfoViewMono2)
+                .flatMap(tuple2 -> {
                     var bundleInfoView = tuple2.getT1();
                     var bundleInfoView2 = tuple2.getT2();
-                    //And then add app01 to created bundle
-                    StepVerifier.create(bundleApiService.addApp("app01", bundleInfoView.getBundleId()))
-                            .verifyComplete();
-                    //or move bundle
-                    StepVerifier.create(bundleApiService.moveApp("app01", bundleInfoView.getBundleId(), bundleInfoView2.getBundleId()))
-                            .verifyComplete();
-                    //Try no dev user to add app to bundle
-                    when(sessionUserService.getVisitorId()).thenReturn(Mono.just("user01"));
-                    when(sessionUserService.getVisitorOrgMemberCache()).thenReturn(Mono.just(new OrgMember("org01", "user01", MemberRole.MEMBER, "NORMAL", 0)));
-                    StepVerifier.create(bundleApiService.addApp("app01", bundleInfoView.getBundleId()))
-                            .expectError();
-                    StepVerifier.create(bundleApiService.moveApp("app01", bundleInfoView.getBundleId(), bundleInfoView2.getBundleId()))
-                            .expectError();
-                })
+
+                    return bundleApiService.addApp("app01", bundleInfoView.getBundleId())
+                            .then(bundleApiService.moveApp("app01", bundleInfoView.getBundleId(), bundleInfoView2.getBundleId()))
+                            .then(Mono.fromRunnable(() -> {
+                                // Try a no-dev user to add app to bundle
+                                when(sessionUserService.getVisitorId()).thenReturn(Mono.just("user01"));
+                                when(sessionUserService.getVisitorOrgMemberCache()).thenReturn(Mono.just(new OrgMember("org01", "user01", MemberRole.MEMBER, "NORMAL", 0)));
+                            }))
+                            .then(bundleApiService.addApp("app01", bundleInfoView.getBundleId()).onErrorResume(e -> Mono.empty()))
+                            .then(bundleApiService.moveApp("app01", bundleInfoView.getBundleId(), bundleInfoView2.getBundleId()).onErrorResume(e -> Mono.empty()))
+                            //Get published bundle
+                            .then(bundleApiService.getPublishedBundle(bundleInfoView2.getBundleId(), BundleRequestType.PUBLIC_TO_ALL))
+                            .doOnNext(bundle -> {
+                                //should have no published dsl since not yet published
+                                assertNotNull(bundle.getBundleId());
+                                assertNull(bundle.getPublishedBundleDSL());
+                            })
+                            .then();
+                });
+
+        StepVerifier.create(testMono)
                 .verifyComplete();
     }
 }