Update to support upstream weatherfeeder v0.12.1 and add ends field to the alerts schema

README.md

@@ -26,14 +26,11 @@ database credentials through your normal secret-management process.
 - Hourly and narrative forecasts
 - Forecast discussions
 - Weather stories
-- Convective outlooks:
+- Convective outlooks
-  - `GET /outlooks/convective`
-  - `GET /outlooks/convective/active`
-  - `GET /outlooks/convective/location`
 
 Common query parameters include `format`, `units`, and route-specific options
 such as forecast `precision`, timezone `tz` / `TZ`, and outlook filters
-`day`, `outlookType`, and `containsLocation`.
+`day` and `outlookType`.
 
 See [`docs/api.md`](docs/api.md) for the HTTP contract.
 

docs/api.md

@@ -212,14 +212,17 @@ Run `data` fields:
 | `alerts` | array | active alerts, possibly empty |
 
 Alerts are active when `messageType` is not `Cancel`, `effective` is absent or
-at or before request time, and `expires` is absent or after request time.
+at or before request time, and the alert end boundary is absent or after request
+time. The end boundary prefers `ends`; if `ends` is absent, `expires` is used as
+a fallback for older rows or providers that do not supply an alert-period end.
 `onset` is presented when available but is not used as the active boundary.
 
 Alert fields include `id`, `event`, `headline`, `severity`, `urgency`,
 `certainty`, `status`, `messageType`, `category`, `response`, `description`,
-`instruction`, `sent`, `effective`, `onset`, `expires`, `areaDescription`,
+`instruction`, `sent`, `effective`, `onset`, `ends`, `expires`,
-`senderName`, and `references`. Most alert fields are optional except `id` when
+`areaDescription`, `senderName`, and `references`. Most alert fields are
-an alert item is present.
+optional except `id` when an alert item is present. `ends` is the alert-period
+end; `expires` is provider expiration metadata.
 
 Reference fields are `id`, `identifier`, `sender`, and `sent`.
 
@@ -234,7 +237,6 @@ GET /alerts/active?format=text
 ```http
 GET /outlooks/convective
 GET /outlooks/convective/active
-GET /outlooks/convective/location
 ```
 
 Returns the latest SPC convective outlook run reconstructed from
@@ -246,9 +248,6 @@ Route behavior:
   outlook polygons unless user filters are supplied.
 - `/outlooks/convective/active` adds an active-time filter using the server's
   current UTC time. Outlooks are active when `validFrom <= now < validTo`.
-- `/outlooks/convective/location` adds the same active-time filter and
-  `containsLocation=true`. It remains as an active local-outlook compatibility
-  route under the v2 weatherfeeder contract.
 
 When no latest run exists, `data` is null. When a run exists but filters match
 no outlooks, `data` remains an object and `outlooks` and `discussions` are
@@ -262,14 +261,10 @@ Query parameters:
 | `format`, `units`, `tz` / `TZ` | all outlook routes | shared rules above |
 | `day` | all outlook routes | `1`, `2`, or `3` |
 | `outlookType` | all outlook routes | `categorical`, `tornado`, `hail`, or `wind` |
-| `containsLocation` | `/outlooks/convective`, `/outlooks/convective/active` | boolean |
 
 `outlookType` values are normalized case-insensitively. Weatherfeeder v2
-outlooks are already filtered for the configured location, so
+outlooks are already filtered for the configured location. `precision`,
-`containsLocation` is expected to be true for stored v2 outlooks.
+`containsLocation`, and unknown parameters are rejected.
-`containsLocation` is rejected on `/outlooks/convective/location` because that
-route always applies `containsLocation=true`. `precision` and unknown
-parameters are rejected.
 
 Run `data` fields:
 
@@ -314,7 +309,7 @@ Examples:
 
 ```http
 GET /outlooks/convective?day=1&outlookType=categorical
-GET /outlooks/convective/location?format=text&tz=CDT
+GET /outlooks/convective/active?format=text&tz=CDT
 ```
 
 Example JSON response:
