Merge pull request #2097 from alanpoulain/graphql-fix-collection-field-mutation

[GraphQL] Fix collection field mutation

Author: soyuka

features/graphql/mutation.feature

@@ -142,7 +142,7 @@ Feature: GraphQL mutation support
 
   @createSchema
   Scenario: Modify an item through a mutation
-    Given there are 1 dummy objects
+    Given there are 1 dummy objects having each 2 relatedDummies
     When I send the following GraphQL request:
     """
     mutation {
@@ -151,6 +151,13 @@ Feature: GraphQL mutation support
         name
         description
         dummyDate
+        relatedDummies {
+          edges {
+            node {
+              name
+            }
+          }
+        }
         clientMutationId
       }
     }
@@ -162,6 +169,7 @@ Feature: GraphQL mutation support
     And the JSON node "data.updateDummy.name" should be equal to "Dummy #1"
     And the JSON node "data.updateDummy.description" should be equal to "Modified description."
     And the JSON node "data.updateDummy.dummyDate" should be equal to "2018-06-05T00:00:00+00:00"
+    And the JSON node "data.updateDummy.relatedDummies.edges[0].node.name" should be equal to "RelatedDummy11"
     And the JSON node "data.updateDummy.clientMutationId" should be equal to "myId"
 
   Scenario: Modify an item with composite identifiers through a mutation

src/GraphQl/Resolver/Factory/CollectionResolverFactory.php

@@ -28,7 +28,7 @@
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
- * Creates a function retrieving a collection to resolve a GraphQL query.
+ * Creates a function retrieving a collection to resolve a GraphQL query or a field returned by a mutation.
  *
  * @experimental
  *
@@ -62,7 +62,7 @@ public function __construct(CollectionDataProviderInterface $collectionDataProvi
 
     public function __invoke(string $resourceClass = null, string $rootClass = null, string $operationName = null): callable
     {
-        return function ($source, $args, $context, ResolveInfo $info) use ($resourceClass, $rootClass) {
+        return function ($source, $args, $context, ResolveInfo $info) use ($resourceClass, $rootClass, $operationName) {
             if (null === $resourceClass) {
                 return null;
             }
@@ -75,7 +75,7 @@ public function __invoke(string $resourceClass = null, string $rootClass = null,
             }
 
             $resourceMetadata = $this->resourceMetadataFactory->create($resourceClass);
-            $dataProviderContext = $resourceMetadata->getGraphqlAttribute('query', 'normalization_context', [], true);
+            $dataProviderContext = $resourceMetadata->getGraphqlAttribute($operationName ?? 'query', 'normalization_context', [], true);
             $dataProviderContext['attributes'] = $this->fieldsToAttributes($info);
             $dataProviderContext['filters'] = $this->getNormalizedFilters($args);
 
@@ -87,7 +87,7 @@ public function __invoke(string $resourceClass = null, string $rootClass = null,
                 $collection = $this->collectionDataProvider->getCollection($resourceClass, null, $dataProviderContext);
             }
 
-            $this->canAccess($this->resourceAccessChecker, $resourceMetadata, $resourceClass, $info, $collection, 'query');
+            $this->canAccess($this->resourceAccessChecker, $resourceMetadata, $resourceClass, $info, $collection, $operationName ?? 'query');
 
             if (!$this->paginationEnabled) {
                 $data = [];

src/GraphQl/Type/SchemaBuilder.php

@@ -249,11 +249,11 @@ private function getResourceFieldConfiguration(string $resourceClass, ResourceMe
                 $args = $this->convertFilterArgsToTypes($args);
             }
 
-            if ($isInternalGraphqlType || $input || null !== $mutationName) {
+            if ($isInternalGraphqlType || $input) {
                 $resolve = null;
             } elseif ($this->isCollection($type)) {
                 $resolverFactory = $this->collectionResolverFactory;
-                $resolve = $resolverFactory($className, $rootResource);
+                $resolve = $resolverFactory($className, $rootResource, $mutationName);
             } else {
                 $resolve = $this->itemResolver;
             }