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

Commitd43d0aa

Browse files
authored
Merge pull request#1439 from lowcoder-org/fix/folderid_null
#1331: added folder Id to all applicationInfoViews
2 parentsed7790d +47d65d7 commitd43d0aa

File tree

3 files changed

+48
-38
lines changed

3 files changed

+48
-38
lines changed

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

Lines changed: 40 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
importorg.lowcoder.domain.application.service.ApplicationService;
2929
importorg.lowcoder.domain.datasource.model.Datasource;
3030
importorg.lowcoder.domain.datasource.service.DatasourceService;
31+
importorg.lowcoder.domain.folder.service.FolderElementRelationService;
3132
importorg.lowcoder.domain.interaction.UserApplicationInteractionService;
3233
importorg.lowcoder.domain.organization.model.Organization;
3334
importorg.lowcoder.domain.organization.service.OrgMemberService;
@@ -94,6 +95,7 @@ public class ApplicationApiServiceImpl implements ApplicationApiService {
9495
privatefinalDatasourceServicedatasourceService;
9596
privatefinalApplicationHistorySnapshotServiceapplicationHistorySnapshotService;
9697
privatefinalApplicationRecordServiceapplicationRecordService;
98+
privatefinalFolderElementRelationServicefolderElementRelationService;
9799

98100
@Override
99101
publicMono<ApplicationView>create(CreateApplicationRequestcreateApplicationRequest) {
@@ -185,10 +187,10 @@ public Mono<ApplicationView> delete(String applicationId) {
185187
returncheckApplicationStatus(applicationId,ApplicationStatus.RECYCLED)
186188
.then(updateApplicationStatus(applicationId,ApplicationStatus.DELETED))
187189
.then(applicationService.findById(applicationId))
188-
.map(application ->ApplicationView.builder()
189-
.applicationInfoView(buildView(application))
190+
.flatMap(application ->buildView(application).map(appInfoView ->ApplicationView.builder()
191+
.applicationInfoView(appInfoView)
190192
.applicationDSL(application.getEditingApplicationDSL())
191-
.build());
193+
.build()));
192194
}
193195

194196
@Override
@@ -269,13 +271,14 @@ public Mono<ApplicationView> getEditingApplication(String applicationId) {
269271
.map(dsl ->Map.entry(app.getId(),sanitizeDsl(dsl))))
270272
.collectMap(Map.Entry::getKey,Map.Entry::getValue)
271273
.flatMap(dependentModuleDsl ->
272-
applicationService.updateById(applicationId,application).map(__ ->
273-
ApplicationView.builder()
274-
.applicationInfoView(buildView(application,permission.getResourceRole().getValue()))
275-
.applicationDSL(application.getEditingApplicationDSL())
276-
.moduleDSL(dependentModuleDsl)
277-
.orgCommonSettings(commonSettings)
278-
.build()));
274+
applicationService.updateById(applicationId,application).flatMap(__ ->
275+
buildView(application,permission.getResourceRole().getValue()).map(appInfoView ->
276+
ApplicationView.builder()
277+
.applicationInfoView(appInfoView)
278+
.applicationDSL(application.getEditingApplicationDSL())
279+
.moduleDSL(dependentModuleDsl)
280+
.orgCommonSettings(commonSettings)
281+
.build())));
279282
});
280283
}
281284

