Merge pull request #58 from mehdi-fathi/mehdi-dev

Fix:fix some bugs
mehdi-fathi · Feb 26, 2020 · 6e55c52 · 6e55c52
2 parents 051ec05 + 0ea49bb
commit 6e55c52
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/QueryFilter/Queries/QueryBuilder.php b/src/QueryFilter/Queries/QueryBuilder.php
@@ -56,7 +56,7 @@ public function buildQuery($field, array $params)
             $this->queryFilterBuilder->whereByOpt($field, $params);
         } elseif (is_array($params[0])) {
             $this->queryFilterBuilder->whereIn("$field", $params[0]);
-        } else {
+        } elseif (!empty($params[0])) {
             $this->queryFilterBuilder->where("$field", $params[0]);
         }
     }

diff --git a/src/QueryFilter/Queries/QueryFilterBuilder.php b/src/QueryFilter/Queries/QueryFilterBuilder.php
@@ -68,7 +68,14 @@ public function whereByOpt($field, $params)
      */
     public function whereIn($field, array $params)
     {
-        $this->builder->whereIn("$field", $params);
+        foreach ($params as $key => $value) {
+            if (is_null($value) || $value == '') {
+                unset($params[$key]);
+            }
+        }
+        if (!empty($params)) {
+            $this->builder->whereIn("$field", $params);
+        }
     }
 
     /**

diff --git a/tests/Tests/CategoryFilterTest.php b/tests/Tests/CategoryFilterTest.php
@@ -25,7 +25,6 @@ public function itCanGetCategoryByCategoryAndDateNull()
         $request->merge(
             [
                 'category'   => 'Html',
-                'created_at' => null,
             ]
         );
         $modelfilter = new ModelFilters(
@@ -35,7 +34,6 @@ public function itCanGetCategoryByCategoryAndDateNull()
         $category = CategoriesController::filterCategory($modelfilter);
         $category_pure = Category::where([
             'category'   => 'Html',
-            'created_at' => null,
         ])->get();
 
         $this->assertEquals($category, $category_pure);