Servers - Carbon::now() is better than Carbon:today() because both th…

…e current date and time are set.
computablefacts · May 30, 2024 · ae88170 · ae88170
1 parent 6561c65
commit ae88170
Showing 1 changed file with 9 additions and 17 deletions.
diff --git a/app/Models/YnhServer.php b/app/Models/YnhServer.php
@@ -156,16 +156,12 @@ public function status(): ServerStatusEnum
         }
 
         // Check if status is running
-        $minDate = Carbon::today()->subMinutes(10);
+        $minDate = Carbon::now()->subMinutes(10);
         $isRunning = collect(DB::select("
-            SELECT CASE WHEN MAX(id) IS NULL THEN 0 ELSE 1 END AS count
-            FROM ynh_osquery
-            WHERE id IN (
-                SELECT MAX(id) AS id
-                FROM ynh_osquery
-                WHERE ynh_server_id = {$this->id}
-            )
-            AND calendar_time >= '{$minDate->toDateTimeString()}'
+          SELECT COUNT(id) AS count
+          FROM ynh_osquery
+          WHERE ynh_server_id = {$this->id}
+          AND calendar_time >= '{$minDate->toDateTimeString()}'
         "))->first();
 
         if ($isRunning->count > 0) {
@@ -176,14 +172,10 @@ public function status(): ServerStatusEnum
         // Check if status is unknown
         $minDate = $minDate->subMinutes(10);
         $isUnknown = collect(DB::select("
-            SELECT CASE WHEN MAX(id) IS NULL THEN 0 ELSE 1 END AS count
-            FROM ynh_osquery
-            WHERE id IN (
-                SELECT MAX(id) AS id
-                FROM ynh_osquery
-                WHERE ynh_server_id = {$this->id}
-            )
-            AND calendar_time >= '{$minDate->toDateTimeString()}'
+          SELECT COUNT(id) AS count
+          FROM ynh_osquery
+          WHERE ynh_server_id = {$this->id}
+          AND calendar_time >= '{$minDate->toDateTimeString()}'
         "))->first();
 
         if ($isUnknown->count > 0) {