@@ -299,14 +302,15 @@ public Mono<ApplicationView> getPublishedApplication(String applicationId, Appli
299302
.map(dsl ->Map.entry(app.getId(),sanitizeDsl(dsl))))
300303
.collectMap(Map.Entry::getKey,Map.Entry::getValue)
301304
.flatMap(dependentModuleDsl ->
302-
application.getLiveApplicationDsl(applicationRecordService).map(liveDsl ->
303-
ApplicationView.builder()
304-
.applicationInfoView(buildView(application,permission.getResourceRole().getValue()))
305-
.applicationDSL(sanitizeDsl(liveDsl))
306-
.moduleDSL(dependentModuleDsl)
307-
.orgCommonSettings(commonSettings)
308-
.templateId(templateId)
309-
.build())
305+
application.getLiveApplicationDsl(applicationRecordService).flatMap(liveDsl ->
306+
buildView(application,permission.getResourceRole().getValue()).map(appInfoView ->
307+
ApplicationView.builder()
308+
.applicationInfoView(appInfoView)
309+
.applicationDSL(sanitizeDsl(liveDsl))
310+
.moduleDSL(dependentModuleDsl)
311+
.orgCommonSettings(commonSettings)
312+
.templateId(templateId)
313+
.build()))
310314
);
311315
})
312316
.delayUntil(applicationView -> {
@@ -346,10 +350,10 @@ public Mono<ApplicationView> update(String applicationId, Application applicatio
346350
applicationId,EDIT_APPLICATIONS))
347351
.delayUntil(__ ->checkDatasourcePermissions(application))
348352
.flatMap(permission ->doUpdateApplication(applicationId,application)
349-
.map(applicationUpdated ->ApplicationView.builder()
350-
.applicationInfoView(buildView(applicationUpdated,permission.getResourceRole().getValue()))
353+
.flatMap(applicationUpdated ->buildView(applicationUpdated,permission.getResourceRole().getValue()).map(appInfoView ->ApplicationView.builder()
354+
.applicationInfoView(appInfoView)
351355
.applicationDSL(applicationUpdated.getEditingApplicationDSL())
352-
.build()));
356+
.build())));
353357
}
354358

355359
privateMono<Application>doUpdateApplication(StringapplicationId,Applicationapplication) {
@@ -376,10 +380,10 @@ public Mono<ApplicationView> publish(String applicationId, ApplicationPublishReq
376380
.build())
377381
.flatMap(applicationRecordService::insert))
378382
.flatMap(permission ->applicationService.findById(applicationId)
379-
.map(applicationUpdated ->ApplicationView.builder()
380-
.applicationInfoView(buildView(applicationUpdated,permission.getResourceRole().getValue()))
383+
.flatMap(applicationUpdated ->buildView(applicationUpdated,permission.getResourceRole().getValue()).map(appInfoView ->ApplicationView.builder()
384+
.applicationInfoView(appInfoView)
381385
.applicationDSL(applicationUpdated.getEditingApplicationDSL())
382-
.build()));
386+
.build())));
383387
}
384388

385389
@Override
@@ -472,10 +476,10 @@ public Mono<ApplicationView> createFromTemplate(String templateId) {
472476
.delayUntil(orgMember ->orgDevChecker.checkCurrentOrgDev())
473477
.delayUntil(bizThresholdChecker::checkMaxOrgApplicationCount)
474478
.flatMap(orgMember ->templateSolutionService.createFromTemplate(templateId,orgMember.getOrgId(),orgMember.getUserId())
475-
.map(applicationCreated ->ApplicationView.builder()
476-
.applicationInfoView(buildView(applicationCreated))
479+
.flatMap(applicationCreated ->buildView(applicationCreated).map(appInfoView ->ApplicationView.builder()
480+
.applicationInfoView(appInfoView)
477481
.applicationDSL(applicationCreated.getEditingApplicationDSL())
478-
.build()));
482+
.build())));
479483
}
480484

