Fix nested create, upsert and update on lists of inputs

CHANGELOG.md

@@ -22,6 +22,8 @@ You can find and compare releases at the [GitHub release page](https://github.co
 - Fix nested mutations with multiple `belongsTo` relations at the same level https://github.com/nuwave/lighthouse/pull/1285
 - Avoid race condition that occurs when using `Cache::has()` https://github.com/nuwave/lighthouse/pull/1290
 - Replace usage of `resolve()` helper with Lumen-compatible `app()` https://github.com/nuwave/lighthouse/pull/1305
+- Fix using `@create` and `@update` on nested input object fields that accept an array of input types  
+  https://github.com/nuwave/lighthouse/pull/1316
 
 ### Changed
 

src/Schema/Directives/MutationExecutorDirective.php

@@ -89,7 +89,7 @@ public function __invoke($parent, $args)
     }
 
     /**
-     * @param  \Nuwave\Lighthouse\Execution\Arguments\ArgumentSet|\Nuwave\Lighthouse\Execution\Arguments\ArgumentSet[]
+     * @param  \Nuwave\Lighthouse\Execution\Arguments\ArgumentSet|\Nuwave\Lighthouse\Execution\Arguments\ArgumentSet[]  $args
      * @return \Illuminate\Database\Eloquent\Model|\Illuminate\Database\Eloquent\Model[]
      */
     protected function executeMutation(Model $model, $args, ?Relation $parentRelation = null)
