🐛 include distant relation problem

Author: GautierDele

README.md

@@ -69,7 +69,7 @@ Here is a quick look at what you can do using API search method:
             "type": "max",
             "field": "rate",
             "filters": [
-                {"field": 'approved', "value": true}
+                {"field": "approved', "value": true}
             ]
         },
     ],

src/Console/stubs/resource.stub

@@ -29,7 +29,7 @@ class {{ class }} extends Resource
         return [];
     }
 
-    public function exposedPaginations(\Lomkit\Rest\Http\Requests\RestRequest $request) {
+    public function exposedLimits(\Lomkit\Rest\Http\Requests\RestRequest $request) {
         return [
             10,
             25,

src/Console/stubs/user-resource.stub

@@ -31,7 +31,7 @@ class User extends Resource
         return [];
     }
 
-    public function exposedPaginations(\Lomkit\Rest\Http\Requests\RestRequest $request) {
+    public function exposedLimits(\Lomkit\Rest\Http\Requests\RestRequest $request) {
         return [
             10,
             25,

src/Http/Response.php

@@ -41,6 +41,11 @@ protected function buildGatesForModel(Model $model) {
     }
 
     public function modelToResponse(Model $model, Resource $resource, array $requestArray, Relation $relation = null) {
+        $currentRequestArray = $relation === null ? $requestArray : collect($requestArray['includes'])
+            ->first(function ($include) use ($relation) {
+                return preg_match('/(?:\.\b)?'.$relation->relation.'\b/', $include['relation']);
+            });
+
         return array_merge(
             // toArray to take advantage of Laravel's logic
             collect($model->attributesToArray())
@@ -84,7 +89,7 @@ public function modelToResponse(Model $model, Resource $resource, array $request
                     $relationResource = $relationConcrete->resource();
                     $requestArrayRelation = collect($requestArray['includes'])
                         ->first(function ($include) use ($relationName) {
-                            return $include['relation'] === $relationName;
+                            return preg_match('/(?:\.\b)?'.$relationName.'\b/', $include['relation']);
                         });
 
                     // We reapply the limits in case of BelongsToManyRelation where we can't apply limits easily
@@ -95,14 +100,14 @@ public function modelToResponse(Model $model, Resource $resource, array $request
                             $key => $this->modelToResponse(
                                 $modelRelation,
                                 $relationResource,
-                                $requestArrayRelation,
+                                $requestArray,
                                 $relationConcrete
                             )
                         ];
                     }
                     return [
                         $key => $modelRelation
-                            ->map(fn ($collectionRelation) => $this->modelToResponse($collectionRelation, $relationResource, $requestArrayRelation, $relationConcrete))
+                            ->map(fn ($collectionRelation) => $this->modelToResponse($collectionRelation, $relationResource, $requestArray, $relationConcrete))
                             ->toArray()
                     ];
                 })

tests/Feature/Controllers/SearchIncludingRelationshipsOperationsTest.php

@@ -84,6 +84,55 @@ public function test_getting_a_list_of_resources_including_belongs_to_relation()
         );
     }
 
+    public function test_getting_a_list_of_resources_including_belongs_to_has_many_relation(): void
+    {
+        $belongsTo = BelongsToRelationFactory::new()->create();
+        $matchingModel = ModelFactory::new()
+            ->for($belongsTo)
+            ->create()->fresh();
+
+        $matchingModel2 = ModelFactory::new()->create()->fresh();
+
+        Gate::policy(Model::class, GreenPolicy::class);
+        Gate::policy(BelongsToRelation::class, GreenPolicy::class);
+
+        $response = $this->post(
+            '/api/models/search',
+            [
+                'includes' => [
+                    ['relation' => 'belongsToRelation.models'],
+                ],
+            ],
+            ['Accept' => 'application/json']
+        );
+
+        $matchingModelBelongsToRelation = $matchingModel->belongsToRelation;
+
+        $this->assertResourcePaginated(
+            $response,
+            [$matchingModel, $matchingModel2],
+            new ModelResource,
+            [
+                [
+                    'belongs_to_relation' => array_merge(
+                        $matchingModelBelongsToRelation
+                            ->only((new BelongsToResource)->exposedFields(app()->make(RestRequest::class))),
+                        [
+                            'models' => $matchingModelBelongsToRelation->models
+                                ->map(function($model) {
+                                    return $model->only((new ModelResource)->exposedFields(app()->make(RestRequest::class)));
+                                })
+                                ->toArray(),
+                        ]
+                    ),
+                ],
+                [
+                    'belongs_to_relation' => null,
+                ]
+            ]
+        );
+    }
+
     public function test_getting_a_list_of_resources_including_has_one_relation(): void
     {
         $matchingModel = ModelFactory::new()

tests/Support/Models/BelongsToRelation.php

@@ -6,7 +6,7 @@
 
 class BelongsToRelation extends BaseModel
 {
-    public function model() {
+    public function models() {
         return $this->hasMany(Model::class);
     }
 }

tests/Support/Rest/Resources/BelongsToResource.php

@@ -6,6 +6,7 @@
 use Lomkit\Rest\Concerns\Resource\DisableAutomaticGates;
 use Lomkit\Rest\Http\Requests\RestRequest;
 use Lomkit\Rest\Http\Resource;
+use Lomkit\Rest\Relations\HasMany;
 use Lomkit\Rest\Tests\Support\Models\BelongsToRelation;
 
 class BelongsToResource extends Resource
@@ -16,7 +17,9 @@ class BelongsToResource extends Resource
 
     public function relations(RestRequest $request)
     {
-        return [];
+        return [
+            HasMany::make('models', ModelResource::class)
+        ];
     }
 
     public function exposedFields(RestRequest $request)