481485
@Override
@@ -547,8 +551,14 @@ public Mono<ResourcePermission> checkApplicationPermissionWithReadableErrorMsg(S
547551

548552

549553

550-
privateApplicationInfoViewbuildView(Applicationapplication,Stringrole) {
551-
returnbuildView(application,role,null);
554+
privateMono<ApplicationInfoView>buildView(Applicationapplication,Stringrole) {
555+
returnMono.just(buildView(application,role,null)).delayUntil(applicationInfoView -> {
556+
StringapplicationId =applicationInfoView.getApplicationId();
557+
returnfolderElementRelationService.getByElementIds(List.of(applicationId))
558+
.doOnNext(folderElement -> {
559+
applicationInfoView.setFolderId(folderElement.folderId());
560+
}).then();
561+
});
552562
}
553563

554564
privateApplicationInfoViewbuildView(Applicationapplication,Stringrole,@NullableStringfolderId) {
@@ -572,7 +582,7 @@ private ApplicationInfoView buildView(Application application, String role, @Nul
572582
.build();
573583
}
574584

575-
privateApplicationInfoViewbuildView(Applicationapplication) {
585+
privateMono<ApplicationInfoView>buildView(Applicationapplication) {
576586
returnbuildView(application,"");
577587
}
578588

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ public class ApplicationController implements ApplicationEndpoints {
3939
privatefinalBusinessEventPublisherbusinessEventPublisher;
4040
privatefinalSessionUserServicesessionUserService;
4141
privatefinalGidServicegidService;
42-
privatefinalFolderElementRelationServicefolderElementRelationService;
4342
privatefinalApplicationRecordServiceapplicationRecordService;
4443

4544
@Override
@@ -187,13 +186,6 @@ public Mono<ResponseView<List<ApplicationInfoView>>> getApplications(@RequestPar
187186
@RequestParam(required =false,defaultValue ="0")IntegerpageSize) {
188187
ApplicationTypeapplicationTypeEnum =applicationType ==null ?null :ApplicationType.fromValue(applicationType);
189188
varflux =userHomeApiService.getAllAuthorisedApplications4CurrentOrgMember(applicationTypeEnum,applicationStatus,withContainerSize,name,category)
190-
.delayUntil(applicationInfoView -> {
191-
StringapplicationId =applicationInfoView.getApplicationId();
192-
returnfolderElementRelationService.getByElementIds(List.of(applicationId))
193-
.doOnNext(folderElement -> {
194-
applicationInfoView.setFolderId(folderElement.folderId());
195-
}).then();
196-
})
197189
.cache();
198190
Mono<Long>countMono =flux.count();
199191
varflux1 =flux.skip((long) (pageNum -1) *pageSize);

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
importorg.lowcoder.domain.bundle.model.BundleStatus;
2222
importorg.lowcoder.domain.bundle.service.BundleElementRelationServiceImpl;
2323
importorg.lowcoder.domain.bundle.service.BundleService;
24+
importorg.lowcoder.domain.folder.service.FolderElementRelationService;
2425
importorg.lowcoder.domain.interaction.UserApplicationInteraction;
2526
importorg.lowcoder.domain.interaction.UserApplicationInteractionService;
2627
importorg.lowcoder.domain.organization.model.OrgMember;
@@ -72,6 +73,7 @@ public class UserHomeApiServiceImpl implements UserHomeApiService {
7273
privatefinalBundleElementRelationServiceImplbundleElementRelationServiceImpl;
7374
privatefinalBundleServicebundleService;
7475
privatefinalApplicationRecordServiceapplicationRecordService;
76+
privatefinalFolderElementRelationServicefolderElementRelationService;
7577

7678
@Override
7779
publicMono<UserProfileView>buildUserProfileView(Useruser,ServerWebExchangeexchange) {
@@ -607,6 +609,12 @@ private Mono<ApplicationInfoView> buildView(Application application, ResourceRol
607609
.build()));
608610
}
609611
returnMono.just(applicationInfoViewBuilder.build());
612+
}).delayUntil(applicationInfoView -> {
613+
StringapplicationId =applicationInfoView.getApplicationId();
614+
returnfolderElementRelationService.getByElementIds(List.of(applicationId))
615+
.doOnNext(folderElement -> {
616+
applicationInfoView.setFolderId(folderElement.folderId());
617+
}).then();
610618
});
611619
}
612620

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp