Test upsert with id null

nuwave · Aug 2, 2024 · 98cff28 · 98cff28
1 parent 30fedff
commit 98cff28
Show file tree

Hide file tree

Showing 3 changed files with 76 additions and 7 deletions.
diff --git a/src/Execution/Arguments/UpsertModel.php b/src/Execution/Arguments/UpsertModel.php
@@ -26,10 +26,10 @@ public function __invoke($model, $args): mixed
             ?? $args->arguments[$model->getKeyName()]
             ?? null;
 
-        if ($id !== null) {
-            $existingModel = $model
-                ->newQuery()
-                ->find($id->value);
+        $idValue = $id?->value;
+        if ($idValue) {
+            $existingModel = $model->newQuery()
+                ->find($idValue);
 
             if ($existingModel !== null) {
                 $model = $existingModel;

diff --git a/tests/Integration/Execution/MutationExecutor/BelongsToTest.php b/tests/Integration/Execution/MutationExecutor/BelongsToTest.php
@@ -307,6 +307,40 @@ public function testUpsertBelongsToWithoutID(): void
         ]);
     }
 
+    public function testUpsertBelongsToWithIDNull(): void
+    {
+        $this->graphQL(/** @lang GraphQL */ <<<'GRAPHQL'
+        mutation {
+            upsertTask(input: {
+                name: "foo"
+                user: {
+                    upsert: {
+                        id: null
+                        name: "New User"
+                    }
+                }
+            }) {
+                id
+                name
+                user {
+                    id
+                }
+            }
+        }
+GRAPHQL
+        )->assertJson([
+            'data' => [
+                'upsertTask' => [
+                    'id' => '1',
+                    'name' => 'foo',
+                    'user' => [
+                        'id' => '1',
+                    ],
+                ],
+            ],
+        ]);
+    }
+
     public function testUpsertUsingCreateWithNewBelongsTo(): void
     {
         $this->graphQL(/** @lang GraphQL */ '

diff --git a/tests/Integration/Execution/MutationExecutor/HasOneTest.php b/tests/Integration/Execution/MutationExecutor/HasOneTest.php
@@ -120,7 +120,7 @@ public function testUpsertWithNewHasOne(): void
                 name: "foo"
                 post: {
                     upsert: {
-                        id: 1
+                        id: 2
                         title: "bar"
                     }
                 }
@@ -139,7 +139,7 @@ public function testUpsertWithNewHasOne(): void
                     'id' => '1',
                     'name' => 'foo',
                     'post' => [
-                        'id' => '1',
+                        'id' => '2',
                         'title' => 'bar',
                     ],
                 ],
@@ -183,14 +183,49 @@ public function testCreateUsingUpsertWithNewHasOne(): void
         ]);
     }
 
-    public function testUpsertHasOneWithoutId(): void
+    public function testUpsertHasOneWithoutID(): void
+    {
+        $this->graphQL(/** @lang GraphQL */ '
+        mutation {
+            upsertTask(input: {
+                name: "foo"
+                post: {
+                    upsert: {
+                        title: "bar"
+                    }
+                }
+            }) {
+                id
+                name
+                post {
+                    id
+                    title
+                }
+            }
+        }
+        ')->assertJson([
+            'data' => [
+                'upsertTask' => [
+                    'id' => '1',
+                    'name' => 'foo',
+                    'post' => [
+                        'id' => '1',
+                        'title' => 'bar',
+                    ],
+                ],
+            ],
+        ]);
+    }
+
+    public function testUpsertHasOneWithIDNull(): void
     {
         $this->graphQL(/** @lang GraphQL */ '
         mutation {
             upsertTask(input: {
                 name: "foo"
                 post: {
                     upsert: {
+                        id: null
                         title: "bar"
                     }
                 }