[Bug] Fix InfluxDB Data Export & Add Test / Export History jobs

app/Actions/InfluxDBv2/SendAllResultsToInfluxDB.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Actions\InfluxDBv2;
+
+use App\Jobs\InfluxDBv2\WriteSpeedtestResult;
+use App\Models\Result;
+use App\Settings\DataIntegrationSettings;
+use Filament\Notifications\Notification;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class SendAllResultsToInfluxDB
+{
+    use AsAction;
+
+    /**
+     * Execute the action.
+     */
+    public function handle(): void
+    {
+        // Resolve the settings within the action
+        $settings = app(DataIntegrationSettings::class);
+
+        // Get the count of all Result records
+        $totalResults = Result::count();
+
+        if ($totalResults === 0) {
+            // Notify that there are no results to export
+            Notification::make()
+                ->title('No Results to Export')
+                ->body('There are no speed test results available to send to InfluxDB.')
+                ->warning()
+                ->send();
+
+            return;
+        }
+
+        // Notify that the export is starting
+        Notification::make()
+            ->title('Export Started')
+            ->body("Found {$totalResults} results to be sent to InfluxDB. Export process has started.")
+            ->info()
+            ->send();
+
+        // Fetch all results
+        $results = Result::all();
+
+        // Dispatch the job for each result
+        foreach ($results as $result) {
+            WriteSpeedtestResult::dispatch($result);
+        }
+    }
+}

app/Actions/InfluxDBv2/TestInfluxDB.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Actions\InfluxDBv2;
+
+use App\Jobs\InfluxDBv2\WriteSpeedtestResult;
+use App\Models\Result;
+use App\Settings\DataIntegrationSettings;
+use Filament\Notifications\Notification;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class TestInfluxDB
+{
+    use AsAction;
+
+    /**
+     * Execute the action.
+     */
+    public function handle(): void
+    {
+        // Resolve the settings within the action
+        $settings = app(DataIntegrationSettings::class);
+
+        $influxdb = [
+            'enabled' => $settings->influxdb_v2_enabled,
+            'url' => $settings?->influxdb_v2_url,
+            'org' => $settings?->influxdb_v2_org,
+            'bucket' => $settings?->influxdb_v2_bucket,
+            'token' => $settings?->influxdb_v2_token,
+        ];
+
+        if ($influxdb['enabled'] == true) {
+            // Create a test result if InfluxDB is enabled
+            $result = Result::factory()->create();
+
+            // Dispatch the job to write the result to InfluxDB
+            dispatch(new WriteSpeedtestResult($result, $settings));
+        }
+
+        // Optional: Notification
+        Notification::make()
+            ->title('Success')
+            ->body('A test log has been sent to InfluxDB. Check if the data is received!')
+            ->success()
+            ->send();
+    }
+}

app/Enums/ResultService.php

