add gid to Datasource

Thomas · ludomikula · commit 9ab8b517668f · 2024-07-03T16:33:01.000+02:00
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/Datasource.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/Datasource.java
@@ -71,6 +71,7 @@ public class Datasource extends HasIdAndAuditing {
         LOWCODER_API.setDetailConfig(LowcoderApiDatasourceConfig.INSTANCE);
     }
 
+    private String gid;
     private String name;
     private String type;
     private String organizationId;
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/DatasourceDO.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/DatasourceDO.java
@@ -24,7 +24,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 public class DatasourceDO extends HasIdAndAuditing {
-
+    private String gid;
     private String name;
     private String type;
     private String organizationId;
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/repository/DatasourceDORepository.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/repository/DatasourceDORepository.java
@@ -6,11 +6,15 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
+import java.util.Collection;
+
 public interface DatasourceDORepository extends ReactiveMongoRepository<DatasourceDO, String> {
 
     Flux<DatasourceDO> findAllByOrganizationId(String organizationId);
 
     Mono<DatasourceDO> findByOrganizationIdAndTypeAndCreationSource(String organizationId, String type, int creationSource);
 
     Mono<Long> countByOrganizationId(String organizationId);
+    Flux<DatasourceDO> findByGid(String gid);
+    Flux<DatasourceDO> findAllByGidIn(Collection<String> gid);
 }
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/repository/DatasourceRepository.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/repository/DatasourceRepository.java
@@ -3,9 +3,7 @@
 import static org.lowcoder.sdk.util.JsonUtils.fromJsonMap;
 import static org.lowcoder.sdk.util.JsonUtils.toJson;
 
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.*;
 import java.util.function.Function;
 
 import org.apache.commons.collections4.CollectionUtils;
@@ -18,6 +16,7 @@
 import org.lowcoder.domain.plugin.client.DatasourcePluginClient;
 import org.lowcoder.domain.plugin.service.DatasourceMetaInfoService;
 import org.lowcoder.infra.mongo.MongoUpsertHelper;
+import org.lowcoder.sdk.constants.FieldName;
 import org.lowcoder.sdk.models.DatasourceConnectionConfig;
 import org.lowcoder.sdk.models.HasIdAndAuditing;
 import org.lowcoder.sdk.models.JsDatasourceConnectionConfig;
@@ -56,6 +55,9 @@ public class DatasourceRepository {
     private JsDatasourceHelper jsDatasourceHelper;
 
     public Mono<Datasource> findById(String datasourceId) {
+        if(FieldName.isGID(datasourceId))
+            return Mono.from(repository.findByGid(datasourceId))
+                    .flatMap(this::convertToDomainObjectAndDecrypt);
         return repository.findById(datasourceId)
                 .flatMap(this::convertToDomainObjectAndDecrypt);
     }
@@ -67,8 +69,24 @@ public Mono<Datasource> findWorkspacePredefinedDatasourceByOrgIdAndType(String o
     }
 
     public Flux<Datasource> findAllById(Iterable<String> ids) {
-        return repository.findAllById(ids)
+        List<String> idList = new ArrayList<>();
+        List<String> gidList = new ArrayList<>();
+
+        for (String id : ids) {
+            if (FieldName.isGID(id)) {
+                gidList.add(id);
+            } else {
+                idList.add(id);
+            }
+        }
+
+        Flux<Datasource> idFlux = idList.isEmpty() ? Flux.empty() : repository.findAllById(idList)
                 .flatMap(this::convertToDomainObjectAndDecrypt);
+
+        Flux<Datasource> gidFlux = gidList.isEmpty() ? Flux.empty() : repository.findAllByGidIn(gidList)
+                .flatMap(this::convertToDomainObjectAndDecrypt);
+
+        return Flux.merge(idFlux, gidFlux);
     }
 
     public Flux<Datasource> findAllByOrganizationId(String orgId) {
@@ -92,8 +110,12 @@ public Flux<String> retainNoneExistAndNonCurrentOrgDatasourceIds(Collection<Stri
         if (CollectionUtils.isEmpty(datasourceIds)) {
             return Flux.empty();
         }
-        return repository.findAllById(new HashSet<>(datasourceIds))
-                .collectList()
+        Flux<DatasourceDO> mixedMono;
+        if(FieldName.isGID(datasourceIds.stream().findFirst().orElseThrow()))
+            mixedMono = repository.findAllByGidIn(new HashSet<>(datasourceIds));
+        else
+            mixedMono = repository.findAllById(new HashSet<>(datasourceIds));
+        return mixedMono.collectList()
                 .map(existDatasources -> {
                     Set<String> result = new HashSet<>(datasourceIds);
                     existDatasources.stream()
@@ -114,6 +136,7 @@ private Mono<Datasource> convertToDomainObjectAndDecrypt(DatasourceDO datasource
 
         Mono<Datasource> datasourceMono = Mono.fromSupplier(() -> {
                     Datasource result = new Datasource();
+                    result.setGid(datasourceDO.getGid());
                     result.setName(datasourceDO.getName());
                     result.setType(datasourceDO.getType());
                     result.setOrganizationId(datasourceDO.getOrganizationId());
@@ -156,6 +179,7 @@ private Mono<DatasourceDO> encryptDataAndConvertToDataObject(Datasource datasour
 
         return Mono.fromSupplier(() -> {
                     DatasourceDO result = new DatasourceDO();
+                    result.setGid(datasource.getGid());
                     result.setName(datasource.getName());
                     result.setType(datasource.getType());
                     result.setOrganizationId(datasource.getOrganizationId());

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@ public class Datasource extends HasIdAndAuditing {`
`71`	`71`	`LOWCODER_API.setDetailConfig(LowcoderApiDatasourceConfig.INSTANCE);`
`72`	`72`	`}`
`73`	`73`
	`74`	`+ private String gid;`
`74`	`75`	`private String name;`
`75`	`76`	`private String type;`
`76`	`77`	`private String organizationId;`