move initialization of gid to create endpoint

Thomas · Thomas · commit 4aac42ed6ca6 · 2024-06-18T13:35:51.000-04:00
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/Application.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/Application.java
@@ -37,7 +37,7 @@
 @NoArgsConstructor
 public class Application extends HasIdAndAuditing {
     @Getter
-    private String gid = UuidCreator.getTimeOrderedEpoch().toString();
+    private String gid;
     private String organizationId;
     private String name;
     private Integer applicationType;
@@ -64,6 +64,7 @@ public Application(
             @JsonProperty("publicToMarketplace") Boolean publicToMarketplace,
             @JsonProperty("agencyProfile") Boolean agencyProfile
     ) {
+        this.gid = UuidCreator.getTimeOrderedEpoch().toString();
         this.organizationId = organizationId;
         this.name = name;
         this.applicationType = applicationType;
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/bundle/model/Bundle.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/bundle/model/Bundle.java
@@ -21,7 +21,7 @@
 @SuperBuilder
 public class Bundle extends HasIdAndAuditing {
     @Getter
-    private String gid = UuidCreator.getTimeOrderedEpoch().toString();
+    private String gid;
     private String organizationId;
     @Nullable
     private String name;
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/folder/model/Folder.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/folder/model/Folder.java
@@ -16,7 +16,7 @@
 public class Folder extends HasIdAndAuditing {
 
     private String organizationId;
-    private String gid = UuidCreator.getTimeOrderedEpoch().toString();
+    private String gid;
     @Nullable
     private String parentFolderId; // null represents folder in the root folder
     private String parentFolderGid; // null represents folder in the root folder
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/model/Organization.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/model/Organization.java
@@ -39,7 +39,7 @@ public class Organization extends HasIdAndAuditing implements BeforeMongodbWrite
 
     private static final OrganizationCommonSettings EMPTY_SETTINGS = new OrganizationCommonSettings();
     @Getter
-    private String gid = UuidCreator.getTimeOrderedEpoch().toString();
+    private String gid;
 
     private String name;
 
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrganizationServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrganizationServiceImpl.java
@@ -1,5 +1,6 @@
 package org.lowcoder.domain.organization.service;
 
+import com.github.f4b6a3.uuid.UuidCreator;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
@@ -81,6 +82,7 @@ public Mono<Organization> createDefault(User user, boolean isSuperAdmin) {
             String userOrgSuffix = getMessage(locale, "USER_ORG_SUFFIX");
 
             Organization organization = new Organization();
+            organization.setGid(UuidCreator.getTimeOrderedEpoch().toString());
             organization.setName(user.getName() + userOrgSuffix);
             organization.setIsAutoGeneratedOrganization(true);
             // saas mode
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/bundle/BundleApiServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/bundle/BundleApiServiceImpl.java
@@ -1,5 +1,6 @@
 package org.lowcoder.api.bundle;
 
+import com.github.f4b6a3.uuid.UuidCreator;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
@@ -82,6 +83,7 @@ public class BundleApiServiceImpl implements BundleApiService {
     @Override
     public Mono<BundleInfoView> create(CreateBundleRequest createBundleRequest) {
         Bundle bundle = Bundle.builder()
+                .gid(UuidCreator.getTimeOrderedEpoch().toString())
                 .organizationId(createBundleRequest.organizationId())
                 .name(createBundleRequest.name())
                 .image(createBundleRequest.image())
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderApiServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderApiServiceImpl.java
@@ -1,5 +1,6 @@
 package org.lowcoder.api.home;
 
+import com.github.f4b6a3.uuid.UuidCreator;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
@@ -84,6 +85,7 @@ public Mono<FolderInfoView> create(Folder folder) {
         if (StringUtils.isBlank(folder.getName())) {
             return Mono.error(new BizException(BizError.INVALID_PARAMETER, "FOLDER_NAME_EMPTY"));
         }
+        folder.setGid(UuidCreator.getTimeOrderedEpoch().toString());
         return orgDevChecker.checkCurrentOrgDev()
                 .then(sessionUserService.getVisitorOrgMemberCache())
                 .delayUntil(orgMember -> {
