Thanks to visit codestin.com
Credit goes to github.com

Skip to content

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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 15, 2024
Merged

Feature To Set Application AS Agency Profile #679

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
570d184
Add feature to set app as agency profile
aq-ikhwa-tech Feb 14, 2024
acbef3c
Add validation between ptm and agency apis
aq-ikhwa-tech Feb 14, 2024
10643ce
Merge branch 'dev' into agency-profile-feature
FalkWolsky Feb 15, 2024
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
Prev Previous commit
Next Next commit
Add validation between ptm and agency apis
  • Loading branch information
@aq-ikhwa-tech
aq-ikhwa-tech committed Feb 14, 2024
commit acbef3c0e54048b51bac3a1bce624f838afc3c65
18 changes: 16 additions & 2 deletions ...ice/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand 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 Down Expand 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 Down
6 changes: 3 additions & 3 deletions ...ice/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,23 +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)
return applicationApiService.getPublishedApplication(applicationId, ApplicationRequestType.AGENCY_PROFILE)
.delayUntil(applicationView -> applicationApiService.updateUserApplicationLastViewTime(applicationId))
.delayUntil(applicationView -> businessEventPublisher.publishApplicationCommonEvent(applicationView, VIEW))
.map(ResponseView::success);
Expand Down
6 changes: 6 additions & 0 deletions ...vice/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationEndpoints.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,12 @@ public Boolean agencyProfile() {
}
}

public enum ApplicationRequestType {
PUBLIC_TO_ALL,
PUBLIC_TO_MARKETPLACE,
AGENCY_PROFILE,
}

public record UpdatePermissionRequest(String role) {
}

Expand Down