Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Feature To Set Application AS Agency Profile#679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
FalkWolsky merged 3 commits intodevfromagency-profile-feature
Feb 15, 2024
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,8 @@ public class Application extends HasIdAndAuditing {
private final Boolean publicToAll;
private final Boolean publicToMarketplace;

private final Boolean agencyProfile;

private Map<String, Object> editingApplicationDSL;

@Transient
Expand DownExpand Up@@ -78,6 +80,7 @@ public Application(@JsonProperty("orgId") String organizationId,
@JsonProperty("publishedApplicationDSL") Map<String, Object> publishedApplicationDSL,
@JsonProperty("publicToAll") Boolean publicToAll,
@JsonProperty("publicToMarketplace") Boolean publicToMarketplace,
@JsonProperty("agencyProfile") Boolean agencyProfile,
@JsonProperty("editingApplicationDSL") Map<String, Object> editingApplicationDSL) {
this.organizationId = organizationId;
this.name = name;
Expand All@@ -86,6 +89,7 @@ public Application(@JsonProperty("orgId") String organizationId,
this.publishedApplicationDSL = publishedApplicationDSL;
this.publicToAll = publicToAll;
this.publicToMarketplace = publicToMarketplace;
this.agencyProfile = agencyProfile;
this.editingApplicationDSL = editingApplicationDSL;
}

Expand DownExpand Up@@ -113,6 +117,10 @@ public boolean isPublicToMarketplace() {
return BooleanUtils.toBooleanDefaultIfNull(publicToMarketplace, false);
}

public boolean agencyProfile() {
return BooleanUtils.toBooleanDefaultIfNull(agencyProfile, false);
}

public ApplicationQuery getQueryByViewModeAndQueryId(boolean isViewMode, String queryId) {
return (isViewMode ? getLiveQueries() : getEditingQueries())
.stream()
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,9 +34,12 @@ public interface ApplicationRepository extends ReactiveMongoRepository<Applicati

Flux<Application> findByIdIn(List<String> ids);

@Query(fields = "{_id : 1}")
Flux<Application> findByPublicToAllIsTrueAndPublicToMarketplaceIsAndIdIn(Boolean publicToMarketplace, Collection<String> ids);
@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);

Flux<Application> findByPublicToAllIsTrueAndPublicToMarketplaceIsTrue();

Flux<Application> findByPublicToAllIsTrueAndAgencyProfileIsTrue();

}
Original file line numberDiff line numberDiff line change
Expand Up@@ -107,6 +107,10 @@ public Flux<Application> findAllMarketplaceApps() {
return repository.findByPublicToAllIsTrueAndPublicToMarketplaceIsTrue();
}

public Flux<Application> findAllAgencyProfileApps() {
return repository.findByPublicToAllIsTrueAndAgencyProfileIsTrue();
}

public Mono<Long> countByOrganizationId(String orgId, ApplicationStatus applicationStatus) {
return repository.countByOrganizationIdAndApplicationStatus(orgId, applicationStatus);
}
Expand DownExpand Up@@ -158,10 +162,17 @@ public Mono<Boolean> setApplicationPublicToMarketplace(String applicationId, boo
return mongoUpsertHelper.updateById(application, applicationId);
}

public Mono<Boolean> setApplicationAsAgencyProfile(String applicationId, boolean agencyProfile) {
Application application = Application.builder()
.agencyProfile(agencyProfile)
.build();
return mongoUpsertHelper.updateById(application, applicationId);
}

@NonEmptyMono
@SuppressWarnings("ReactiveStreamsNullableInLambdaInTransform")
public Mono<Set<String>> getPublicApplicationIds(Collection<String> applicationIds, Boolean isAnonymous) {
return repository.findByPublicToAllIsTrueAndPublicToMarketplaceIsAndIdIn(!isAnonymous, applicationIds)
return repository.findByPublicToAllIsTrueAndPublicToMarketplaceIsOrAgencyProfileIsAndIdIn(!isAnonymous,!isAnonymous, applicationIds)
.map(HasIdAndAuditing::getId)
.collect(Collectors.toSet());

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ public enum ResourceAction {

SET_APPLICATIONS_PUBLIC(ResourceRole.EDITOR, ResourceType.APPLICATION),
SET_APPLICATIONS_PUBLIC_TO_MARKETPLACE(ResourceRole.EDITOR, ResourceType.APPLICATION),
SET_APPLICATIONS_AS_AGENCY_PROFILE(ResourceRole.EDITOR, ResourceType.APPLICATION),

// datasource action
MANAGE_DATASOURCES(ResourceRole.OWNER, ResourceType.DATASOURCE),
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -141,7 +141,7 @@ public Mono<ApplicationView> create(CreateApplicationRequest createApplicationRe
createApplicationRequest.applicationType(),
NORMAL,
createApplicationRequest.publishedApplicationDSL(),
false, false, createApplicationRequest.editingApplicationDSL());
false, false,false,createApplicationRequest.editingApplicationDSL());

if (StringUtils.isBlank(application.getOrganizationId())) {
return deferredError(INVALID_PARAMETER, "ORG_ID_EMPTY");
Expand DownExpand Up@@ -248,6 +248,19 @@ private Mono<Void> checkApplicationStatus(Application application, ApplicationSt
return Mono.error(new BizException(BizError.UNSUPPORTED_OPERATION, "BAD_REQUEST"));
}

private Mono<Void> checkApplicationViewRequest(Application application, ApplicationEndpoints.ApplicationRequestType expected) {
if (expected == ApplicationEndpoints.ApplicationRequestType.PUBLIC_TO_ALL && application.isPublicToAll()) {
return Mono.empty();
}
if (expected == ApplicationEndpoints.ApplicationRequestType.PUBLIC_TO_MARKETPLACE && application.isPublicToMarketplace()) {
return Mono.empty();
}
if (expected == ApplicationEndpoints.ApplicationRequestType.AGENCY_PROFILE && application.agencyProfile()) {
return Mono.empty();
}
return Mono.error(new BizException(BizError.UNSUPPORTED_OPERATION, "BAD_REQUEST"));
}

private Mono<Boolean> updateApplicationStatus(String applicationId, ApplicationStatus applicationStatus) {
return checkCurrentUserApplicationPermission(applicationId, MANAGE_APPLICATIONS)
.then(Mono.defer(() -> {
Expand DownExpand Up@@ -280,10 +293,11 @@ public Mono<ApplicationView> getEditingApplication(String applicationId) {
});
}

public Mono<ApplicationView> getPublishedApplication(String applicationId) {
public Mono<ApplicationView> getPublishedApplication(String applicationId, ApplicationEndpoints.ApplicationRequestType requestType) {
return checkPermissionWithReadableErrorMsg(applicationId, READ_APPLICATIONS)
.zipWhen(permission -> applicationService.findById(applicationId)
.delayUntil(application -> checkApplicationStatus(application, NORMAL)))
.delayUntil(application -> checkApplicationStatus(application, NORMAL))
.delayUntil(application -> checkApplicationViewRequest(application, requestType)))
.zipWhen(tuple -> applicationService.getAllDependentModulesFromApplication(tuple.getT2(), true), TupleUtils::merge)
.zipWhen(tuple -> organizationService.getOrgCommonSettings(tuple.getT2().getOrganizationId()), TupleUtils::merge)
.zipWith(getTemplateIdFromApplicationId(applicationId), TupleUtils::merge)
Expand DownExpand Up@@ -506,6 +520,12 @@ public Mono<Boolean> setApplicationPublicToMarketplace(String applicationId, boo
.then(applicationService.setApplicationPublicToMarketplace(applicationId, publicToMarketplace));
}

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));
}

private Map<String, Object> sanitizeDsl(Map<String, Object> applicationDsl) {
if (applicationDsl.get("queries") instanceof List<?> queries) {
List<Map<String, Object>> list = queries.stream().map(this::doSanitizeQuery).toList();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,15 +91,23 @@ public Mono<ResponseView<ApplicationView>> getEditingApplication(@PathVariable S

@Override
public Mono<ResponseView<ApplicationView>> getPublishedApplication(@PathVariable String applicationId) {
return applicationApiService.getPublishedApplication(applicationId)
return applicationApiService.getPublishedApplication(applicationId, ApplicationRequestType.PUBLIC_TO_ALL)
.delayUntil(applicationView -> applicationApiService.updateUserApplicationLastViewTime(applicationId))
.delayUntil(applicationView -> businessEventPublisher.publishApplicationCommonEvent(applicationView, VIEW))
.map(ResponseView::success);
}

@Override
public Mono<ResponseView<ApplicationView>> getPublishedMarketPlaceApplication(@PathVariable String applicationId) {
return applicationApiService.getPublishedApplication(applicationId)
return applicationApiService.getPublishedApplication(applicationId, ApplicationRequestType.PUBLIC_TO_MARKETPLACE)
.delayUntil(applicationView -> applicationApiService.updateUserApplicationLastViewTime(applicationId))
.delayUntil(applicationView -> businessEventPublisher.publishApplicationCommonEvent(applicationView, VIEW))
.map(ResponseView::success);
}

@Override
public Mono<ResponseView<ApplicationView>> getAgencyProfileApplication(@PathVariable String applicationId) {
return applicationApiService.getPublishedApplication(applicationId, ApplicationRequestType.AGENCY_PROFILE)
.delayUntil(applicationView -> applicationApiService.updateUserApplicationLastViewTime(applicationId))
.delayUntil(applicationView -> businessEventPublisher.publishApplicationCommonEvent(applicationView, VIEW))
.map(ResponseView::success);
Expand DownExpand Up@@ -144,6 +152,14 @@ public Mono<ResponseView<List<MarketplaceApplicationInfoView>>> getMarketplaceAp
.map(ResponseView::success);
}

@Override
public Mono<ResponseView<List<MarketplaceApplicationInfoView>>> getAgencyProfileApplications(@RequestParam(required = false) Integer applicationType) {
ApplicationType applicationTypeEnum = applicationType == null ? null : ApplicationType.fromValue(applicationType);
return userHomeApiService.getAllMarketplaceApplications(applicationTypeEnum)
.collectList()
.map(ResponseView::success);
}

@Override
public Mono<ResponseView<Boolean>> updatePermission(@PathVariable String applicationId,
@PathVariable String permissionId,
Expand DownExpand Up@@ -201,4 +217,13 @@ public Mono<ResponseView<Boolean>> setApplicationPublicToMarketplace(@PathVariab
return applicationApiService.setApplicationPublicToMarketplace(applicationId, request.publicToMarketplace())
.map(ResponseView::success);
}

@Override
public Mono<ResponseView<Boolean>> setApplicationAsAgencyProfile(@PathVariable String applicationId,
@RequestBody ApplicationAsAgencyProfileRequest request) {
return applicationApiService.setApplicationAsAgencyProfile(applicationId, request.agencyProfile())
.map(ResponseView::success);
}


}
Original file line numberDiff line numberDiff line change
Expand Up@@ -120,6 +120,15 @@ public interface ApplicationEndpoints
@GetMapping("/{applicationId}/view_marketplace")
public Mono<ResponseView<ApplicationView>> getPublishedMarketPlaceApplication(@PathVariable String applicationId);

@Operation(
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."
)
@GetMapping("/{applicationId}/view_agency")
public Mono<ResponseView<ApplicationView>> getAgencyProfileApplication(@PathVariable String applicationId);

@Operation(
tags = TAG_APPLICATION_MANAGEMENT,
operationId = "updateApplication",
Expand DownExpand Up@@ -168,6 +177,15 @@ public Mono<ResponseView<List<ApplicationInfoView>>> getApplications(@RequestPar
@GetMapping("/marketplace-apps")
public Mono<ResponseView<List<MarketplaceApplicationInfoView>>> getMarketplaceApplications(@RequestParam(required = false) Integer applicationType);

@Operation(
tags = TAG_APPLICATION_MANAGEMENT,
operationId = "listAgencyProfileApplications",
summary = "List agency profile Applications",
description = "Retrieve a list of Lowcoder Applications that are set as agency profiles"
)
@GetMapping("/agency-profiles")
public Mono<ResponseView<List<MarketplaceApplicationInfoView>>> getAgencyProfileApplications(@RequestParam(required = false) Integer applicationType);

@Operation(
tags = TAG_APPLICATION_PERMISSIONS,
operationId = "updateApplicationPermissions",
Expand DownExpand Up@@ -231,6 +249,16 @@ public Mono<ResponseView<Boolean>> setApplicationPublicToAll(@PathVariable Strin
public Mono<ResponseView<Boolean>> setApplicationPublicToMarketplace(@PathVariable String applicationId,
@RequestBody ApplicationPublicToMarketplaceRequest request);

@Operation(
tags = TAG_APPLICATION_MANAGEMENT,
operationId = "setApplicationAsAgencyProfile",
summary = "Set Application as agency profile",
description = "Set a Lowcoder Application identified by its ID as as agency profile but to only logged in users."
)
@PutMapping("/{applicationId}/agency-profile")
public Mono<ResponseView<Boolean>> setApplicationAsAgencyProfile(@PathVariable String applicationId,
@RequestBody ApplicationAsAgencyProfileRequest request);


public record BatchAddPermissionRequest(String role, Set<String> userIds, Set<String> groupIds) {
}
Expand All@@ -249,6 +277,19 @@ public Boolean publicToMarketplace() {
}
}

public record ApplicationAsAgencyProfileRequest(Boolean agencyProfile) {
@Override
public Boolean agencyProfile() {
return BooleanUtils.isTrue(agencyProfile);
}
}

public enum ApplicationRequestType {
PUBLIC_TO_ALL,
PUBLIC_TO_MARKETPLACE,
AGENCY_PROFILE,
}

public record UpdatePermissionRequest(String role) {
}

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,4 +25,6 @@ Flux<ApplicationInfoView> getAllAuthorisedApplications4CurrentOrgMember(@Nullabl
@Nullable ApplicationStatus applicationStatus, boolean withContainerSize);

public Flux<MarketplaceApplicationInfoView> getAllMarketplaceApplications(@Nullable ApplicationType applicationType);

public Flux<MarketplaceApplicationInfoView> getAllAgencyProfileApplications(@Nullable ApplicationType applicationType);
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -310,6 +310,59 @@ public Flux<MarketplaceApplicationInfoView> getAllMarketplaceApplications(@Nulla
});
}

@Override
public Flux<MarketplaceApplicationInfoView> getAllAgencyProfileApplications(@Nullable ApplicationType applicationType) {

return sessionUserService.getVisitorOrgMemberCache()
.flatMapMany(orgMember -> {
// application flux
Flux<Application> applicationFlux = Flux.defer(() -> applicationService.findAllAgencyProfileApps())
.filter(application -> isNull(applicationType) || application.getApplicationType() == applicationType.getValue())
.cache();

// user map
Mono<Map<String, User>> userMapMono = applicationFlux
.flatMap(application -> emptyIfNull(application.getCreatedBy()))
.collectList()
.flatMap(creatorIds -> userService.getByIds(creatorIds))
.cache();

// org map
Mono<Map<String, Organization>> orgMapMono = applicationFlux
.flatMap(application -> emptyIfNull(application.getOrganizationId()))
.collectList()
.flatMap(orgIds -> organizationService.getByIds(orgIds)
.collectList()
.map(it -> it.stream().collect(Collectors.toMap(Organization::getId, Function.identity())))
)
.cache();


return applicationFlux
.flatMap(application -> Mono.zip(Mono.just(application), userMapMono, orgMapMono))
.map(tuple -> {
// build view
Application application = tuple.getT1();
Map<String, User> userMap = tuple.getT2();
Map<String, Organization> orgMap = tuple.getT3();
return MarketplaceApplicationInfoView.builder()
.applicationId(application.getId())
.name(application.getName())
.applicationType(application.getApplicationType())
.applicationStatus(application.getApplicationStatus())
.orgId(application.getOrganizationId())
.orgName(orgMap.get(application.getOrganizationId()).getName())
.creatorEmail(Optional.ofNullable(userMap.get(application.getCreatedBy()))
.map(User::getName)
.orElse(""))
.createAt(application.getCreatedAt().toEpochMilli())
.createBy(application.getCreatedBy())
.build();
});

});
}

private ApplicationInfoView buildView(Application application, ResourceRole maxRole, Map<String, User> userMap, @Nullable Instant lastViewTime,
boolean withContainerSize) {
ApplicationInfoViewBuilder applicationInfoViewBuilder = ApplicationInfoView.builder()
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp