Merge pull request #1073 from goldants/fix/gid

rename gidutil to gidservice
lowcoder-org · Aug 10, 2024 · d63d3a0 · d63d3a0
2 parents b1f1ede + 93557cf
commit d63d3a0
Show file tree

Hide file tree

Showing 14 changed files with 129 additions and 103 deletions.
diff --git a/...vice/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/Application.java b/...vice/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/Application.java
@@ -65,7 +65,7 @@ public Application(
             @JsonProperty("publicToMarketplace") Boolean publicToMarketplace,
             @JsonProperty("agencyProfile") Boolean agencyProfile
     ) {
-        this.gid = StringUtils.isEmpty(gid)?UuidCreator.getTimeOrderedEpoch().toString():gid;
+        this.gid = gid;
         this.organizationId = organizationId;
         this.name = name;
         this.applicationType = applicationType;

diff --git a/...ice/lowcoder-domain/src/main/java/org/lowcoder/domain/group/service/GroupServiceImpl.java b/...ice/lowcoder-domain/src/main/java/org/lowcoder/domain/group/service/GroupServiceImpl.java
@@ -7,6 +7,7 @@
 import java.util.Collection;
 import java.util.Locale;
 
+import com.github.f4b6a3.uuid.UuidCreator;
 import lombok.RequiredArgsConstructor;
 import org.lowcoder.domain.group.event.GroupDeletedEvent;
 import org.lowcoder.domain.group.model.Group;
@@ -94,9 +95,11 @@ private Mono<Group> createSystemGroup(String organizationId, String type) {
             Group group = Group.builder()
                     .organizationId(organizationId)
                     .name(SystemGroups.getName(type, locale))
+                    .gid(UuidCreator.getTimeOrderedEpoch().toString())
                     .type(type)
                     .allUsersGroup(type.equals(ALL_USER))
                     .build();
+
             return repository.save(group);
         });
     }

diff --git a/...coder-domain/src/main/java/org/lowcoder/domain/solutions/TemplateSolutionServiceImpl.java b/...coder-domain/src/main/java/org/lowcoder/domain/solutions/TemplateSolutionServiceImpl.java
@@ -1,5 +1,6 @@
 package org.lowcoder.domain.solutions;
 
+import com.github.f4b6a3.uuid.UuidCreator;
 import jakarta.annotation.Nonnull;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.RandomStringUtils;
@@ -65,6 +66,7 @@ public Mono<Application> createFromTemplate(String templateId, String orgId, Str
                     Map<String, Object> applicationDSL = JsonUtils.fromJsonMap(dsl);
                     Application application = Application.builder()
                             .applicationStatus(ApplicationStatus.NORMAL)
+                            .gid(UuidCreator.getTimeOrderedEpoch().toString())
                             .organizationId(organizationId)
                             .name(template.getName())
                             .editingApplicationDSL(applicationDSL)
@@ -132,7 +134,7 @@ private Mono<String> doCopyDatasource(String organizationId, String datasourceId
     private Mono<String> createNewDatasourceFrom(String organizationId, String visitorId, Datasource datasource) {
         Datasource copyDatasource = new Datasource();
         copyDatasource.setName(generateCopyDatasourceName(datasource.getName()));
-        copyDatasource.setGid(datasource.getGid());
+        copyDatasource.setGid(UuidCreator.getTimeOrderedEpoch().toString());
         copyDatasource.setType(datasource.getType());
         copyDatasource.setDetailConfig(datasource.getDetailConfig());
         copyDatasource.setCreationSource(DatasourceCreationSource.CLONE_FROM_TEMPLATE.getValue());

diff --git a/...lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiServiceImpl.java b/...lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiServiceImpl.java
@@ -1,5 +1,6 @@
 package org.lowcoder.api.application;
 
+import com.github.f4b6a3.uuid.UuidCreator;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import jakarta.annotation.Nonnull;
@@ -98,7 +99,7 @@ public class ApplicationApiServiceImpl implements ApplicationApiService {
     public Mono<ApplicationView> create(CreateApplicationRequest createApplicationRequest) {
 
         Application application = new Application(createApplicationRequest.organizationId(),
-                createApplicationRequest.gid(),
+                UuidCreator.getTimeOrderedEpoch().toString(),
                 createApplicationRequest.name(),
                 createApplicationRequest.applicationType(),
                 NORMAL,

diff --git a/...ice/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationController.java b/...ice/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationController.java
@@ -22,7 +22,7 @@
 import org.lowcoder.api.home.UserHomeApiService;
 import org.lowcoder.api.home.UserHomepageView;
 import org.lowcoder.api.util.BusinessEventPublisher;
-import org.lowcoder.api.util.GIDUtil;
+import org.lowcoder.api.util.GidService;
 import org.lowcoder.domain.application.model.Application;
 import org.lowcoder.domain.application.model.ApplicationRequestType;
 import org.lowcoder.domain.application.model.ApplicationStatus;
@@ -44,7 +44,7 @@ public class ApplicationController implements ApplicationEndpoints {
     private final ApplicationApiService applicationApiService;
     private final BusinessEventPublisher businessEventPublisher;
     private final SessionUserService sessionUserService;
-    private final GIDUtil gidUtil;
+    private final GidService gidService;
 
     @Override
     public Mono<ResponseView<ApplicationView>> create(@RequestBody CreateApplicationRequest createApplicationRequest) {
@@ -62,15 +62,15 @@ public Mono<ResponseView<ApplicationView>> createFromTemplate(@RequestParam Stri
 
     @Override
     public Mono<ResponseView<Boolean>> recycle(@PathVariable String applicationId) {
-        String appId = gidUtil.convertApplicationIdToObjectId(applicationId);
+        String appId = gidService.convertApplicationIdToObjectId(applicationId);
         return applicationApiService.recycle(appId)
                 .delayUntil(__ -> businessEventPublisher.publishApplicationCommonEvent(applicationId, null, APPLICATION_RECYCLED))
                 .map(ResponseView::success);
     }
 
     @Override
     public Mono<ResponseView<Boolean>> restore(@PathVariable String applicationId) {
-        String appId = gidUtil.convertApplicationIdToObjectId(applicationId);
+        String appId = gidService.convertApplicationIdToObjectId(applicationId);
         return applicationApiService.restore(appId)
                 .delayUntil(__ -> businessEventPublisher.publishApplicationCommonEvent(applicationId, null, APPLICATION_RESTORE))
                 .map(ResponseView::success);
@@ -85,23 +85,23 @@ public Mono<ResponseView<List<ApplicationInfoView>>> getRecycledApplications() {
 
     @Override
     public Mono<ResponseView<ApplicationView>> delete(@PathVariable String applicationId) {
-        String appId = gidUtil.convertApplicationIdToObjectId(applicationId);
+        String appId = gidService.convertApplicationIdToObjectId(applicationId);
         return applicationApiService.delete(appId)
                 .delayUntil(applicationView -> businessEventPublisher.publishApplicationCommonEvent(applicationView, APPLICATION_DELETE))
                 .map(ResponseView::success);
     }
 
     @Override
     public Mono<ResponseView<ApplicationView>> getEditingApplication(@PathVariable String applicationId) {
-        String appId = gidUtil.convertApplicationIdToObjectId(applicationId);
+        String appId = gidService.convertApplicationIdToObjectId(applicationId);
         return applicationApiService.getEditingApplication(appId)
                 .delayUntil(__ -> applicationApiService.updateUserApplicationLastViewTime(appId))
                 .map(ResponseView::success);
     }
 
     @Override
     public Mono<ResponseView<ApplicationView>> getPublishedApplication(@PathVariable String applicationId) {
-        String appId = gidUtil.convertApplicationIdToObjectId(applicationId);
+        String appId = gidService.convertApplicationIdToObjectId(applicationId);
         return applicationApiService.getPublishedApplication(appId, ApplicationRequestType.PUBLIC_TO_ALL)
                 .delayUntil(applicationView -> applicationApiService.updateUserApplicationLastViewTime(appId))
                 .delayUntil(applicationView -> businessEventPublisher.publishApplicationCommonEvent(applicationView, APPLICATION_VIEW))
@@ -110,7 +110,7 @@ public Mono<ResponseView<ApplicationView>> getPublishedApplication(@PathVariable
 
     @Override
     public Mono<ResponseView<ApplicationView>> getPublishedMarketPlaceApplication(@PathVariable String applicationId) {
-        String appId = gidUtil.convertApplicationIdToObjectId(applicationId);
+        String appId = gidService.convertApplicationIdToObjectId(applicationId);
         return applicationApiService.getPublishedApplication(appId, ApplicationRequestType.PUBLIC_TO_MARKETPLACE)
                 .delayUntil(applicationView -> applicationApiService.updateUserApplicationLastViewTime(appId))
                 .delayUntil(applicationView -> businessEventPublisher.publishApplicationCommonEvent(applicationView, APPLICATION_VIEW))
@@ -119,7 +119,7 @@ public Mono<ResponseView<ApplicationView>> getPublishedMarketPlaceApplication(@P
 
     @Override
     public Mono<ResponseView<ApplicationView>> getAgencyProfileApplication(@PathVariable String applicationId) {
-        String appId = gidUtil.convertApplicationIdToObjectId(applicationId);
+        String appId = gidService.convertApplicationIdToObjectId(applicationId);
         return applicationApiService.getPublishedApplication(appId, ApplicationRequestType.AGENCY_PROFILE)
                 .delayUntil(applicationView -> applicationApiService.updateUserApplicationLastViewTime(appId))
                 .delayUntil(applicationView -> businessEventPublisher.publishApplicationCommonEvent(applicationView, APPLICATION_VIEW))
@@ -129,15 +129,15 @@ public Mono<ResponseView<ApplicationView>> getAgencyProfileApplication(@PathVari
     @Override
     public Mono<ResponseView<ApplicationView>> update(@PathVariable String applicationId,
             @RequestBody Application newApplication) {
-        String appId = gidUtil.convertApplicationIdToObjectId(applicationId);
+        String appId = gidService.convertApplicationIdToObjectId(applicationId);
         return applicationApiService.update(appId, newApplication)
                 .delayUntil(applicationView -> businessEventPublisher.publishApplicationCommonEvent(applicationView, APPLICATION_UPDATE))
                 .map(ResponseView::success);
     }
 
     @Override
     public Mono<ResponseView<ApplicationView>> publish(@PathVariable String applicationId) {
-        String appId = gidUtil.convertApplicationIdToObjectId(applicationId);
+        String appId = gidService.convertApplicationIdToObjectId(applicationId);
         return applicationApiService.publish(appId)
                 .map(ResponseView::success);
     }
@@ -179,7 +179,7 @@ public Mono<ResponseView<List<MarketplaceApplicationInfoView>>> getAgencyProfile
     public Mono<ResponseView<Boolean>> updatePermission(@PathVariable String applicationId,
             @PathVariable String permissionId,
             @RequestBody UpdatePermissionRequest updatePermissionRequest) {
-        String appId = gidUtil.convertApplicationIdToObjectId(applicationId);
+        String appId = gidService.convertApplicationIdToObjectId(applicationId);
         ResourceRole role = ResourceRole.fromValue(updatePermissionRequest.role());
         if (role == null) {
             return ofError(INVALID_PARAMETER, "INVALID_PARAMETER", updatePermissionRequest);
@@ -193,7 +193,7 @@ public Mono<ResponseView<Boolean>> updatePermission(@PathVariable String applica
     public Mono<ResponseView<Boolean>> removePermission(
             @PathVariable String applicationId,
             @PathVariable String permissionId) {
-        String appId = gidUtil.convertApplicationIdToObjectId(applicationId);
+        String appId = gidService.convertApplicationIdToObjectId(applicationId);
 
         return applicationApiService.removePermission(appId, permissionId)
                 .map(ResponseView::success);
@@ -203,7 +203,7 @@ public Mono<ResponseView<Boolean>> removePermission(
     public Mono<ResponseView<Boolean>> grantPermission(
             @PathVariable String applicationId,
             @RequestBody BatchAddPermissionRequest request) {
-        String appId = gidUtil.convertApplicationIdToObjectId(applicationId);
+        String appId = gidService.convertApplicationIdToObjectId(applicationId);
         ResourceRole role = ResourceRole.fromValue(request.role());
         if (role == null) {
             return ofError(INVALID_PARAMETER, "INVALID_PARAMETER", request.role());
@@ -218,31 +218,31 @@ public Mono<ResponseView<Boolean>> grantPermission(
 
     @Override
     public Mono<ResponseView<ApplicationPermissionView>> getApplicationPermissions(@PathVariable String applicationId) {
-        String appId = gidUtil.convertApplicationIdToObjectId(applicationId);
+        String appId = gidService.convertApplicationIdToObjectId(applicationId);
         return applicationApiService.getApplicationPermissions(appId)
                 .map(ResponseView::success);
     }
 
     @Override
     public Mono<ResponseView<Boolean>> setApplicationPublicToAll(@PathVariable String applicationId,
             @RequestBody ApplicationPublicToAllRequest request) {
-        String appId = gidUtil.convertApplicationIdToObjectId(applicationId);
+        String appId = gidService.convertApplicationIdToObjectId(applicationId);
         return applicationApiService.setApplicationPublicToAll(appId, request.publicToAll())
                 .map(ResponseView::success);
     }
 
     @Override
     public Mono<ResponseView<Boolean>> setApplicationPublicToMarketplace(@PathVariable String applicationId,
                                                                          @RequestBody ApplicationPublicToMarketplaceRequest request) {
-        String appId = gidUtil.convertApplicationIdToObjectId(applicationId);
+        String appId = gidService.convertApplicationIdToObjectId(applicationId);
         return applicationApiService.setApplicationPublicToMarketplace(appId, request)
                 .map(ResponseView::success);
     }
 
     @Override
     public Mono<ResponseView<Boolean>> setApplicationAsAgencyProfile(@PathVariable String applicationId,
                                                                      @RequestBody ApplicationAsAgencyProfileRequest request) {
-        String appId = gidUtil.convertApplicationIdToObjectId(applicationId);
+        String appId = gidService.convertApplicationIdToObjectId(applicationId);
         return applicationApiService.setApplicationAsAgencyProfile(appId, request.agencyProfile())
                 .map(ResponseView::success);
     }

diff --git a/...vice/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationEndpoints.java b/...vice/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationEndpoints.java
@@ -279,7 +279,6 @@ public record UpdatePermissionRequest(String role) {
     }
 
     public record CreateApplicationRequest(@JsonProperty("orgId") String organizationId,
-										   String gid,
                                            String name,
                                            Integer applicationType,
                                            Map<String, Object> publishedApplicationDSL,