Merge pull request #76 from outgrow/trunk

Don't include `$skip` if value is 0
reactioncommerce · Jun 1, 2021 · a6e0cf9 · a6e0cf9
2 parents a7fbc6b + 0a57eee
commit a6e0cf9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/lib/graphql/applyOffsetPaginationToMongoAggregate.js b/lib/graphql/applyOffsetPaginationToMongoAggregate.js
@@ -23,19 +23,21 @@ export default async function applyOffsetPaginationToMongoAggregate(collection,
   const limit = first || DEFAULT_LIMIT;
   const newPipeline = [...pipeline];
 
+  const hasPreviousPage = offset > 0;
+
   // Apply limit + skip to the provided pipeline
-  newPipeline.push({
-    "$skip": offset
-  });
+  if (hasPreviousPage) {
+    newPipeline.push({
+      "$skip": offset
+    });
+  }
 
   newPipeline.push({
     "$limit": limit
   });
 
   let hasNextPage = null;
 
-  const hasPreviousPage = offset > 0;
-
   if (includeHasNextPage) {
     const nextCursor = collection.aggregate(pipeline);
     const nextDoc = await nextCursor.hasNext();

diff --git a/lib/graphql/applyPaginationToMongoAggregate.js b/lib/graphql/applyPaginationToMongoAggregate.js
@@ -76,7 +76,7 @@ export default async function applyPaginationToMongoAggregate(collection, pipeli
     "$limit": limit
   });
 
-  if (skip) {
+  if (skip > 0) {
     pipeline.push({
       "$skip": skip
     });