PredefinedFilter fix

Author: Klausw-1

app/Models/PredefinedFilter.php

@@ -124,48 +124,32 @@ protected function applyLikeFilter(Builder $assets, array $filter, string $key,
         }
     }
 
-    public function applyDateRangeFilter($query, array $filters, string $qualifiedField)
+    protected function applyDateRangeFilter(Builder $assets, array $filter, string $field): void
     {
-        $start = null;
-        $end   = null;
+        $startKey = $field . '_start';
+        $endKey   = $field . '_end';
 
-        $fieldNameOnly = Str::afterLast($qualifiedField, '.');
+        $start = $filter[$startKey] ?? null;
+        $end   = $filter[$endKey] ?? null;
 
-        foreach ($filters as $filter) {
-            if (!isset($filter['field'], $filter['value']) || !is_array($filter['value'])) {
-                continue;
-            }
-
-            if ($filter['field'] !== $fieldNameOnly) {
-                continue;
-            }
-
-            if (isset($filter['value']['startDate'])) {
-                $start = $filter['value']['startDate'] ?: null;
-            }
 
-            if (isset($filter['value']['endDate'])) {
-                $end = $filter['value']['endDate'] ?: null;
-            }
+        if (!$start && !$end) {
+            return;
         }
 
-        if ($start || $end) {
-            $query->whereNotNull($qualifiedField);
-        }
+        $table  = $assets->getModel()->getTable();
+        $column = $table . '.' . $field;
 
-        if (!empty($start)) {
-            $query->whereDate($qualifiedField, '>=', $start);
+        if ($start) {
+            $assets->whereDate($column, '>=', $start);
         }
 
-        if (!empty($end)) {
-            $query->whereDate($qualifiedField, '<=', $end);
+        if ($end) {
+            $assets->whereDate($column, '<=', $end);
         }
-
-        return $query;
     }
 
 
-
     public function filterAssets(Builder $assets)
     {
         $filter = $this->filter_data ?? [];
@@ -183,15 +167,15 @@ public function filterAssets(Builder $assets)
             $this->applyArrayOrScalarFilter($assets, $filter, 'manufacturer_id', 'models.manufacturer_id');
         }
 
-        $this->applyDateRangeFilter($assets, $filter, 'assets.created_at');
-        $this->applyDateRangeFilter($assets, $filter, 'assets.purchase_date');
-        $this->applyDateRangeFilter($assets, $filter, 'assets.last_checkout');
-        $this->applyDateRangeFilter($assets, $filter, 'assets.last_checkin');
-        $this->applyDateRangeFilter($assets, $filter, 'assets.expected_checkin');
-        $this->applyDateRangeFilter($assets, $filter, 'assets.asset_eol_date');
-        $this->applyDateRangeFilter($assets, $filter, 'assets.last_audit_date');
-        $this->applyDateRangeFilter($assets, $filter, 'assets.next_audit_date');
-        $this->applyDateRangeFilter($assets, $filter, 'assets.updated_at');
+        $this->applyDateRangeFilter($assets, $filter, 'created_at');
+        $this->applyDateRangeFilter($assets, $filter, 'purchase_date');
+        $this->applyDateRangeFilter($assets, $filter, 'last_checkout');
+        $this->applyDateRangeFilter($assets, $filter, 'last_checkin');
+        $this->applyDateRangeFilter($assets, $filter, 'expected_checkin');
+        $this->applyDateRangeFilter($assets, $filter, 'asset_eol_date');
+        $this->applyDateRangeFilter($assets, $filter, 'last_audit_date');
+        $this->applyDateRangeFilter($assets, $filter, 'next_audit_date');
+        $this->applyDateRangeFilter($assets, $filter, 'updated_at');
 
         $this->applyLikeFilter($assets, $filter, 'name', 'assets.name');
         $this->applyLikeFilter($assets, $filter, 'asset_tag', 'assets.asset_tag');

tests/Unit/Models/PredefinedFilter/PredefinedFilterFilterAssetsTest.php

@@ -356,16 +356,16 @@ public function it_filters_by_created_at_date_range_insclusive()
     {
         $user = User::factory()->create();
 
-        $in = Asset::factory()->create(['created_at' => '2025-01-15']);
+        $in   = Asset::factory()->create(['created_at' => '2025-01-15']);
         $out1 = Asset::factory()->create(['created_at' => '2024-12-31']);
         $out2 = Asset::factory()->create(['created_at' => '2025-02-01']);
 
         $filter = PredefinedFilter::create([
-            'name'  =>  'filter_by_date',
+            'name'       => 'filter_by_date',
             'created_by' => $user->id,
-            'filter_data' => [
+            'filter_data'=> [
                 'created_at_start' => '2025-01-01',
-                'created_at_end' => '2025-01-31',        
+                'created_at_end'   => '2025-01-31',
             ],
         ]);