add gid to Datasource and initialize with uuid

Thomas · ludomikula · commit e437522af7ea · 2024-07-03T16:33:01.000+02: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
@@ -18,6 +18,7 @@
 import org.lowcoder.sdk.util.JsonUtils;
 import org.springframework.data.annotation.Transient;
 import org.springframework.data.mongodb.core.mapping.Document;
+import org.springframework.util.StringUtils;
 
 import java.util.Collections;
 import java.util.Map;
@@ -54,6 +55,7 @@ public class Application extends HasIdAndAuditing {
 
     public Application(
             @JsonProperty("orgId") String organizationId,
+            @JsonProperty("gid") String gid,
             @JsonProperty("name") String name,
             @JsonProperty("applicationType") Integer applicationType,
             @JsonProperty("applicationStatus") ApplicationStatus applicationStatus,
@@ -63,7 +65,7 @@ public Application(
             @JsonProperty("publicToMarketplace") Boolean publicToMarketplace,
             @JsonProperty("agencyProfile") Boolean agencyProfile
     ) {
-        this.gid = UuidCreator.getTimeOrderedEpoch().toString();
+        this.gid = StringUtils.isEmpty(gid)?UuidCreator.getTimeOrderedEpoch().toString():gid;
         this.organizationId = organizationId;
         this.name = name;
         this.applicationType = applicationType;
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/solutions/TemplateSolutionServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/solutions/TemplateSolutionServiceImpl.java
@@ -132,6 +132,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.setType(datasource.getType());
         copyDatasource.setDetailConfig(datasource.getDetailConfig());
         copyDatasource.setCreationSource(DatasourceCreationSource.CLONE_FROM_TEMPLATE.getValue());
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiServiceImpl.java
@@ -97,6 +97,7 @@ public class ApplicationApiServiceImpl implements ApplicationApiService {
     public Mono<ApplicationView> create(CreateApplicationRequest createApplicationRequest) {
 
         Application application = new Application(createApplicationRequest.organizationId(),
+                createApplicationRequest.gid(),
                 createApplicationRequest.name(),
                 createApplicationRequest.applicationType(),
                 NORMAL,
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationEndpoints.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationEndpoints.java
@@ -279,6 +279,7 @@ public record UpdatePermissionRequest(String role) {
     }
 
     public record CreateApplicationRequest(@JsonProperty("orgId") String organizationId,
+										   String gid,
                                            String name,
                                            Integer applicationType,
                                            Map<String, Object> publishedApplicationDSL,
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
@@ -78,7 +78,7 @@ public class BundleApiServiceImpl implements BundleApiService {
     @Override
     public Mono<BundleInfoView> create(CreateBundleRequest createBundleRequest) {
         Bundle bundle = Bundle.builder()
-                .gid(UuidCreator.getTimeOrderedEpoch().toString())
+                .gid(StringUtils.isEmpty(createBundleRequest.gid())?UuidCreator.getTimeOrderedEpoch().toString():createBundleRequest.gid())
                 .organizationId(createBundleRequest.organizationId())
                 .name(createBundleRequest.name())
                 .image(createBundleRequest.image())
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/bundle/BundleEndpoints.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/bundle/BundleEndpoints.java
@@ -292,6 +292,7 @@ public record UpdatePermissionRequest(String role) {
     }
 
 	public record CreateBundleRequest(@JsonProperty("orgId") String organizationId,
+										   String gid,
 										   String name,
 										   String title,
 										   String description,
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/UpsertDatasourceRequest.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/UpsertDatasourceRequest.java
@@ -10,6 +10,7 @@
 public class UpsertDatasourceRequest {
 
     private String id;
+    private String gid;
     private String name;
     private String type;
     private String organizationId;
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/UpsertDatasourceRequestMapper.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/UpsertDatasourceRequestMapper.java
@@ -3,6 +3,7 @@
 import static org.lowcoder.sdk.exception.BizError.INVALID_DATASOURCE_CONFIGURATION;
 import static org.lowcoder.sdk.util.ExceptionUtils.ofException;
 
+import com.github.f4b6a3.uuid.UuidCreator;
 import org.apache.commons.lang3.StringUtils;
 import org.lowcoder.domain.datasource.model.Datasource;
 import org.lowcoder.domain.plugin.service.DatasourceMetaInfoService;
@@ -33,6 +34,7 @@ public Datasource resolve(UpsertDatasourceRequest dto) {
 
         Datasource datasource = new Datasource();
         datasource.setId(dto.getId());
+        datasource.setGid(StringUtils.isEmpty(dto.getGid())?UuidCreator.getTimeOrderedEpoch().toString():dto.getGid());
         datasource.setName(dto.getName());
         datasource.setType(dto.getType());
         datasource.setOrganizationId(dto.getOrganizationId());
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
@@ -85,7 +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());
+        if(StringUtils.isEmpty(folder.getId())) folder.setGid(UuidCreator.getTimeOrderedEpoch().toString());
         return orgDevChecker.checkCurrentOrgDev()
                 .then(sessionUserService.getVisitorOrgMemberCache())
                 .delayUntil(orgMember -> {

Original file line number	Diff line number	Diff line change
`@@ -279,6 +279,7 @@ public record UpdatePermissionRequest(String role) {`
`279`	`279`	`}`
`280`	`280`
`281`	`281`	`public record CreateApplicationRequest(@JsonProperty("orgId") String organizationId,`
	`282`	`+ String gid,`
`282`	`283`	`String name,`
`283`	`284`	`Integer applicationType,`
`284`	`285`	`Map<String, Object> publishedApplicationDSL,`
Original file line number	Diff line number	Diff line change
`@@ -292,6 +292,7 @@ public record UpdatePermissionRequest(String role) {`
`292`	`292`	`}`
`293`	`293`
`294`	`294`	`public record CreateBundleRequest(@JsonProperty("orgId") String organizationId,`
	`295`	`+ String gid,`
`295`	`296`	`String name,`
`296`	`297`	`String title,`
`297`	`298`	`String description,`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public Mono<FolderInfoView> create(Folder folder) {`
`85`	`85`	`if (StringUtils.isBlank(folder.getName())) {`
`86`	`86`	`return Mono.error(new BizException(BizError.INVALID_PARAMETER, "FOLDER_NAME_EMPTY"));`
`87`	`87`	`}`
`88`		`- folder.setGid(UuidCreator.getTimeOrderedEpoch().toString());`
	`88`	`+ if(StringUtils.isEmpty(folder.getId())) folder.setGid(UuidCreator.getTimeOrderedEpoch().toString());`
`89`	`89`	`return orgDevChecker.checkCurrentOrgDev()`
`90`	`90`	`.then(sessionUserService.getVisitorOrgMemberCache())`
`91`	`91`	`.delayUntil(orgMember -> {`