Only alter status from incidents if they aren't resolved (#232)

Author: icecoldPHP

src/Models/Component.php

@@ -135,7 +135,7 @@ public function scopeOutage(Builder $query): void
      */
     public function latestStatus(): Attribute
     {
-        return Attribute::get(fn () => $this->incidents()->latest()->first()?->pivot->component_status ?? $this->status);
+        return Attribute::get(fn () => $this->incidents()->unresolved()->latest()->first()?->pivot->component_status ?? $this->status);
     }
 
     /**

src/Status.php

@@ -80,8 +80,8 @@ public function incidents(): object
         return $this->incidents ??= Incident::query()
             ->toBase()
             ->selectRaw('count(*) as total')
-            ->selectRaw('sum(case when ? in (incidents.status, latest_update.status) then 1 else 0 end) as resolved', [IncidentStatusEnum::fixed->value])
-            ->selectRaw('sum(case when ? not in (incidents.status, latest_update.status) then 1 else 0 end) as unresolved', [IncidentStatusEnum::fixed->value])
+            ->selectRaw('sum(case when ? in (incidents.status, coalesce(latest_update.status, ?)) then 1 else 0 end) as resolved', [IncidentStatusEnum::fixed->value, ''])
+            ->selectRaw('sum(case when ? not in (incidents.status, coalesce(latest_update.status, ?)) then 1 else 0 end) as unresolved', [IncidentStatusEnum::fixed->value, ''])
             ->joinSub(function (Builder $query) {
                 $query
                     ->select('iu1.updateable_id', 'iu1.status')
@@ -92,8 +92,8 @@ public function incidents(): object
                             ->from('updates')
                             ->where('updates.updateable_type', Relation::getMorphAlias(Incident::class))
                             ->groupBy('updateable_id');
-                    }, 'iu2', 'iu1.id', '=', 'iu2.max_id');
-            }, 'latest_update', 'latest_update.updateable_id', '=', 'incidents.id')
+                    }, 'iu2', 'iu1.id', '=', 'iu2.max_id', 'left');
+            }, 'latest_update', 'latest_update.updateable_id', '=', 'incidents.id', 'left')
             ->first();
     }
 }