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

Commit5221870

Browse files
author
Thomas
committed
use UUIDv7
Add GID to Organization
1 parent3f88b5b commit5221870

File tree

6 files changed

+28
-4
lines changed

6 files changed

+28
-4
lines changed

‎server/api-service/lowcoder-domain/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,11 @@
262262
<artifactId>jaxb-runtime</artifactId>
263263
</dependency>
264264
<!-- oss-->
265+
<dependency>
266+
<groupId>com.github.f4b6a3</groupId>
267+
<artifactId>uuid-creator</artifactId>
268+
<version>5.2.0</version>
269+
</dependency>
265270
</dependencies>
266271

267272
<build>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
importjava.util.*;
1010
importjava.util.function.Supplier;
1111

12+
importcom.github.f4b6a3.uuid.UuidCreator;
1213
importlombok.Getter;
1314
importlombok.NoArgsConstructor;
1415
importlombok.Setter;
@@ -36,7 +37,7 @@
3637
@NoArgsConstructor
3738
publicclassApplicationextendsHasIdAndAuditing {
3839
@Getter
39-
privateStringgid =UUID.randomUUID().toString();
40+
privateStringgid =UuidCreator.getTimeOrderedEpoch().toString();
4041
privateStringorganizationId;
4142
privateStringname;
4243
privateIntegerapplicationType;

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/bundle/model/Bundle.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
packageorg.lowcoder.domain.bundle.model;
22

33

4+
importcom.github.f4b6a3.uuid.UuidCreator;
45
importjakarta.annotation.Nullable;
56
importlombok.Getter;
67
importlombok.NoArgsConstructor;
@@ -20,7 +21,7 @@
2021
@SuperBuilder
2122
publicclassBundleextendsHasIdAndAuditing {
2223
@Getter
23-
privateStringgid =UUID.randomUUID().toString();
24+
privateStringgid =UuidCreator.getTimeOrderedEpoch().toString();
2425
privateStringorganizationId;
2526
@Nullable
2627
privateStringname;

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/model/Organization.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
importcom.fasterxml.jackson.annotation.JsonIgnoreProperties;
1010
importcom.fasterxml.jackson.annotation.JsonView;
11+
importcom.github.f4b6a3.uuid.UuidCreator;
1112
importlombok.experimental.SuperBuilder;
1213
importlombok.extern.jackson.Jacksonized;
1314
importorg.apache.commons.lang3.builder.ToStringBuilder;
@@ -37,6 +38,8 @@
3738
publicclassOrganizationextendsHasIdAndAuditingimplementsBeforeMongodbWrite,AfterMongodbRead {
3839

3940
privatestaticfinalOrganizationCommonSettingsEMPTY_SETTINGS =newOrganizationCommonSettings();
41+
@Getter
42+
privateStringgid =UuidCreator.getTimeOrderedEpoch().toString();
4043

4144
privateStringname;
4245

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/repository/OrganizationRepository.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@ public interface OrganizationRepository extends ReactiveMongoRepository<Organiza
1515
Mono<Organization>findFirstByStateMatches(OrganizationStatestate);
1616

1717
Flux<Organization>findByIdInAndState(Collection<String>id,OrganizationStatestate);
18+
Flux<Organization>findByIdGinAndState(Collection<String>gid,OrganizationStatestate);
1819

1920
Mono<Organization>findByIdAndState(Stringid,OrganizationStatestate);
21+
Mono<Organization>findByGidAndState(Stringgid,OrganizationStatestate);
2022

2123
Mono<Organization>findBySourceAndThirdPartyCompanyIdAndState(Stringsource,StringtpCompanyId,OrganizationStatestate);
2224

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrganizationServiceImpl.java‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public Mono<Organization> createDefault(User user, boolean isSuperAdmin) {
103103

104104
privateMono<Boolean>joinOrganizationInEnterpriseMode(StringuserId) {
105105
returngetOrganizationInEnterpriseMode()
106-
.flatMap(organization ->orgMemberService.addMember(organization.getId(),userId,MemberRole.MEMBER))
106+
.flatMap(organization ->orgMemberService.addMember(organization.getGid(),userId,MemberRole.MEMBER))
107107
.defaultIfEmpty(false);
108108
}
109109

@@ -164,19 +164,28 @@ private Mono<Boolean> setOrgAdmin(String userId, Organization newOrg, boolean is
164164

165165
@Override
166166
publicMono<Organization>getById(Stringid) {
167+
if(FieldName.isGID(id))
168+
returnrepository.findByGidAndState(id,ACTIVE)
169+
.switchIfEmpty(deferredError(UNABLE_TO_FIND_VALID_ORG,"INVALID_ORG_ID"));
167170
returnrepository.findByIdAndState(id,ACTIVE)
168171
.switchIfEmpty(deferredError(UNABLE_TO_FIND_VALID_ORG,"INVALID_ORG_ID"));
169172
}
170173

171174
@Override
172175
publicMono<OrganizationCommonSettings>getOrgCommonSettings(StringorgId) {
176+
if(FieldName.isGID(orgId))
177+
returnrepository.findByGidAndState(orgId,ACTIVE)
178+
.switchIfEmpty(deferredError(UNABLE_TO_FIND_VALID_ORG,"INVALID_ORG_ID"))
179+
.map(Organization::getCommonSettings);
173180
returnrepository.findByIdAndState(orgId,ACTIVE)
174181
.switchIfEmpty(deferredError(UNABLE_TO_FIND_VALID_ORG,"INVALID_ORG_ID"))
175182
.map(Organization::getCommonSettings);
176183
}
177184

178185
@Override
179186
publicFlux<Organization>getByIds(Collection<String>ids) {
187+
if(!ids.isEmpty() &&FieldName.isGID(ids.stream().findFirst().get()))
188+
returnrepository.findByIdGinAndState(ids,ACTIVE);
180189
returnrepository.findByIdInAndState(ids,ACTIVE);
181190
}
182191

@@ -203,7 +212,10 @@ public Mono<Boolean> uploadLogo(String organizationId, Part filePart) {
203212

204213
@Override
205214
publicMono<Boolean>deleteLogo(StringorganizationId) {
206-
returnrepository.findByIdAndState(organizationId,ACTIVE)
215+
Mono<Organization>organizationMono;
216+
if(FieldName.isGID(organizationId))organizationMono =repository.findByGidAndState(organizationId,ACTIVE);
217+
elseorganizationMono =repository.findByIdAndState(organizationId,ACTIVE);
218+
returnorganizationMono
207219
.flatMap(organization -> {
208220
// delete from asset repo.
209221
finalStringprevAssetId =organization.getLogoAssetId();

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp