Merge pull request #328 from payloadcms/fix/query-estimate-count

fix: pagination estimatedCount limited to near query

src/collections/operations/find.ts

@@ -4,6 +4,7 @@ import executeAccess from '../../auth/executeAccess';
 import sanitizeInternalFields from '../../utilities/sanitizeInternalFields';
 import { Collection, PaginatedDocs } from '../config/types';
 import { hasWhereAccessResult } from '../../auth/types';
+import flattenWhereConstraints from '../../utilities/flattenWhereConstraints';
 
 export type Arguments = {
   collection: Collection
@@ -55,6 +56,7 @@ async function find(incomingArgs: Arguments): Promise<PaginatedDocs> {
   // /////////////////////////////////////
 
   const queryToBuild: { where?: Where} = {};
+  let useEstimatedCount = false;
 
   if (where) {
     let and = [];
@@ -68,6 +70,10 @@ async function find(incomingArgs: Arguments): Promise<PaginatedDocs> {
         ...and,
       ],
     };
+
+    const constraints = flattenWhereConstraints(queryToBuild);
+
+    useEstimatedCount = constraints.some((prop) => Object.keys(prop).some((key) => key === 'near'));
   }
 
   if (!overrideAccess) {
@@ -110,7 +116,7 @@ async function find(incomingArgs: Arguments): Promise<PaginatedDocs> {
     sort,
     lean: true,
     leanWithId: true,
-    useEstimatedCount: true,
+    useEstimatedCount,
   };
 
   const paginatedDocs = await Model.paginate(query, optionsToExecute);

src/utilities/flattenWhereConstraints.ts

@@ -0,0 +1,18 @@
+import { WhereField } from '../types';
+
+const flattenWhereConstraints = (query): WhereField[] => {
+  if (!query.where && !query.and && !query.or) {
+    return Object.keys(query).map((key) => query[key]);
+  }
+  if (query.where) {
+    const whereResult = flattenWhereConstraints(query.where);
+    return Object.keys(whereResult).map((key) => whereResult[key]);
+  }
+  const nested = [...query.or || [], ...query.and || []];
+  if (nested.length > 0) {
+    return nested.flatMap((nest) => flattenWhereConstraints(nest));
+  }
+  return query;
+};
+
+export default flattenWhereConstraints;