@@ -98,7 +98,7 @@ protected function executeMutation(Model $model, $args, ?Relation $parentRelatio
 
         return Utils::applyEach(
             static function (ArgumentSet $argumentSet) use ($update, $model) {
-                return $update($model, $argumentSet);
+                return $update($model->newInstance(), $argumentSet);
             },
             $args
         );

tests/Integration/Schema/Directives/CreateDirectiveTest.php

@@ -11,7 +11,7 @@ class CreateDirectiveTest extends DBTestCase
 {
     public function testCanCreateFromFieldArguments(): void
     {
-        $this->schema .= /** @lang GraphQL */ '
+        $this->schema .= /** @lang GraphQL */'
         type Company {
             id: ID!
             name: String!
@@ -41,7 +41,7 @@ public function testCanCreateFromFieldArguments(): void
 
     public function testCanCreateFromInputObject(): void
     {
-        $this->schema .= /** @lang GraphQL */ '
+        $this->schema .= /** @lang GraphQL */'
         type Company {
             id: ID!
             name: String!
@@ -77,7 +77,7 @@ public function testCanCreateFromInputObject(): void
 
     public function testCreatesAnEntryWithDatabaseDefaultsAndReturnsItImmediately(): void
     {
-        $this->schema .= /** @lang GraphQL */ '
+        $this->schema .= /** @lang GraphQL */'
         type Mutation {
             createTag(name: String): Tag @create
         }
@@ -111,7 +111,7 @@ public function testDoesNotCreateWithFailingRelationship(): void
 
         $this->app['config']->set('app.debug', false);
 
-        $this->schema .= /** @lang GraphQL */ '
+        $this->schema .= /** @lang GraphQL */'
         type Task {
             id: ID!
             name: String!
@@ -178,7 +178,7 @@ public function testCreatesOnPartialFailureWithTransactionsDisabled(): void
         $this->app['config']->set('app.debug', false);
         config(['lighthouse.transactional_mutations' => false]);
 
-        $this->schema .= /** @lang GraphQL */ '
+        $this->schema .= /** @lang GraphQL */'
         type Task {
             id: ID!
             name: String!
@@ -244,7 +244,7 @@ public function testCreatesOnPartialFailureWithTransactionsDisabled(): void
 
     public function testDoesNotFailWhenPropertyNameMatchesModelsNativeMethods(): void
     {
-        $this->schema .= /** @lang GraphQL */ '
+        $this->schema .= /** @lang GraphQL */'
         type Task {
             id: ID!
             name: String!
@@ -307,7 +307,7 @@ public function testDoesNotFailWhenPropertyNameMatchesModelsNativeMethods(): voi
 
     public function testNestedArgResolverHasMany(): void
     {
-        $this->schema .= /** @lang GraphQL */ '
+        $this->schema .= /** @lang GraphQL */'
         type Mutation {
             createUser(input: CreateUserInput! @spread): User @create
         }
@@ -361,7 +361,7 @@ public function testNestedArgResolverHasMany(): void
 
     public function testNestedArgResolverForOptionalBelongsTo(): void
     {
-        $this->schema .= /** @lang GraphQL */ '
+        $this->schema .= /** @lang GraphQL */'
         type Mutation {
             createTask(input: CreateTaskInput! @spread): Task @create
         }
@@ -413,7 +413,7 @@ public function testNestedArgResolverForOptionalBelongsTo(): void
 
     public function testCanCreateTwice(): void
     {
-        $this->schema .= /** @lang GraphQL */ '
+        $this->schema .= /** @lang GraphQL */'
         type Task {
             id: ID!
             name: String!
@@ -485,4 +485,68 @@ public function testCanCreateTwice(): void
             ],
         ]);
     }
+
+    public function testCanCreateTwiceWithCreateDirective(): void
+    {
+        $this->schema .= /** @lang GraphQL */'
+        type Task {
+            id: ID!
+            name: String!
+        }
+
+        type User {
+            id: ID!
+            name: String
+            tasks: [Task!]! @hasMany
+        }
+
+        type Mutation {
+            createUser(input: CreateUserInput! @spread): User @create
+        }
+
+        input CreateUserInput {
+            name: String
+            tasks: [CreateTaskInput!] @create
+        }
+
+        input CreateTaskInput {
+            name: String
+        }
+        ';
+
+        $this->graphQL(/** @lang GraphQL */ '
+        mutation {
+            createUser(input: {
+                name: "foo"
+                tasks: [
+                    {
+                        name: "fooTask"
+                    },
+                    {
+                        name: "barTask"
+                    }
+                ]
+            }) {
+                name
+                tasks {
+                    name
+                }
+            }
+        }
+        ')->assertJson([
+            'data' => [
+                'createUser' => [
+                    'name' => 'foo',
+                    'tasks' => [
+                        [
+                            'name' => 'fooTask',
+                        ],
+                        [
+                            'name' => 'barTask',
+                        ],
+                    ],
+                ],
+            ],
+        ]);
+    }
 }

tests/Integration/Schema/Directives/UpdateDirectiveTest.php

@@ -15,7 +15,7 @@ public function testCanUpdateFromFieldArguments(): void
     {
         factory(Company::class)->create(['name' => 'foo']);
 
-        $this->schema .= '
+        $this->schema .= /** @lang GraphQL */ '
         type Company {
             id: ID!
             name: String!
@@ -29,7 +29,7 @@ public function testCanUpdateFromFieldArguments(): void
         }
         ';
 
-        $this->graphQL('
+        $this->graphQL(/** @lang GraphQL */'
         mutation {
             updateCompany(
                 id: 1
@@ -55,7 +55,7 @@ public function testCanUpdateFromInputObject(): void
     {
         factory(Company::class)->create(['name' => 'foo']);
 
-        $this->schema .= '
+        $this->schema .= /** @lang GraphQL */'
         type Company {
             id: ID!
             name: String!
@@ -99,7 +99,7 @@ public function testCanUpdateWithCustomPrimaryKey(): void
     {
         factory(Category::class)->create(['name' => 'foo']);
 
-        $this->schema .= '
+        $this->schema .= /** @lang GraphQL */'
         type Category {
             category_id: ID!
             name: String!
@@ -139,7 +139,7 @@ public function testDoesNotUpdateWithFailingRelationship(): void
     {
         factory(User::class)->create(['name' => 'Original']);
 
-        $this->schema .= /** @lang GraphQL */ '
+        $this->schema .= /** @lang GraphQL */'
         type Task {
             id: ID!
             name: String!
@@ -202,27 +202,27 @@ public function testNestedArgResolver(): void
             'id' => 3,
         ]);
 
-        $this->schema .= /** @lang GraphQL */ '
+        $this->schema .= /** @lang GraphQL */'
         type Mutation {
             updateUser(input: UpdateUserInput! @spread): User @update
         }
-        
+
         type Task {
             id: Int
             name: String!
         }
-        
+
         type User {
             name: String
             tasks: [Task!]! @hasMany
         }
-        
+
         input UpdateUserInput {
             id: Int
             name: String
             updateTask: UpdateTaskInput @update(relation: "tasks")
         }
-        
+
         input UpdateTaskInput {
             id: Int
             name: String
@@ -260,4 +260,82 @@ public function testNestedArgResolver(): void
             ],
         ]);
     }
+
+    public function testNestedUpdateOnInputList(): void
+    {
+        factory(User::class)->create();
+        factory(Task::class)->create([
+            'id' => 3,
+        ]);
+        factory(Task::class)->create([
+            'id' => 4,
+        ]);
+
+        $this->schema .= /** @lang GraphQL */'
+        type Mutation {
+            updateUser(input: UpdateUserInput! @spread): User @update
+        }
+
+        type Task {
+            id: Int
+            name: String!
+        }
+
+        type User {
+            name: String
+            tasks: [Task!]! @hasMany
+        }
+
+        input UpdateUserInput {
+            id: Int
+            name: String
+            updateTask: [UpdateTaskInput] @update(relation: "tasks")
+        }
+
+        input UpdateTaskInput {
+            id: Int
+            name: String
+        }
+        ';
+
+        $this->graphQL(/** @lang GraphQL */ '
+        mutation {
+            updateUser(input: {
+                id: 1
+                name: "foo"
+                updateTask: [
+                    {
+                        id: 3
+                        name: "Uniq"
+                    },
+                    {
+                        id: 4,
+                        name: "Foo"
+                    }
+                ]
+            }) {
+                name
+                tasks {
+                    id
+                    name
+                }
+            }
+        }
+        ')->assertExactJson([
+            'data' => [
+                'updateUser' => [
+                    'name' => 'foo',
+                    'tasks' => [
+                        [
+                            'id' => 3,
+                            'name' => 'Uniq',
+                        ], [
+                            'id' => 4,
+                            'name' => 'Foo',
+                        ],
+                    ],
+                ],
+            ],
+        ]);
+    }
 }