gid test

Thomasr · ludomikula · commit f8ac7716cf43 · 2024-07-03T16:33:01.000+02:00
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/DatasourceApiServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/DatasourceApiServiceImpl.java
@@ -1,5 +1,6 @@
 package org.lowcoder.api.datasource;
 
+import com.github.f4b6a3.uuid.UuidCreator;
 import jakarta.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.collections4.CollectionUtils;
@@ -73,6 +74,7 @@ public class DatasourceApiServiceImpl implements DatasourceApiService {
 
     @Override
     public Mono<Datasource> create(Datasource datasource) {
+        if(StringUtils.isEmpty(datasource.getGid())) datasource.setGid(UuidCreator.getTimeOrderedEpoch().toString());
         return sessionUserService.getVisitorId()
                 .flatMap(userId -> orgMemberService.getOrgMember(datasource.getOrganizationId(), userId))
                 .switchIfEmpty(deferredError(NOT_AUTHORIZED, "NOT_AUTHORIZED"))
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
@@ -34,7 +34,6 @@ 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/query/view/LibraryQueryView.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/view/LibraryQueryView.java
@@ -6,6 +6,7 @@
 import org.lowcoder.domain.user.model.User;
 
 public record LibraryQueryView(String id,
+                               String gid,
                                String organizationId,
                                String name,
                                Map<String, Object> libraryQueryDSL,
@@ -15,6 +16,7 @@ public record LibraryQueryView(String id,
     public static LibraryQueryView from(LibraryQuery libraryQuery, User user) {
         return new LibraryQueryView(libraryQuery.getId(),
                 libraryQuery.getOrganizationId(),
+                libraryQuery.getGid(),
                 libraryQuery.getName(),
                 libraryQuery.getLibraryQueryDSL(),
                 libraryQuery.getCreatedAt().toEpochMilli(),
diff --git a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/datasource/DatasourceApiServiceIntegrationTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/datasource/DatasourceApiServiceIntegrationTest.java
@@ -11,6 +11,7 @@
 import org.lowcoder.domain.datasource.model.Datasource;
 import org.lowcoder.domain.datasource.model.DatasourceCreationSource;
 import org.lowcoder.domain.datasource.model.DatasourceStatus;
+import org.lowcoder.sdk.constants.FieldName;
 import org.lowcoder.sdk.exception.BizError;
 import org.lowcoder.sdk.exception.BizException;
 import org.lowcoder.sdk.plugin.mysql.MysqlDatasourceConfig;
@@ -59,6 +60,7 @@ public void testListOrgDatasource() {
                 .assertNext(datasourceViews -> {
                     Assertions.assertFalse(findDatasourceView(datasourceViews, "mysql04").edit());
                     Assertions.assertTrue(findDatasourceView(datasourceViews, "mysql05").edit());
+                    Assertions.assertTrue(FieldName.isGID(findDatasourceView(datasourceViews, "mysql04").datasource().getGid()));
                 })
                 .verifyComplete();
     }
diff --git a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/query/LibraryQueryApiServiceIntegrationTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/query/LibraryQueryApiServiceIntegrationTest.java
@@ -10,6 +10,7 @@
 import org.lowcoder.api.datasource.DatasourceApiServiceIntegrationTest;
 import org.lowcoder.api.query.view.LibraryQueryView;
 import org.lowcoder.domain.query.model.LibraryQuery;
+import org.lowcoder.sdk.constants.FieldName;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
@@ -49,7 +50,10 @@ public void testListLibraryQueries() {
                 .then(libraryQueryApiService.listLibraryQueries());
 
         StepVerifier.create(listMono)
-                .assertNext(libraryQueryViews -> Assertions.assertNotNull(find(libraryQueryViews, "query01")))
+                .assertNext(libraryQueryViews -> {
+                    Assertions.assertNotNull(find(libraryQueryViews, "query01"));
+                    Assertions.assertTrue(FieldName.isGID(find(libraryQueryViews, "query01").gid()));
+                })
                 .verifyComplete();
     }
 
diff --git a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/service/FolderApiServiceTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/service/FolderApiServiceTest.java
@@ -12,6 +12,7 @@
 import org.lowcoder.domain.folder.model.Folder;
 import org.lowcoder.domain.folder.service.FolderService;
 import org.lowcoder.domain.permission.model.ResourceRole;
+import org.lowcoder.sdk.constants.FieldName;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
@@ -23,6 +24,7 @@
 import java.util.stream.Collectors;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @SpringBootTest
 @ActiveProfiles("test")
@@ -48,7 +50,10 @@ public void create() {
         folder.setParentFolderId(null);
         folder.setName("root");
         StepVerifier.create(folderApiService.create(folder))
-                .assertNext(f -> assertNotNull(f.getFolderId()))
+                .assertNext(f -> {
+                    assertNotNull(f.getFolderId());
+                    assertTrue(FieldName.isGID(f.getFolderGid()));
+                })
                 .verifyComplete();
     }
 
