Move ptm apps data to application dsl

aq-ikhwa-tech · aq-ikhwa-tech · commit e5f2d297dc58 · 2024-02-23T17:54:52.000+05:00
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/service/ApplicationService.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/service/ApplicationService.java
@@ -3,10 +3,7 @@
 
 import static org.lowcoder.domain.application.ApplicationUtil.getDependentModulesFromDsl;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import org.lowcoder.domain.application.model.Application;
@@ -155,11 +152,41 @@ public Mono<Boolean> setApplicationPublicToAll(String applicationId, boolean pub
         return mongoUpsertHelper.updateById(application, applicationId);
     }
 
-    public Mono<Boolean> setApplicationPublicToMarketplace(String applicationId, boolean publicToMarketplace) {
-        Application application = Application.builder()
-                .publicToMarketplace(publicToMarketplace)
-                .build();
-        return mongoUpsertHelper.updateById(application, applicationId);
+    public Mono<Boolean> setApplicationPublicToMarketplace(String applicationId, Boolean publicToMarketplace, String title, String category, String description) {
+
+        return findById(applicationId)
+                .map(application -> {
+                    Map<String, Object> applicationDsl = application.getEditingApplicationDSL();
+                    if (applicationDsl.containsKey("ui")) {
+                        Map<String, Object> dataObject = (Map<String, Object>) applicationDsl.get("ui");
+
+                        if(publicToMarketplace) {
+                            Map<String, Object> marketplaceMeta = new HashMap<>();
+                            marketplaceMeta.put("title", title);
+                            marketplaceMeta.put("description", description);
+                            marketplaceMeta.put("category", category);
+                            if (dataObject.containsKey("marketplaceMeta")) {
+                                dataObject.replace("marketplaceMeta", marketplaceMeta);
+                            } else {
+                                dataObject.put("marketplaceMeta", marketplaceMeta);
+                            }
+                        } else {
+                            dataObject.remove("marketplaceMeta");
+                        }
+
+                        applicationDsl.replace("ui", dataObject);
+
+                    }
+
+                    return Application.builder()
+                            .publicToMarketplace(publicToMarketplace)
+                            .editingApplicationDSL(applicationDsl)
+                            .build();
+
+                })
+                .flatMap(application -> mongoUpsertHelper.updateById(application, applicationId));
+
+
     }
 
     public Mono<Boolean> setApplicationAsAgencyProfile(String applicationId, boolean agencyProfile) {
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiService.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiService.java
@@ -514,10 +514,10 @@ public Mono<Boolean> setApplicationPublicToAll(String applicationId, boolean pub
                 .then(applicationService.setApplicationPublicToAll(applicationId, publicToAll));
     }
 
-    public Mono<Boolean> setApplicationPublicToMarketplace(String applicationId, boolean publicToMarketplace) {
+    public Mono<Boolean> setApplicationPublicToMarketplace(String applicationId, ApplicationEndpoints.ApplicationPublicToMarketplaceRequest request) {
         return checkCurrentUserApplicationPermission(applicationId, ResourceAction.SET_APPLICATIONS_PUBLIC_TO_MARKETPLACE)
                 .then(checkApplicationStatus(applicationId, NORMAL))
-                .then(applicationService.setApplicationPublicToMarketplace(applicationId, publicToMarketplace));
+                .then(applicationService.setApplicationPublicToMarketplace(applicationId, request.publicToMarketplace(), request.title(), request.category(), request.description()));
     }
 
     public Mono<Boolean> setApplicationAsAgencyProfile(String applicationId, boolean agencyProfile) {
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationController.java
@@ -214,7 +214,7 @@ public Mono<ResponseView<Boolean>> setApplicationPublicToAll(@PathVariable Strin
     @Override
     public Mono<ResponseView<Boolean>> setApplicationPublicToMarketplace(@PathVariable String applicationId,
                                                                          @RequestBody ApplicationPublicToMarketplaceRequest request) {
-        return applicationApiService.setApplicationPublicToMarketplace(applicationId, request.publicToMarketplace())
+        return applicationApiService.setApplicationPublicToMarketplace(applicationId, request)
                 .map(ResponseView::success);
     }
 
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationEndpoints.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationEndpoints.java
@@ -270,11 +270,27 @@ public Boolean publicToAll() {
         }
     }
 
-	public record ApplicationPublicToMarketplaceRequest(Boolean publicToMarketplace) {
+	public record ApplicationPublicToMarketplaceRequest(Boolean publicToMarketplace, String title, String description, String category) {
 		@Override
 		public Boolean publicToMarketplace() {
 			return BooleanUtils.isTrue(publicToMarketplace);
 		}
+
+		@Override
+		public String title() {
+			return title;
+		}
+
+		@Override
+		public String description() {
+			return description;
+		}
+
+		@Override
+		public String category() {
+			return category;
+		}
+
 	}
 
 	public record ApplicationAsAgencyProfileRequest(Boolean agencyProfile) {

Original file line number	Diff line number	Diff line change
`@@ -514,10 +514,10 @@ public Mono<Boolean> setApplicationPublicToAll(String applicationId, boolean pub`
`514`	`514`	`.then(applicationService.setApplicationPublicToAll(applicationId, publicToAll));`
`515`	`515`	`}`
`516`	`516`
`517`		`- public Mono<Boolean> setApplicationPublicToMarketplace(String applicationId, boolean publicToMarketplace) {`
	`517`	`+ public Mono<Boolean> setApplicationPublicToMarketplace(String applicationId, ApplicationEndpoints.ApplicationPublicToMarketplaceRequest request) {`
`518`	`518`	`return checkCurrentUserApplicationPermission(applicationId, ResourceAction.SET_APPLICATIONS_PUBLIC_TO_MARKETPLACE)`
`519`	`519`	`.then(checkApplicationStatus(applicationId, NORMAL))`
`520`		`- .then(applicationService.setApplicationPublicToMarketplace(applicationId, publicToMarketplace));`
	`520`	`+ .then(applicationService.setApplicationPublicToMarketplace(applicationId, request.publicToMarketplace(), request.title(), request.category(), request.description()));`
`521`	`521`	`}`
`522`	`522`
`523`	`523`	`public Mono<Boolean> setApplicationAsAgencyProfile(String applicationId, boolean agencyProfile) {`
Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ public Mono<ResponseView<Boolean>> setApplicationPublicToAll(@PathVariable Strin`
`214`	`214`	`@Override`
`215`	`215`	`public Mono<ResponseView<Boolean>> setApplicationPublicToMarketplace(@PathVariable String applicationId,`
`216`	`216`	`@RequestBody ApplicationPublicToMarketplaceRequest request) {`
`217`		`- return applicationApiService.setApplicationPublicToMarketplace(applicationId, request.publicToMarketplace())`
	`217`	`+ return applicationApiService.setApplicationPublicToMarketplace(applicationId, request)`
`218`	`218`	`.map(ResponseView::success);`
`219`	`219`	`}`
`220`	`220`