Use gid to create app

dragonpoo · dragonpoo · commit 59ef6c9740e9 · 2025-03-19T02:58:33.000-04:00
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
@@ -9,6 +9,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.SetUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.lowcoder.api.application.ApplicationEndpoints.CreateApplicationRequest;
 import org.lowcoder.api.application.view.ApplicationInfoView;
@@ -101,7 +102,7 @@ public class ApplicationApiServiceImpl implements ApplicationApiService {
     public Mono<ApplicationView> create(CreateApplicationRequest createApplicationRequest) {
 
         Application application = new Application(createApplicationRequest.organizationId(),
-                UuidCreator.getTimeOrderedEpoch().toString(),
+                ObjectUtils.defaultIfNull(createApplicationRequest.gid(), UuidCreator.getTimeOrderedEpoch().toString()),
                 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
@@ -298,6 +298,7 @@ public record UpdatePermissionRequest(String role) {
     }
 
     public record CreateApplicationRequest(@JsonProperty("orgId") String organizationId,
+										   @Nullable String gid,
                                            String name,
                                            Integer applicationType,
                                            Map<String, Object> editingApplicationDSL,
diff --git a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/application/ApplicationApiServiceIntegrationTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/application/ApplicationApiServiceIntegrationTest.java
@@ -70,7 +70,7 @@ public void testCreateApplicationSuccess() {
         });
         //
         Mono<ApplicationView> applicationViewMono = datasourceMono.map(datasource -> new CreateApplicationRequest(
-                        "org01",
+                        "org01", null,
                         "app05",
                         ApplicationType.APPLICATION.getValue(),
                         Map.of("comp", "list", "queries", Set.of(Map.of("datasourceId", datasource.getId()))),
@@ -104,7 +104,7 @@ public void testUpdateApplicationFailedDueToLackOfDatasourcePermissions() {
         });
         //
         Mono<ApplicationView> applicationViewMono = datasourceMono.map(datasource -> new CreateApplicationRequest(
-                        "org01",
+                        "org01", null,
                         "app03",
                         ApplicationType.APPLICATION.getValue(),
                         Map.of("comp", "list", "queries", Set.of(Map.of("datasourceId", datasource.getId()))),
@@ -129,7 +129,7 @@ public void testUpdateApplicationFailedDueToLackOfDatasourcePermissions() {
     @Test
     @WithMockUser
     public void testUpdateEditingStateSuccess() {
-        Mono<ApplicationView> applicationViewMono = applicationApiService.create(new CreateApplicationRequest("org01", "app1", ApplicationType.APPLICATION.getValue(), Map.of("comp", "list"), null));
+        Mono<ApplicationView> applicationViewMono = applicationApiService.create(new CreateApplicationRequest("org01", null, "app1", ApplicationType.APPLICATION.getValue(), Map.of("comp", "list"), null));
         Mono<ApplicationView> updateEditStateMono = applicationViewMono.delayUntil(app -> applicationApiService.updateEditState(app.getApplicationInfoView().getApplicationId(), new ApplicationEndpoints.UpdateEditStateRequest(true)));
         Mono<ApplicationView> app = updateEditStateMono.flatMap(applicationView -> applicationApiService.getEditingApplication(applicationView.getApplicationInfoView().getApplicationId()));
         StepVerifier.create(app)
diff --git a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/application/ApplicationApiServiceTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/application/ApplicationApiServiceTest.java
@@ -130,7 +130,7 @@ public void testDeleteNormalApplicationWithError() {
 
     private Mono<ApplicationView> createApplication(String name, String folderId) {
         CreateApplicationRequest createApplicationRequest =
-                new CreateApplicationRequest("org01", name, ApplicationType.APPLICATION.getValue(),
+                new CreateApplicationRequest("org01", null, name, ApplicationType.APPLICATION.getValue(),
                         Map.of("comp", "list"), folderId);
         return applicationApiService.create(createApplicationRequest);
     }

Original file line number	Diff line number	Diff line change
`@@ -298,6 +298,7 @@ public record UpdatePermissionRequest(String role) {`
`298`	`298`	`}`
`299`	`299`
`300`	`300`	`public record CreateApplicationRequest(@JsonProperty("orgId") String organizationId,`
	`301`	`+ @Nullable String gid,`
`301`	`302`	`String name,`
`302`	`303`	`Integer applicationType,`
`303`	`304`	`Map<String, Object> editingApplicationDSL,`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ public void testDeleteNormalApplicationWithError() {`
`130`	`130`
`131`	`131`	`private Mono<ApplicationView> createApplication(String name, String folderId) {`
`132`	`132`	`CreateApplicationRequest createApplicationRequest =`
`133`		`- new CreateApplicationRequest("org01", name, ApplicationType.APPLICATION.getValue(),`
	`133`	`+ new CreateApplicationRequest("org01", null, name, ApplicationType.APPLICATION.getValue(),`
`134`	`134`	`Map.of("comp", "list"), folderId);`
`135`	`135`	`return applicationApiService.create(createApplicationRequest);`
`136`	`136`	`}`