Merge pull request #4485 from prisma/AggregationWithoutCursor

Distinguish between counting with pagination and without

Author: do4gr

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

@@ -114,13 +114,13 @@ trait NodeManyQueries extends FilterConditionBuilder with AggregationQueryBuilde
         }
     }
 
-  //Fixme this does not use all queryarguments
   def countFromModel(model: Model, queryArguments: QueryArguments) = SimpleMongoAction { database =>
     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
+          case 0                                                                    => 0
+          case z if queryArguments.first.isDefined || queryArguments.last.isDefined => z - 1 // we fetch one more item than asked for for the page info
+          case z                                                                    => z
         }
       }
     } else {

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

@@ -111,7 +111,7 @@ class MultiItemConnectionQuerySpec extends FlatSpec with Matchers with ApiSpecBa
       .toString should equal("""{"data":{"todoesConnection":{"edges":[{"node":{"title":"Hello World!"}}]}}}""")
   }
 
-  "the connection query" should "work when using cursors when not on Mongo" taggedAs (IgnoreSQLite) in {
+  "the connection query" should "work when using cursors" taggedAs (IgnoreSQLite) in {
     val datamodels = {
       val dm1 =
         """type User {
@@ -122,14 +122,22 @@ class MultiItemConnectionQuerySpec extends FlatSpec with Matchers with ApiSpecBa
               }"""
 
       val dm2 =
+        """type User {
+                id: ID! @id
+                name: String
+                following: [User!]! @relation(name: "UserToFollow")
+                followers: [User!]! @relation(name: "UserToFollow", link: INLINE)
+              }"""
+
+      val dm3 =
         """type User {
           |  id: ID! @id
           |  name: String
           |  following: [User!]! @relation(name: "UserToFollow", link: TABLE)
           |  followers: [User!]! @relation(name: "UserToFollow")
           |}"""
 
-      TestDataModels(mongo = Vector(dm1), sql = Vector(dm2))
+      TestDataModels(mongo = Vector(dm1, dm2), sql = Vector(dm3))
     }
     datamodels.testV11 { project =>
       val a = server.query(s"""mutation{createUser(data:{name: "a", followers:{create:[{name:"b"}, {name:"c"}, {name:"x"}]}}){id}}""", project)
@@ -162,4 +170,81 @@ class MultiItemConnectionQuerySpec extends FlatSpec with Matchers with ApiSpecBa
     }
   }
 
+  "the connection query" should "work when not using cursors" taggedAs (IgnoreSQLite) in {
+    val datamodels = {
+      val dm1 =
+        """type User {
+          |  id: ID! @id
+          |  name: String
+          |  company: Company @relation(link: INLINE)
+          |}
+          |
+          |type Company {
+          |  id: ID! @id
+          |  name: String,
+          |  members: [User!]!
+          |}"""
+
+      val dm2 =
+        """type User {
+          |  id: ID! @id
+          |  name: String
+          |  company: Company
+          |}
+          |
+          |type Company {
+          |  id: ID! @id
+          |  name: String,
+          |  members: [User!]! @relation(link: INLINE)
+          |}"""
+
+      val dm3 =
+        """type User {
+          |  id: ID! @id
+          |  name: String
+          |  company: Company @relation(link: TABLE)
+          |}
+          |
+          |type Company {
+          |  id: ID! @id
+          |  name: String,
+          |  members: [User!]!
+          |}"""
+
+      TestDataModels(mongo = Vector(dm1, dm2), sql = Vector(dm3))
+    }
+
+    datamodels.testV11 { project =>
+      val a = server.query(s"""mutation{createUser(data:{name: "a", company:{create:{name:"b"}}}){id, company{id}}}""", project)
+      val d = server.query(s"""mutation{createUser(data:{name: "d", company:{create:{name:"e"}}}){id, company{id}}}""", project)
+      val g = server.query(s"""mutation{createUser(data:{name: "g", company:{create:{name:"h"}}}){id, company{id}}}""", project)
+      val k = server.query(s"""mutation{createUser(data:{name: "k", company:{create:{name:"l"}}}){id, company{id}}}""", project)
+
+      val result = server.query(
+        s"""{
+          |  usersConnection(where: {
+          |    company: {
+          |      id: "${a.pathAsString("data.createUser.company.id")}"
+          |    }
+          |  }) {
+          |    edges {
+          |      node {
+          |        name
+          |        company {
+          |          name
+          |        }
+          |      }
+          |    }
+          |    aggregate {
+          |      count
+          |    }
+          |  }
+          |}""".stripMargin,
+        project
+      )
+
+      result.toString should be("""{"data":{"usersConnection":{"edges":[{"node":{"name":"a","company":{"name":"b"}}}],"aggregate":{"count":1}}}}""")
+    }
+  }
+
 }