fixed chart query date filter (alexjustesen#223)

Author: alexjustesen

app/Filament/Widgets/RecentJitterChart.php

@@ -12,6 +12,8 @@ class RecentJitterChart extends LineChartWidget
 
     protected static ?string $maxHeight = '300px';
 
+    public ?string $filter = '24h';
+
     protected function getHeading(): string
     {
         return 'Jitter (ms)';
@@ -20,44 +22,27 @@ protected function getHeading(): string
     protected function getFilters(): ?array
     {
         return [
-            'today' => 'Today',
+            '24h' => 'Last 24h',
             'week' => 'Last week',
             'month' => 'Last month',
         ];
     }
 
     protected function getData(): array
     {
-        $range = [];
-
         $settings = new GeneralSettings();
 
-        switch ($this->filter) {
-            case 'today':
-                $range = [
-                    ['created_at', '>=', now()->startOfDay()],
-                    ['created_at', '<=', now()],
-                ];
-                break;
-
-            case 'week':
-                $range = [
-                    ['created_at', '>=', now()->subWeek()],
-                    ['created_at', '<=', now()],
-                ];
-                break;
-
-            case 'month':
-                $range = [
-                    ['created_at', '>=', now()->subMonth()],
-                    ['created_at', '<=', now()],
-                ];
-                break;
-        }
-
         $results = Result::query()
             ->select(['data', 'created_at'])
-            ->where($range)
+            ->when($this->filter == '24h', function ($query) {
+                $query->where('created_at', '>=', now()->subDay());
+            })
+            ->when($this->filter == 'week', function ($query) {
+                $query->where('created_at', '>=', now()->subWeek());
+            })
+            ->when($this->filter == 'month', function ($query) {
+                $query->where('created_at', '>=', now()->subMonth());
+            })
             ->get();
 
         return [

app/Filament/Widgets/RecentPingChart.php

@@ -12,6 +12,8 @@ class RecentPingChart extends LineChartWidget
 
     protected static ?string $maxHeight = '300px';
 
+    public ?string $filter = '24h';
+
     protected function getHeading(): string
     {
         return 'Ping (ms)';
@@ -20,44 +22,27 @@ protected function getHeading(): string
     protected function getFilters(): ?array
     {
         return [
-            'today' => 'Today',
+            '24h' => 'Last 24h',
             'week' => 'Last week',
             'month' => 'Last month',
         ];
     }
 
     protected function getData(): array
     {
-        $range = [];
-
         $settings = new GeneralSettings();
 
-        switch ($this->filter) {
-            case 'today':
-                $range = [
-                    ['created_at', '>=', now()->startOfDay()],
-                    ['created_at', '<=', now()],
-                ];
-                break;
-
-            case 'week':
-                $range = [
-                    ['created_at', '>=', now()->subWeek()],
-                    ['created_at', '<=', now()],
-                ];
-                break;
-
-            case 'month':
-                $range = [
-                    ['created_at', '>=', now()->subMonth()],
-                    ['created_at', '<=', now()],
-                ];
-                break;
-        }
-
         $results = Result::query()
             ->select(['ping', 'created_at'])
-            ->where($range)
+            ->when($this->filter == '24h', function ($query) {
+                $query->where('created_at', '>=', now()->subDay());
+            })
+            ->when($this->filter == 'week', function ($query) {
+                $query->where('created_at', '>=', now()->subWeek());
+            })
+            ->when($this->filter == 'month', function ($query) {
+                $query->where('created_at', '>=', now()->subMonth());
+            })
             ->get();
 
         return [

app/Filament/Widgets/RecentSpeedChart.php

@@ -12,6 +12,8 @@ class RecentSpeedChart extends LineChartWidget
 
     protected static ?string $maxHeight = '300px';
 
+    public ?string $filter = '24h';
+
     protected function getHeading(): string
     {
         return 'Download / Upload (mbps)';
@@ -20,44 +22,27 @@ protected function getHeading(): string
     protected function getFilters(): ?array
     {
         return [
-            'today' => 'Today',
+            '24h' => 'Last 24h',
             'week' => 'Last week',
             'month' => 'Last month',
         ];
     }
 
     protected function getData(): array
     {
-        $range = [];
-
         $settings = new GeneralSettings();
 
-        switch ($this->filter) {
-            case 'today':
-                $range = [
-                    ['created_at', '>=', now()->startOfDay()],
-                    ['created_at', '<=', now()],
-                ];
-                break;
-
-            case 'week':
-                $range = [
-                    ['created_at', '>=', now()->subWeek()],
-                    ['created_at', '<=', now()],
-                ];
-                break;
-
-            case 'month':
-                $range = [
-                    ['created_at', '>=', now()->subMonth()],
-                    ['created_at', '<=', now()],
-                ];
-                break;
-        }
-
         $results = Result::query()
-            ->select(['download', 'upload', 'created_at'])
-            ->where($range)
+            ->select(['id', 'download', 'upload', 'created_at'])
+            ->when($this->filter == '24h', function ($query) {
+                $query->where('created_at', '>=', now()->subDay());
+            })
+            ->when($this->filter == 'week', function ($query) {
+                $query->where('created_at', '>=', now()->subWeek());
+            })
+            ->when($this->filter == 'month', function ($query) {
+                $query->where('created_at', '>=', now()->subMonth());
+            })
             ->get();
 
         return [