chore: refactor crud to custom repository

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<Application, String>, CustomApplicationRepository {
-
-    Flux<Application> findByIdIn(List<String> ids);
-
-    Flux<Application> findByWorkspaceId(String workspaceId);
-
-    Mono<Long> countByWorkspaceId(String workspaceId);
-
+    // All methods moved to CustomApplicationRepositoryCE
     Flux<IdOnly> findIdsByWorkspaceId(String workspaceId);
-
-    Flux<Application> findByClonedFromApplicationId(String clonedFromApplicationId);
-
-    Mono<Long> countByDeletedAtNull();
-
-    Mono<Application> findByIdAndExportWithConfiguration(String id, boolean exportWithConfiguration);
 }

app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomApplicationRepositoryCE.java

@@ -81,4 +81,16 @@ Mono<Long> getAllApplicationsCountAccessibleToARoleWithPermission(
 
     Flux<String> findAllBranchedApplicationIdsByBranchedApplicationId(
             String branchedApplicationId, AclPermission permission);
+
+    Flux<Application> findByIdIn(List<String> ids);
+
+    Flux<Application> findByWorkspaceId(String workspaceId);
+
+    Mono<Long> countByWorkspaceId(String workspaceId);
+
+    Flux<Application> findByClonedFromApplicationId(String clonedFromApplicationId);
+
+    Mono<Long> countByDeletedAtNull();
+
+    Mono<Application> findByIdAndExportWithConfiguration(String id, boolean exportWithConfiguration);
 }

app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomApplicationRepositoryCEImpl.java

@@ -298,4 +298,42 @@ public Flux<String> findAllBranchedApplicationIdsByBranchedApplicationId(
             }
         });
     }
+
+    @Override
+    public Flux<Application> findByIdIn(List<String> ids) {
+        final BridgeQuery<Application> q = Bridge.in(Application.Fields.id, ids);
+        return queryBuilder().criteria(q).all();
+    }
+
+    @Override
+    public Flux<Application> findByWorkspaceId(String workspaceId) {
+        final BridgeQuery<Application> q = Bridge.equal(Application.Fields.workspaceId, workspaceId);
+        return queryBuilder().criteria(q).all();
+    }
+
+    @Override
+    public Mono<Long> countByWorkspaceId(String workspaceId) {
+        final BridgeQuery<Application> q = Bridge.equal(Application.Fields.workspaceId, workspaceId);
+        return queryBuilder().criteria(q).count();
+    }
+
+    @Override
+    public Flux<Application> findByClonedFromApplicationId(String clonedFromApplicationId) {
+        final BridgeQuery<Application> q =
+                Bridge.equal(Application.Fields.clonedFromApplicationId, clonedFromApplicationId);
+        return queryBuilder().criteria(q).all();
+    }
+
+    @Override
+    public Mono<Long> countByDeletedAtNull() {
+        final BridgeQuery<Application> q = Bridge.isNull(Application.Fields.deletedAt);
+        return queryBuilder().criteria(q).count();
+    }
+
+    @Override
+    public Mono<Application> findByIdAndExportWithConfiguration(String id, boolean exportWithConfiguration) {
+        final BridgeQuery<Application> q = Bridge.<Application>equal(Application.Fields.id, id)
+                .equal(Application.Fields.exportWithConfiguration, exportWithConfiguration);
+        return queryBuilder().criteria(q).one();
+    }
 }