refactor crud repository methods

Zeral-Zhang · Dec 13, 2024 · f226809 · f226809
1 parent 4ea5021
commit f226809
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/...ava/com/appsmith/server/repositories/ce/CustomDatasourceStorageStructureRepositoryCE.java b/...ava/com/appsmith/server/repositories/ce/CustomDatasourceStorageStructureRepositoryCE.java
@@ -1,9 +1,12 @@
 package com.appsmith.server.repositories.ce;
 
+import com.appsmith.external.models.DatasourceStorageStructure;
 import com.appsmith.external.models.DatasourceStructure;
 import reactor.core.publisher.Mono;
 
 public interface CustomDatasourceStorageStructureRepositoryCE {
 
     Mono<Integer> updateStructure(String datasourceId, String environmentId, DatasourceStructure structure);
+
+    Mono<DatasourceStorageStructure> findByDatasourceIdAndEnvironmentId(String datasourceId, String environmentId);
 }
diff --git a/...com/appsmith/server/repositories/ce/CustomDatasourceStorageStructureRepositoryCEImpl.java b/...com/appsmith/server/repositories/ce/CustomDatasourceStorageStructureRepositoryCEImpl.java
@@ -3,6 +3,7 @@
 import com.appsmith.external.models.DatasourceStorageStructure;
 import com.appsmith.external.models.DatasourceStructure;
 import com.appsmith.server.helpers.ce.bridge.Bridge;
+import com.appsmith.server.helpers.ce.bridge.BridgeQuery;
 import com.appsmith.server.repositories.BaseAppsmithRepositoryImpl;
 import org.springframework.stereotype.Component;
 import reactor.core.publisher.Mono;
@@ -19,4 +20,13 @@ public Mono<Integer> updateStructure(String datasourceId, String environmentId,
                         .equal(DatasourceStorageStructure.Fields.environmentId, environmentId))
                 .updateFirst(Bridge.update().set(DatasourceStorageStructure.Fields.structure, structure));
     }
+
+    @Override
+    public Mono<DatasourceStorageStructure> findByDatasourceIdAndEnvironmentId(
+            String datasourceId, String environmentId) {
+        final BridgeQuery<DatasourceStorageStructure> q = Bridge.<DatasourceStorageStructure>equal(
+                        DatasourceStorageStructure.Fields.datasourceId, datasourceId)
+                .equal(DatasourceStorageStructure.Fields.environmentId, environmentId);
+        return queryBuilder().criteria(q).one();
+    }
 }
diff --git a/...main/java/com/appsmith/server/repositories/ce/DatasourceStorageStructureRepositoryCE.java b/...main/java/com/appsmith/server/repositories/ce/DatasourceStorageStructureRepositoryCE.java
@@ -3,10 +3,8 @@
 import com.appsmith.external.models.DatasourceStorageStructure;
 import com.appsmith.server.repositories.BaseRepository;
 import com.appsmith.server.repositories.CustomDatasourceStorageStructureRepository;
-import reactor.core.publisher.Mono;
+import org.springframework.stereotype.Repository;
 
+@Repository
 public interface DatasourceStorageStructureRepositoryCE
-        extends BaseRepository<DatasourceStorageStructure, String>, CustomDatasourceStorageStructureRepository {
-
-    Mono<DatasourceStorageStructure> findByDatasourceIdAndEnvironmentId(String datasourceId, String environmentId);
-}
+        extends BaseRepository<DatasourceStorageStructure, String>, CustomDatasourceStorageStructureRepository {}