Added comments based on common discussion

Author: FalkWolsky

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

@@ -18,6 +18,7 @@
 @Repository
 public interface ApplicationRepository extends ReactiveMongoRepository<Application, String>, CustomApplicationRepository {
 
+    // publishedApplicationDSL : 0 -> excludes publishedApplicationDSL from the return
     @Query(fields = "{ publishedApplicationDSL : 0 , editingApplicationDSL : 0 }")
     Flux<Application> findByOrganizationId(String organizationId);
 
@@ -37,14 +38,20 @@ public interface ApplicationRepository extends ReactiveMongoRepository<Applicati
 
     // 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}")
+    /* @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);
+            (Boolean publicToMarketplace, Boolean agencyProfile, Collection<String> ids); */
 
-    Flux<Application> findByPublicToAllIsTrueAndPublicToMarketplaceIsAndAgencyProfileIsAndIdIn(Boolean publicToMarketplace, Boolean agencyProfile, Collection<String> ids);
+    // this we do not need
+    // Flux<Application> findByPublicToAllIsTrueAndPublicToMarketplaceIsAndAgencyProfileIsAndIdIn(Boolean publicToMarketplace, Boolean agencyProfile, Collection<String> ids);
 
+    // Find all Public Applications
+    Flux<Application> findByPublicToAllIsTrue();
+
+    // Find all Marketplace Apps
     Flux<Application> findByPublicToAllIsTrueAndPublicToMarketplaceIsTrue();
 
+    // Find all Agencies
     Flux<Application> findByPublicToAllIsTrueAndAgencyProfileIsTrue();
 
 }

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

@@ -204,10 +204,64 @@ public Mono<Boolean> setApplicationAsAgencyProfile(String applicationId, boolean
         return mongoUpsertHelper.updateById(application, applicationId);
     }
 
+    // getPublicApplicationIds /view - publicToAll check
+    // getPublicMarketplaceApplicationIds / marketplace_view - publicToAll and publicToMarketplace check & isPrivateMarketplace check
+    // getPublicAgencyProfileApplicationIds / agency_profile_view - publicToAll and agencyProfile check
+
+    // marketplace_view [anonymous] publicToAll and publicToMarketplace check & isPrivateMarketplace false -> OK
+    
+    // marketplace_view [anonymous] publicToAll and publicToMarketplace check & isPrivateMarketplace true -> NOT OK
+
+    // marketplace_view [LoggedIn] publicToAll and publicToMarketplace check & isPrivateMarketplace true -> OK
+    // marketplace_view [LoggedIn] publicToAll and publicToMarketplace check & isPrivateMarketplace false -> OK
+
+
+    // will be extended by EndpointType
+    /*
+     * if (EndpointType == view)
+     * if (EndpointType == marketplace_view)
+     * if (EndpointType == agency_profile_view)
+     */
+
+    // is it needed?
     @NonEmptyMono
     @SuppressWarnings("ReactiveStreamsNullableInLambdaInTransform")
     public Mono<Set<String>> getPublicApplicationIds(Collection<String> applicationIds, Boolean isAnonymous, Boolean isPrivateMarketplace) {
 
+        return repository.findByPublicToAllIsTrue()
+                        .map(HasIdAndAuditing::getId)
+                        .collect(Collectors.toSet());
+    }
+
+    // for Marketplaces
+    @NonEmptyMono
+    @SuppressWarnings("ReactiveStreamsNullableInLambdaInTransform")
+    public Mono<Set<String>> getPublicMarketplaceApplicationIds(Collection<String> applicationIds, Boolean isAnonymous, Boolean isPrivateMarketplace) {
+
+        if(isAnonymous) {
+            if(isPrivateMarketplace) {
+                return repository.findByPublicToAllIsTrueAndPublicToMarketplaceIsTrue(false, false, applicationIds)
+                        .map(HasIdAndAuditing::getId)
+                        .collect(Collectors.toSet());
+            } else {
+                return repository.findByPublicToAllIsTrueAndPublicToMarketplaceIsTrue(true, false, applicationIds)
+                        .map(HasIdAndAuditing::getId)
+                        .collect(Collectors.toSet());
+            }
+        } else {
+                return repository.findByPublicToAllIsTrueAndPublicToMarketplaceIsTrue(true, true, applicationIds)
+                        .map(HasIdAndAuditing::getId)
+                        .collect(Collectors.toSet());
+        }
+
+
+    }
+
+    // for Agencies
+    @NonEmptyMono
+    @SuppressWarnings("ReactiveStreamsNullableInLambdaInTransform")
+    public Mono<Set<String>> getPublicAgencyApplicationIds(Collection<String> applicationIds, Boolean isAnonymous, Boolean isPrivateMarketplace) {
+
         if(isAnonymous) {
             if(isPrivateMarketplace) {
                 return repository.findByPublicToAllIsTrueAndPublicToMarketplaceIsAndAgencyProfileIsAndIdIn(false, false, applicationIds)

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

@@ -16,6 +16,8 @@
 import org.lowcoder.api.application.view.ApplicationPermissionView;
 import org.lowcoder.api.application.view.ApplicationView;
 import org.lowcoder.api.application.view.MarketplaceApplicationInfoView;
+// should we not have a AgencyApplicationInfoView
+
 import org.lowcoder.api.framework.view.ResponseView;
 import org.lowcoder.api.home.SessionUserService;
 import org.lowcoder.api.home.UserHomeApiService;
@@ -91,6 +93,7 @@ public Mono<ResponseView<ApplicationView>> getEditingApplication(@PathVariable S
                 .map(ResponseView::success);
     }
 
+    // will call the check in ApplicationApiService and ApplicationService
     @Override
     public Mono<ResponseView<ApplicationView>> getPublishedApplication(@PathVariable String applicationId) {
         return applicationApiService.getPublishedApplication(applicationId, ApplicationRequestType.PUBLIC_TO_ALL)