From e2d226f12791d7481ca2d6a92b897b268673d14a Mon Sep 17 00:00:00 2001 From: Shrikant Sharat Kandula Date: Wed, 28 Feb 2024 11:09:53 +0530 Subject: [PATCH] Revert "chore: Use queryBulider for count op" This reverts commit 70cd65ec7debc0cee7d0e1e8790ab670baae8324. --- .../repositories/ce/CustomNewActionRepositoryCEImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewActionRepositoryCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewActionRepositoryCEImpl.java index 81a38a83fe..16d455712b 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewActionRepositoryCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewActionRepositoryCEImpl.java @@ -22,6 +22,7 @@ import org.springframework.data.mongodb.core.aggregation.MatchOperation; import org.springframework.data.mongodb.core.aggregation.ProjectionOperation; import org.springframework.data.mongodb.core.convert.MongoConverter; import org.springframework.data.mongodb.core.query.Criteria; +import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.core.query.Update; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -350,9 +351,12 @@ public class CustomNewActionRepositoryCEImpl extends BaseAppsmithRepositoryImpl< where(NewAction.Fields.publishedAction + ".datasource._id").is(new ObjectId(datasourceId)); Criteria datasourceCriteria = - new Criteria().orOperator(unpublishedDatasourceCriteria, publishedDatasourceCriteria); + notDeleted().orOperator(unpublishedDatasourceCriteria, publishedDatasourceCriteria); - return queryBuilder().criteria(datasourceCriteria).count(); + Query query = new Query(); + query.addCriteria(datasourceCriteria); + + return mongoOperations.count(query, NewAction.class); } @Override