wrap up count implementation using the aggregation framework

Author: do4gr

server/connectors/api-connector-mongo/src/main/scala/com/prisma/api/connector/mongo/database/NodeManyQueries.scala

@@ -116,29 +116,16 @@ trait NodeManyQueries extends FilterConditionBuilder with AggregationQueryBuilde
 
   //Fixme this does not use all queryarguments
   def countFromModel(model: Model, queryArguments: QueryArguments) = SimpleMongoAction { database =>
-    //    val queryArgFilter = queryArguments match {
-//      case Some(arg) => arg.filter
-//      case None      => None
-//    }
-//
-//    val skipAndLimit = LimitClauseHelper.skipAndLimitValues(queryArguments)
-//
-//    val cursorCondition = CursorConditionBuilder.buildCursorCondition(queryArguments)
-//    We could try passing the other args into countoptions, but not sure about order
-//    val baseQuery2                               = collection.countDocuments(Filters.and(buildConditionForFilter(queryArgFilter), cursorCondition)).toFuture()
-//
-//    val baseQuery: FindObservable[Document]      = collection(Filters.and(buildConditionForFilter(queryArgFilter), cursorCondition))
-//    val queryWithOrder: FindObservable[Document] = OrderByClauseBuilder.queryWithOrder(baseQuery, queryArguments)
-//    val queryWithSkip: FindObservable[Document]  = queryWithOrder.skip(skipAndLimit.skip)
-//
-//    val queryWithLimit = skipAndLimit.limit match {
-//      case Some(limit) => queryWithSkip.limit(limit)
-//      case None        => queryWithSkip
-//    }
-//
-//    queryWithLimit.collect().toFuture
-
-    database.getCollection(model.dbName).countDocuments(buildConditionForFilter(queryArguments.filter)).toFuture.map(_.toInt)
+    if (needsAggregation(queryArguments.filter)) {
+      aggregationQueryForId(database, model, queryArguments).map { x =>
+        x.length match {
+          case 0 => 0
+          case x => x - 1 // we always fetch one more item for the page info we need to subtract that
+        }
+      }
+    } else {
+      database.getCollection(model.dbName).countDocuments(buildConditionForFilter(queryArguments.filter)).toFuture.map(_.toInt)
+    }
   }
 
   def countFromTable(table: String, filter: Option[Filter]) = SimpleMongoAction { database =>

server/servers/api/src/test/scala/com/prisma/api/queries/MultiItemConnectionQuerySpec.scala

@@ -136,6 +136,9 @@ class MultiItemConnectionQuerySpec extends FlatSpec with Matchers with ApiSpecBa
          |      name: "x"
          |    },
          |  }, first: 2, after: "${a.pathAsString("data.createUser.id")}") {
+         |     aggregate {
+         |	    count
+         |    }
          |    edges {
          |      node {
          |        name
@@ -146,7 +149,7 @@ class MultiItemConnectionQuerySpec extends FlatSpec with Matchers with ApiSpecBa
       project2
     )
 
-    result.toString should be("""{"data":{"usersConnection":{"edges":[{"node":{"name":"d"}},{"node":{"name":"g"}}]}}}""")
+    result.toString should be("""{"data":{"usersConnection":{"aggregate":{"count":2},"edges":[{"node":{"name":"d"}},{"node":{"name":"g"}}]}}}""")
 
   }
 
@@ -175,6 +178,9 @@ class MultiItemConnectionQuerySpec extends FlatSpec with Matchers with ApiSpecBa
          |      name: "x"
          |    },
          |  }, first: 2, after: "${a.pathAsString("data.createUser.id")}") {
+         |   aggregate {
+         |	    count
+         |    }
          |    edges {
          |      node {
          |        name
@@ -185,7 +191,7 @@ class MultiItemConnectionQuerySpec extends FlatSpec with Matchers with ApiSpecBa
       project2
     )
 
-    result.toString should be("""{"data":{"usersConnection":{"edges":[{"node":{"name":"d"}},{"node":{"name":"g"}}]}}}""")
+    result.toString should be("""{"data":{"usersConnection":{"aggregate":{"count":2},"edges":[{"node":{"name":"d"}},{"node":{"name":"g"}}]}}}""")
 
   }