From df9059ce349c63cbd4ebb011713ea20c806f6ecc Mon Sep 17 00:00:00 2001 From: Anagh Hegde Date: Fri, 13 Dec 2024 00:57:46 +0530 Subject: [PATCH 1/2] refactor the crud method to custom repo class --- .../repositories/ce/CustomActionCollectionRepositoryCE.java | 2 ++ .../ce/CustomActionCollectionRepositoryCEImpl.java | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomActionCollectionRepositoryCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomActionCollectionRepositoryCE.java index c7103a988fb8..4da3cdc325ab 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomActionCollectionRepositoryCE.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomActionCollectionRepositoryCE.java @@ -42,4 +42,6 @@ Flux findAllPublishedActionCollectionsByContextIdAndContextTyp Flux findAllNonComposedByPageIdAndViewMode( String pageId, boolean viewMode, AclPermission permission); + + Flux findByApplicationId(String applicationId); } diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomActionCollectionRepositoryCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomActionCollectionRepositoryCEImpl.java index b47d6751485a..2c845414323e 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomActionCollectionRepositoryCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomActionCollectionRepositoryCEImpl.java @@ -168,4 +168,10 @@ public Flux findAllNonComposedByPageIdAndViewMode( String pageId, boolean viewMode, AclPermission permission) { return this.findByPageIdAndViewMode(pageId, viewMode, permission); } + + @Override + public Flux findByApplicationId(String applicationId) { + final BridgeQuery q = Bridge.equal(ActionCollection.Fields.applicationId, applicationId); + return queryBuilder().criteria(q).all(); + } } From d85d3ae9d9ca95a454b1f43f159e45b7643eea60 Mon Sep 17 00:00:00 2001 From: Anagh Hegde Date: Fri, 13 Dec 2024 01:06:32 +0530 Subject: [PATCH 2/2] refactor --- .../server/repositories/ce/ActionCollectionRepositoryCE.java | 1 - 1 file changed, 1 deletion(-) diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/ActionCollectionRepositoryCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/ActionCollectionRepositoryCE.java index 0a2a4e554894..2b3137afa034 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/ActionCollectionRepositoryCE.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/ActionCollectionRepositoryCE.java @@ -10,7 +10,6 @@ public interface ActionCollectionRepositoryCE extends BaseRepository, CustomActionCollectionRepository { - Flux findByApplicationId(String applicationId); Flux findIdsAndPolicyMapByApplicationIdIn(List applicationIds); }