Skip to content

Commit d63d3a0

Browse files
FalkWolskyFalkWolsky
authored
Merge pull request #1073 from goldants/fix/gid
rename gidutil to gidservice
2 parents b1f1ede + 93557cf commit d63d3a0

File tree

14 files changed

+129
-103
lines changed

14 files changed

+129
-103
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public Application(
6565
@JsonProperty("publicToMarketplace") Boolean publicToMarketplace,
6666
@JsonProperty("agencyProfile") Boolean agencyProfile
6767
) {
68-
this.gid = StringUtils.isEmpty(gid)?UuidCreator.getTimeOrderedEpoch().toString():gid;
68+
this.gid = gid;
6969
this.organizationId = organizationId;
7070
this.name = name;
7171
this.applicationType = applicationType;

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/group/service/GroupServiceImpl.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import java.util.Collection;
88
import java.util.Locale;
99

10+
import com.github.f4b6a3.uuid.UuidCreator;
1011
import lombok.RequiredArgsConstructor;
1112
import org.lowcoder.domain.group.event.GroupDeletedEvent;
1213
import org.lowcoder.domain.group.model.Group;
@@ -94,9 +95,11 @@ private Mono<Group> createSystemGroup(String organizationId, String type) {
9495
Group group = Group.builder()
9596
.organizationId(organizationId)
9697
.name(SystemGroups.getName(type, locale))
98+
.gid(UuidCreator.getTimeOrderedEpoch().toString())
9799
.type(type)
98100
.allUsersGroup(type.equals(ALL_USER))
99101
.build();
102+
100103
return repository.save(group);
101104
});
102105
}

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/solutions/TemplateSolutionServiceImpl.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.lowcoder.domain.solutions;
22

