Added Comments to Marketplace Use

Author: FalkWolsky

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/Application.java

@@ -43,7 +43,6 @@ public class Application extends HasIdAndAuditing {
     private Boolean publicToAll;
     @Setter
     private Boolean publicToMarketplace;
-
     @Setter
     private Boolean agencyProfile;
 
@@ -77,15 +76,17 @@ public class Application extends HasIdAndAuditing {
 
     @Builder
     @JsonCreator
-    public Application(@JsonProperty("orgId") String organizationId,
+    public Application(
+            @JsonProperty("orgId") String organizationId,
             @JsonProperty("name") String name,
             @JsonProperty("applicationType") Integer applicationType,
             @JsonProperty("applicationStatus") ApplicationStatus applicationStatus,
             @JsonProperty("publishedApplicationDSL") Map<String, Object> publishedApplicationDSL,
+            @JsonProperty("editingApplicationDSL") Map<String, Object> editingApplicationDSL,
             @JsonProperty("publicToAll") Boolean publicToAll,
             @JsonProperty("publicToMarketplace") Boolean publicToMarketplace,
-            @JsonProperty("agencyProfile") Boolean agencyProfile,
-            @JsonProperty("editingApplicationDSL") Map<String, Object> editingApplicationDSL) {
+            @JsonProperty("agencyProfile") Boolean agencyProfile
+        ) {
         this.organizationId = organizationId;
         this.name = name;
         this.applicationType = applicationType;

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/repository/ApplicationRepository.java

@@ -34,6 +34,9 @@ public interface ApplicationRepository extends ReactiveMongoRepository<Applicati
 
     Flux<Application> findByIdIn(List<String> ids);
 
+
+    // Falk: Why to combine? Marketplace-List and Agency-List are different Endpoints
+
     @Query(value = "{$and:[{'publicToAll':true},{'$or':[{'publicToMarketplace':?0},{'agencyProfile':?1}]}, {'_id': { $in: ?2}}]}", fields = "{_id : 1}")
     Flux<Application> findByPublicToAllIsTrueAndPublicToMarketplaceIsOrAgencyProfileIsAndIdIn
             (Boolean publicToMarketplace, Boolean agencyProfile, Collection<String> ids);

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/service/ApplicationService.java

@@ -152,13 +152,19 @@ public Mono<Boolean> setApplicationPublicToAll(String applicationId, boolean pub
         return mongoUpsertHelper.updateById(application, applicationId);
     }
 
-    public Mono<Boolean> setApplicationPublicToMarketplace(String applicationId, Boolean publicToMarketplace,
-                                                           String title, String category, String description, String image) {
+    // Falk: String title, String category, String description, String image will be set in Application Settings inside DSL by Frontend
+    public Mono<Boolean> setApplicationPublicToMarketplace(String applicationId, Boolean publicToMarketplace) {
 
         return findById(applicationId)
+
+                // Falk: question - do we need Map<String, Object> applicationDsl = application.getEditingApplicationDSL(); and  .editingApplicationDSL(applicationDsl) - or is .publicToMarketplace(publicToMarketplace).build(); enough?
+
                 .map(application -> {
+
                     Map<String, Object> applicationDsl = application.getEditingApplicationDSL();
-                    if (applicationDsl.containsKey("ui")) {
+                    
+                    // Falk: this logic is not needed anymore, because we set Meta Data in Settings in the UI already
+                    /* if (applicationDsl.containsKey("ui")) {
                         Map<String, Object> dataObject = (Map<String, Object>) applicationDsl.get("ui");
 
                         if(publicToMarketplace) {
@@ -178,7 +184,7 @@ public Mono<Boolean> setApplicationPublicToMarketplace(String applicationId, Boo
 
                         applicationDsl.replace("ui", dataObject);
 
-                    }
+                    } */
 
                     return Application.builder()
                             .publicToMarketplace(publicToMarketplace)

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiService.java

@@ -250,13 +250,20 @@ private Mono<Void> checkApplicationStatus(Application application, ApplicationSt
 
     private Mono<Void> checkApplicationViewRequest(Application application, ApplicationEndpoints.ApplicationRequestType expected) {
         // TODO: The check is correct ( logically ) but we need to provide some time for the users to adapt. Will bring it back in the next release
-        if (expected == ApplicationEndpoints.ApplicationRequestType.PUBLIC_TO_ALL /* && application.isPublicToAll() */) {
-            return Mono.empty();
-        }
-        if (expected == ApplicationEndpoints.ApplicationRequestType.PUBLIC_TO_MARKETPLACE && application.isPublicToMarketplace()) {
+
+        // Falk: switched && application.isPublicToAll() on again - seems here is the bug.
+        if (expected == ApplicationEndpoints.ApplicationRequestType.PUBLIC_TO_ALL && application.isPublicToAll()) {
             return Mono.empty();
         }
-        if (expected == ApplicationEndpoints.ApplicationRequestType.AGENCY_PROFILE && application.agencyProfile()) {
+
+        // Falk: here is to check the ENV Variable LOWCODER_MARKETPLACE_PRIVATE_MODE
+        // isPublicToMarketplace & isPublicToAll must be both true
+            if (expected == ApplicationEndpoints.ApplicationRequestType.PUBLIC_TO_MARKETPLACE && application.isPublicToMarketplace() && application.isPublicToAll()) {
+                return Mono.empty();
+            }
+        // 
+        // Falk: application.agencyProfile() & isPublicToAll must be both true
+        if (expected == ApplicationEndpoints.ApplicationRequestType.AGENCY_PROFILE && application.agencyProfile() && application.isPublicToAll()) {
             return Mono.empty();
         }
         return Mono.error(new BizException(BizError.UNSUPPORTED_OPERATION, "BAD_REQUEST"));
@@ -445,6 +452,7 @@ public Mono<ApplicationPermissionView> getApplicationPermissions(String applicat
                                         .orgName(organization.getName())
                                         .publicToAll(application.isPublicToAll())
                                         .publicToMarketplace(application.isPublicToMarketplace())
+                                        .agencyProfile(application.agencyProfile())
                                         .build();
                             });
                 });
@@ -502,6 +510,7 @@ private ApplicationInfoView buildView(Application application, String role, @Nul
                 .folderId(folderId)
                 .publicToAll(application.isPublicToAll())
                 .publicToMarketplace(application.isPublicToMarketplace())
+                .agencyProfile(application.agencyProfile())
                 .build();
     }
 
@@ -519,13 +528,15 @@ public Mono<Boolean> setApplicationPublicToMarketplace(String applicationId, App
         return checkCurrentUserApplicationPermission(applicationId, ResourceAction.SET_APPLICATIONS_PUBLIC_TO_MARKETPLACE)
                 .then(checkApplicationStatus(applicationId, NORMAL))
                 .then(applicationService.setApplicationPublicToMarketplace
-                        (applicationId, request.publicToMarketplace(), request.title(), request.category(), request.description(), request.image()));
+                        (applicationId, request.publicToMarketplace()));
     }
 
+    // Falk: why we have request.publicToMarketplace() - but here only agencyProfile? Not from request?
     public Mono<Boolean> setApplicationAsAgencyProfile(String applicationId, boolean agencyProfile) {
         return checkCurrentUserApplicationPermission(applicationId, ResourceAction.SET_APPLICATIONS_AS_AGENCY_PROFILE)
                 .then(checkApplicationStatus(applicationId, NORMAL))
-                .then(applicationService.setApplicationAsAgencyProfile(applicationId, agencyProfile));
+                .then(applicationService.setApplicationAsAgencyProfile
+                        (applicationId, agencyProfile));
     }
 
     private Map<String, Object> sanitizeDsl(Map<String, Object> applicationDsl) {

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationEndpoints.java

@@ -11,6 +11,9 @@
 import org.lowcoder.api.application.view.ApplicationPermissionView;
 import org.lowcoder.api.application.view.ApplicationView;
 import org.lowcoder.api.application.view.MarketplaceApplicationInfoView;
+
+//Falk: shouldn't be here ...?
+// import org.lowcoder.api.application.view.AgencyProfileApplicationView;
 import org.lowcoder.api.framework.view.ResponseView;
 import org.lowcoder.api.home.UserHomepageView;
 import org.lowcoder.domain.application.model.Application;
@@ -115,7 +118,7 @@ public interface ApplicationEndpoints
 			tags = TAG_APPLICATION_MANAGEMENT,
 			operationId = "getMarketplaceApplicationDataInViewMode",
 			summary = "Get Marketplace Application data in view mode",
-			description = "Retrieve the DSL data of a Lowcoder Application in view-mode by its ID for the marketplace."
+			description = "Retrieve the DSL data of a Lowcoder Application in view-mode by its ID for the Marketplace."
 	)
 	@GetMapping("/{applicationId}/view_marketplace")
 	public Mono<ResponseView<ApplicationView>> getPublishedMarketPlaceApplication(@PathVariable String applicationId);
@@ -124,7 +127,7 @@ public interface ApplicationEndpoints
 			tags = TAG_APPLICATION_MANAGEMENT,
 			operationId = "getAgencyProfileApplicationDataInViewMode",
 			summary = "Get Agency profile Application data in view mode",
-			description = "Retrieve the DSL data of a Lowcoder Application in view-mode by its ID marked as agency profile."
+			description = "Retrieve the DSL data of a Lowcoder Application in view-mode by its ID marked as Agency Profile."
 	)
 	@GetMapping("/{applicationId}/view_agency")
 	public Mono<ResponseView<ApplicationView>> getAgencyProfileApplication(@PathVariable String applicationId);
@@ -171,12 +174,13 @@ public Mono<ResponseView<List<ApplicationInfoView>>> getApplications(@RequestPar
 	@Operation(
 			tags = TAG_APPLICATION_MANAGEMENT,
 			operationId = "listMarketplaceApplications",
-			summary = "List marketplace Applications",
-			description = "Retrieve a list of Lowcoder Applications that are published to the marketplace"
+			summary = "List Marketplace Applications",
+			description = "Retrieve a list of Lowcoder Applications that are published to the Marketplace"
 	)
 	@GetMapping("/marketplace-apps")
 	public Mono<ResponseView<List<MarketplaceApplicationInfoView>>> getMarketplaceApplications(@RequestParam(required = false) Integer applicationType);
 
+	// Falk: why we use MarketplaceApplicationInfoView for AgencyProfile?
 	@Operation(
 			tags = TAG_APPLICATION_MANAGEMENT,
 			operationId = "listAgencyProfileApplications",
@@ -270,33 +274,12 @@ public Boolean publicToAll() {
         }
     }
 
-	public record ApplicationPublicToMarketplaceRequest(Boolean publicToMarketplace, String title,
-														String description, String category, String image) {
+	public record ApplicationPublicToMarketplaceRequest(Boolean publicToMarketplace) {
 		@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;
-		}
-
-		@Override
-		public String image() {
-			return image;
-		}
-
 	}
 
 	public record ApplicationAsAgencyProfileRequest(Boolean agencyProfile) {

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/view/ApplicationInfoView.java

@@ -37,8 +37,8 @@ public class ApplicationInfoView {
     private final Instant lastModifyTime; // app's last update time
 
     private final boolean publicToAll;
-
     private final boolean publicToMarketplace;
+    private final boolean agencyProfile;
 
     public long getLastViewTime() {
         return lastViewTime == null ? 0 : lastViewTime.toEpochMilli();

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/view/ApplicationPermissionView.java

@@ -9,6 +9,7 @@ public class ApplicationPermissionView extends CommonPermissionView {
 
     private boolean publicToAll;
     private boolean publicToMarketplace;
+    private boolean agencyProfile;
 
     public boolean isPublicToAll() {
         return publicToAll;
@@ -17,4 +18,8 @@ public boolean isPublicToAll() {
     public boolean isPublicToMarketplace() {
         return publicToMarketplace;
     }
+
+    public boolean isAgencyProfile() {
+        return agencyProfile;
+    }
 }

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

@@ -399,7 +399,8 @@ private ApplicationInfoView buildView(Application application, ResourceRole maxR
                 .lastModifyTime(application.getUpdatedAt())
                 .lastViewTime(lastViewTime)
                 .publicToAll(application.isPublicToAll())
-                .publicToMarketplace(application.isPublicToMarketplace());
+                .publicToMarketplace(application.isPublicToMarketplace())
+                .agencyProfile(application.agencyProfile());
         if (withContainerSize) {
             return applicationInfoViewBuilder
                     .containerSize(application.getLiveContainerSize())