Skip to content

#1331: added folder Id to all applicationInfoViews #1439

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 1 commit into from
Jan 13, 2025
Merged

#1331: added folder Id to all applicationInfoViews #1439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
70 changes: 40 additions & 30 deletions ...lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.lowcoder.domain.application.service.ApplicationService;
import org.lowcoder.domain.datasource.model.Datasource;
import org.lowcoder.domain.datasource.service.DatasourceService;
import org.lowcoder.domain.folder.service.FolderElementRelationService;
import org.lowcoder.domain.interaction.UserApplicationInteractionService;
import org.lowcoder.domain.organization.model.Organization;
import org.lowcoder.domain.organization.service.OrgMemberService;
Expand Down Expand Up @@ -94,6 +95,7 @@ public class ApplicationApiServiceImpl implements ApplicationApiService {
private final DatasourceService datasourceService;
private final ApplicationHistorySnapshotService applicationHistorySnapshotService;
private final ApplicationRecordService applicationRecordService;
private final FolderElementRelationService folderElementRelationService;

@Override
public Mono<ApplicationView> create(CreateApplicationRequest createApplicationRequest) {
Expand Down Expand Up @@ -185,10 +187,10 @@ public Mono<ApplicationView> delete(String applicationId) {
return checkApplicationStatus(applicationId, ApplicationStatus.RECYCLED)
.then(updateApplicationStatus(applicationId, ApplicationStatus.DELETED))
.then(applicationService.findById(applicationId))
.map(application -> ApplicationView.builder()
.applicationInfoView(buildView(application))
.flatMap(application -> buildView(application).map(appInfoView -> ApplicationView.builder()
.applicationInfoView(appInfoView)
.applicationDSL(application.getEditingApplicationDSL())
.build());
.build()));
}

@Override
Expand Down Expand Up @@ -269,13 +271,14 @@ public Mono<ApplicationView> getEditingApplication(String applicationId) {
.map(dsl -> Map.entry(app.getId(), sanitizeDsl(dsl))))
.collectMap(Map.Entry::getKey, Map.Entry::getValue)
.flatMap(dependentModuleDsl ->
applicationService.updateById(applicationId, application).map(__ ->
ApplicationView.builder()
.applicationInfoView(buildView(application, permission.getResourceRole().getValue()))
.applicationDSL(application.getEditingApplicationDSL())
.moduleDSL(dependentModuleDsl)
.orgCommonSettings(commonSettings)
.build()));
applicationService.updateById(applicationId, application).flatMap(__ ->
buildView(application, permission.getResourceRole().getValue()).map(appInfoView ->
ApplicationView.builder()
.applicationInfoView(appInfoView)
.applicationDSL(application.getEditingApplicationDSL())
.moduleDSL(dependentModuleDsl)
.orgCommonSettings(commonSettings)
.build())));
});
}

Expand All @@ -299,14 +302,15 @@ public Mono<ApplicationView> getPublishedApplication(String applicationId, Appli
.map(dsl -> Map.entry(app.getId(), sanitizeDsl(dsl))))
.collectMap(Map.Entry::getKey, Map.Entry::getValue)
.flatMap(dependentModuleDsl ->
application.getLiveApplicationDsl(applicationRecordService).map(liveDsl ->
ApplicationView.builder()
.applicationInfoView(buildView(application, permission.getResourceRole().getValue()))
.applicationDSL(sanitizeDsl(liveDsl))
.moduleDSL(dependentModuleDsl)
.orgCommonSettings(commonSettings)
.templateId(templateId)
.build())
application.getLiveApplicationDsl(applicationRecordService).flatMap(liveDsl ->
buildView(application, permission.getResourceRole().getValue()).map(appInfoView ->
ApplicationView.builder()
.applicationInfoView(appInfoView)
.applicationDSL(sanitizeDsl(liveDsl))
.moduleDSL(dependentModuleDsl)
.orgCommonSettings(commonSettings)
.templateId(templateId)
.build()))
);
})
.delayUntil(applicationView -> {
Expand Down Expand Up @@ -346,10 +350,10 @@ public Mono<ApplicationView> update(String applicationId, Application applicatio
applicationId, EDIT_APPLICATIONS))
.delayUntil(__ -> checkDatasourcePermissions(application))
.flatMap(permission -> doUpdateApplication(applicationId, application)
.map(applicationUpdated -> ApplicationView.builder()
.applicationInfoView(buildView(applicationUpdated, permission.getResourceRole().getValue()))
.flatMap(applicationUpdated -> buildView(applicationUpdated, permission.getResourceRole().getValue()).map(appInfoView -> ApplicationView.builder()
.applicationInfoView(appInfoView)
.applicationDSL(applicationUpdated.getEditingApplicationDSL())
.build()));
.build())));
}

