Fix status query

cachethq · Jan 22, 2024 · 644192d · 644192d
1 parent f5911ec
commit 644192d
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/Status.php b/src/Status.php
@@ -85,19 +85,19 @@ public function incidents()
         return $this->incidents ??= Incident::query()
             ->toBase()
             ->selectRaw('count(*) as total')
-            ->selectRaw('sum(case when ? in (latest_incident_updates.status, incidents.status) then 1 else 0 end) as resolved', [IncidentStatusEnum::fixed])
-            ->selectRaw('sum(case when ? not in (latest_incident_updates.status, incidents.status) then 1 else 0 end) as unresolved', [IncidentStatusEnum::fixed])
+            ->selectRaw('sum(case when ? in (incidents.status, latest_update.status) then 1 else 0 end) as resolved', [IncidentStatusEnum::fixed])
+            ->selectRaw('sum(case when ? not in (incidents.status, latest_update.status) then 1 else 0 end) as unresolved', [IncidentStatusEnum::fixed])
             ->joinSub(function (Builder $query) {
                 $query
-                    ->select('latest_updates.incident_id', 'latest_updates.status', 'latest_updates.latest_update_id')
-                    ->from('incident_updates')
+                    ->select('iu1.incident_id', 'iu1.status')
+                    ->from('incident_updates', 'iu1')
                     ->joinSub(function (Builder $query) {
-                        $query->select('incident_id', 'status')
-                            ->selectRaw('max(id) as latest_update_id')
+                        $query->select('incident_id')
+                            ->selectRaw('max(id) as max_id')
                             ->from('incident_updates')
                             ->groupBy('incident_id');
-                    }, 'latest_updates', 'latest_updates.incident_id', '=', 'incident_updates.incident_id');
-            }, 'latest_incident_updates', 'latest_incident_updates.incident_id', '=', 'incidents.id')
+                    }, 'iu2', 'iu1.id', '=', 'iu2.max_id');
+            }, 'latest_update', 'latest_update.incident_id', '=', 'incidents.id')
             ->first();
     }
 }