Fixing belongs to nullable. (#327)

* Fixing belongs to nullable. * Apply fixes from StyleCI (#328)
BinarCode · Dec 22, 2020 · dbbeafb · dbbeafb
1 parent d474838
commit dbbeafb
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/src/Fields/EagerField.php b/src/Fields/EagerField.php
@@ -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))

diff --git a/tests/Fields/BelongsToFieldTest.php b/tests/Fields/BelongsToFieldTest.php
@@ -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) {