Merge pull request #187 from sliit-foss/perf/aggregate-paginate-plugin

Perf/aggregate paginate plugin
sliit-foss · Jul 5, 2024 · 72a5e8f · 72a5e8f
2 parents b730979 + 42d5827
commit 72a5e8f
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/plugins/mongoose-aggregate-paginate-v2/src/core.js b/plugins/mongoose-aggregate-paginate-v2/src/core.js
@@ -86,7 +86,7 @@ export function aggregatePaginate(query, options, callback) {
   const allowDiskUse = options.allowDiskUse || false;
   const isPaginationEnabled = options.pagination === false ? false : true;
 
-  const q = this.aggregate();
+  let q = this.aggregate();
 
   if (allowDiskUse) {
     q.allowDiskUse(true);
@@ -120,7 +120,13 @@ export function aggregatePaginate(query, options, callback) {
   let promise;
 
   if (options.useFacet && !options.countQuery) {
-    const [pipeline, countPipeline] = constructPipelines();
+    let [pipeline, countPipeline] = constructPipelines();
+    const match = pipeline[0]?.$match;
+    if (match) {
+      pipeline.shift();
+      countPipeline.shift();
+      q = q.match(match);
+    }
     promise = q
       .facet({
         docs: pipeline,