wrap filter in match stage for Mongo,

add test cases

Author: do4gr

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

@@ -58,7 +58,7 @@ trait AggregationQueryBuilder extends FilterConditionBuilder with ProjectionBuil
     //-------------------------------- Match on Cursor Condition ----------------------------------------
     val pipeline = rowValueOpt match {
       case None           => common
-      case Some(rowValue) => CursorConditionBuilder.buildCursorCondition(model, queryArguments, rowValue) +: common
+      case Some(rowValue) => `match`(CursorConditionBuilder.buildCursorCondition(model, queryArguments, rowValue)) +: common
     }
 
     database.getCollection(model.dbName).aggregate(pipeline).toFuture.map(_.map(readsId))

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

@@ -1,10 +1,12 @@
 package com.prisma.api.queries
 
+import com.prisma.{IgnoreMongo, IgnoreMySql, IgnorePostgres, IgnoreSQLite}
 import com.prisma.api.ApiSpecBase
 import com.prisma.shared.schema_dsl.SchemaDsl
 import org.scalatest.{FlatSpec, Matchers}
 
 class MultiItemConnectionQuerySpec extends FlatSpec with Matchers with ApiSpecBase {
+
   val project = SchemaDsl.fromStringV11() {
     """type Todo {
       |  id: ID! @id
@@ -108,4 +110,83 @@ 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 on Mongo" taggedAs (IgnoreMySql, IgnorePostgres, IgnoreSQLite) in {
+
+    val project2 = SchemaDsl.fromStringV11() {
+      """type User {
+        |  id: ID! @id
+        |  name: String
+        |  following: [User!]! @relation(name: "UserToFollow", link: INLINE)
+        |  followers: [User!]! @relation(name: "UserToFollow")
+        |}""".stripMargin
+    }
+
+    database.setup(project2)
+
+    val a = server.query(s"""mutation{createUser(data:{name: "a", followers:{create:[{name:"b"}, {name:"c"}, {name:"x"}]}}){id}}""", project2)
+    val d = server.query(s"""mutation{createUser(data:{name: "d", followers:{create:[{name:"e"}, {name:"f"}, {name:"x"}]}}){id}}""", project2)
+    val g = server.query(s"""mutation{createUser(data:{name: "g", followers:{create:[{name:"h"}, {name:"i"}, {name:"x"}]}}){id}}""", project2)
+    val k = server.query(s"""mutation{createUser(data:{name: "k", followers:{create:[{name:"l"}, {name:"m"}, {name:"x"}]}}){id}}""", project2)
+
+    val result = server.query(
+      s"""{
+         |  usersConnection(where: {
+         |    followers_some: {
+         |      name: "x"
+         |    },
+         |  }, first: 2, after: "${a.pathAsString("data.createUser.id")}") {
+         |    edges {
+         |      node {
+         |        name
+         |      }
+         |    }
+         |  }
+         |}""".stripMargin,
+      project2
+    )
+
+    result.toString should be("""{"data":{"usersConnection":{"edges":[{"node":{"name":"d"}},{"node":{"name":"g"}}]}}}""")
+
+  }
+
+  "the connection query" should "work when using cursors when not on Mongo" taggedAs (IgnoreMongo) in {
+
+    val project2 = SchemaDsl.fromStringV11() {
+      """type User {
+        |  id: ID! @id
+        |  name: String
+        |  following: [User!]! @relation(name: "UserToFollow", link: TABLE)
+        |  followers: [User!]! @relation(name: "UserToFollow")
+        |}""".stripMargin
+    }
+
+    database.setup(project2)
+
+    val a = server.query(s"""mutation{createUser(data:{name: "a", followers:{create:[{name:"b"}, {name:"c"}, {name:"x"}]}}){id}}""", project2)
+    val d = server.query(s"""mutation{createUser(data:{name: "d", followers:{create:[{name:"e"}, {name:"f"}, {name:"x"}]}}){id}}""", project2)
+    val g = server.query(s"""mutation{createUser(data:{name: "g", followers:{create:[{name:"h"}, {name:"i"}, {name:"x"}]}}){id}}""", project2)
+    val k = server.query(s"""mutation{createUser(data:{name: "k", followers:{create:[{name:"l"}, {name:"m"}, {name:"x"}]}}){id}}""", project2)
+
+    val result = server.query(
+      s"""{
+         |  usersConnection(where: {
+         |    followers_some: {
+         |      name: "x"
+         |    },
+         |  }, first: 2, after: "${a.pathAsString("data.createUser.id")}") {
+         |    edges {
+         |      node {
+         |        name
+         |      }
+         |    }
+         |  }
+         |}""".stripMargin,
+      project2
+    )
+
+    result.toString should be("""{"data":{"usersConnection":{"edges":[{"node":{"name":"d"}},{"node":{"name":"g"}}]}}}""")
+
+  }
+
 }