diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/ApplicationRepositoryCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/ApplicationRepositoryCE.java index 4974bb4425b4..1f3f311c121f 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/ApplicationRepositoryCE.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/ApplicationRepositoryCE.java @@ -6,24 +6,9 @@ import com.appsmith.server.repositories.CustomApplicationRepository; import org.springframework.stereotype.Repository; import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; - -import java.util.List; @Repository public interface ApplicationRepositoryCE extends BaseRepository, CustomApplicationRepository { - - Flux findByIdIn(List ids); - - Flux findByWorkspaceId(String workspaceId); - - Mono countByWorkspaceId(String workspaceId); - + // All methods moved to CustomApplicationRepositoryCE Flux findIdsByWorkspaceId(String workspaceId); - - Flux findByClonedFromApplicationId(String clonedFromApplicationId); - - Mono countByDeletedAtNull(); - - Mono findByIdAndExportWithConfiguration(String id, boolean exportWithConfiguration); } diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomApplicationRepositoryCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomApplicationRepositoryCE.java index 33d45af9ece7..d37a6ab7650c 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomApplicationRepositoryCE.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomApplicationRepositoryCE.java @@ -81,4 +81,16 @@ Mono getAllApplicationsCountAccessibleToARoleWithPermission( Flux findAllBranchedApplicationIdsByBranchedApplicationId( String branchedApplicationId, AclPermission permission); + + Flux findByIdIn(List ids); + + Flux findByWorkspaceId(String workspaceId); + + Mono countByWorkspaceId(String workspaceId); + + Flux findByClonedFromApplicationId(String clonedFromApplicationId); + + Mono countByDeletedAtNull(); + + Mono findByIdAndExportWithConfiguration(String id, boolean exportWithConfiguration); } diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomApplicationRepositoryCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomApplicationRepositoryCEImpl.java index fa4b56c351af..426f57d80057 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomApplicationRepositoryCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomApplicationRepositoryCEImpl.java @@ -298,4 +298,42 @@ public Flux findAllBranchedApplicationIdsByBranchedApplicationId( } }); } + + @Override + public Flux findByIdIn(List ids) { + final BridgeQuery q = Bridge.in(Application.Fields.id, ids); + return queryBuilder().criteria(q).all(); + } + + @Override + public Flux findByWorkspaceId(String workspaceId) { + final BridgeQuery q = Bridge.equal(Application.Fields.workspaceId, workspaceId); + return queryBuilder().criteria(q).all(); + } + + @Override + public Mono countByWorkspaceId(String workspaceId) { + final BridgeQuery q = Bridge.equal(Application.Fields.workspaceId, workspaceId); + return queryBuilder().criteria(q).count(); + } + + @Override + public Flux findByClonedFromApplicationId(String clonedFromApplicationId) { + final BridgeQuery q = + Bridge.equal(Application.Fields.clonedFromApplicationId, clonedFromApplicationId); + return queryBuilder().criteria(q).all(); + } + + @Override + public Mono countByDeletedAtNull() { + final BridgeQuery q = Bridge.isNull(Application.Fields.deletedAt); + return queryBuilder().criteria(q).count(); + } + + @Override + public Mono findByIdAndExportWithConfiguration(String id, boolean exportWithConfiguration) { + final BridgeQuery q = Bridge.equal(Application.Fields.id, id) + .equal(Application.Fields.exportWithConfiguration, exportWithConfiguration); + return queryBuilder().criteria(q).one(); + } }