Skip to content

Fixing belongs to nullable. #327

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
merged 2 commits into from
Dec 22, 2020
Merged

Fixing belongs to nullable. #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f912510
Fixing belongs to nullable.
binaryk Dec 22, 2020
501e021
Apply fixes from StyleCI (#328)
binaryk Dec 22, 2020
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
6 changes: 6 additions & 0 deletions src/Fields/EagerField.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,12 @@ public function resolve($repository, $attribute = null)

$relatedModel = $model->{$this->relation}()->first();

if (is_null($relatedModel)) {
$this->value = null;

return $this;
}

try {
$this->value = $this->repositoryClass::resolveWith($relatedModel)
->allowToShow(app(Request::class))
Expand Down
17 changes: 17 additions & 0 deletions tests/Fields/BelongsToFieldTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,23 @@ public function test_unauthorized_see_relationship()
});
}

public function test_dont_show_key_when_nullable_related()
{
$_SERVER['restify.users.show'] = true;

Gate::policy(User::class, UserPolicy::class);

tap(factory(Post::class)->create([
'user_id' => null,
]), function ($post) {
$this->get(PostWithUserRepository::uriKey()."/{$post->id}?related=user")
->assertJsonFragment([
'user' => null,
])
->assertOk();
});
}

public function test_field_used_when_storing()
{
tap(factory(User::class)->create(), function ($user) {
Expand Down