Add Bundle DSP

Author: Thomas

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

@@ -9,6 +9,8 @@
 import org.lowcoder.sdk.models.HasIdAndAuditing;
 import org.springframework.data.mongodb.core.mapping.Document;
 
+import java.util.Map;
+
 @Getter
 @Setter
 @Document
@@ -23,7 +25,11 @@ public class Bundle extends HasIdAndAuditing {
     private String category;
     private String image;
     private BundleStatus bundleStatus;
+
     private Boolean publicToAll;
     private Boolean publicToMarketplace;
     private Boolean agencyProfile;
+
+    private Map<String, Object> editingBundleDSL;
+    private Map<String, Object> publishedBundleDSL;
 }

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

@@ -16,10 +16,13 @@
 import org.lowcoder.api.permission.PermissionHelper;
 import org.lowcoder.api.permission.view.PermissionItemView;
 import org.lowcoder.api.usermanagement.OrgDevChecker;
+import org.lowcoder.domain.application.model.Application;
 import org.lowcoder.domain.application.model.ApplicationStatus;
 import org.lowcoder.domain.application.model.ApplicationType;
+import org.lowcoder.domain.application.repository.ApplicationRepository;
 import org.lowcoder.domain.application.service.ApplicationServiceImpl;
 import org.lowcoder.domain.bundle.model.*;
+import org.lowcoder.domain.bundle.repository.BundleRepository;
 import org.lowcoder.domain.bundle.service.BundleElementRelationService;
 import org.lowcoder.domain.bundle.service.BundleNode;
 import org.lowcoder.domain.bundle.service.BundleService;
@@ -47,6 +50,7 @@
 import java.util.*;
 import java.util.function.Function;
 import java.util.function.ToLongFunction;
+import java.util.stream.Collectors;
 
 import static org.apache.commons.collections4.CollectionUtils.isNotEmpty;
 import static org.lowcoder.domain.bundle.model.BundleStatus.NORMAL;
@@ -72,6 +76,8 @@ public class BundleApiServiceImpl implements BundleApiService {
     private final OrganizationService organizationService;
     private final FolderApiService folderApiService;
     private final ApplicationServiceImpl applicationServiceImpl;
+    private final ApplicationRepository applicationRepository;
+    private final BundleRepository bundleRepository;
 
     @Override
     public Mono<BundleInfoView> create(CreateBundleRequest createBundleRequest) {
@@ -262,11 +268,27 @@ public Mono<Void> moveApp(String applicationId, String fromBundleId, String toBu
                     if (StringUtils.isBlank(toBundleId)) {
                         return Mono.empty();
                     }
-                    return bundleElementRelationService.create(toBundleId, applicationId);
+                    return bundleService.findById(fromBundleId).map(bundle -> {
+                        var map = bundle.getEditingBundleDSL();
+                        if(map == null) map = new HashMap<>();
+                        ((List<Application>) map.computeIfAbsent("applications", k-> new ArrayList<>())).removeIf(app -> app.getId() == applicationId);
+                        bundle.setEditingBundleDSL(map);
+                        return bundle;
+                    }).map(bundle -> applicationRepository.findById(applicationId)
+                            .flatMap(newapplication -> addAppToBundle(bundle, newapplication)))
+                            .then(bundleElementRelationService.create(toBundleId, applicationId));
                 })
                 .then();
     }
 
+    private Mono<Bundle> addAppToBundle(Bundle bundle, Application newapplication) {
+        var map = bundle.getEditingBundleDSL();
+        if(map == null) map = new HashMap<>();
+        ((List<Application>) map.computeIfAbsent("applications", k-> new ArrayList<>())).add(newapplication);
+        bundle.setEditingBundleDSL(map);
+        return bundleRepository.save(bundle);
+    }
+
     /**
      * @param applicationId app id to add
      * @param toBundleId bundle id to add app to
@@ -283,7 +305,9 @@ public Mono<Void> addApp(String applicationId, String toBundleId) {
                     if (StringUtils.isBlank(toBundleId)) {
                         return Mono.empty();
                     }
-                    return bundleElementRelationService.create(toBundleId, applicationId);
+                    return bundleService.findById(toBundleId).map(bundle -> applicationRepository.findById(applicationId)
+                                    .flatMap(newapplication-> addAppToBundle(bundle, newapplication)))
+                            .then(bundleElementRelationService.create(toBundleId, applicationId));
                 })
                 .then();
     }
@@ -344,6 +368,8 @@ 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())
                             .agencyProfile(bundle.getAgencyProfile())

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

@@ -8,6 +8,7 @@
 
 import java.time.Instant;
 import java.util.List;
+import java.util.Map;
 
 @Getter
 @Setter
@@ -31,7 +32,8 @@ public class BundleInfoView {
     private boolean isVisible;
     private boolean isManageable;
 
-    private List<ApplicationInfoView> subApplications;
+    private Map<String, Object> editingBundleDSL;
+    private Map<String, Object> publishedBundleDSL;
 
     private final Instant createTime;