Merge branch 'main' into bugfix/eager-loading-search

Author: Samoht70

src/Http/Response.php

@@ -109,7 +109,7 @@ public function modelToResponse(Model $model, Resource $resource, array $request
                 })
                 ->toArray(),
             collect($model->getRelations())
-                ->mapWithKeys(function ($modelRelation, $relationName) use ($requestArray, $relation, $resource) {
+                ->mapWithKeys(function ($modelRelation, $relationName) use ($currentRequestArray, $relation, $resource) {
                     $key = Str::snake($relationName);
 
                     if (is_null($modelRelation)) {
@@ -132,15 +132,15 @@ public function modelToResponse(Model $model, Resource $resource, array $request
                             $key => $this->modelToResponse(
                                 $modelRelation,
                                 $relationResource,
-                                $requestArray,
+                                $currentRequestArray,
                                 $relationConcrete
                             ),
                         ];
                     }
 
                     return [
                         $key => $modelRelation
-                            ->map(fn ($collectionRelation) => $this->modelToResponse($collectionRelation, $relationResource, $requestArray, $relationConcrete))
+                            ->map(fn ($collectionRelation) => $this->modelToResponse($collectionRelation, $relationResource, $currentRequestArray, $relationConcrete))
                             ->toArray(),
                     ];
                 })

tests/Feature/Controllers/SearchIncludingRelationshipsOperationsTest.php

@@ -93,7 +93,7 @@ public function test_getting_a_list_of_resources_including_relation_with_unautho
                 'search' => [
                     'includes' => [
                         [
-                            'relation'   => 'hasManyRelation.model',
+                            'relation'   => 'hasManyRelation.belongsToRelation',
                         ],
                         [
                             'relation'   => 'hasManyRelation',

tests/Feature/Controllers/SearchSelectingOperationsTest.php

@@ -4,7 +4,9 @@
 
 use Illuminate\Support\Facades\Gate;
 use Lomkit\Rest\Tests\Feature\TestCase;
+use Lomkit\Rest\Tests\Support\Database\Factories\HasManyRelationFactory;
 use Lomkit\Rest\Tests\Support\Database\Factories\ModelFactory;
+use Lomkit\Rest\Tests\Support\Models\HasManyRelation;
 use Lomkit\Rest\Tests\Support\Models\Model;
 use Lomkit\Rest\Tests\Support\Policies\GreenPolicy;
 use Lomkit\Rest\Tests\Support\Rest\Resources\ModelResource;
@@ -89,4 +91,64 @@ public function test_getting_a_list_of_resources_selecting_two_fields(): void
             ['id', 'number']
         );
     }
+
+    public function test_getting_a_list_of_resources_deep_selecting_fields(): void
+    {
+        $matchingModel = ModelFactory::new()->has(HasManyRelationFactory::new()->count(2), 'hasManyRelation')->create()->fresh();
+        $matchingModel2 = ModelFactory::new()->create()->fresh();
+
+        Gate::policy(Model::class, GreenPolicy::class);
+        Gate::policy(HasManyRelation::class, GreenPolicy::class);
+
+        $response = $this->post(
+            '/api/models/search',
+            [
+                'search' => [
+                    'selects' => [
+                        ['field' => 'id'],
+                    ],
+                    'includes' => [
+                        [
+                            'relation' => 'hasManyRelation',
+                            'selects'  => [
+                                ['field' => 'id'],
+                            ],
+                            'includes' => [
+                                [
+                                    'relation' => 'model',
+                                    'selects'  => [
+                                        ['field' => 'id'],
+                                    ],
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+            ['Accept' => 'application/json']
+        );
+
+        $this->assertResourcePaginated(
+            $response,
+            [$matchingModel, $matchingModel2],
+            new ModelResource(),
+            [
+                [
+                    'has_many_relation' => $matchingModel->hasManyRelation()
+                        ->orderBy('id')
+                        ->with('model:id')
+                        ->get()
+                        ->map(function ($relation) {
+                            $relation->model = $relation->model->toArray();
+
+                            return $relation->only(['id', 'model']);
+                        })->toArray(),
+                ],
+                [
+                    'has_many_relation' => [],
+                ],
+            ],
+            ['id', 'has_many_relation']
+        );
+    }
 }