Improve incident timestamps

Author: jbrooksuk

resources/views/components/incident.blade.php

@@ -14,7 +14,7 @@
                     <h3 class="text-base md:text-xl break-words font-semibold">
                         <a href="{{ route('cachet.status-page.incident', $incident) }}">{{ $incident->name}}</a>
                     </h3>
-                    <span class="text-xs text-zinc-500">{{ $incident->occurred_at->diffForHumans() }} — {{ $incident->occurred_at->toDayDateTimeString() }}</span>
+                    <span class="text-xs text-zinc-500">{{ $incident->timestamp->diffForHumans() }} — {{ $incident->timestamp->toDayDateTimeString() }}</span>
                 </div>
                 <div>
                     <x-cachet::incident-badge :type="$incident->status" />

resources/views/status-page/incident.blade.php

@@ -8,7 +8,7 @@
 
         <div class="flex flex-col gap-6">
             <div class="flex flex-col gap-14 w-full">
-                <x-cachet::incident :date="$incident->occurred_at" :incidents="[$incident]" />
+                <x-cachet::incident :date="$incident->timestamp" :incidents="[$incident]" />
             </div>
         </div>
     </div>

src/Models/Incident.php

@@ -8,6 +8,7 @@
 use Cachet\Events\Incidents\IncidentDeleted;
 use Cachet\Events\Incidents\IncidentUpdated;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -103,6 +104,11 @@ public function scopeStickied(Builder $query): Builder
         return $query->where('stickied', true);
     }
 
+    public function timestamp(): Attribute
+    {
+        return Attribute::get(fn () => $this->occurred_at ?: $this->created_at);
+    }
+
     /**
      * Render the Markdown message.
      */

src/View/Components/Incidents.php

@@ -5,6 +5,7 @@
 use Cachet\Models\Incident;
 use Cachet\Settings\AppSettings;
 use Illuminate\Contracts\View\View;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
 use Illuminate\View\Component;
@@ -44,13 +45,21 @@ private function incidents(Carbon $startDate, Carbon $endDate, bool $onlyDisrupt
                 'incidentUpdates' => fn ($query) => $query->orderByDesc('created_at'),
             ])
             ->where('visible', '>=', ! auth()->check())
-            ->whereBetween('occurred_at', [
-                $endDate->startOfDay()->toDateTimeString(),
-                $startDate->endofDay()->toDateTimeString(),
-            ])
+            ->where(function (Builder $query) use ($endDate, $startDate) {
+                $query->whereBetween('occurred_at', [
+                    $endDate->startOfDay()->toDateTimeString(),
+                    $startDate->endofDay()->toDateTimeString(),
+                ])->orWhere(function (Builder $query) use ($endDate, $startDate) {
+                    $query->whereNull('occurred_at')->whereBetween('created_at', [
+                        $endDate->startOfDay()->toDateTimeString(),
+                        $startDate->endofDay()->toDateTimeString(),
+                    ]);
+                });
+            })
             ->orderBy('occurred_at', 'desc')
+            ->orderBy('created_at', 'desc')
             ->get()
-            ->groupBy(fn (Incident $incident) => $incident->occurred_at?->toDateString())
+            ->groupBy(fn (Incident $incident) => $incident->timestamp->toDateString())
             ->union(
                 // Back-fill any missing dates...
                 collect($endDate->toPeriod($startDate))