@@ -367,53 +362,8 @@ Example JSON response:
 }
 ```
 
-Example location-filtered JSON response:
+Text format uses the shared convective outlook template for both outlook routes
-
+and renders a no-data message when `data` is null.
-```json
-{
-  "data": {
-    "locationId": "stl",
-    "asOf": "2026-06-11T18:00:00Z",
-    "outlooks": [
-      {
-        "id": "spc-day1-tor-2pct",
-        "provider": "spc",
-        "product": "convective",
-        "day": 1,
-        "outlookType": "tornado",
-        "label": "2%",
-        "validFrom": "2026-06-11T18:00:00Z",
-        "validTo": "2026-06-12T12:00:00Z",
-        "issuedAt": "2026-06-11T17:00:00Z",
-        "expiresAt": "2026-06-12T12:00:00Z",
-        "containsLocation": true,
-        "geometry": {
-          "type": "Polygon",
-          "coordinates": [
-            [
-              [-90.6, 38.4],
-              [-90.0, 38.4],
-              [-90.0, 38.8],
-              [-90.6, 38.4]
-            ]
-          ]
-        }
-      }
-    ],
-    "discussions": [
-      {
-        "day": 1,
-        "headline": "Tornado risk near the configured location",
-        "discussion": "SPC tornado outlook discussion text.",
-        "updatedAt": "2026-06-11T17:30:00Z"
-      }
-    ]
-  }
-}
-```
-
-Text format uses the shared convective outlook template for all three outlook
-routes and renders a no-data message when `data` is null.
 
 ### Forecasts
 

docs/integrations/weatherfeeder-postgres.md

@@ -105,8 +105,8 @@ and `event_emitted_at`.
 
 `alert_index`, `alert_id`, `event`, `headline`, `severity`, `urgency`,
 `certainty`, `status`, `message_type`, `category`, `response`, `description`,
-`instruction`, `sent`, `effective`, `onset`, `expires`, `area_description`,
+`instruction`, `sent`, `effective`, `onset`, `ends`, `expires`,
-`sender_name`, and `run_event_id`.
+`area_description`, `sender_name`, and `run_event_id`.
 
 ### `alert_references`
 

docs/internal/http-adapter.md

@@ -8,7 +8,7 @@ This document describes the internal HTTP adapter under
 
 The HTTP adapter turns feedapi route definitions into calls on the application
 service boundary. It owns route registration, query binding, request validation,
-forecast day-slice filtering, outlook active/location filter construction,
+forecast day-slice filtering, outlook active filter construction,
 alert active-time selection, response envelopes, and template names.
 
 ## Inputs and Outputs
@@ -36,7 +36,7 @@ The adapter may:
 - choose the presenter function for an endpoint;
 - filter forecast copies for `/today` and `/tomorrow`;
 - pass the current UTC instant to active-alert application filtering;
-- construct outlook active/location filters.
+- construct outlook active filters.
 
 The adapter must not:
 
@@ -99,10 +99,8 @@ common query values are lowercased and trimmed before binding where applicable.
 available only through binders used by forecast, discussion, weather story, and
 outlook routes.
 
-Outlook routes accept `day`, `outlookType`, and, except for
+Outlook routes accept `day` and `outlookType`. `containsLocation` is a response
-`/outlooks/convective/location`, `containsLocation`. The location route always
+field only and is rejected as a request parameter.
-adds `containsLocation=true` after binding and rejects an explicit
-`containsLocation` query value.
 
 ## Timezone Parsing
 
@@ -136,7 +134,9 @@ behavior deterministic.
 
 `/alerts/active` uses the shared `format` and `units` binder. The handler calls
 the application service with `alertNow().UTC()` so active alert filtering uses
-the request-time instant while remaining deterministic in endpoint tests.
+the request-time instant while remaining deterministic in endpoint tests. The
+application service prefers alert `ends` over `expires` when deciding whether an
+alert has ended.
 
 ## Outlook Filters
 
@@ -144,17 +144,13 @@ Outlook route filters are built at the HTTP boundary and passed to the
 application service:
 
 - `/outlooks/convective` uses only user-supplied filters;
-- `/outlooks/convective/active` adds `ActiveAt=outlookNow().UTC()`;
+- `/outlooks/convective/active` adds `ActiveAt=outlookNow().UTC()`.
-- `/outlooks/convective/location` adds the same active timestamp and
-  `ContainsLocation=true`.
 
-The package variable `outlookNow` exists so endpoint tests can make active and
+The package variable `outlookNow` exists so endpoint tests can make active
-location filtering deterministic.
+filtering deterministic.
 
 The application service returns filtered outlook copies and trims run-level
 discussions to days represented by retained outlooks.
-`/outlooks/convective/location` is retained for compatibility and active
-local-outlook behavior under the weatherfeeder outlook v2 contract.
 
 ## Failure Behavior
 

docs/internal/postgres-repository.md

@@ -79,8 +79,9 @@ successful responses with `data: null`.
 - `CurrentConditions`: aggregates recent rows from `observations` using the
   application-provided observation window.
 - `LatestAlertRun`: latest row from `alert_runs`, then child `alerts` and
-  `alert_references`. This is the latest stored alert snapshot; active-time
+  `alert_references`. This is the latest stored alert snapshot. The repository
-  filtering is performed by the application service.
+  maps both `ends` and `expires`; active-time filtering is performed by the
+  application service.
 - `LatestHourlyForecast`: latest `forecasts` row where `product = 'hourly'`,
   then child `forecast_periods`.
 - `LatestNarrativeForecast`: latest `forecasts` row where

docs/policy/architecture.md

@@ -100,7 +100,7 @@ Outputs are HTTP responses in JSON, XML, or text format. All public endpoint han
 
 `weatherapi` owns no durable weather state. Its runtime state is limited to process memory, loaded configuration, HTTP server state, template registry, renderer registry, and database connection pools. Durable weather data and schema creation are external concerns owned by `weatherfeeder` and Postgres.
 
-The API currently serves latest-resource views: latest observation, current conditions, latest hourly forecast, latest narrative forecast, latest forecast discussion, latest weather story run, latest individual weather story, and latest convective outlook run. Active alert, forecast `today` and `tomorrow`, and convective outlook active/location routes derive filtered copies from the latest stored run.
+The API currently serves latest-resource views: latest observation, current conditions, latest hourly forecast, latest narrative forecast, latest forecast discussion, latest weather story run, latest individual weather story, and latest convective outlook run. Active alert, forecast `today` and `tomorrow`, and convective outlook active routes derive filtered copies from the latest stored run.
 
 ## Configuration and CLI Boundaries
 

docs/roadmap/implementation.md

@@ -1,247 +0,0 @@
-# Active Alert Filtering Cleanup
-
-## Status
-
-Implementation, current-behavior documentation, and automated verification are
-complete.
-
-## Verification Record
-
-Completed on 2026-06-12:
-
-- `go test ./internal/app`
-- `go test ./internal/adapters/inbound/httpapi`
-- `go test ./internal/adapters/inbound/httpapi/presenter`
-- `go test ./...`
-
-Deployment smoke checks were not run from this workspace because the local
-repository state is not a deployed `weatherapi` instance.
-
-## Summary
-
-Fix `/alerts/active` so it returns alerts that are active at request time, not merely every alert from the latest stored alert snapshot.
-
-The current implementation reads the latest `alert_runs` parent row, loads all child `alerts`, and presents the run unchanged. This can expose expired alerts when the latest persisted weatherfeeder snapshot is stale or when a snapshot contains alerts that later expire before the next successful ingestion cycle.
-
-This cleanup preserves the existing route, response envelope, repository contract, and weatherfeeder table ownership. The change should be implemented as app-layer filtering over the latest stored snapshot, following the same architectural pattern already used by convective outlook active filtering.
-
-## Current Behavior To Correct
-
-- `GET /alerts/active` calls `LatestAlertRun(ctx)`.
-- `LatestAlertRun(ctx)` returns the latest stored alert snapshot from Postgres.
-- All child alerts for that run are returned unchanged.
-- The endpoint does not compare `effective`, `onset`, `expires`, `status`, or `messageType` to the request time.
-- Expired alerts can therefore appear under an endpoint named `/alerts/active`.
-
-## Target Behavior
-
-- `GET /alerts/active` returns the latest stored alert run with `alerts` filtered to items active at request time.
-- Missing latest alert run still returns `{ "data": null }`.
-- A latest run with no currently active alerts returns a non-null run object with `alerts: []`.
-- The repository remains a latest-snapshot reader and does not own active-time policy.
-- The app service owns alert active filtering policy.
-- The HTTP adapter supplies the request-time instant using an injectable clock for tests.
-- Presentation remains responsible only for response shape, units no-op behavior, and rendering.
-
-## Active Alert Policy
-
-Use a single app-layer predicate for determining whether an alert is active at an instant `activeAt`.
-
-An alert is active when all of the following are true:
-
-- `messageType` is not `Cancel`, case-insensitive after trimming.
-- `effective` is absent or `effective <= activeAt`.
-- `expires` is absent or `activeAt < expires`.
-
-Additional policy notes:
-
-- Do not use `onset` as a required active boundary. `onset` can describe hazard onset and may be later than alert effective time; using it as a hard lower bound could hide valid watches, warnings, or advisories that are already in effect from an alerting perspective.
-- Do not filter by `status` in the first cleanup unless existing model/test data proves a specific non-active status must be excluded. NWS active feeds commonly use `Actual`; persisted historical snapshots may include other values, but time and cancellation policy are the high-confidence active criteria.
-- Treat nil `expires` as active if the other criteria pass. This preserves data when an upstream alert omits an expiration, while still allowing future tightening if real data shows nil expiration should be suppressed.
-- Preserve input alert order after filtering.
-- Preserve run metadata such as `asOf`, location fields, latitude, and longitude even when all alerts are filtered out.
-
-## Public API Impact
-
-- Route remains `GET /alerts/active`.
-- Supported query parameters remain `format` and `units`.
-- `precision`, `tz` / `TZ`, and unknown query parameters remain rejected unless a separate roadmap explicitly changes alert query support.
-- JSON/XML/text format support remains unchanged.
-- Response envelope remains `{ "data": ... }`.
-- No Postgres schema or weatherfeeder migration is required.
-
-## Stage 1: App Service Filtering
-
-### Changes
-
-- Keep `app.Repository.LatestAlertRun(ctx)` unchanged.
-- Add an app-level alert read use case, either:
-  - `LatestActiveAlertRun(ctx context.Context, activeAt time.Time) (*model.WeatherAlertRun, error)`, or
-  - `LatestAlerts(ctx context.Context, filter AlertFilter) (*model.WeatherAlertRun, error)` with `AlertFilter.ActiveAt`.
-- Prefer the first option unless another alert route is being added at the same time; it is narrower and clearer for the existing API.
-- Implement the new service method by:
-  - reading `s.repo.LatestAlertRun(ctx)`;
-  - returning `nil, nil` when no run exists;
-  - cloning the run before mutation;
-  - filtering cloned `Alerts` with the active predicate;
-  - returning the cloned run.
-- Add package-local helpers for:
-  - cloning `WeatherAlertRun`;
-  - cloning `WeatherAlert` values deeply enough to avoid mutating repository-owned slices;
-  - copying `References` slices;
-  - evaluating `isActiveAlert(alert, activeAt)`.
-
-### Clone Requirements
-
-The clone must protect repository-returned data from service mutation:
-
-- allocate a new `Alerts` slice;
-- allocate new `References` slices for each alert;
-- copy pointer time fields only if the model uses pointer fields for alert timestamps;
-- preserve string, boolean, enum, and scalar values exactly.
-
-### Tests
-
-Add app tests covering:
-
-- repository delegation and error propagation;
-- `nil, nil` when the repository has no latest alert run;
-- expired alerts are removed when `activeAt >= expires`;
-- alerts expiring exactly at `activeAt` are inactive;
-- alerts effective exactly at `activeAt` are active;
-- future-effective alerts are inactive;
-- missing `effective` does not make an otherwise valid alert inactive;
-- missing `expires` does not make an otherwise valid alert inactive;
-- `messageType=Cancel` is excluded case-insensitively;
-- alert order is preserved;
-- run metadata is preserved when all alerts are filtered out;
-- filtering does not mutate the repository-owned run, alerts, references, or timestamp pointers.
-
-### Verification
-
-```sh
-go test ./internal/app
-```
-
-## Stage 2: HTTP Adapter Wiring
-
-### Changes
-
-- Extend `internal/adapters/inbound/httpapi.Service` with the app service method selected in Stage 1.
-- Add adapter-local clock injection near `alerts_endpoint.go`:
-
-```go
-var alertNow = time.Now
-```
-
-- Update `/alerts/active` handler to call the new active-alert service method with `alertNow().UTC()`.
-- Keep `bindQuery` as the binder so public query support remains `format` and `units` only.
-- Keep the text template name `alerts_active.txt.tmpl`.
-- Do not add timezone support in this cleanup. Alert timestamp presentation currently returns canonical model timestamps; timezone support would be a separate public API expansion.
-
-### Tests
-
-Update HTTP tests covering:
-
-- route registration remains unchanged;
-- handler passes `alertNow().UTC()` to the service;
-- JSON success response renders filtered service output;
-- text output renders zero active alerts as `Alerts: 0` when data is non-null;
-- `data: null` still renders no-data behavior;
-- `units=us` remains accepted and has no schema effect;
-- `precision`, `tz`, `TZ`, and unknown query params still return `400`.
-
-### Verification
-
-```sh
-go test ./internal/adapters/inbound/httpapi
-```
-
-## Stage 3: Presenter And Template Check
-
-### Changes
-
-- Keep `presenter.AlertsPayload` as a pass-through unless filtering requires defensive copy behavior at presentation time.
-- Do not move active filtering into the presenter.
-- Review `templates/alerts_active.txt.tmpl` and ensure it behaves correctly when `Data` is non-null and `Alerts` is empty.
-- If needed, add an explicit text fixture/assertion rather than changing template wording broadly.
-
-### Tests
-
-Add or update presenter/template-sensitive tests only if current endpoint tests do not prove:
-
-- nil data renders no-data text;
-- non-null data with empty alerts renders an active-alert run with `Alerts: 0`;
-- expired/canceled alerts do not appear in text output after service filtering.
-
-### Verification
-
-```sh
-go test ./internal/adapters/inbound/httpapi ./internal/adapters/inbound/httpapi/presenter
-```
-
-## Stage 4: Documentation Updates
-
-### Changes
-
-Update current-behavior docs after implementation is complete:
-
-- `docs/api.md`:
-  - clarify that `/alerts/active` returns the latest alert run filtered to alerts active at request time;
-  - document that no current active alerts returns a run with `alerts: []` when a latest run exists;
-  - keep `data: null` limited to no stored alert run;
-  - keep supported query params as `format` and `units`.
-- `README.md` if endpoint summaries mention active alerts.
-- `docs/internal/postgres-repository.md`:
-  - clarify that `LatestAlertRun` reads the latest stored snapshot and active filtering is performed in the app service.
-- `docs/policy/architecture.md` only if its latest-resource wording needs to distinguish latest snapshots from request-time derived active views.
-
-Do not document this unimplemented behavior outside `docs/roadmap/` before the code change lands.
-
-### Tests
-
-No doc-specific tests are required unless existing docs consistency tests cover endpoint summaries.
-
-## Stage 5: Final Verification
-
-Run focused tests:
-
-```sh
-go test ./internal/app ./internal/adapters/inbound/httpapi ./internal/adapters/inbound/httpapi/presenter
-```
-
-Run the full suite:
-
-```sh
-go test ./...
-```
-
-Manual smoke checks after deployment:
-
-```sh
-curl 'https://weather.api.rakestrawhome.com/alerts/active?format=json'
-curl 'https://weather.api.rakestrawhome.com/alerts/active?format=text'
-```
-
-Expected behavior when all alerts in the latest stored run are expired:
-
-- JSON returns a non-null `data` object with `alerts: []`.
-- Text output shows the run metadata and `Alerts: 0`.
-
-## Guardrails
-
-- Do not change weatherfeeder ingestion behavior in this cleanup.
-- Do not alter Postgres tables or SQL filtering unless a later performance issue justifies it.
-- Do not make `weatherapi` poll NWS or any upstream provider.
-- Do not rename `/alerts/active`.
-- Do not add alert history endpoints in this cleanup.
-- Do not introduce generic filtering frameworks; use small app-local helpers.
-- Do not move route query validation into the app layer.
-- Do not move active filtering into presenters or text templates.
-
-## Assumptions
-
-- `weatherfeeder` persists alert snapshots that were active at ingestion time, but `weatherapi` must still enforce request-time active semantics.
-- Cancellation messages are operational metadata, not active hazards, and should not be returned by `/alerts/active`.
-- Missing `expires` should not suppress an alert unless future real-world data shows this creates stale records.
-- Time comparisons should use UTC instants; timezone presentation is not part of this cleanup.

examples/requests.http

@@ -15,8 +15,8 @@ GET {{baseUrl}}/alerts/active?format=text
 GET {{baseUrl}}/outlooks/convective?day=1&outlookType=categorical
 Accept: application/json
 
-### Active convective outlooks for the configured location as text
+### Active convective outlooks as text
-GET {{baseUrl}}/outlooks/convective/location?format=text&tz=CDT
+GET {{baseUrl}}/outlooks/convective/active?format=text&tz=CDT
 
 ### Hourly forecast in US units
 GET {{baseUrl}}/forecast/hourly?units=us&precision=1&tz=Chicago

go.mod

@@ -4,7 +4,7 @@ go 1.25.5
 
 require (
 	gitea.maximumdirect.net/ejr/feedapi v0.1.0
-	gitea.maximumdirect.net/ejr/weatherfeeder v0.12.0
+	gitea.maximumdirect.net/ejr/weatherfeeder v0.12.1
 	github.com/lib/pq v1.10.9
 )
 

go.sum

@@ -1,7 +1,7 @@
 gitea.maximumdirect.net/ejr/feedapi v0.1.0 h1:ZB5QWKD5DPFV3P7vyeJqXPMcSWN9qHkDUHw1LgN9hwY=
 gitea.maximumdirect.net/ejr/feedapi v0.1.0/go.mod h1:3fIaFFx4ywt0TWbN8DIIBAHJn7ZQUm6PNcceqRgy3bw=
-gitea.maximumdirect.net/ejr/weatherfeeder v0.12.0 h1:U3yln3o2rGqfMvWVRwOGgQeqYuqMm+/p0XIRhK8TDUQ=
+gitea.maximumdirect.net/ejr/weatherfeeder v0.12.1 h1:dZYDpOd0vEIk6QljsrhFyrOY0Lt4WyEoazhqDFIZKNQ=
-gitea.maximumdirect.net/ejr/weatherfeeder v0.12.0/go.mod h1:VVtuwrbddWdUu21ovCSSojhH5J9P6kk0/dfnFqC4/Lw=
+gitea.maximumdirect.net/ejr/weatherfeeder v0.12.1/go.mod h1:VVtuwrbddWdUu21ovCSSojhH5J9P6kk0/dfnFqC4/Lw=
 github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
 github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=

internal/adapters/inbound/httpapi/endpoints_test.go

@@ -324,12 +324,14 @@ func TestObservationUSUnitsChangesFieldNames(t *testing.T) {
 }
 
 func TestAlertsUSUnitsKeepSchema(t *testing.T) {
+	ends := time.Date(2026, 6, 11, 14, 0, 0, 0, time.UTC)
 	h := newHandler(t, &fakeService{
 		alerts: &model.WeatherAlertRun{
 			AsOf: time.Now().UTC(),
 			Alerts: []model.WeatherAlert{{
 				ID:       "abc",
 				Headline: "A headline",
+				Ends:     &ends,
 			}},
 		},
 	}, "/alerts/active")
@@ -359,6 +361,9 @@ func TestAlertsUSUnitsKeepSchema(t *testing.T) {
 	if first["id"] != "abc" {
 		t.Fatalf("expected alert id abc, got %#v", first["id"])
 	}
+	if _, ok := first["ends"].(string); !ok {
+		t.Fatalf("expected alert ends string, got %#v", first["ends"])
+	}
 }
 
 func TestAlertsRouteRegistered(t *testing.T) {
@@ -456,8 +461,10 @@ func TestAlertsTextOmitsInactiveAlertsAfterServiceFiltering(t *testing.T) {
 	activeAt := time.Date(2026, 6, 11, 12, 0, 0, 0, time.UTC)
 	setAlertNowForTest(t, activeAt)
 	effective := activeAt.Add(-1 * time.Hour)
-	activeExpires := activeAt.Add(1 * time.Hour)
+	activeEnds := activeAt.Add(1 * time.Hour)
-	expiredAtBoundary := activeAt
+	expiredEndsAtBoundary := activeAt
+	expiredProviderMetadata := activeAt.Add(-30 * time.Minute)
+	activeProviderMetadata := activeAt.Add(30 * time.Minute)
 	repo := &alertRepository{
 		alerts: &model.WeatherAlertRun{
 			AsOf: activeAt,
@@ -467,21 +474,23 @@ func TestAlertsTextOmitsInactiveAlertsAfterServiceFiltering(t *testing.T) {
 					Headline:    "Active warning",
 					MessageType: "Alert",
 					Effective:   &effective,
-					Expires:     &activeExpires,
+					Ends:        &activeEnds,
+					Expires:     &expiredProviderMetadata,
 				},
 				{
 					ID:          "expired-alert",
 					Headline:    "Expired warning",
 					MessageType: "Alert",
 					Effective:   &effective,
-					Expires:     &expiredAtBoundary,
+					Ends:        &expiredEndsAtBoundary,
+					Expires:     &activeProviderMetadata,
 				},
 				{
 					ID:          "canceled-alert",
 					Headline:    "Canceled warning",
 					MessageType: " cancel ",
 					Effective:   &effective,
-					Expires:     &activeExpires,
+					Ends:        &activeEnds,
 				},
 			},
 		},
@@ -496,7 +505,7 @@ func TestAlertsTextOmitsInactiveAlertsAfterServiceFiltering(t *testing.T) {
 		t.Fatalf("expected 200, got %d", w.Code)
 	}
 	body := w.Body.String()
-	for _, want := range []string{"Alerts: 1", "active-alert", "Active warning"} {
+	for _, want := range []string{"Alerts: 1", "active-alert", "Active warning", "Ends:"} {
 		if !strings.Contains(body, want) {
 			t.Fatalf("expected %q in text body, got %q", want, body)
 		}
@@ -1484,13 +1493,15 @@ func TestOutlookRoutesRegistered(t *testing.T) {
 	for _, path := range []string{
 		"/outlooks/convective",
 		"/outlooks/convective/active",
-		"/outlooks/convective/location",
 	} {
 		def := definitionForPath(t, defs, path)
 		if len(def.Methods) != 1 || def.Methods[0] != http.MethodGet {
 			t.Fatalf("%s: expected GET definition, got %+v", path, def.Methods)
 		}
 	}
+	if endpointExists(defs, "/outlooks/convective/location") {
+		t.Fatal("expected /outlooks/convective/location to be removed")
+	}
 }
 
 func TestOutlookRoutesJSONSuccess(t *testing.T) {
@@ -1499,7 +1510,6 @@ func TestOutlookRoutesJSONSuccess(t *testing.T) {
 	for _, path := range []string{
 		"/outlooks/convective",
 		"/outlooks/convective/active",
-		"/outlooks/convective/location",
 	} {
 		t.Run(path, func(t *testing.T) {
 			h := newHandler(t, &fakeService{outlookRun: testOutlookRun()}, path)
@@ -1676,7 +1686,7 @@ func TestOutlookQueryParamsConstructFilter(t *testing.T) {
 	h := newHandler(t, svc, "/outlooks/convective")
 
 	w := httptest.NewRecorder()
-	req := httptest.NewRequest(http.MethodGet, "/outlooks/convective?day=2&outlookType=Tornado&containsLocation=true&tz=CDT&units=US", nil)
+	req := httptest.NewRequest(http.MethodGet, "/outlooks/convective?day=2&outlookType=Tornado&tz=CDT&units=US", nil)
 	h.ServeHTTP(w, req)
 
 	if w.Code != http.StatusOK {
@@ -1692,15 +1702,12 @@ func TestOutlookQueryParamsConstructFilter(t *testing.T) {
 	if filter.OutlookType != "tornado" {
 		t.Fatalf("expected outlookType tornado, got %q", filter.OutlookType)
 	}
-	if filter.ContainsLocation == nil || !*filter.ContainsLocation {
-		t.Fatalf("expected containsLocation true, got %+v", filter.ContainsLocation)
-	}
 	if filter.ActiveAt != nil {
 		t.Fatalf("expected no active filter, got %v", filter.ActiveAt)
 	}
 }
 
-func TestOutlookActiveAndLocationFiltersUseNow(t *testing.T) {
+func TestOutlookActiveFilterUsesNow(t *testing.T) {
 	now := time.Date(2026, 6, 11, 15, 30, 0, 0, time.FixedZone("CDT", -5*3600))
 	setOutlookNowForTest(t, now)
 
@@ -1716,28 +1723,6 @@ func TestOutlookActiveAndLocationFiltersUseNow(t *testing.T) {
 	if activeFilter.ActiveAt == nil || !activeFilter.ActiveAt.Equal(now.UTC()) {
 		t.Fatalf("expected activeAt %s, got %v", now.UTC(), activeFilter.ActiveAt)
 	}
-	if activeFilter.ContainsLocation != nil {
-		t.Fatalf("expected active route not to force containsLocation, got %+v", activeFilter.ContainsLocation)
-	}
-
-	locationSvc := &fakeService{outlookRun: testOutlookRun()}
-	locationHandler := newHandler(t, locationSvc, "/outlooks/convective/location")
-	w = httptest.NewRecorder()
-	req = httptest.NewRequest(http.MethodGet, "/outlooks/convective/location?outlookType=hail", nil)
-	locationHandler.ServeHTTP(w, req)
-	if w.Code != http.StatusOK {
-		t.Fatalf("expected location 200, got %d", w.Code)
-	}
-	locationFilter := locationSvc.outlookFilters[0]
-	if locationFilter.ActiveAt == nil || !locationFilter.ActiveAt.Equal(now.UTC()) {
-		t.Fatalf("expected location activeAt %s, got %v", now.UTC(), locationFilter.ActiveAt)
-	}
-	if locationFilter.ContainsLocation == nil || !*locationFilter.ContainsLocation {
-		t.Fatalf("expected location route to force containsLocation true, got %+v", locationFilter.ContainsLocation)
-	}
-	if locationFilter.OutlookType != "hail" {
-		t.Fatalf("expected outlookType hail, got %q", locationFilter.OutlookType)
-	}
 }
 
 func TestOutlookInvalidQueryParamsReturnBadRequest(t *testing.T) {
@@ -1748,10 +1733,10 @@ func TestOutlookInvalidQueryParamsReturnBadRequest(t *testing.T) {
 		"/outlooks/convective?day=4",
 		"/outlooks/convective?day=two",
 		"/outlooks/convective?outlookType=snow",
-		"/outlooks/convective?containsLocation=maybe",
+		"/outlooks/convective?containsLocation=true",
+		"/outlooks/convective/active?containsLocation=true",
 		"/outlooks/convective?tz=not-a-timezone",
 		"/outlooks/convective?tz=CDT&TZ=EST",
-		"/outlooks/convective/location?containsLocation=true",
 	} {
 		t.Run(rawURL, func(t *testing.T) {
 			h := newHandler(t, &fakeService{outlookRun: testOutlookRun()}, strings.Split(rawURL, "?")[0])
@@ -2440,6 +2425,15 @@ func definitionForPath(t *testing.T, defs []endpoint.Definition, path string) en
 	return endpoint.Definition{}
 }
 
+func endpointExists(defs []endpoint.Definition, path string) bool {
+	for _, def := range defs {
+		if def.Path == path {
+			return true
+		}
+	}
+	return false
+}
+
 func testRenderers(t *testing.T) *render.Registry {
 	t.Helper()
 
@@ -2463,7 +2457,7 @@ func testRenderers(t *testing.T) *render.Registry {
 		"outlooks_convective.txt.tmpl":     "Convective Outlook\n{{if .Data}}Outlooks: {{len .Data.Outlooks}}\nDiscussions: {{len .Data.Discussions}}{{range .Data.Discussions}}\nDiscussion: {{.Discussion}}{{end}}{{else}}No convective outlook data available.{{end}}",
 		"weatherstories.txt.tmpl":          "Weather Stories",
 		"weatherstories_latest.txt.tmpl":   "Latest Weather Story",
-		"alerts_active.txt.tmpl":           "{{if .Data}}Active Alerts\nAlerts: {{len .Data.Alerts}}{{range .Data.Alerts}}\n{{.ID}}{{if .Headline}}\nHeadline: {{.Headline}}{{end}}{{end}}{{else}}No active alerts data available.{{end}}",
+		"alerts_active.txt.tmpl":           "{{if .Data}}Active Alerts\nAlerts: {{len .Data.Alerts}}{{range .Data.Alerts}}\n{{.ID}}{{if .Headline}}\nHeadline: {{.Headline}}{{end}}{{if .Ends}}\nEnds: {{.Ends}}{{end}}{{end}}{{else}}No active alerts data available.{{end}}",
 		"conditions_current.txt.tmpl":      "Conditions text",
 	} {
 		tmpl, err := template.New(name).Parse(body)

internal/adapters/inbound/httpapi/outlooks_endpoint.go

@@ -18,7 +18,6 @@ type outlookFilterMode int
 const (
 	outlookFilterUser outlookFilterMode = iota
 	outlookFilterActive
-	outlookFilterLocation
 )
 
 var outlookNow = time.Now
@@ -27,7 +26,6 @@ func outlookDefinitions(svc Service) []endpoint.Definition {
 	return []endpoint.Definition{
 		outlookDefinition("/outlooks/convective", outlookFilterUser, bindOutlookQuery, svc),
 		outlookDefinition("/outlooks/convective/active", outlookFilterActive, bindOutlookQuery, svc),
-		outlookDefinition("/outlooks/convective/location", outlookFilterLocation, bindOutlookLocationQuery, svc),
 	}
 }
 
@@ -42,14 +40,10 @@ func outlookDefinition(
 		binder,
 		func(ctx context.Context, req outlookQueryRequest) (any, error) {
 			filter := req.Filter
-			if mode == outlookFilterActive || mode == outlookFilterLocation {
+			if mode == outlookFilterActive {
 				activeAt := outlookNow().UTC()
 				filter.ActiveAt = &activeAt
 			}
-			if mode == outlookFilterLocation {
-				containsLocation := true
-				filter.ContainsLocation = &containsLocation
-			}
 
 			run, err := svc.LatestConvectiveOutlook(ctx, filter)
 			if err != nil {

internal/adapters/inbound/httpapi/query_bind.go

@@ -145,29 +145,16 @@ func bindPrecisionQueryInternal(r *http.Request, allowTimezone bool) (precisionQ
 }
 
 func bindOutlookQuery(r *http.Request) (outlookQueryRequest, error) {
-	return bindOutlookQueryInternal(r, true)
-}
-
-func bindOutlookLocationQuery(r *http.Request) (outlookQueryRequest, error) {
-	return bindOutlookQueryInternal(r, false)
-}
-
-func bindOutlookQueryInternal(r *http.Request, allowContainsLocation bool) (outlookQueryRequest, error) {
 	normalizeCommonQueryValue(r, "units")
 	normalizeCommonQueryValue(r, "format")
 	normalizeCommonQueryValue(r, "outlookType")
 
-	allowedExtra := []string{"tz", "TZ", "day", "outlookType"}
-	if allowContainsLocation {
-		allowedExtra = append(allowedExtra, "containsLocation")
-	}
-
 	common, err := bind.CommonQueryParams(r, bind.QueryPolicy{
 		AllowUnits:    true,
 		AllowFormat:   true,
 		DefaultUnits:  string(presenter.UnitsMetric),
 		RejectUnknown: true,
-	}, allowedExtra...)
+	}, "tz", "TZ", "day", "outlookType")
 	if err != nil {
 		return outlookQueryRequest{}, err
 	}
@@ -182,7 +169,7 @@ func bindOutlookQueryInternal(r *http.Request, allowContainsLocation bool) (outl
 		return outlookQueryRequest{}, err
 	}
 
-	filter, err := bindOutlookFilter(r, allowContainsLocation)
+	filter, err := bindOutlookFilter(r)
 	if err != nil {
 		return outlookQueryRequest{}, err
 	}
@@ -194,7 +181,7 @@ func bindOutlookQueryInternal(r *http.Request, allowContainsLocation bool) (outl
 	}, nil
 }
 
-func bindOutlookFilter(r *http.Request, allowContainsLocation bool) (app.OutlookFilter, error) {
+func bindOutlookFilter(r *http.Request) (app.OutlookFilter, error) {
 	var filter app.OutlookFilter
 
 	if strings.TrimSpace(r.URL.Query().Get("day")) != "" {
@@ -218,16 +205,5 @@ func bindOutlookFilter(r *http.Request, allowContainsLocation bool) (app.Outlook
 		}
 	}
 
-	if strings.TrimSpace(r.URL.Query().Get("containsLocation")) != "" {
-		if !allowContainsLocation {
-			return app.OutlookFilter{}, apierrors.InvalidParameter("containsLocation is not allowed on this endpoint")
-		}
-		containsLocation, err := bind.OptionalBool(r, "containsLocation", false)
-		if err != nil {
-			return app.OutlookFilter{}, err
-		}
-		filter.ContainsLocation = &containsLocation
-	}
-
 	return filter, nil
 }

internal/adapters/outbound/postgres/alerts_mapper.go

@@ -33,6 +33,7 @@ func mapAlertRow(row alertRow) indexedAlert {
 			Sent:            timePtr(row.Sent),
 			Effective:       timePtr(row.Effective),
 			Onset:           timePtr(row.Onset),
+			Ends:            timePtr(row.Ends),
 			Expires:         timePtr(row.Expires),
 			AreaDescription: stringValue(row.AreaDescription),
 			SenderName:      stringValue(row.SenderName),

internal/adapters/outbound/postgres/alerts_queries.go

@@ -33,6 +33,7 @@ SELECT
   sent,
   effective,
   onset,
+  ends,
   expires,
   area_description,
   sender_name

internal/adapters/outbound/postgres/alerts_read.go

@@ -70,6 +70,7 @@ func (r *Repository) loadAlerts(ctx context.Context, eventID string) ([]model.We
 			&row.Sent,
 			&row.Effective,
 			&row.Onset,
+			&row.Ends,
 			&row.Expires,
 			&row.AreaDescription,
 			&row.SenderName,

internal/adapters/outbound/postgres/alerts_rows.go

@@ -35,6 +35,7 @@ type alertRow struct {
 	Sent            sql.NullTime
 	Effective       sql.NullTime
 	Onset           sql.NullTime
+	Ends            sql.NullTime
 	Expires         sql.NullTime
 	AreaDescription sql.NullString
 	SenderName      sql.NullString

internal/adapters/outbound/postgres/repository_test.go

@@ -246,6 +246,36 @@ func TestAttachAlertReferencesPreservesOrder(t *testing.T) {
 	}
 }
 
+func TestMapAlertRowMapsEndsAndExpires(t *testing.T) {
+	ends := time.Date(2026, 6, 16, 14, 0, 0, 0, time.FixedZone("CDT", -5*3600))
+	expires := time.Date(2026, 6, 16, 11, 0, 0, 0, time.FixedZone("CDT", -5*3600))
+
+	alert := mapAlertRow(alertRow{
+		AlertIndex: 1,
+		AlertID:    "alert-1",
+		Ends:       sql.NullTime{Time: ends, Valid: true},
+		Expires:    sql.NullTime{Time: expires, Valid: true},
+	}).Alert
+
+	if alert.Ends == nil || alert.Ends.Location().String() != "UTC" || !alert.Ends.Equal(ends.UTC()) {
+		t.Fatalf("expected ends UTC %s, got %v", ends.UTC(), alert.Ends)
+	}
+	if alert.Expires == nil || alert.Expires.Location().String() != "UTC" || !alert.Expires.Equal(expires.UTC()) {
+		t.Fatalf("expected expires UTC %s, got %v", expires.UTC(), alert.Expires)
+	}
+}
+
+func TestMapAlertRowNullableEnds(t *testing.T) {
+	alert := mapAlertRow(alertRow{
+		AlertIndex: 1,
+		AlertID:    "alert-1",
+	}).Alert
+
+	if alert.Ends != nil {
+		t.Fatalf("expected nil ends, got %v", alert.Ends)
+	}
+}
+
 func TestMapCurrentConditionsRowNoSamplesReturnsNil(t *testing.T) {
 	got := mapCurrentConditionsRow(currentConditionsRow{
 		SampleCount: 0,

internal/app/service.go

@@ -25,10 +25,9 @@ type Repository interface {
 
 // OutlookFilter selects outlook entries from the latest convective outlook run.
 type OutlookFilter struct {
-	Day              *int
+	Day         *int
-	OutlookType      string
+	OutlookType string
-	ContainsLocation *bool
+	ActiveAt    *time.Time
-	ActiveAt         *time.Time
 }
 
 // Service provides weather read use-cases.
@@ -120,9 +119,6 @@ func matchesOutlookFilter(outlook model.WeatherOutlook, filter OutlookFilter) bo
 	if filter.OutlookType != "" && outlook.OutlookType != normalizeOutlookType(filter.OutlookType) {
 		return false
 	}
-	if filter.ContainsLocation != nil && outlook.ContainsLocation != *filter.ContainsLocation {
-		return false
-	}
 	if filter.ActiveAt != nil && (filter.ActiveAt.Before(outlook.ValidFrom) || !filter.ActiveAt.Before(outlook.ValidTo)) {
 		return false
 	}
@@ -151,6 +147,7 @@ func cloneAlert(alert model.WeatherAlert) model.WeatherAlert {
 	out.Sent = copyTime(alert.Sent)
 	out.Effective = copyTime(alert.Effective)
 	out.Onset = copyTime(alert.Onset)
+	out.Ends = copyTime(alert.Ends)
 	out.Expires = copyTime(alert.Expires)
 	if alert.References != nil {
 		out.References = make([]model.AlertReference, len(alert.References))
@@ -174,7 +171,11 @@ func isActiveAlert(alert model.WeatherAlert, activeAt time.Time) bool {
 	if alert.Effective != nil && activeAt.Before(*alert.Effective) {
 		return false
 	}
-	if alert.Expires != nil && !activeAt.Before(*alert.Expires) {
+	endBoundary := alert.Ends
+	if endBoundary == nil {
+		endBoundary = alert.Expires
+	}
+	if endBoundary != nil && !activeAt.Before(*endBoundary) {
 		return false
 	}
 	return true

internal/app/service_test.go

@@ -132,7 +132,7 @@ func TestServiceLatestActiveAlertRunDelegatesAndFilters(t *testing.T) {
 	if repo.alertRunCalls != 1 {
 		t.Fatalf("expected one repository call, got %d", repo.alertRunCalls)
 	}
-	assertAlertIDs(t, run, []string{"current", "effective-at-boundary", "missing-effective", "missing-expires", "later-onset"})
+	assertAlertIDs(t, run, []string{"current", "effective-at-boundary", "missing-effective", "missing-expires", "later-onset", "ends-preferred"})
 }
 
 func TestServiceLatestActiveAlertRunNoData(t *testing.T) {
@@ -165,9 +165,9 @@ func TestServiceLatestActiveAlertRunPropagatesErrors(t *testing.T) {
 func TestServiceLatestActiveAlertRunKeepsMetadataWithEmptyAlerts(t *testing.T) {
 	activeAt := testTime(12)
 	repo := &fakeRepository{alerts: testAlertRunWithAlerts([]model.WeatherAlert{
-		testAlert("expired", "Alert", testTimePtr(9), testTimePtr(10), testTimePtr(11), testTimePtr(12)),
+		testAlert("expired", "Alert", testTimePtr(9), testTimePtr(10), testTimePtr(11), testTimePtr(12), testTimePtr(13)),
-		testAlert("cancel", "Cancel", testTimePtr(9), testTimePtr(10), testTimePtr(11), testTimePtr(13)),
+		testAlert("cancel", "Cancel", testTimePtr(9), testTimePtr(10), testTimePtr(11), testTimePtr(13), testTimePtr(13)),
-		testAlert("future", "Alert", testTimePtr(9), testTimePtr(13), testTimePtr(13), testTimePtr(14)),
+		testAlert("future", "Alert", testTimePtr(9), testTimePtr(13), testTimePtr(13), testTimePtr(14), testTimePtr(14)),
 	})}
 	svc := NewService(repo)
 
@@ -213,7 +213,8 @@ func TestServiceLatestActiveAlertRunDoesNotMutateRepositoryRun(t *testing.T) {
 	*run.Alerts[0].Sent = testTime(1)
 	*run.Alerts[0].Effective = testTime(2)
 	*run.Alerts[0].Onset = testTime(3)
-	*run.Alerts[0].Expires = testTime(4)
+	*run.Alerts[0].Ends = testTime(4)
+	*run.Alerts[0].Expires = testTime(5)
 	*run.Alerts[0].References[0].Sent = testTime(5)
 	run.Alerts[0].ID = "changed"
 	run.Alerts[0].References[0].ID = "changed"
@@ -237,7 +238,10 @@ func TestServiceLatestActiveAlertRunDoesNotMutateRepositoryRun(t *testing.T) {
 	if original.Alerts[0].Onset == nil || !original.Alerts[0].Onset.Equal(testTime(11)) {
 		t.Fatalf("expected original onset unchanged, got %v", original.Alerts[0].Onset)
 	}
-	if original.Alerts[0].Expires == nil || !original.Alerts[0].Expires.Equal(testTime(13)) {
+	if original.Alerts[0].Ends == nil || !original.Alerts[0].Ends.Equal(testTime(13)) {
+		t.Fatalf("expected original ends unchanged, got %v", original.Alerts[0].Ends)
+	}
+	if original.Alerts[0].Expires == nil || !original.Alerts[0].Expires.Equal(testTime(12)) {
 		t.Fatalf("expected original expires unchanged, got %v", original.Alerts[0].Expires)
 	}
 	if original.Alerts[0].References[0].ID != "ref-current" {
@@ -246,11 +250,28 @@ func TestServiceLatestActiveAlertRunDoesNotMutateRepositoryRun(t *testing.T) {
 	if original.Alerts[0].References[0].Sent == nil || !original.Alerts[0].References[0].Sent.Equal(testTime(8)) {
 		t.Fatalf("expected original reference sent unchanged, got %v", original.Alerts[0].References[0].Sent)
 	}
-	if len(original.Alerts) != 8 {
+	if len(original.Alerts) != 10 {
 		t.Fatalf("expected original alert slice unchanged, got %d entries", len(original.Alerts))
 	}
 }
 
+func TestServiceLatestActiveAlertRunUsesEndsBeforeExpires(t *testing.T) {
+	activeAt := testTime(12)
+	repo := &fakeRepository{alerts: testAlertRunWithAlerts([]model.WeatherAlert{
+		testAlert("ends-at-boundary", "Alert", testTimePtr(9), testTimePtr(10), testTimePtr(11), testTimePtr(12), testTimePtr(13)),
+		testAlert("ends-after-active-expires-before", "Alert", testTimePtr(9), testTimePtr(10), testTimePtr(11), testTimePtr(13), testTimePtr(11)),
+		testAlert("expires-fallback", "Alert", testTimePtr(9), testTimePtr(10), testTimePtr(11), nil, testTimePtr(13)),
+		testAlert("expires-fallback-expired", "Alert", testTimePtr(9), testTimePtr(10), testTimePtr(11), nil, testTimePtr(12)),
+	})}
+	svc := NewService(repo)
+
+	run, err := svc.LatestActiveAlertRun(context.Background(), activeAt)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	assertAlertIDs(t, run, []string{"ends-after-active-expires-before", "expires-fallback"})
+}
+
 func TestServiceDelegatesLatestConvectiveOutlookRun(t *testing.T) {
 	repo := &fakeRepository{outlookRun: testOutlookRun()}
 	svc := NewService(repo)
@@ -358,32 +379,6 @@ func TestServiceLatestConvectiveOutlookFiltersByOutlookType(t *testing.T) {
 	assertDiscussionDays(t, run, []int{1})
 }
 
-func TestServiceLatestConvectiveOutlookFiltersByContainsLocation(t *testing.T) {
-	containsLocation := true
-	repo := &fakeRepository{outlookRun: testOutlookRun()}
-	svc := NewService(repo)
-
-	run, err := svc.LatestConvectiveOutlook(context.Background(), OutlookFilter{ContainsLocation: &containsLocation})
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	assertOutlookIDs(t, run, []string{"cat-1", "tor-1", "day-2"})
-	assertDiscussionDays(t, run, []int{1, 2})
-}
-
-func TestServiceLatestConvectiveOutlookContainsLocationFalseReturnsEmptyRun(t *testing.T) {
-	containsLocation := false
-	repo := &fakeRepository{outlookRun: testOutlookRun()}
-	svc := NewService(repo)
-
-	run, err := svc.LatestConvectiveOutlook(context.Background(), OutlookFilter{ContainsLocation: &containsLocation})
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	assertOutlookIDs(t, run, nil)
-	assertDiscussionDays(t, run, nil)
-}
-
 func TestServiceLatestConvectiveOutlookFiltersByActiveAt(t *testing.T) {
 	activeAt := time.Date(2026, 6, 11, 15, 0, 0, 0, time.UTC)
 	repo := &fakeRepository{outlookRun: testOutlookRun()}
@@ -399,16 +394,14 @@ func TestServiceLatestConvectiveOutlookFiltersByActiveAt(t *testing.T) {
 
 func TestServiceLatestConvectiveOutlookCombinesFilters(t *testing.T) {
 	day := 1
-	containsLocation := true
 	activeAt := time.Date(2026, 6, 11, 15, 0, 0, 0, time.UTC)
 	repo := &fakeRepository{outlookRun: testOutlookRun()}
 	svc := NewService(repo)
 
 	run, err := svc.LatestConvectiveOutlook(context.Background(), OutlookFilter{
-		Day:              &day,
+		Day:         &day,
-		OutlookType:      "categorical",
+		OutlookType: "categorical",
-		ContainsLocation: &containsLocation,
+		ActiveAt:    &activeAt,
-		ActiveAt:         &activeAt,
 	})
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
@@ -537,14 +530,16 @@ func TestServicePropagatesErrors(t *testing.T) {
 
 func testAlertRun() *model.WeatherAlertRun {
 	return testAlertRunWithAlerts([]model.WeatherAlert{
-		testAlert("current", "Alert", testTimePtr(9), testTimePtr(10), testTimePtr(11), testTimePtr(13)),
+		testAlert("current", "Alert", testTimePtr(9), testTimePtr(10), testTimePtr(11), testTimePtr(13), testTimePtr(12)),
-		testAlert("expired", "Update", testTimePtr(9), testTimePtr(10), testTimePtr(11), testTimePtr(12)),
+		testAlert("expired", "Update", testTimePtr(9), testTimePtr(10), testTimePtr(11), testTimePtr(12), testTimePtr(13)),
-		testAlert("future-effective", "Alert", testTimePtr(9), testTimePtr(13), testTimePtr(13), testTimePtr(15)),
+		testAlert("future-effective", "Alert", testTimePtr(9), testTimePtr(13), testTimePtr(13), testTimePtr(15), testTimePtr(15)),
-		testAlert("canceled", " cancel ", testTimePtr(9), testTimePtr(10), testTimePtr(11), testTimePtr(13)),
+		testAlert("canceled", " cancel ", testTimePtr(9), testTimePtr(10), testTimePtr(11), testTimePtr(13), testTimePtr(13)),
-		testAlert("effective-at-boundary", "Alert", testTimePtr(9), testTimePtr(12), testTimePtr(12), testTimePtr(14)),
+		testAlert("effective-at-boundary", "Alert", testTimePtr(9), testTimePtr(12), testTimePtr(12), testTimePtr(14), testTimePtr(14)),
-		testAlert("missing-effective", "Alert", testTimePtr(9), nil, nil, testTimePtr(14)),
+		testAlert("missing-effective", "Alert", testTimePtr(9), nil, nil, testTimePtr(14), testTimePtr(14)),
-		testAlert("missing-expires", "Alert", testTimePtr(9), testTimePtr(10), nil, nil),
+		testAlert("missing-expires", "Alert", testTimePtr(9), testTimePtr(10), nil, nil, nil),
-		testAlert("later-onset", "Alert", testTimePtr(9), testTimePtr(10), testTimePtr(13), testTimePtr(14)),
+		testAlert("later-onset", "Alert", testTimePtr(9), testTimePtr(10), testTimePtr(13), testTimePtr(14), testTimePtr(14)),
+		testAlert("ends-preferred", "Alert", testTimePtr(9), testTimePtr(10), nil, testTimePtr(14), testTimePtr(11)),
+		testAlert("ends-at-boundary", "Alert", testTimePtr(9), testTimePtr(10), nil, testTimePtr(12), testTimePtr(14)),
 	})
 }
 
@@ -561,7 +556,7 @@ func testAlertRunWithAlerts(alerts []model.WeatherAlert) *model.WeatherAlertRun
 	}
 }
 
-func testAlert(id string, messageType string, sent *time.Time, effective *time.Time, onset *time.Time, expires *time.Time) model.WeatherAlert {
+func testAlert(id string, messageType string, sent *time.Time, effective *time.Time, onset *time.Time, ends *time.Time, expires *time.Time) model.WeatherAlert {
 	refSent := testTime(8)
 	return model.WeatherAlert{
 		ID:              id,
@@ -579,6 +574,7 @@ func testAlert(id string, messageType string, sent *time.Time, effective *time.T
 		Sent:            sent,
 		Effective:       effective,
 		Onset:           onset,
+		Ends:            ends,
 		Expires:         expires,
 		AreaDescription: "St. Louis City",
 		SenderName:      "NWS St. Louis",

templates/alerts_active.txt.tmpl

@@ -11,6 +11,9 @@ Headline: {{$alert.Headline}}
 {{- if $alert.Severity}}
 Severity: {{$alert.Severity}}
 {{- end}}
+{{- if $alert.Ends}}
+Ends: {{$alert.Ends}}
+{{- end}}
 {{- if $alert.Expires}}
 Expires: {{$alert.Expires}}
 {{- end}}