@@ -8,6 +8,7 @@
 enum ResultService: string implements HasLabel
 {
     case Ookla = 'ookla';
+    case faker = 'faker';
 
     public function getLabel(): ?string
     {

app/Filament/Pages/Settings/InfluxDbPage.php → app/Filament/Pages/Settings/DataIntegrationPage.php

@@ -2,24 +2,26 @@
 
 namespace App\Filament\Pages\Settings;
 
-use App\Settings\InfluxDbSettings;
+use App\Actions\InfluxDBv2\SendAllResultsToInfluxDB;
+use App\Actions\InfluxDBv2\TestInfluxDB;
+use App\Settings\DataIntegrationSettings;
 use Filament\Forms;
 use Filament\Forms\Form;
 use Filament\Pages\SettingsPage;
 
-class InfluxDbPage extends SettingsPage
+class DataIntegrationPage extends SettingsPage
 {
     protected static ?string $navigationIcon = 'heroicon-o-circle-stack';
 
     protected static ?string $navigationGroup = 'Settings';
 
     protected static ?int $navigationSort = 2;
 
-    protected static ?string $title = 'InfluxDB';
+    protected static ?string $title = 'Data Integration';
 
-    protected static ?string $navigationLabel = 'InfluxDB';
+    protected static ?string $navigationLabel = 'Data Integration';
 
-    protected static string $settings = InfluxDbSettings::class;
+    protected static string $settings = DataIntegrationSettings::class;
 
     public static function canAccess(): bool
     {
@@ -37,56 +39,72 @@ public function form(Form $form): Form
             ->schema([
                 Forms\Components\Grid::make([
                     'default' => 1,
+                    'md' => 3,
                 ])
                     ->schema([
-                        Forms\Components\Section::make('InfluxDB v2 Settings')
+                        Forms\Components\Section::make('InfluxDB v2')
+                            ->description('When enabled, all new Speedtest results will also be sent to InfluxDB.')
                             ->schema([
-                                Forms\Components\Toggle::make('v2_enabled')
+                                Forms\Components\Toggle::make('influxdb_v2_enabled')
                                     ->label('Enable')
                                     ->reactive()
-                                    ->columnSpan(2),
-                                Forms\Components\Grid::make([
-                                    'default' => 1,
-                                    'md' => 3,
-                                ])
-                                    ->hidden(fn (Forms\Get $get) => $get('v2_enabled') !== true)
+                                    ->columnSpanFull(),
+                                Forms\Components\Grid::make(['default' => 1, 'md' => 3])
+                                    ->hidden(fn (Forms\Get $get) => $get('influxdb_v2_enabled') !== true)
                                     ->schema([
-                                        Forms\Components\TextInput::make('v2_url')
+                                        Forms\Components\TextInput::make('influxdb_v2_url')
                                             ->label('URL')
                                             ->placeholder('http://your-influxdb-instance')
                                             ->maxLength(255)
-                                            ->required(fn (Forms\Get $get) => $get('v2_enabled') == true)
-                                            ->columnSpanFull(),
-                                        Forms\Components\Checkbox::make('v2_verify_ssl')
-                                            ->label('Verify SSL')
-                                            ->columnSpanFull(),
-                                        Forms\Components\TextInput::make('v2_org')
+                                            ->required(fn (Forms\Get $get) => $get('influxdb_v2_enabled') === true)
+                                            ->columnSpan(['md' => 1]),
+                                        Forms\Components\TextInput::make('influxdb_v2_org')
                                             ->label('Org')
                                             ->maxLength(255)
-                                            ->required(fn (Forms\Get $get) => $get('v2_enabled') == true)
-                                            ->columnSpan(['md' => 2]),
-                                        Forms\Components\TextInput::make('v2_bucket')
+                                            ->required(fn (Forms\Get $get) => $get('influxdb_v2_enabled') === true)
+                                            ->columnSpan(['md' => 1]),
+                                        Forms\Components\TextInput::make('influxdb_v2_bucket')
                                             ->placeholder('speedtest-tracker')
                                             ->label('Bucket')
                                             ->maxLength(255)
-                                            ->required(fn (Forms\Get $get) => $get('v2_enabled') == true)
-                                            ->columnSpan(['md' => 1]),
-                                        Forms\Components\TextInput::make('v2_token')
+                                            ->required(fn (Forms\Get $get) => $get('influxdb_v2_enabled') === true)
+                                            ->columnSpan(['md' => 2]),
+                                        Forms\Components\TextInput::make('influxdb_v2_token')
                                             ->label('Token')
                                             ->maxLength(255)
                                             ->password()
-                                            ->required(fn (Forms\Get $get) => $get('v2_enabled') == true)
+                                            ->required(fn (Forms\Get $get) => $get('influxdb_v2_enabled') === true)
                                             ->disableAutocomplete()
+                                            ->columnSpan(['md' => 2]),
+                                        Forms\Components\Checkbox::make('influxdb_v2_verify_ssl')
+                                            ->label('Verify SSL')
                                             ->columnSpanFull(),
+                                        // Button to send old data to InfluxDB
+                                        Forms\Components\Actions::make([
+                                            Forms\Components\Actions\Action::make('Export current results')
+                                                ->label('Export current results')
+                                                ->action(fn () => app(SendAllResultsToInfluxDB::class)->handle())
+                                                ->color('primary')
+                                                ->icon('heroicon-o-cloud-arrow-up')
+                                                ->visible(fn (): bool => app(DataIntegrationSettings::class)->influxdb_v2_enabled),
+                                        ]),
+                                        // Button to test InfluxDB connection
+                                        Forms\Components\Actions::make([
+                                            Forms\Components\Actions\Action::make('Test InfluxDB connection')
+                                                ->label('Test InfluxDB connection')
+                                                ->action(fn () => app(TestInfluxDB::class)->handle())
+                                                ->color('primary')
+                                                ->icon('heroicon-o-check-circle')
+                                                ->visible(fn (): bool => app(DataIntegrationSettings::class)->influxdb_v2_enabled),
+                                        ]),
                                     ]),
                             ])
                             ->compact()
                             ->columns([
                                 'default' => 1,
                                 'md' => 2,
                             ]),
-                    ])
-                    ->columnSpan('full'),
+                    ]),
             ]);
     }
 }