Merge pull request #3 from cinderblockgames/streamline

Simplifying

Author: cinderblockgames

app/Actions/GetLatestSpeedtestData.php

@@ -2,27 +2,23 @@
 
 namespace App\Http\Controllers;
 
-use App\Actions\GetLatestSpeedtestData;
-use App\Actions\QueueSpeedtest;
-use App\Jobs\SpeedtestJob;
+use App\Helpers\SpeedtestHelper;
 use App\Models\Speedtest;
-use Carbon\Carbon;
-use Exception;
 use Illuminate\Http\Request;
 use Illuminate\Http\JsonResponse;
 
 class SpeedtestController extends Controller
 {
-  
+
     /**
      * Return latest speedtest
      *
      * @return  JsonResponse
      */
     public function latest()
     {
-        $data = run(GetLatestSpeedtestData::class);
-        
+        $data = SpeedtestController::getData();
+
         if ($data['data']) {
             return response()->json($data, 200);
         } else {
@@ -34,25 +30,27 @@ public function latest()
     }
 
     /**
-     * Queue a new speedtest
+     * Return latest speedtest
      *
-     * @return JsonResponse
+     * @return mixed
      */
-    public function run()
+    private function getData()
     {
-        try {
-            run(QueueSpeedtest::class);
+        $data = SpeedtestHelper::latest();
 
-            return response()->json([
-                'method' => 'run speedtest',
-                'data' => 'a new speedtest has been added to the queue'
-            ], 200);
-        } catch (Exception $e) {
-            return response()->json([
-                'method' => 'run speedtest',
-                'error' => $e
-            ], 500);
+        // Homepage expects this to in Mbps.  This calculation matches the results shown in the UI.
+        if ($data['download']) {
+            $data['download'] /= 125000;
+        }
+        if ($data['upload']) {
+            $data['upload'] /= 125000;
         }
+
+        $response = [
+            'data' => $data,
+        ];
+
+        return $response;
     }
 
 }

app/Http/Controllers/SpeedtestController.php

@@ -12,7 +12,6 @@
         "filament/filament": "^2.0",
         "filament/spatie-laravel-settings-plugin": "^2.0",
         "guzzlehttp/guzzle": "^7.2",
-        "henrywhitaker3/laravel-actions": "^1.0",
         "influxdata/influxdb-client-php": "^2.9",
         "laravel-notification-channels/telegram": "^3.0",
         "laravel/framework": "^9.19",