reestablish order after using find to fetch the items the aggregationquery returned in the correct order

Author: do4gr

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

@@ -26,8 +26,10 @@ trait AggregationQueryBuilder extends FilterConditionBuilder with ProjectionBuil
                        selectedFields: SelectedFields,
                        rowValueOpt: Option[GCValue]): Future[Seq[Document]] = {
     aggregationQueryForId(database, model, queryArguments, rowValueOpt).flatMap { ids =>
-      val inFilter = in("_id", ids.map(GCToBson(_)): _*)
-      database.getCollection(model.dbName).find(inFilter).projection(projectSelected(selectedFields)).toFuture
+      val bsonIds = ids.map(GCToBson(_))
+      database.getCollection(model.dbName).find(in("_id", bsonIds: _*)).projection(projectSelected(selectedFields)).toFuture.map { seq =>
+        bsonIds.map(id => seq.find(doc => doc.get("_id").get == id).get) //sort according to ids ordering
+      }
     }
   }
 

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

@@ -0,0 +1,40 @@
+package com.prisma.api.queries
+
+import com.prisma.api.ApiSpecBase
+import com.prisma.shared.schema_dsl.SchemaDsl
+import org.scalatest.{FlatSpec, Matchers}
+
+class RelationFilterOrderingSpec extends FlatSpec with Matchers with ApiSpecBase {
+
+  "Using relational filters" should "return items in the specified order" in {
+
+    val project = SchemaDsl.fromStringV11() {
+      """type Blog {
+        |  id: ID! @id
+        |  title: String!
+        |  score: Int!
+        |  labels: [Label!]! @relation(name: "BlogLabels", link: INLINE)
+        |}
+        |type Label {
+        |  id: ID! @id
+        |  text: String! @unique
+        |}"""
+    }
+
+    database.setup(project)
+
+    server.query(s"""mutation {createLabel(data: {text: "x"}) {text }}""", project)
+
+    server.query(s"""mutation {createBlog(data: {title: "blog_1", score: 10,labels: {connect: {text: "x"}}}) {title}}""", project)
+    server.query(s"""mutation {createBlog(data: {title: "blog_1", score: 20,labels: {connect: {text: "x"}}}) {title}}""", project)
+    server.query(s"""mutation {createBlog(data: {title: "blog_1", score: 30,labels: {connect: {text: "x"}}}) {title}}""", project)
+
+    val res1 = server.query("""query {blogs(first: 2, orderBy: score_DESC) {title, score}}""", project)
+
+    res1.toString should be("""{"data":{"blogs":[{"title":"blog_1","score":30},{"title":"blog_1","score":20}]}}""")
+
+    val res2 = server.query("""query {blogs (first: 2, orderBy: score_DESC, where:{labels_some: {text: "x"}}) {title, score}}""", project)
+    res2.toString should be("""{"data":{"blogs":[{"title":"blog_1","score":30},{"title":"blog_1","score":20}]}}""")
+
+  }
+}