Outage handle additional filtering cases (librenms#18562)

when selecting current, only open outages that start in the range should be selected.
when selecting previous, only outages that both start and end in the range should be selected
when selecting all, include anything that overlaps with the given time range.

Author: murrant

app/Http/Controllers/Table/OutagesController.php

@@ -74,30 +74,42 @@ public function baseQuery(Request $request): Builder
             ->whereHas('device', function ($query): void {
                 $query->where('disabled', 0);
             })
-            ->when($from_ts || $to_ts, function ($query) use ($from_ts, $to_ts): void {
-                $query->where(function ($q) use ($from_ts, $to_ts): void {
-                    // Outage starts within range
-                    $this->applyDateRangeCondition($q, 'going_down', $from_ts, $to_ts);
-
-                    // OR outage ends within range (if it has ended)
-                    $q->orWhere(function ($subQuery) use ($from_ts, $to_ts): void {
-                        $subQuery->whereNotNull('up_again');
-                        $this->applyDateRangeCondition($subQuery, 'up_again', $from_ts, $to_ts);
+            ->when($from_ts || $to_ts, function ($query) use ($request, $from_ts, $to_ts): void {
+                if ($request->status === 'current') {
+                    // Current outages: only filter by start date within range
+                    $this->applyDateRangeCondition($query, 'going_down', $from_ts, $to_ts);
+                } elseif ($request->status === 'previous') {
+                    // Previous outages: both start AND end must be within range
+                    $query->where(function ($q) use ($from_ts, $to_ts): void {
+                        $this->applyDateRangeCondition($q, 'going_down', $from_ts, $to_ts);
+                        $this->applyDateRangeCondition($q, 'up_again', $from_ts, $to_ts);
                     });
-
-                    // OR outage spans the entire range (started before, still ongoing or ended after)
-                    $q->orWhere(function ($subQuery) use ($from_ts, $to_ts): void {
-                        if ($from_ts) {
-                            $subQuery->where('going_down', '<', $from_ts);
-                        }
-                        if ($to_ts) {
-                            $subQuery->where(function ($q) use ($to_ts): void {
-                                $q->whereNotNull('up_again') // Still ongoing
-                                ->orWhere('up_again', '>', $to_ts); // Ended after range
-                            });
-                        }
+                } else {
+                    // All outages: use original logic (any overlap with range)
+                    $query->where(function ($q) use ($from_ts, $to_ts): void {
+                        // Outage starts within range
+                        $this->applyDateRangeCondition($q, 'going_down', $from_ts, $to_ts);
+
+                        // OR outage ends within range (if it has ended)
+                        $q->orWhere(function ($subQuery) use ($from_ts, $to_ts): void {
+                            $subQuery->whereNotNull('up_again');
+                            $this->applyDateRangeCondition($subQuery, 'up_again', $from_ts, $to_ts);
+                        });
+
+                        // OR outage spans the entire range (started before, still ongoing or ended after)
+                        $q->orWhere(function ($subQuery) use ($from_ts, $to_ts): void {
+                            if ($from_ts) {
+                                $subQuery->where('going_down', '<', $from_ts);
+                            }
+                            if ($to_ts) {
+                                $subQuery->where(function ($q) use ($to_ts): void {
+                                    $q->whereNull('up_again') // Still ongoing
+                                    ->orWhere('up_again', '>', $to_ts); // Ended after range
+                                });
+                            }
+                        });
                     });
-                });
+                }
             })
             ->when($request->status === 'current', function ($query): void {
                 $query->whereNull('up_again');