Fix Relation filter input on zero (0) value fields (#157)

Tucker-Eric · May 11, 2021 · 628a694 · 628a694
1 parent 1cda293
commit 628a694
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/ModelFilter.php b/src/ModelFilter.php
@@ -4,7 +4,6 @@
 
 use Illuminate\Database\Eloquent\Builder as QueryBuilder;
 use Illuminate\Database\Eloquent\Relations\Relation;
-use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 
 /**
@@ -435,8 +434,14 @@ public function getRelatedFilterInput($related)
             foreach ((array) $this->relations[$related] as $alias => $name) {
                 // If the alias is a string that is what we grab from the input
                 // Then use the name for the output so we can alias relations
-                if ($value = Arr::get($this->input, is_string($alias) ? $alias : $name)) {
-                    $output[$name] = $value;
+                $keyName = is_string($alias) ? $alias : $name;
+
+                if (array_key_exists($keyName, $this->input)) {
+                    $keyValue = $this->input[$keyName];
+
+                    if ($this->includeFilterInput($keyName, $keyValue)) {
+                        $output[$name] = $keyValue;
+                    }
                 }
             }
         }

diff --git a/tests/ModelFilterTest.php b/tests/ModelFilterTest.php
@@ -167,11 +167,15 @@ public function testRelatedMethodBooleans()
     public function testGetFilterInputForRelationsArray()
     {
         $this->filter->relations = [
-            'roles' => ['roles'],
+            'roles' => ['roles', 'enabled', 'flagged'],
         ];
         $this->filter->push($this->testInput);
 
-        $this->assertEquals($this->filter->getRelatedFilterInput('roles'), ['roles' => $this->filter->input('roles')]);
+        $this->filter->push(['enabled' => 0]);
+
+        $this->filter->push(['flagged' => 1]);
+
+        $this->assertEquals($this->filter->getRelatedFilterInput('roles'), ['roles' => $this->filter->input('roles'), 'enabled' => $this->filter->input('enabled'), 'flagged' => $this->filter->input('flagged')]);
     }
 
     /**