[Chore] Only skip scheduled tests (#1803)

only skip scheduled tests
alexjustesen · Nov 21, 2024 · 6c01aad · 6c01aad
1 parent 073ffe7
commit 6c01aad
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/app/Actions/Speedtests/RunOoklaSpeedtest.php b/app/Actions/Speedtests/RunOoklaSpeedtest.php
@@ -22,6 +22,6 @@ public function handle(?int $serverId = null, bool $scheduled = false): void
 
         SpeedtestStarted::dispatch($result);
 
-        ExecuteOoklaSpeedtest::dispatch(result: $result, serverId: $serverId);
+        ExecuteOoklaSpeedtest::dispatch(result: $result, serverId: $serverId, scheduled: $scheduled);
     }
 }
diff --git a/app/Jobs/Speedtests/ExecuteOoklaSpeedtest.php b/app/Jobs/Speedtests/ExecuteOoklaSpeedtest.php
@@ -37,6 +37,7 @@ class ExecuteOoklaSpeedtest implements ShouldBeUnique, ShouldQueue
     public function __construct(
         public Result $result,
         public ?int $serverId = null,
+        public bool $scheduled = false,
     ) {}
 
     /**
@@ -48,17 +49,19 @@ public function handle(): void
             return;
         }
 
-        $externalIp = GetExternalIpAddress::run();
+        if ($this->scheduled) {
+            $externalIp = GetExternalIpAddress::run();
 
-        $shouldSkip = $this->shouldSkip($externalIp);
+            $shouldSkip = $this->shouldSkip($externalIp);
 
-        if ($shouldSkip !== false) {
-            $this->markAsSkipped(
-                message: $shouldSkip,
-                externalIp: $externalIp,
-            );
+            if ($shouldSkip !== false) {
+                $this->markAsSkipped(
+                    message: $shouldSkip,
+                    externalIp: $externalIp,
+                );
 
-            return;
+                return;
+            }
         }
 
         // Execute Speedtest