Merge pull request #20 from bluefyn-international/chore/null-contains

Updating contains and does not cotains to handle null
always-open · Jul 20, 2022 · 2cb3717 · 2cb3717
2 parents 883e67a + 68d4bd7
commit 2cb3717
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/src/BaseFeatures/Filters/ContainsFilter.php b/src/BaseFeatures/Filters/ContainsFilter.php
@@ -3,6 +3,7 @@
 namespace BluefynInternational\ReportEngine\BaseFeatures\Filters;
 
 use Illuminate\Database\Query\Builder;
+use Illuminate\Support\Facades\DB;
 
 class ContainsFilter extends BaseFilter
 {
@@ -25,9 +26,9 @@ public function apply(Builder $builder, array $options = []) : Builder
      *
      * @return Builder
      */
-    public static function build(Builder $builder, $field, $value, string $action = 'where') : Builder
+    public static function build(Builder $builder, mixed $field, mixed $value, string $action = 'where') : Builder
     {
-        return $builder->$action($field, 'like', '%' . $value . '%');
+        return $builder->$action(DB::raw('COALESCE(' . $field . ", '')"), 'like', '%' . $value . '%');
     }
 
     /**

diff --git a/src/BaseFeatures/Filters/DoesNotContainFilter.php b/src/BaseFeatures/Filters/DoesNotContainFilter.php
@@ -3,6 +3,7 @@
 namespace BluefynInternational\ReportEngine\BaseFeatures\Filters;
 
 use Illuminate\Database\Query\Builder;
+use Illuminate\Support\Facades\DB;
 
 class DoesNotContainFilter extends BaseFilter
 {
@@ -14,9 +15,20 @@ class DoesNotContainFilter extends BaseFilter
      */
     public function apply(Builder $builder, array $options = []) : Builder
     {
-        $action = $this->getAction();
+        return self::build($builder, $this->getField(), $this->getValue(), $this->getAction());
+    }
 
-        return $builder->$action($this->getField(), 'not like', '%' . $this->getValue() . '%');
+    /**
+     * @param Builder $builder
+     * @param mixed   $field
+     * @param mixed   $value
+     * @param string  $action
+     *
+     * @return Builder
+     */
+    public static function build(Builder $builder, mixed $field, mixed $value, string $action = 'where') : Builder
+    {
+        return $builder->$action(DB::raw('COALESCE(' . $field . ", '')"), 'not like', '%' . $value . '%');
     }
 
     /**