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

Commit4d8148e

Browse files
author
Thomasr
committed
Rename collectionapplicationRecord toapplicationVersion
1 parentdcd76c3 commit4d8148e

File tree

11 files changed

+62
-42
lines changed

11 files changed

+62
-42
lines changed

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/Application.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ public Mono<ApplicationQuery> getQueryByViewModeAndQueryId(boolean isViewMode, S
141141
@JsonIgnore
142142
publicMono<Map<String,Object>>getLiveApplicationDsl(ApplicationRecordServiceapplicationRecordService) {
143143
returnapplicationRecordService.getLatestRecordByApplicationId(this.getId())
144-
.map(ApplicationRecord::getApplicationDSL)
144+
.map(ApplicationVersion::getApplicationDSL)
145145
.switchIfEmpty(Mono.just(editingApplicationDSL));
146146
}
147147

@@ -237,7 +237,7 @@ public Mono<Object> getLiveContainerSize(ApplicationRecordService applicationRec
237237
}
238238

239239
publicMono<Map<String,Object>>getPublishedApplicationDSL(ApplicationRecordServiceapplicationRecordService) {
240-
returnapplicationRecordService.getLatestRecordByApplicationId(this.getId()).map(ApplicationRecord::getApplicationDSL);
240+
returnapplicationRecordService.getLatestRecordByApplicationId(this.getId()).map(ApplicationVersion::getApplicationDSL);
241241
}
242242

243243
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
@SuperBuilder
1515
@Jacksonized
1616
@NoArgsConstructor
17-
publicclassApplicationRecordextendsHasIdAndAuditing {
17+
publicclassApplicationVersionextendsHasIdAndAuditing {
1818

1919
privateStringapplicationId;
2020
privateStringtag;
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
packageorg.lowcoder.domain.application.repository;
22

33

4-
importorg.lowcoder.domain.application.model.ApplicationRecord;
4+
importorg.lowcoder.domain.application.model.ApplicationVersion;
55
importorg.springframework.data.mongodb.repository.ReactiveMongoRepository;
66
importorg.springframework.stereotype.Repository;
77
importreactor.core.publisher.Flux;
@@ -10,14 +10,14 @@
1010
importjava.util.List;
1111

1212
@Repository
13-
publicinterfaceApplicationRecordRepositoryextendsReactiveMongoRepository<ApplicationRecord,String> {
13+
publicinterfaceApplicationRecordRepositoryextendsReactiveMongoRepository<ApplicationVersion,String> {
1414

1515
Mono<Long>deleteByApplicationId(StringapplicationId);
1616

17-
Flux<ApplicationRecord>findByApplicationId(StringapplicationId);
17+
Flux<ApplicationVersion>findByApplicationId(StringapplicationId);
1818

19-
Flux<ApplicationRecord>findByApplicationIdIn(List<String>ids);
19+
Flux<ApplicationVersion>findByApplicationIdIn(List<String>ids);
2020

21-
Mono<ApplicationRecord>findTop1ByApplicationIdOrderByCreatedAtDesc(StringapplicationId);
21+
Mono<ApplicationVersion>findTop1ByApplicationIdOrderByCreatedAtDesc(StringapplicationId);
2222

2323
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
packageorg.lowcoder.domain.application.service;
22

3-
importorg.lowcoder.domain.application.model.ApplicationRecord;
3+
importorg.lowcoder.domain.application.model.ApplicationVersion;
44
importreactor.core.publisher.Mono;
55

66
importjava.util.List;
77
importjava.util.Map;
88

99
publicinterfaceApplicationRecordService {
10-
Mono<ApplicationRecord>insert(ApplicationRecordapplicationRecord);
10+
Mono<ApplicationVersion>insert(ApplicationVersionapplicationRecord);
1111

12-
Mono<List<ApplicationRecord>>getByApplicationId(StringapplicationId);
12+
Mono<List<ApplicationVersion>>getByApplicationId(StringapplicationId);
1313

14-
Mono<Map<String,List<ApplicationRecord>>>getByApplicationIdIn(List<String>applicationIdList);
14+
Mono<Map<String,List<ApplicationVersion>>>getByApplicationIdIn(List<String>applicationIdList);
1515

16-
Mono<ApplicationRecord>getById(Stringid);
16+
Mono<ApplicationVersion>getById(Stringid);
1717

18-
Mono<ApplicationRecord>getLatestRecordByApplicationId(StringapplicationId);
18+
Mono<ApplicationVersion>getLatestRecordByApplicationId(StringapplicationId);
1919

2020
Mono<Long>deleteAllApplicationTagByApplicationId(StringapplicationId);
2121

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
packageorg.lowcoder.domain.application.service;
22

33
importlombok.RequiredArgsConstructor;
4-
importorg.lowcoder.domain.application.model.ApplicationRecord;
4+
importorg.lowcoder.domain.application.model.ApplicationVersion;
55
importorg.lowcoder.domain.application.repository.ApplicationRecordRepository;
66
importorg.springframework.stereotype.Service;
77
importreactor.core.publisher.Mono;
@@ -21,31 +21,31 @@ public class ApplicationRecordServiceImpl implements ApplicationRecordService {
2121
privatefinalApplicationRecordRepositoryapplicationRecordRepository;
2222

2323
@Override
24-
publicMono<ApplicationRecord>insert(ApplicationRecordapplicationRecord) {
24+
publicMono<ApplicationVersion>insert(ApplicationVersionapplicationRecord) {
2525
returnapplicationRecordRepository.save(applicationRecord);
2626
}
2727

2828
/**
2929
* get all published versions
3030
*/
3131
@Override
32-
publicMono<List<ApplicationRecord>>getByApplicationId(StringapplicationId) {
32+
publicMono<List<ApplicationVersion>>getByApplicationId(StringapplicationId) {
3333
returnapplicationRecordRepository.findByApplicationId(applicationId)
34-
.sort(Comparator.comparing(ApplicationRecord::getCreatedAt).reversed())
34+
.sort(Comparator.comparing(ApplicationVersion::getCreatedAt).reversed())
3535
.collectList();
3636
}
3737

3838
@Override
39-
publicMono<Map<String,List<ApplicationRecord>>>getByApplicationIdIn(List<String>applicationIdList) {
39+
publicMono<Map<String,List<ApplicationVersion>>>getByApplicationIdIn(List<String>applicationIdList) {
4040
returnapplicationRecordRepository.findByApplicationIdIn(applicationIdList)
41-
.sort(Comparator.comparing(ApplicationRecord::getCreatedAt).reversed())
41+
.sort(Comparator.comparing(ApplicationVersion::getCreatedAt).reversed())
4242
.collectList()
4343
.map(applicationRecords ->applicationRecords.stream()
44-
.collect(Collectors.groupingBy(ApplicationRecord::getApplicationId)));
44+
.collect(Collectors.groupingBy(ApplicationVersion::getApplicationId)));
4545
}
4646

4747
@Override
48-
publicMono<ApplicationRecord>getById(Stringid) {
48+
publicMono<ApplicationVersion>getById(Stringid) {
4949
returnapplicationRecordRepository.findById(id)
5050
.switchIfEmpty(deferredError(APPLICATION_NOT_FOUND,"APPLICATION_NOT_FOUND"));
5151
}
@@ -54,7 +54,7 @@ public Mono<ApplicationRecord> getById(String id) {
5454
* get the latest published version
5555
*/
5656
@Override
57-
publicMono<ApplicationRecord>getLatestRecordByApplicationId(StringapplicationId) {
57+
publicMono<ApplicationVersion>getLatestRecordByApplicationId(StringapplicationId) {
5858
returnapplicationRecordRepository.findTop1ByApplicationIdOrderByCreatedAtDesc(applicationId);
5959
}
6060

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
importlombok.RequiredArgsConstructor;
1111
importorg.apache.commons.lang3.StringUtils;
1212
importorg.lowcoder.domain.application.model.Application;
13-
importorg.lowcoder.domain.application.model.ApplicationRecord;
13+
importorg.lowcoder.domain.application.model.ApplicationVersion;
1414
importorg.lowcoder.domain.application.model.ApplicationRequestType;
1515
importorg.lowcoder.domain.application.model.ApplicationStatus;
1616
importorg.lowcoder.domain.application.repository.ApplicationRepository;
@@ -347,7 +347,7 @@ public Mono<Boolean> updateLastEditedAt(String applicationId, Instant time, Stri
347347
@Override
348348
publicMono<Map<String,Object>>getLiveDSLByApplicationId(StringapplicationId) {
349349
returnapplicationRecordService.getLatestRecordByApplicationId(applicationId)
350-
.map(ApplicationRecord::getApplicationDSL)
350+
.map(ApplicationVersion::getApplicationDSL)
351351
.switchIfEmpty(findById(applicationId)
352352
.map(Application::getEditingApplicationDSL));
353353
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ public Mono<ApplicationView> publish(String applicationId, ApplicationPublishReq
368368
.flatMap(userId ->resourcePermissionService.checkAndReturnMaxPermission(userId,
369369
applicationId,PUBLISH_APPLICATIONS))
370370
.delayUntil(__ ->applicationService.findById(applicationId)
371-
.map(application ->ApplicationRecord.builder()
371+
.map(application ->ApplicationVersion.builder()
372372
.tag(applicationPublishRequest.tag())
373373
.commitMessage(applicationPublishRequest.commitMessage())
374374
.applicationId(application.getId())

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22

33
importlombok.RequiredArgsConstructor;
44
importorg.lowcoder.api.home.SessionUserService;
5-
importorg.lowcoder.api.application.ApplicationApiServiceImpl;
65
importorg.lowcoder.api.application.view.ApplicationRecordMetaView;
76
importorg.lowcoder.api.usermanagement.OrgDevChecker;
7+
importorg.lowcoder.domain.application.model.ApplicationVersion;
88
importorg.lowcoder.domain.organization.model.OrgMember;
99
importorg.lowcoder.domain.application.model.Application;
1010
importorg.lowcoder.domain.application.model.ApplicationCombineId;
11-
importorg.lowcoder.domain.application.model.ApplicationRecord;
1211
importorg.lowcoder.domain.application.service.ApplicationRecordService;
1312
importorg.lowcoder.domain.application.service.ApplicationService;
1413
importorg.lowcoder.domain.user.service.UserService;
@@ -41,7 +40,7 @@ public Mono<Map<String, Object>> getRecordDSLFromApplicationCombineId(Applicatio
4140
returnapplicationService.getLiveDSLByApplicationId(applicationCombineId.applicationId());
4241
}
4342
returnapplicationRecordService.getById(applicationCombineId.applicationRecordId())
44-
.map(ApplicationRecord::getApplicationDSL);
43+
.map(ApplicationVersion::getApplicationDSL);
4544
}));
4645
}
4746

@@ -55,7 +54,7 @@ public Mono<Void> delete(String id) {
5554
publicMono<List<ApplicationRecordMetaView>>getByApplicationId(StringapplicationId) {
5655
returnapplicationRecordService.getByApplicationId(applicationId)
5756
.flatMap(applicationRecords ->multiBuild(applicationRecords,
58-
ApplicationRecord::getCreatedBy,
57+
ApplicationVersion::getCreatedBy,
5958
userService::getByIds,
6059
ApplicationRecordMetaView::from
6160
));

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
packageorg.lowcoder.api.application.view;
22

3-
importorg.lowcoder.domain.application.model.ApplicationRecord;
3+
importorg.lowcoder.domain.application.model.ApplicationVersion;
44
importorg.lowcoder.domain.user.model.User;
55

66
publicrecordApplicationRecordMetaView(Stringid,
@@ -10,7 +10,7 @@ public record ApplicationRecordMetaView(String id,
1010
longcreateTime,
1111
StringcreatorName) {
1212

13-
publicstaticApplicationRecordMetaViewfrom(ApplicationRecordapplicationRecord) {
13+
publicstaticApplicationRecordMetaViewfrom(ApplicationVersionapplicationRecord) {
1414
returnnewApplicationRecordMetaView(applicationRecord.getId(),
1515
applicationRecord.getApplicationId(),
1616
applicationRecord.getTag(),
@@ -19,7 +19,7 @@ public static ApplicationRecordMetaView from(ApplicationRecord applicationRecord
1919
null);
2020
}
2121

22-
publicstaticApplicationRecordMetaViewfrom(ApplicationRecordapplicationRecord,UserapplicationRecordCreator) {
22+
publicstaticApplicationRecordMetaViewfrom(ApplicationVersionapplicationRecord,UserapplicationRecordCreator) {
2323
returnnewApplicationRecordMetaView(applicationRecord.getId(),
2424
applicationRecord.getApplicationId(),
2525
applicationRecord.getTag(),

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44
importlombok.RequiredArgsConstructor;
55
importorg.apache.commons.lang3.StringUtils;
66
importorg.lowcoder.api.application.view.ApplicationInfoView;
7-
importorg.lowcoder.api.application.view.ApplicationInfoView.ApplicationInfoViewBuilder;
87
importorg.lowcoder.api.application.view.MarketplaceApplicationInfoView;
98
importorg.lowcoder.api.bundle.view.BundleInfoView;
109
importorg.lowcoder.api.bundle.view.MarketplaceBundleInfoView;
1110
importorg.lowcoder.api.usermanagement.OrgDevChecker;
1211
importorg.lowcoder.api.usermanagement.view.OrgAndVisitorRoleView;
1312
importorg.lowcoder.api.usermanagement.view.UserProfileView;
1413
importorg.lowcoder.domain.application.model.Application;
15-
importorg.lowcoder.domain.application.model.ApplicationRecord;
14+
importorg.lowcoder.domain.application.model.ApplicationVersion;
1615
importorg.lowcoder.domain.application.model.ApplicationStatus;
1716
importorg.lowcoder.domain.application.model.ApplicationType;
1817
importorg.lowcoder.domain.application.service.ApplicationRecordService;
@@ -38,7 +37,6 @@
3837
importorg.lowcoder.infra.util.NetworkUtils;
3938
importorg.lowcoder.infra.util.TupleUtils;
4039
importorg.lowcoder.sdk.config.CommonConfig;
41-
importorg.lowcoder.sdk.models.VersionedModel;
4240
importorg.springframework.stereotype.Component;
4341
importorg.springframework.web.server.ServerWebExchange;
4442
importreactor.core.publisher.Flux;
@@ -574,7 +572,7 @@ private Mono<ApplicationInfoView> buildView(Application application, ResourceRol
574572
.zipWith(application.getIcon(applicationRecordService),TupleUtils::merge)
575573
.zipWith(applicationRecordService.getLatestRecordByApplicationId(application.getId()).map(Optional::of).switchIfEmpty(Mono.just(Optional.empty())),TupleUtils::merge)
576574
.flatMap(tuple -> {
577-
Optional<ApplicationRecord>lastAppRecord =tuple.getT5();
575+
Optional<ApplicationVersion>lastAppRecord =tuple.getT5();
578576
ApplicationInfoView.ApplicationInfoViewBuilderapplicationInfoViewBuilder =ApplicationInfoView.builder()
579577
.applicationId(application.getId())
580578
.applicationGid(application.getGid())
@@ -585,8 +583,8 @@ private Mono<ApplicationInfoView> buildView(Application application, ResourceRol
585583
.category(tuple.getT3())
586584
.icon(tuple.getT4())
587585
.published(lastAppRecord.isPresent())
588-
.publishedVersion(lastAppRecord.map(ApplicationRecord::version).orElse(null))
589-
.lastPublishedTime(lastAppRecord.map(ApplicationRecord::getCreatedAt).orElse(null))
586+
.publishedVersion(lastAppRecord.map(ApplicationVersion::version).orElse(null))
587+
.lastPublishedTime(lastAppRecord.map(ApplicationVersion::getCreatedAt).orElse(null))
590588
.createBy(Optional.ofNullable(userMap.get(application.getCreatedBy()))
591589
.map(User::getName)
592590
.orElse(""))

0 commit comments

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