3+
import com.github.f4b6a3.uuid.UuidCreator;
34
import jakarta.annotation.Nonnull;
45
import lombok.RequiredArgsConstructor;
56
import org.apache.commons.lang3.RandomStringUtils;
@@ -65,6 +66,7 @@ public Mono<Application> createFromTemplate(String templateId, String orgId, Str
6566
Map<String, Object> applicationDSL = JsonUtils.fromJsonMap(dsl);
6667
Application application = Application.builder()
6768
.applicationStatus(ApplicationStatus.NORMAL)
69+
.gid(UuidCreator.getTimeOrderedEpoch().toString())
6870
.organizationId(organizationId)
6971
.name(template.getName())
7072
.editingApplicationDSL(applicationDSL)
@@ -132,7 +134,7 @@ private Mono<String> doCopyDatasource(String organizationId, String datasourceId
132134
private Mono<String> createNewDatasourceFrom(String organizationId, String visitorId, Datasource datasource) {
133135
Datasource copyDatasource = new Datasource();
134136
copyDatasource.setName(generateCopyDatasourceName(datasource.getName()));
135-
copyDatasource.setGid(datasource.getGid());
137+
copyDatasource.setGid(UuidCreator.getTimeOrderedEpoch().toString());
136138
copyDatasource.setType(datasource.getType());
137139
copyDatasource.setDetailConfig(datasource.getDetailConfig());
138140
copyDatasource.setCreationSource(DatasourceCreationSource.CLONE_FROM_TEMPLATE.getValue());

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.lowcoder.api.application;
22

3+
import com.github.f4b6a3.uuid.UuidCreator;
34
import com.google.common.collect.Maps;
45
import com.google.common.collect.Sets;
56
import jakarta.annotation.Nonnull;
@@ -98,7 +99,7 @@ public class ApplicationApiServiceImpl implements ApplicationApiService {
9899
public Mono<ApplicationView> create(CreateApplicationRequest createApplicationRequest) {
99100

100101
Application application = new Application(createApplicationRequest.organizationId(),
101-
createApplicationRequest.gid(),
102+
UuidCreator.getTimeOrderedEpoch().toString(),
102103
createApplicationRequest.name(),
103104
createApplicationRequest.applicationType(),
104105
NORMAL,

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.lowcoder.api.home.UserHomeApiService;
2323
import org.lowcoder.api.home.UserHomepageView;
2424
import org.lowcoder.api.util.BusinessEventPublisher;
25-
import org.lowcoder.api.util.GIDUtil;
25+
import org.lowcoder.api.util.GidService;
2626
import org.lowcoder.domain.application.model.Application;
2727
import org.lowcoder.domain.application.model.ApplicationRequestType;
2828
import org.lowcoder.domain.application.model.ApplicationStatus;
@@ -44,7 +44,7 @@ public class ApplicationController implements ApplicationEndpoints {
4444
private final ApplicationApiService applicationApiService;
4545
private final BusinessEventPublisher businessEventPublisher;
4646
private final SessionUserService sessionUserService;
47-
private final GIDUtil gidUtil;
47+
private final GidService gidService;
4848

4949
@Override
5050
public Mono<ResponseView<ApplicationView>> create(@RequestBody CreateApplicationRequest createApplicationRequest) {
@@ -62,15 +62,15 @@ public Mono<ResponseView<ApplicationView>> createFromTemplate(@RequestParam Stri
6262

6363
@Override
6464
public Mono<ResponseView<Boolean>> recycle(@PathVariable String applicationId) {
65-
String appId = gidUtil.convertApplicationIdToObjectId(applicationId);
65+
String appId = gidService.convertApplicationIdToObjectId(applicationId);
6666
return applicationApiService.recycle(appId)
6767
.delayUntil(__ -> businessEventPublisher.publishApplicationCommonEvent(applicationId, null, APPLICATION_RECYCLED))
6868
.map(ResponseView::success);
6969
}
7070

7171
@Override
7272
public Mono<ResponseView<Boolean>> restore(@PathVariable String applicationId) {
73-
String appId = gidUtil.convertApplicationIdToObjectId(applicationId);
73+
String appId = gidService.convertApplicationIdToObjectId(applicationId);
7474
return applicationApiService.restore(appId)
7575
.delayUntil(__ -> businessEventPublisher.publishApplicationCommonEvent(applicationId, null, APPLICATION_RESTORE))
7676
.map(ResponseView::success);
@@ -85,23 +85,23 @@ public Mono<ResponseView<List<ApplicationInfoView>>> getRecycledApplications() {
8585

8686
@Override
8787
public Mono<ResponseView<ApplicationView>> delete(@PathVariable String applicationId) {
88-
String appId = gidUtil.convertApplicationIdToObjectId(applicationId);
88+
String appId = gidService.convertApplicationIdToObjectId(applicationId);
8989
return applicationApiService.delete(appId)
9090
.delayUntil(applicationView -> businessEventPublisher.publishApplicationCommonEvent(applicationView, APPLICATION_DELETE))
9191
.map(ResponseView::success);
9292
}
9393

9494
@Override
9595
public Mono<ResponseView<ApplicationView>> getEditingApplication(@PathVariable String applicationId) {
96-
String appId = gidUtil.convertApplicationIdToObjectId(applicationId);
96+
String appId = gidService.convertApplicationIdToObjectId(applicationId);
9797
return applicationApiService.getEditingApplication(appId)
9898
.delayUntil(__ -> applicationApiService.updateUserApplicationLastViewTime(appId))
9999
.map(ResponseView::success);
100100
}
101101

102102
@Override
103103
public Mono<ResponseView<ApplicationView>> getPublishedApplication(@PathVariable String applicationId) {
104-
String appId = gidUtil.convertApplicationIdToObjectId(applicationId);
104+
String appId = gidService.convertApplicationIdToObjectId(applicationId);
105105
return applicationApiService.getPublishedApplication(appId, ApplicationRequestType.PUBLIC_TO_ALL)
106106
.delayUntil(applicationView -> applicationApiService.updateUserApplicationLastViewTime(appId))
107107
.delayUntil(applicationView -> businessEventPublisher.publishApplicationCommonEvent(applicationView, APPLICATION_VIEW))
@@ -110,7 +110,7 @@ public Mono<ResponseView<ApplicationView>> getPublishedApplication(@PathVariable
110110

111111
@Override
112112
public Mono<ResponseView<ApplicationView>> getPublishedMarketPlaceApplication(@PathVariable String applicationId) {
113-
String appId = gidUtil.convertApplicationIdToObjectId(applicationId);
113+
String appId = gidService.convertApplicationIdToObjectId(applicationId);
114114
return applicationApiService.getPublishedApplication(appId, ApplicationRequestType.PUBLIC_TO_MARKETPLACE)
115115
.delayUntil(applicationView -> applicationApiService.updateUserApplicationLastViewTime(appId))
116116
.delayUntil(applicationView -> businessEventPublisher.publishApplicationCommonEvent(applicationView, APPLICATION_VIEW))
@@ -119,7 +119,7 @@ public Mono<ResponseView<ApplicationView>> getPublishedMarketPlaceApplication(@P
119119

120120
@Override
121121
public Mono<ResponseView<ApplicationView>> getAgencyProfileApplication(@PathVariable String applicationId) {
122-
String appId = gidUtil.convertApplicationIdToObjectId(applicationId);
122+
String appId = gidService.convertApplicationIdToObjectId(applicationId);
123123
return applicationApiService.getPublishedApplication(appId, ApplicationRequestType.AGENCY_PROFILE)
124124
.delayUntil(applicationView -> applicationApiService.updateUserApplicationLastViewTime(appId))
125125
.delayUntil(applicationView -> businessEventPublisher.publishApplicationCommonEvent(applicationView, APPLICATION_VIEW))
@@ -129,15 +129,15 @@ public Mono<ResponseView<ApplicationView>> getAgencyProfileApplication(@PathVari
129129
@Override
130130
public Mono<ResponseView<ApplicationView>> update(@PathVariable String applicationId,
131131
@RequestBody Application newApplication) {
132-
String appId = gidUtil.convertApplicationIdToObjectId(applicationId);
132+
String appId = gidService.convertApplicationIdToObjectId(applicationId);
133133
return applicationApiService.update(appId, newApplication)
134134
.delayUntil(applicationView -> businessEventPublisher.publishApplicationCommonEvent(applicationView, APPLICATION_UPDATE))
135135
.map(ResponseView::success);
136136
}
137137

138138
@Override
139139
public Mono<ResponseView<ApplicationView>> publish(@PathVariable String applicationId) {
140-
String appId = gidUtil.convertApplicationIdToObjectId(applicationId);
140+
String appId = gidService.convertApplicationIdToObjectId(applicationId);
141141
return applicationApiService.publish(appId)
142142
.map(ResponseView::success);
143143
}
@@ -179,7 +179,7 @@ public Mono<ResponseView<List<MarketplaceApplicationInfoView>>> getAgencyProfile
179179
public Mono<ResponseView<Boolean>> updatePermission(@PathVariable String applicationId,
180180
@PathVariable String permissionId,
181181
@RequestBody UpdatePermissionRequest updatePermissionRequest) {
182-
String appId = gidUtil.convertApplicationIdToObjectId(applicationId);
182+
String appId = gidService.convertApplicationIdToObjectId(applicationId);
183183
ResourceRole role = ResourceRole.fromValue(updatePermissionRequest.role());
184184
if (role == null) {
185185
return ofError(INVALID_PARAMETER, "INVALID_PARAMETER", updatePermissionRequest);
@@ -193,7 +193,7 @@ public Mono<ResponseView<Boolean>> updatePermission(@PathVariable String applica
193193
public Mono<ResponseView<Boolean>> removePermission(
194194
@PathVariable String applicationId,
195195
@PathVariable String permissionId) {
196-
String appId = gidUtil.convertApplicationIdToObjectId(applicationId);
196+
String appId = gidService.convertApplicationIdToObjectId(applicationId);
197197

198198
return applicationApiService.removePermission(appId, permissionId)
199199
.map(ResponseView::success);
@@ -203,7 +203,7 @@ public Mono<ResponseView<Boolean>> removePermission(
203203
public Mono<ResponseView<Boolean>> grantPermission(
204204
@PathVariable String applicationId,
205205
@RequestBody BatchAddPermissionRequest request) {
206-
String appId = gidUtil.convertApplicationIdToObjectId(applicationId);
206+
String appId = gidService.convertApplicationIdToObjectId(applicationId);
207207
ResourceRole role = ResourceRole.fromValue(request.role());
208208
if (role == null) {
209209
return ofError(INVALID_PARAMETER, "INVALID_PARAMETER", request.role());
@@ -218,31 +218,31 @@ public Mono<ResponseView<Boolean>> grantPermission(
218218

219219
@Override
220220
public Mono<ResponseView<ApplicationPermissionView>> getApplicationPermissions(@PathVariable String applicationId) {
221-
String appId = gidUtil.convertApplicationIdToObjectId(applicationId);
221+
String appId = gidService.convertApplicationIdToObjectId(applicationId);
222222
return applicationApiService.getApplicationPermissions(appId)
223223
.map(ResponseView::success);
224224
}
225225

226226
@Override
227227
public Mono<ResponseView<Boolean>> setApplicationPublicToAll(@PathVariable String applicationId,
228228
@RequestBody ApplicationPublicToAllRequest request) {
229-
String appId = gidUtil.convertApplicationIdToObjectId(applicationId);
229+
String appId = gidService.convertApplicationIdToObjectId(applicationId);
230230
return applicationApiService.setApplicationPublicToAll(appId, request.publicToAll())
231231
.map(ResponseView::success);
232232
}
233233

234234
@Override
235235
public Mono<ResponseView<Boolean>> setApplicationPublicToMarketplace(@PathVariable String applicationId,
236236
@RequestBody ApplicationPublicToMarketplaceRequest request) {
237-
String appId = gidUtil.convertApplicationIdToObjectId(applicationId);
237+
String appId = gidService.convertApplicationIdToObjectId(applicationId);
238238
return applicationApiService.setApplicationPublicToMarketplace(appId, request)
239239
.map(ResponseView::success);
240240
}
241241

242242
@Override
243243
public Mono<ResponseView<Boolean>> setApplicationAsAgencyProfile(@PathVariable String applicationId,
244244
@RequestBody ApplicationAsAgencyProfileRequest request) {
245-
String appId = gidUtil.convertApplicationIdToObjectId(applicationId);
245+
String appId = gidService.convertApplicationIdToObjectId(applicationId);
246246
return applicationApiService.setApplicationAsAgencyProfile(appId, request.agencyProfile())
247247
.map(ResponseView::success);
248248
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,6 @@ public record UpdatePermissionRequest(String role) {
279279
}
280280

281281
public record CreateApplicationRequest(@JsonProperty("orgId") String organizationId,
282-
String gid,
283282
String name,
284283
Integer applicationType,
285284
Map<String, Object> publishedApplicationDSL,

0 commit comments

Comments
 (0)