fix: "listPublishedPages" GraphQL field (#454)

webiny · Jan 31, 2019 · 372ab1e · 372ab1e
1 parent 8c35352
commit 372ab1e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 20 deletions.
diff --git a/packages/webiny-api-cms/src/plugins/graphql/pageResolvers/listPublishedPages.js b/packages/webiny-api-cms/src/plugins/graphql/pageResolvers/listPublishedPages.js
@@ -65,26 +65,25 @@ export const listPublishedPages = async ({ args, Page, Category }: Object) => {
         });
     }
 
-    pipeline.push({
-        $facet: {
-            results: [{ $skip: (page - 1) * perPage }, { $limit: perPage }],
-            totalCount: [
-                {
-                    $count: "count"
-                }
-            ]
-        }
-    });
-
     return Page.find({
         aggregation: async ({ aggregate, QueryResult }) => {
-            const results = await aggregate(pipeline);
+            const pipelines = {
+                results: pipeline.concat({ $skip: (page - 1) * perPage }, { $limit: perPage }),
+                totalCount: pipeline.concat({
+                    $count: "count"
+                })
+            };
+
+            const results = (await aggregate(pipelines.results)) || [];
+            const totalCount = get(await aggregate(pipelines.totalCount), "0.count") || 0;
+
             const meta = createPaginationMeta({
-                totalCount: get(results, "totalCount.0.count") || 0,
+                totalCount,
                 page,
                 perPage
             });
-            return new QueryResult(get(results, "results") || [], meta);
+
+            return new QueryResult(results, meta);
         }
     });
 };

diff --git a/packages/webiny-entity-mongodb/src/MongoDbDriver.js b/packages/webiny-entity-mongodb/src/MongoDbDriver.js
@@ -42,12 +42,10 @@ class MongoDbDriver extends Driver {
      * @param pipeline
      */
     async aggregate(collection, pipeline) {
-        const arrayResults = await this.getDatabase()
+        return await this.getDatabase()
             .collection(collection)
             .aggregate(pipeline)
             .toArray();
-
-        return arrayResults;
     }
 
     // eslint-disable-next-line
@@ -93,12 +91,10 @@ class MongoDbDriver extends Driver {
             if (typeof options.aggregation === "function") {
                 return options.aggregation({
                     aggregate: async pipeline => {
-                        const arrayResults = await this.getDatabase()
+                        return await this.getDatabase()
                             .collection(this.getCollectionName(entity))
                             .aggregate(pipeline)
                             .toArray();
-
-                        return arrayResults[0];
                     },
                     QueryResult
                 });