Merge pull request #1 from ferfabricio/hotfix/empty-null-values

Fix empty null values
ferfabricio · Aug 15, 2020 · 65f51f5 · 65f51f5
2 parents 4de95dc + 0ceb539
commit 65f51f5
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 2 deletions.
diff --git a/src/Filters/AbstractFilter.php b/src/Filters/AbstractFilter.php
@@ -28,13 +28,24 @@ public function apply(Builder $query, string $column, array $filter): Builder
     {
         $operator = $this->identifyOperator($column, $filter);
         $key = $this->identifyKey($column, $filter);
-        if (array_key_exists($key, $filter)) {
+
+        if (array_key_exists($key, $filter) && !$this->checkEmptyOrNull($filter[$key])) {
             $query->where($column, $operator, $filter[$key]);
         }
 
         return $query;
     }
 
+    /**
+     * @param mixed $value
+     *
+     * @return bool
+     */
+    protected function checkEmptyOrNull($value): bool
+    {
+        return null === $value || empty($value);
+    }
+
     /**
      * @param string $identifier
      * @param string $column

diff --git a/src/Filters/Like.php b/src/Filters/Like.php
@@ -19,7 +19,9 @@ public function apply(Builder $query, string $column, array $filter): Builder
     {
         $value = $filter[$column] ?? '';
 
-        $query->where($column, 'like', "%{$value}%");
+        if (!$this->checkEmptyOrNull($value)) {
+            $query->where($column, 'like', "%{$value}%");
+        }
 
         return $query;
     }

diff --git a/tests/Unit/Filters/EqualTest.php b/tests/Unit/Filters/EqualTest.php
@@ -47,4 +47,36 @@ public function testApplyInClass()
             ['test' => 'to equal']
         );
     }
+
+    /**
+     * @dataProvider nullAndEmptyScenario
+     *
+     * @param mixed $value
+     */
+    public function testWithEmptyValue($value)
+    {
+        $exampleModel = new class() {
+            use Filterable;
+
+            protected $filters = [
+                'test' => Equal::IDENTIFIER,
+            ];
+        };
+
+        $query = Mockery::spy(Builder::class);
+        $query->shouldNotReceive('where');
+
+        $exampleModel->scopeFilters(
+            $query,
+            ['test' => $value]
+        );
+    }
+
+    public function nullAndEmptyScenario(): array
+    {
+        return [
+            [''],
+            [null],
+        ];
+    }
 }
diff --git a/tests/Unit/Filters/LikeTest.php b/tests/Unit/Filters/LikeTest.php
@@ -47,4 +47,23 @@ public function testApplyInClass()
             ['test' => 'to like']
         );
     }
+
+    public function testWithEmptyValue()
+    {
+        $exampleModel = new class() {
+            use Filterable;
+
+            protected $filters = [
+                'test' => Like::IDENTIFIER,
+            ];
+        };
+
+        $query = Mockery::spy(Builder::class);
+        $query->shouldNotReceive('where');
+
+        $exampleModel->scopeFilters(
+            $query,
+            ['test' => '']
+        );
+    }
 }