[JSON:API] Fix recursive relationship (#58066)

* [JSON:API] Fix recursive relationship

Signed-off-by: Mior Muhammad Zaki <[email protected]>

* wip

Signed-off-by: Mior Muhammad Zaki <[email protected]>

* wip

Signed-off-by: Mior Muhammad Zaki <[email protected]>

---------

Signed-off-by: Mior Muhammad Zaki <[email protected]>

Author: crynobone

src/Illuminate/Http/Resources/JsonApi/Concerns/ResolvesJsonApiElements.php

@@ -196,7 +196,7 @@ protected function compileResourceRelationships(JsonApiRequest $request): void
                 $relatedModels = $relationResolver->handle($this->resource);
                 $relatedResourceClass = $relationResolver->resourceClass();
 
-                if (! is_null($relatedModels)) {
+                if (! is_null($relatedModels) && $this->includesPreviouslyLoadedRelationships === false) {
                     $relatedModels->loadMissing($request->sparseIncluded($relationName));
                 }
 

tests/Integration/Http/Resources/JsonApi/JsonApiResourceTest.php

@@ -405,6 +405,66 @@ public function testItCanResolveRelationshipWithNestedRelationship()
             ->assertJsonMissing(['jsonapi']);
     }
 
+    public function testItCanResolveRelationshipWithRecursiveNestedRelationship()
+    {
+        $now = $this->freezeSecond();
+
+        $user = User::factory()->create();
+
+        $profile = Profile::factory()->create([
+            'user_id' => $user->getKey(),
+            'date_of_birth' => '2011-06-09',
+            'timezone' => 'America/Chicago',
+        ]);
+
+        $this->getJson("/users/{$user->getKey()}?".http_build_query(['include' => 'profile.user.profile']))
+            ->assertHeader('Content-type', 'application/vnd.api+json')
+            ->assertExactJson([
+                'data' => [
+                    'attributes' => [
+                        'email' => $user->email,
+                        'name' => $user->name,
+                    ],
+                    'id' => (string) $user->getKey(),
+                    'type' => 'users',
+                    'relationships' => [
+                        'profile' => [
+                            'data' => ['id' => (string) $profile->getKey(), 'type' => 'profiles'],
+                        ],
+                    ],
+                ],
+                'included' => [
+                    [
+                        'attributes' => [
+                            'date_of_birth' => '2011-06-09',
+                            'timezone' => 'America/Chicago',
+                        ],
+                        'id' => (string) $profile->getKey(),
+                        'type' => 'profiles',
+                        'relationships' => [
+                            'user' => [
+                                'data' => ['id' => (string) $user->getKey(), 'type' => 'users'],
+                            ],
+                        ],
+                    ],
+                    [
+                        'attributes' => [
+                            'email' => $user->email,
+                            'name' => $user->name,
+                        ],
+                        'id' => (string) $user->getKey(),
+                        'type' => 'users',
+                        'relationships' => [
+                            'profile' => [
+                                'data' => ['id' => (string) $profile->getKey(), 'type' => 'profiles'],
+                            ],
+                        ],
+                    ],
+                ],
+            ])
+            ->assertJsonMissing(['jsonapi']);
+    }
+
     public function testItCanResolveRelationshipWithoutRedundantIncludedRelationship()
     {
         $now = $this->freezeSecond();