fix: filtering by date field in laravel 10+

tailflow · Mar 30, 2024 · 0c94107 · 0c94107
1 parent 36b4e6e
commit 0c94107
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/Drivers/Standard/QueryBuilder.php b/src/Drivers/Standard/QueryBuilder.php
@@ -4,6 +4,7 @@
 
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\Relations\Relation;
@@ -194,8 +195,17 @@ protected function buildFilterNestedQueryWhereClause(
         $query,
         bool $or = false
     ) {
+        /** @var Model $resourceModel */
+        $resourceModel = (new $this->resourceModelClass);
+
+        $dateCasts = collect($resourceModel->getCasts())->filter(function(string $type) {
+            return in_array($type, ['date', 'datetime']);
+        })->keys()->toArray();
+
+        $dateFields = array_merge($resourceModel->getDates(), $dateCasts);
+
         $treatAsDateField = $filterDescriptor['value'] !== null &&
-            in_array($filterDescriptor['field'], (new $this->resourceModelClass)->getDates(), true);
+            in_array($filterDescriptor['field'], $dateFields , true);
 
         if ($treatAsDateField && Carbon::parse($filterDescriptor['value'])->toTimeString() === '00:00:00') {
             $constraint = 'whereDate';

diff --git a/tests/Fixtures/app/Models/Post.php b/tests/Fixtures/app/Models/Post.php
@@ -31,6 +31,7 @@ class Post extends Model
         'meta' => 'array',
         'options' => 'array',
         'stars' => 'float',
+        'publish_at' => 'datetime',
     ];
 
     /**