use selected fields from context for ToOneDeferreds

fuath · Feb 2, 2019 · 0d56602 · 0d56602
1 parent 831ff02
commit 0d56602
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/server/servers/api/src/main/scala/com/prisma/api/resolver/DeferredTypes.scala b/server/servers/api/src/main/scala/com/prisma/api/resolver/DeferredTypes.scala
@@ -29,7 +29,8 @@ object DeferredTypes {
 
   case class ToOneDeferred(
       model: Model,
-      where: NodeSelector
+      where: NodeSelector,
+      selectedFields: SelectedFields
   ) extends Deferred[OneDeferredResultType]
 
   case class CountManyModelDeferred(

diff --git a/server/servers/api/src/main/scala/com/prisma/api/resolver/ToOneDeferredResolver.scala b/server/servers/api/src/main/scala/com/prisma/api/resolver/ToOneDeferredResolver.scala
@@ -9,11 +9,9 @@ class ToOneDeferredResolver(resolver: DataResolver) {
   def resolve(
       deferred: OrderedDeferred[ToOneDeferred]
   )(implicit ec: ExecutionContext): OrderedDeferredFutureResult[OneDeferredResultType] = {
-    val model                 = deferred.deferred.model
     val where                 = deferred.deferred.where
-    val futureResolverResults = resolver.getNodeByWhere(where, SelectedFields.all(model))
+    val futureResolverResults = resolver.getNodeByWhere(where, deferred.deferred.selectedFields)
 
     OrderedDeferredFutureResult(futureResolverResults, deferred.order)
-
   }
 }
diff --git a/server/servers/api/src/main/scala/com/prisma/api/schema/ObjectTypeBuilder.scala b/server/servers/api/src/main/scala/com/prisma/api/schema/ObjectTypeBuilder.scala
@@ -242,7 +242,7 @@ class ObjectTypeBuilder(
         f.relationIsInlinedInParent match {
           case true =>
             item.data.map.get(f.name) match {
-              case Some(id: IdGCValue) => ToOneDeferred(f.relatedModel_!, NodeSelector.forId(f.relatedModel_!, id))
+              case Some(id: IdGCValue) => ToOneDeferred(f.relatedModel_!, NodeSelector.forId(f.relatedModel_!, id), ctx.getSelectedFields(f.relatedModel_!))
               case _                   => None
             }