Merge pull request #80 from govigilant/develop

Fix bug in outpost observer and uptime result aggregates

Author: VincentBean

packages/uptime/src/Actions/AggregateResults.php

@@ -13,31 +13,33 @@ public function aggregate(Monitor $monitor): void
     {
         $results = $monitor
             ->results()
-            ->select(['id', 'country'])
+            ->select(['id', 'country', 'created_at'])
             ->where('created_at', '<', now()->subHour())
             ->get();
 
         $groupedByCountry = $results->groupBy('country');
 
         foreach ($groupedByCountry as $country => $countryResults) {
-            $resultChunks = $countryResults->chunk(60);
+            $groupedByHour = $countryResults->groupBy(function ($result) {
+                return $result->created_at->startOfHour()->toDateTimeString();
+            });
 
-            /** @var Collection $chunk */
-            foreach ($resultChunks as $chunk) {
-                $ids = $chunk->pluck('id');
+            foreach ($groupedByHour as $hour => $hourResults) {
+                $ids = $hourResults->pluck('id')->toArray();
 
-                $query = Result::query()
-                    ->whereIn('id', $ids);
+                $averageTotalTime = Result::query()
+                    ->whereIn('id', $ids)
+                    ->average('total_time');
 
                 ResultAggregate::query()->create([
                     'monitor_id' => $monitor->id,
-                    'total_time' => $query->average('total_time'),
+                    'total_time' => $averageTotalTime,
                     'country' => $country,
-                    'created_at' => now()->subHour(),
-                    'updated_at' => now()->subHour(),
+                    'created_at' => $hour,
+                    'updated_at' => $hour,
                 ]);
 
-                $query->delete();
+                Result::query()->whereIn('id', $ids)->delete();
             }
         }
     }

packages/uptime/src/Observers/OutpostObserver.php

@@ -13,6 +13,7 @@ public function updated(Outpost $outpost): void
         // If outpost becomes unavailable, clear it from monitors using it as closest outpost
         if ($outpost->status === OutpostStatus::Unavailable) {
             Monitor::query()
+                ->withoutGlobalScopes()
                 ->where('closest_outpost_id', $outpost->id)
                 ->update(['closest_outpost_id' => null]);
 
@@ -27,6 +28,7 @@ public function deleted(Outpost $outpost): void
     {
         // Clear the closest_outpost_id for monitors using this outpost
         Monitor::query()
+            ->withoutGlobalScopes()
             ->where('closest_outpost_id', $outpost->id)
             ->update(['closest_outpost_id' => null]);
     }