add gid to LibraryQuery

Thomas · ludomikula · commit dc97ba586f9a · 2024-07-03T16:33:01.000+02:00
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/model/LibraryQuery.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/model/LibraryQuery.java
@@ -26,6 +26,7 @@
 @NoArgsConstructor
 public class LibraryQuery extends HasIdAndAuditing {
 
+    private String gid;
     private String organizationId;
     private String name;
     private Map<String, Object> libraryQueryDSL;
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/repository/LibraryQueryRepository.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/repository/LibraryQueryRepository.java
@@ -1,5 +1,6 @@
 package org.lowcoder.domain.query.repository;
 
+import org.jetbrains.annotations.NotNull;
 import org.lowcoder.domain.query.model.LibraryQuery;
 import org.springframework.data.mongodb.repository.ReactiveMongoRepository;
 import org.springframework.stereotype.Repository;
@@ -13,4 +14,6 @@ public interface LibraryQueryRepository extends ReactiveMongoRepository<LibraryQ
     Flux<LibraryQuery> findByOrganizationId(String organizationId);
 
     Mono<LibraryQuery> findByName(String name);
+    Mono<Void> deleteByGid(String gid);
+    Mono<LibraryQuery> findByGid(String gid);
 }
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/service/LibraryQueryServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/service/LibraryQueryServiceImpl.java
@@ -11,6 +11,7 @@
 import org.lowcoder.domain.query.model.LibraryQueryRecord;
 import org.lowcoder.domain.query.repository.LibraryQueryRepository;
 import org.lowcoder.infra.mongo.MongoUpsertHelper;
+import org.lowcoder.sdk.constants.FieldName;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -27,6 +28,9 @@ public class LibraryQueryServiceImpl implements LibraryQueryService {
 
     @Override
     public Mono<LibraryQuery> getById(String libraryQueryId) {
+        if(FieldName.isGID(libraryQueryId))
+            return libraryQueryRepository.findByGid(libraryQueryId)
+                    .switchIfEmpty(deferredError(LIBRARY_QUERY_NOT_FOUND, "LIBRARY_QUERY_NOT_FOUND"));
         return libraryQueryRepository.findById(libraryQueryId)
                 .switchIfEmpty(deferredError(LIBRARY_QUERY_NOT_FOUND, "LIBRARY_QUERY_NOT_FOUND"));
     }
@@ -54,6 +58,8 @@ public Mono<Boolean> update(String libraryQueryId, LibraryQuery libraryQuery) {
 
     @Override
     public Mono<Void> delete(String libraryQueryId) {
+        if(FieldName.isGID(libraryQueryId))
+            return libraryQueryRepository.deleteByGid(libraryQueryId);
         return libraryQueryRepository.deleteById(libraryQueryId);
     }
 
