Skip to content

🐛 include in include #190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GautierDele merged 3 commits into from
Aug 20, 2025
Merged

🐛 include in include #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9755f62
🐛 include in include
GautierDele Aug 20, 2025
aed897b
Apply fixes from StyleCI
StyleCIBot Aug 20, 2025
b7b5f65
ai feedback
GautierDele Aug 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/Rules/Search/SearchInclude.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ public function buildValidationRules(string $attribute, mixed $value): array
'required',
(new ResourceRelationOrNested())->setResource($this->resource),
],
$attribute.'.includes' => [
'prohibited',
],
$attribute.'.text' => [
'prohibited',
],
Expand Down
84 changes: 84 additions & 0 deletions tests/Feature/Controllers/SearchIncludingRelationshipsOperationsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,90 @@ public function test_getting_a_list_of_resources_including_belongs_to_has_many_r
);
}

public function test_getting_a_list_of_resources_including_belongs_to_has_many_relation_using_nested_include(): 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',
[
'search' => [
'includes' => [
[
'relation' => 'belongsToRelation',
'includes' => [
['relation' => 'models'],
],
],
],
],
],
['Accept' => 'application/json']
);

$matchingModelBelongsToRelation = $matchingModel->belongsToRelation;

$this->assertResourcePaginated(
$response,
[$matchingModel, $matchingModel2],
new ModelResource(),
[
[
'belongs_to_relation' => array_merge(
$matchingModelBelongsToRelation
->only((new BelongsToResource())->getFields(app()->make(RestRequest::class))),
[
'models' => $matchingModelBelongsToRelation->models()
->orderBy('id')
->get()
->map(function ($model) {
return $model->only((new ModelResource())->getFields(app()->make(RestRequest::class)));
})
->toArray(),
]
),
],
[
'belongs_to_relation' => null,
],
]
);
}

public function test_including_unauthorized_nested_relation_returns_validation_error(): void
{
Gate::policy(Model::class, GreenPolicy::class);
Gate::policy(BelongsToRelation::class, GreenPolicy::class);

$response = $this->post(
'/api/models/search',
[
'search' => [
'includes' => [
[
'relation' => 'belongsToRelation',
'includes' => [
['relation' => 'unauthorized'],
],
],
],
],
],
['Accept' => 'application/json']
);

$response->assertStatus(422);
$response->assertExactJsonStructure(['message', 'errors' => ['search.includes.0.includes.0.relation']]);
}

public function test_getting_a_list_of_resources_including_distant_relation_with_intermediary_search_query_condition(): void
{
$matchingModel = ModelFactory::new()->create(
Expand Down