private Mono<Application> doUpdateApplication(String applicationId, Application application) {
Expand All @@ -376,10 +380,10 @@ public Mono<ApplicationView> publish(String applicationId, ApplicationPublishReq
.build())
.flatMap(applicationRecordService::insert))
.flatMap(permission -> applicationService.findById(applicationId)
.map(applicationUpdated -> ApplicationView.builder()
.applicationInfoView(buildView(applicationUpdated, permission.getResourceRole().getValue()))
.flatMap(applicationUpdated -> buildView(applicationUpdated, permission.getResourceRole().getValue()).map(appInfoView -> ApplicationView.builder()
.applicationInfoView(appInfoView)
.applicationDSL(applicationUpdated.getEditingApplicationDSL())
.build()));
.build())));
}

@Override
Expand Down Expand Up @@ -472,10 +476,10 @@ public Mono<ApplicationView> createFromTemplate(String templateId) {
.delayUntil(orgMember -> orgDevChecker.checkCurrentOrgDev())
.delayUntil(bizThresholdChecker::checkMaxOrgApplicationCount)
.flatMap(orgMember -> templateSolutionService.createFromTemplate(templateId, orgMember.getOrgId(), orgMember.getUserId())
.map(applicationCreated -> ApplicationView.builder()
.applicationInfoView(buildView(applicationCreated))
.flatMap(applicationCreated -> buildView(applicationCreated).map(appInfoView -> ApplicationView.builder()
.applicationInfoView(appInfoView)
.applicationDSL(applicationCreated.getEditingApplicationDSL())
.build()));
.build())));
}

@Override
Expand Down Expand Up @@ -547,8 +551,14 @@ public Mono<ResourcePermission> checkApplicationPermissionWithReadableErrorMsg(S



private ApplicationInfoView buildView(Application application, String role) {
return buildView(application, role, null);
private Mono<ApplicationInfoView> buildView(Application application, String role) {
return Mono.just(buildView(application, role, null)).delayUntil(applicationInfoView -> {
String applicationId = applicationInfoView.getApplicationId();
return folderElementRelationService.getByElementIds(List.of(applicationId))
.doOnNext(folderElement -> {
applicationInfoView.setFolderId(folderElement.folderId());
}).then();
});
}

private ApplicationInfoView buildView(Application application, String role, @Nullable String folderId) {
Expand All @@ -572,7 +582,7 @@ private ApplicationInfoView buildView(Application application, String role, @Nul
.build();
}

private ApplicationInfoView buildView(Application application) {
private Mono<ApplicationInfoView> buildView(Application application) {
return buildView(application, "");
}

Expand Down
8 changes: 0 additions & 8 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 @@ -39,7 +39,6 @@ public class ApplicationController implements ApplicationEndpoints {
private final BusinessEventPublisher businessEventPublisher;
private final SessionUserService sessionUserService;
private final GidService gidService;
private final FolderElementRelationService folderElementRelationService;
private final ApplicationRecordService applicationRecordService;

@Override
Expand Down Expand Up @@ -187,13 +186,6 @@ public Mono<ResponseView<List<ApplicationInfoView>>> getApplications(@RequestPar
@RequestParam(required = false, defaultValue = "0") Integer pageSize) {
ApplicationType applicationTypeEnum = applicationType == null ? null : ApplicationType.fromValue(applicationType);
var flux = userHomeApiService.getAllAuthorisedApplications4CurrentOrgMember(applicationTypeEnum, applicationStatus, withContainerSize, name, category)
.delayUntil(applicationInfoView -> {
String applicationId = applicationInfoView.getApplicationId();
return folderElementRelationService.getByElementIds(List.of(applicationId))
.doOnNext(folderElement -> {
applicationInfoView.setFolderId(folderElement.folderId());
}).then();
})
.cache();
Mono<Long> countMono = flux.count();
var flux1 = flux.skip((long) (pageNum - 1) * pageSize);
Expand Down
8 changes: 8 additions & 0 deletions ...i-service/lowcoder-server/src/main/java/org/lowcoder/api/home/UserHomeApiServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import org.lowcoder.domain.bundle.model.BundleStatus;
import org.lowcoder.domain.bundle.service.BundleElementRelationServiceImpl;
import org.lowcoder.domain.bundle.service.BundleService;
import org.lowcoder.domain.folder.service.FolderElementRelationService;
import org.lowcoder.domain.interaction.UserApplicationInteraction;
import org.lowcoder.domain.interaction.UserApplicationInteractionService;
import org.lowcoder.domain.organization.model.OrgMember;
Expand Down Expand Up @@ -72,6 +73,7 @@ public class UserHomeApiServiceImpl implements UserHomeApiService {
private final BundleElementRelationServiceImpl bundleElementRelationServiceImpl;
private final BundleService bundleService;
private final ApplicationRecordService applicationRecordService;
private final FolderElementRelationService folderElementRelationService;

@Override
public Mono<UserProfileView> buildUserProfileView(User user, ServerWebExchange exchange) {
Expand Down Expand Up @@ -607,6 +609,12 @@ private Mono<ApplicationInfoView> buildView(Application application, ResourceRol
.build()));
}
return Mono.just(applicationInfoViewBuilder.build());
}).delayUntil(applicationInfoView -> {
String applicationId = applicationInfoView.getApplicationId();
return folderElementRelationService.getByElementIds(List.of(applicationId))
.doOnNext(folderElement -> {
applicationInfoView.setFolderId(folderElement.folderId());
}).then();
});
}

Expand Down
Loading