Fix: queries to criteria

Author: Alexander Dadyka

app/Repositories/Criteria/WhereDateEqualCriterion.php

@@ -5,6 +5,7 @@
 use App\Models\Enums\Interfaces\ModelColumnInterface;
 use App\Repositories\Criteria\Interfaces\CriterionInterface;
 use Illuminate\Contracts\Database\Query\Builder;
+use Illuminate\Support\Carbon;
 
 class WhereDateEqualCriterion implements CriterionInterface
 {
@@ -17,10 +18,8 @@ public function __construct(
 
     public function apply(Builder $query): void
     {
-        $query->whereRaw(
-            "date_format(`$this->table`.`{$this->column->value}`, '%Y-%m-%d 00:00:00') = "
-            . "str_to_date(?, '%Y-%m-%d 00:00:00')",
-            [$this->date]
-        );
+        $date = Carbon::parse($this->date)->format('Y-m-d');
+
+        $query->whereDate("$this->table.{$this->column->value}", $date);
     }
 }

app/Repositories/Criteria/WhereDateGreaterThanOrEqualCriterion.php

@@ -5,6 +5,7 @@
 use App\Models\Enums\Interfaces\ModelColumnInterface;
 use App\Repositories\Criteria\Interfaces\CriterionInterface;
 use Illuminate\Contracts\Database\Query\Builder;
+use Illuminate\Support\Carbon;
 
 class WhereDateGreaterThanOrEqualCriterion implements CriterionInterface
 {
@@ -17,10 +18,8 @@ public function __construct(
 
     public function apply(Builder $query): void
     {
-        $query->whereRaw(
-            "date_format(`$this->table`.`{$this->column->value}`, '%Y-%m-%d 00:00:00') >= "
-            . "str_to_date(?, '%Y-%m-%d 00:00:00')",
-            [$this->date]
-        );
+        $date = Carbon::parse($this->date)->format('Y-m-d');
+
+        $query->whereDate("$this->table.{$this->column->value}", '>=', $date);
     }
 }

app/Repositories/Criteria/WhereDateLessThanOrEqualCriterion.php

@@ -5,6 +5,7 @@
 use App\Models\Enums\Interfaces\ModelColumnInterface;
 use App\Repositories\Criteria\Interfaces\CriterionInterface;
 use Illuminate\Contracts\Database\Query\Builder;
+use Illuminate\Support\Carbon;
 
 class WhereDateLessThanOrEqualCriterion implements CriterionInterface
 {
@@ -17,10 +18,8 @@ public function __construct(
 
     public function apply(Builder $query): void
     {
-        $query->whereRaw(
-            "date_format(`$this->table`.`{$this->column->value}`, '%Y-%m-%d 00:00:00') <= "
-            . "str_to_date(?, '%Y-%m-%d 00:00:00')",
-            [$this->date]
-        );
+        $date = Carbon::parse($this->date)->format('Y-m-d');
+
+        $query->whereDate("$this->table.{$this->column->value}", '<=', $date);
     }
 }