Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f4dd701204 | |||
| 6316783c3a | |||
| cdfe8881d9 | |||
| 8d0bc90f9d | |||
| 12a7447494 | |||
| dd2f24316c | |||
| 90abc536dd |
@@ -26,14 +26,11 @@ database credentials through your normal secret-management process.
|
||||
- Hourly and narrative forecasts
|
||||
- Forecast discussions
|
||||
- Weather stories
|
||||
- Convective outlooks:
|
||||
- `GET /outlooks/convective`
|
||||
- `GET /outlooks/convective/active`
|
||||
- `GET /outlooks/convective/location`
|
||||
- Convective outlooks
|
||||
|
||||
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.
|
||||
|
||||
|
||||
73
docs/api.md
73
docs/api.md
@@ -194,10 +194,14 @@ GET /conditions/current?format=json&precision=0
|
||||
GET /alerts/active
|
||||
```
|
||||
|
||||
Returns the latest active-alert snapshot.
|
||||
Returns the latest stored alert run filtered to alerts active at request time.
|
||||
|
||||
Query parameters: `format`, `units`.
|
||||
|
||||
When no latest alert run exists, `data` is null. When a latest run exists but
|
||||
no alerts are currently active, `data` remains an object and `alerts` is an
|
||||
empty array.
|
||||
|
||||
Run `data` fields:
|
||||
|
||||
| Field | Type | Notes |
|
||||
@@ -207,6 +211,10 @@ Run `data` fields:
|
||||
| `latitude`, `longitude` | number | optional |
|
||||
| `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.
|
||||
`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`,
|
||||
@@ -226,7 +234,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
|
||||
@@ -238,9 +245,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
|
||||
@@ -254,14 +258,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
|
||||
`containsLocation` is expected to be true for stored v2 outlooks.
|
||||
`containsLocation` is rejected on `/outlooks/convective/location` because that
|
||||
route always applies `containsLocation=true`. `precision` and unknown
|
||||
parameters are rejected.
|
||||
outlooks are already filtered for the configured location. `precision`,
|
||||
`containsLocation`, and unknown parameters are rejected.
|
||||
|
||||
Run `data` fields:
|
||||
|
||||
@@ -306,7 +306,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:
|
||||
@@ -359,53 +359,8 @@ Example JSON response:
|
||||
}
|
||||
```
|
||||
|
||||
Example location-filtered JSON response:
|
||||
|
||||
```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.
|
||||
Text format uses the shared convective outlook template for both outlook routes
|
||||
and renders a no-data message when `data` is null.
|
||||
|
||||
### Forecasts
|
||||
|
||||
|
||||
@@ -8,8 +8,8 @@ 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,
|
||||
response envelopes, and template names.
|
||||
forecast day-slice filtering, outlook active filter construction,
|
||||
alert active-time selection, response envelopes, and template names.
|
||||
|
||||
## Inputs and Outputs
|
||||
|
||||
@@ -35,7 +35,8 @@ The adapter may:
|
||||
- call the `Service` interface;
|
||||
- choose the presenter function for an endpoint;
|
||||
- filter forecast copies for `/today` and `/tomorrow`;
|
||||
- construct outlook active/location filters.
|
||||
- pass the current UTC instant to active-alert application filtering;
|
||||
- construct outlook active filters.
|
||||
|
||||
The adapter must not:
|
||||
|
||||
@@ -61,9 +62,9 @@ declared in endpoint definitions, but `templates.base_dir` is loaded by feedapi.
|
||||
|
||||
## State
|
||||
|
||||
The adapter has no durable state. `forecastNow` and `outlookNow` are
|
||||
package-level state only to make time-dependent endpoint tests deterministic.
|
||||
Do not add request caches or cross-request mutable state here.
|
||||
The adapter has no durable state. `forecastNow`, `alertNow`, and `outlookNow`
|
||||
are package-level state only to make time-dependent endpoint tests
|
||||
deterministic. Do not add request caches or cross-request mutable state here.
|
||||
|
||||
## Route Registry
|
||||
|
||||
@@ -98,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
|
||||
`/outlooks/convective/location`, `containsLocation`. The location route always
|
||||
adds `containsLocation=true` after binding and rejects an explicit
|
||||
`containsLocation` query value.
|
||||
Outlook routes accept `day` and `outlookType`. `containsLocation` is a response
|
||||
field only and is rejected as a request parameter.
|
||||
|
||||
## Timezone Parsing
|
||||
|
||||
@@ -131,23 +130,25 @@ Filtering behavior:
|
||||
The package variable `forecastNow` exists so endpoint tests can make day-slice
|
||||
behavior deterministic.
|
||||
|
||||
## Alert Active Time
|
||||
|
||||
`/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.
|
||||
|
||||
## Outlook Filters
|
||||
|
||||
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/location` adds the same active timestamp and
|
||||
`ContainsLocation=true`.
|
||||
- `/outlooks/convective/active` adds `ActiveAt=outlookNow().UTC()`.
|
||||
|
||||
The package variable `outlookNow` exists so endpoint tests can make active and
|
||||
location filtering deterministic.
|
||||
The package variable `outlookNow` exists so endpoint tests can make active
|
||||
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
|
||||
|
||||
|
||||
@@ -79,7 +79,8 @@ 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`.
|
||||
`alert_references`. This is the latest stored alert snapshot; 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
|
||||
|
||||
@@ -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 active alerts run, latest hourly forecast, latest narrative forecast, latest forecast discussion, latest weather story run, latest individual weather story, and latest convective outlook run. Forecast `today` and `tomorrow` routes derive filtered copies from the latest run. Convective outlook active and location routes derive filtered copies from the latest 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
|
||||
|
||||
|
||||
@@ -1,524 +0,0 @@
|
||||
# Implement Weatherfeeder Outlook V2 Support
|
||||
|
||||
## Status
|
||||
|
||||
Implementation, current-behavior documentation, and automated verification are
|
||||
complete. This file now serves as the checklist and verification record for the
|
||||
outlook v2 compatibility update. Authoritative implemented behavior is
|
||||
documented in `docs/api.md`, `docs/integrations/weatherfeeder-postgres.md`, and
|
||||
`docs/internal/`.
|
||||
|
||||
## Verification Record
|
||||
|
||||
Completed on 2026-06-12:
|
||||
|
||||
- `go test ./internal/app`
|
||||
- `go test ./internal/adapters/outbound/postgres`
|
||||
- `go test ./internal/adapters/inbound/httpapi/presenter`
|
||||
- `go test ./internal/adapters/inbound/httpapi`
|
||||
- `go test ./...`
|
||||
- `go build ./cmd/weatherapi`
|
||||
|
||||
The database-backed endpoint checklist requires a reachable PostgreSQL database
|
||||
populated by weatherfeeder outlook v2 tables. It was not run in this workspace
|
||||
because no such populated database was available.
|
||||
|
||||
## Summary
|
||||
|
||||
Implement `weatherapi` support for the `weatherfeeder` SPC outlook v2 contract described in `docs/roadmap/outlook.md`.
|
||||
|
||||
This is a compatibility update for the existing convective outlook route family. Do not add or remove public routes. Update dependency, repository reads, app filtering, presenters, templates, tests, and current-behavior docs so `weatherapi` reads `weather.outlook.v2` data from the new weatherfeeder Postgres table shape.
|
||||
|
||||
## Required End State
|
||||
|
||||
- `go.mod` depends on the released `weatherfeeder` version containing `weather.outlook.v2` support.
|
||||
- Existing public routes remain available:
|
||||
- `GET /outlooks/convective`
|
||||
- `GET /outlooks/convective/active`
|
||||
- `GET /outlooks/convective/location`
|
||||
- `weatherapi` remains read-only and does not create, migrate, or repair weatherfeeder tables.
|
||||
- The Postgres repository reads `outlook_runs`, `outlooks`, and `outlook_discussions`.
|
||||
- The repository no longer expects polygon-level `headline`, `summary`, or `discussion` columns on `outlooks`.
|
||||
- Returned `WeatherOutlookRun` values include run-level `Discussions` loaded from `outlook_discussions`.
|
||||
- App-level filtering trims both `Outlooks` and `Discussions` so discussions are present only for days with retained outlooks.
|
||||
- Presenters copy and timezone-convert run-level discussion `updatedAt` values.
|
||||
- JSON/XML/text responses expose run-level `discussions` and do not expose polygon-level outlook prose fields.
|
||||
- `data: null` semantics for no latest run are preserved.
|
||||
- Filtered no-match responses return a non-null run with `outlooks: []` and `discussions: []`.
|
||||
- Public query behavior remains compatible: `format`, `units`, `tz` / `TZ`, `day`, `outlookType`, and allowed `containsLocation` behavior are preserved; `precision` and unknown params remain rejected.
|
||||
|
||||
## Guardrails
|
||||
|
||||
- Do not implement weatherfeeder table creation or migration in weatherapi.
|
||||
- Do not call SPC or any upstream weather provider from weatherapi.
|
||||
- Do not introduce historical browsing or cross-run accumulation in this change.
|
||||
- Do not remove `/outlooks/convective/location`; keep it as an API-compatible active local-outlook route.
|
||||
- Do not keep stale v1 SQL reads for `outlooks.headline`, `outlooks.summary`, or `outlooks.discussion`.
|
||||
- Do not commit a `replace` directive for `weatherfeeder`.
|
||||
- Keep SQL in `*_queries.go`, row DTOs in `*_rows.go`, row mapping in `*_mapper.go`, and request/presentation policy in HTTP/presenter packages.
|
||||
|
||||
## Stage 1: Dependency And Compile Boundary
|
||||
|
||||
### Changes
|
||||
|
||||
1. Update `go.mod` to the released `gitea.maximumdirect.net/ejr/weatherfeeder` version that includes:
|
||||
- `standards.SchemaWeatherOutlookV2`;
|
||||
- `model.WeatherOutlookRun.Discussions`;
|
||||
- `model.WeatherOutlookDiscussion`;
|
||||
- `model.WeatherOutlook` without `Headline`, `Summary`, or `Discussion`.
|
||||
2. Run `go mod tidy`.
|
||||
3. Fix compile errors from removed polygon-level outlook prose fields.
|
||||
4. Search for outlook v1 and polygon prose references:
|
||||
|
||||
```sh
|
||||
rg "SchemaWeatherOutlookV1|weather\.outlook\.v1|\.Headline|\.Summary|\.Discussion|headline|summary|discussion" internal docs templates README.md
|
||||
```
|
||||
|
||||
5. Treat matches carefully:
|
||||
- Keep unrelated alert and forecast-discussion uses.
|
||||
- Remove or update outlook polygon-level prose references.
|
||||
- Replace outlook-specific schema references with v2 where applicable.
|
||||
|
||||
### Expected Files
|
||||
|
||||
- `go.mod`
|
||||
- `go.sum`
|
||||
- `internal/adapters/outbound/postgres/outlooks_rows.go`
|
||||
- `internal/adapters/outbound/postgres/outlooks_mapper.go`
|
||||
- `internal/adapters/outbound/postgres/outlooks_queries.go`
|
||||
- `internal/adapters/outbound/postgres/outlooks_read.go`
|
||||
- `internal/adapters/inbound/httpapi/presenter/outlook.go`
|
||||
- `internal/app/service.go`
|
||||
- outlook-related tests under `internal/app`, `internal/adapters/outbound/postgres`, `internal/adapters/inbound/httpapi`, and presenter tests
|
||||
|
||||
### Verification
|
||||
|
||||
At this stage, run a compile-oriented focused set. It may fail until later stages are complete, but failures should identify remaining v1/prose references.
|
||||
|
||||
```sh
|
||||
go test ./internal/app ./internal/adapters/outbound/postgres ./internal/adapters/inbound/httpapi/presenter
|
||||
```
|
||||
|
||||
## Stage 2: Postgres Query, Row, And Mapper Updates
|
||||
|
||||
### Query Changes
|
||||
|
||||
Update `internal/adapters/outbound/postgres/outlooks_queries.go`.
|
||||
|
||||
Parent query:
|
||||
|
||||
- Keep latest run ordering:
|
||||
|
||||
```sql
|
||||
ORDER BY as_of DESC, event_emitted_at DESC
|
||||
LIMIT 1
|
||||
```
|
||||
|
||||
- Continue selecting parent fields needed by `WeatherOutlookRun`.
|
||||
- Optionally select `discussion_count` for test/sanity visibility, but do not expose it in the API response model.
|
||||
|
||||
Outlook child query:
|
||||
|
||||
- Remove these v1 columns from the `SELECT` list:
|
||||
- `headline`
|
||||
- `summary`
|
||||
- `discussion`
|
||||
- Continue selecting:
|
||||
- `outlook_index`
|
||||
- `outlook_id`
|
||||
- `provider`
|
||||
- `product`
|
||||
- `day`
|
||||
- `outlook_type`
|
||||
- `label`
|
||||
- `label_text`
|
||||
- `severity_rank`
|
||||
- `valid_from`
|
||||
- `valid_to`
|
||||
- `issued_at`
|
||||
- `expires_at`
|
||||
- `forecaster`
|
||||
- `source_url`
|
||||
- `image_url`
|
||||
- `contains_location`
|
||||
- `geometry_json`
|
||||
- Keep `WHERE run_event_id = $1`.
|
||||
- Keep `ORDER BY outlook_index ASC`.
|
||||
|
||||
Discussion child query:
|
||||
|
||||
- Add `queryOutlookDiscussionsForRun`:
|
||||
|
||||
```sql
|
||||
SELECT
|
||||
discussion_index,
|
||||
day,
|
||||
headline,
|
||||
summary,
|
||||
discussion,
|
||||
updated_at
|
||||
FROM outlook_discussions
|
||||
WHERE run_event_id = $1
|
||||
ORDER BY discussion_index ASC
|
||||
```
|
||||
|
||||
### Row DTO Changes
|
||||
|
||||
Update `internal/adapters/outbound/postgres/outlooks_rows.go`:
|
||||
|
||||
- Remove `Headline`, `Summary`, and `Discussion` from `outlookRow`.
|
||||
- Add `DiscussionCount` to `outlookRunParentRow` only if selected by parent query.
|
||||
- Add `outlookDiscussionRow`:
|
||||
- `DiscussionIndex int`
|
||||
- `Day int`
|
||||
- `Headline sql.NullString`
|
||||
- `Summary sql.NullString`
|
||||
- `Discussion sql.NullString`
|
||||
- `UpdatedAt sql.NullTime`
|
||||
|
||||
### Mapper Changes
|
||||
|
||||
Update `internal/adapters/outbound/postgres/outlooks_mapper.go`:
|
||||
|
||||
- `mapOutlookRow` maps only v2 polygon fields.
|
||||
- Keep geometry validation with `json.Valid` and return contextual mapper errors for invalid JSON.
|
||||
- Continue copying geometry bytes with `append([]byte(nil), geometry...)`.
|
||||
- Continue normalizing outlook timestamps to UTC.
|
||||
- Add `mapOutlookDiscussionRow` returning `model.WeatherOutlookDiscussion`:
|
||||
- `Day` from row day;
|
||||
- string fields via existing `stringValue` helper;
|
||||
- `UpdatedAt` via existing `timePtr` helper, ensuring UTC normalization.
|
||||
|
||||
### Read Flow Changes
|
||||
|
||||
Update `internal/adapters/outbound/postgres/outlooks_read.go`:
|
||||
|
||||
- `LatestConvectiveOutlookRun` loads parent row as today.
|
||||
- After parent row:
|
||||
- call `loadOutlooks(ctx, row.EventID)`;
|
||||
- call `loadOutlookDiscussions(ctx, row.EventID)`;
|
||||
- attach both to the run.
|
||||
- Add `loadOutlookDiscussions` mirroring `loadOutlooks` style:
|
||||
- query with context;
|
||||
- scan rows;
|
||||
- map rows;
|
||||
- return iteration errors;
|
||||
- wrap query, scan, map, and iteration errors with operation context.
|
||||
- Preserve `nil, nil` on missing parent row.
|
||||
|
||||
### Tests
|
||||
|
||||
Update or add tests in `internal/adapters/outbound/postgres`:
|
||||
|
||||
- `mapOutlookRow` maps v2 polygon fields and no longer expects polygon-level prose.
|
||||
- `mapOutlookRow` rejects invalid `geometry_json`.
|
||||
- nullable label/forecaster/source/image/severity fields map correctly.
|
||||
- `mapOutlookDiscussionRow` maps day/headline/summary/discussion/updatedAt and normalizes time to UTC.
|
||||
- nullable discussion fields map to empty/omitted canonical values.
|
||||
- latest run read loads outlooks in `outlook_index ASC` order.
|
||||
- latest run read loads discussions in `discussion_index ASC` order.
|
||||
- missing latest parent returns `nil, nil`.
|
||||
- query/scan/iteration failures remain context-wrapped.
|
||||
|
||||
### Verification
|
||||
|
||||
```sh
|
||||
go test ./internal/adapters/outbound/postgres
|
||||
```
|
||||
|
||||
## Stage 3: Application Filtering And Copy Semantics
|
||||
|
||||
### Changes
|
||||
|
||||
Update `internal/app/service.go`.
|
||||
|
||||
Clone behavior:
|
||||
|
||||
- `cloneOutlookRun` must deep-copy `Discussions` in addition to `Outlooks`.
|
||||
- Ensure outlook severity pointers, geometry bytes, latitude/longitude pointers, and issuedAt pointers remain copied.
|
||||
- Add a helper such as `cloneOutlookDiscussion` if useful.
|
||||
|
||||
Filtering behavior:
|
||||
|
||||
- Filter `Outlooks` as today using `OutlookFilter`.
|
||||
- After filtering outlooks, filter `Discussions` to only days represented by retained outlooks.
|
||||
- Preserve discussion order from the repository result.
|
||||
- If no outlooks remain, set discussions to an empty slice, not stale unfiltered discussions.
|
||||
- Preserve nil/missing run behavior: repository `nil, nil` still returns `nil, nil`.
|
||||
|
||||
Recommended helper shape:
|
||||
|
||||
```go
|
||||
func filterOutlookDiscussions(discussions []model.WeatherOutlookDiscussion, outlooks []model.WeatherOutlook) []model.WeatherOutlookDiscussion
|
||||
```
|
||||
|
||||
Rules:
|
||||
|
||||
- Build a set of retained outlook days.
|
||||
- If the set is empty, return `[]model.WeatherOutlookDiscussion{}` when discussions was non-nil or when consistent empty-array output is desired.
|
||||
- Include each discussion only if `discussion.Day` is in the set.
|
||||
- Do not synthesize discussions.
|
||||
|
||||
### Query Compatibility
|
||||
|
||||
Do not change query binder behavior in this stage unless tests reveal compile fallout from the model update. Public query behavior remains:
|
||||
|
||||
- `day` accepted on all outlook routes.
|
||||
- `outlookType` accepted on all outlook routes.
|
||||
- `containsLocation` accepted on `/outlooks/convective` and `/outlooks/convective/active`.
|
||||
- `containsLocation` rejected on `/outlooks/convective/location`.
|
||||
- `format`, `units`, and `tz` / `TZ` accepted.
|
||||
- `precision` and unknown params rejected.
|
||||
|
||||
### Tests
|
||||
|
||||
Update `internal/app/service_test.go`:
|
||||
|
||||
- Delegation test still asserts one repository call.
|
||||
- Day filter retains matching outlooks and only matching day discussions.
|
||||
- Outlook type filter retains discussions only for days with retained outlooks.
|
||||
- Active filter retains discussions only for days with active retained outlooks.
|
||||
- `containsLocation=false` returns an empty outlook/discussion run for v2-style test data.
|
||||
- Filtered no-match result has empty `Outlooks` and empty `Discussions`.
|
||||
- Mutating returned outlooks/discussions does not mutate repository-owned data.
|
||||
- Geometry byte copy and pointer copy behavior remains covered.
|
||||
|
||||
### Verification
|
||||
|
||||
```sh
|
||||
go test ./internal/app
|
||||
```
|
||||
|
||||
## Stage 4: Presenter And Text Template Updates
|
||||
|
||||
### Presenter Changes
|
||||
|
||||
Update `internal/adapters/inbound/httpapi/presenter/outlook.go`:
|
||||
|
||||
- Include `Discussions` when constructing the presented `model.WeatherOutlookRun`.
|
||||
- Convert `WeatherOutlookDiscussion.UpdatedAt` using `inLocationTimePtr`.
|
||||
- Deep-copy discussions so presenter output mutation cannot affect repository/app input.
|
||||
- Remove `Headline`, `Summary`, and `Discussion` assignments from `copyOutlook`.
|
||||
- Continue converting:
|
||||
- run `AsOf`;
|
||||
- run `IssuedAt`;
|
||||
- outlook `ValidFrom`;
|
||||
- outlook `ValidTo`;
|
||||
- outlook `IssuedAt`;
|
||||
- outlook `ExpiresAt`.
|
||||
- Continue preserving geometry copy behavior.
|
||||
- Continue returning `nil` for nil input.
|
||||
|
||||
Recommended helper:
|
||||
|
||||
```go
|
||||
func copyOutlookDiscussion(d model.WeatherOutlookDiscussion, tz *time.Location) model.WeatherOutlookDiscussion
|
||||
```
|
||||
|
||||
### Template Changes
|
||||
|
||||
Update `templates/outlooks_convective.txt.tmpl`:
|
||||
|
||||
- Render run-level discussions from `.Data.Discussions`.
|
||||
- Do not reference outlook-level `.Headline`, `.Summary`, or `.Discussion`.
|
||||
- Keep no-data output when `.Data` is nil.
|
||||
- Keep useful output when `.Data` exists and `.Data.Outlooks` is empty.
|
||||
- Include discussion day/headline/summary/discussion fields in a readable, conditional way.
|
||||
- Avoid printing zero timestamps or `<nil>` values for absent `updatedAt`.
|
||||
|
||||
### Presenter Tests
|
||||
|
||||
Update `internal/adapters/inbound/httpapi/presenter/payload_test.go`:
|
||||
|
||||
- `OutlookRunPayload(nil, ...)` returns nil.
|
||||
- Output includes copied `Discussions`.
|
||||
- Discussion `UpdatedAt` is converted to requested timezone.
|
||||
- Mutating output discussions does not mutate input discussions.
|
||||
- Mutating output geometry does not mutate input geometry.
|
||||
- Outlook timestamps still convert to requested timezone.
|
||||
- Polygon-level prose fields are not expected in output structs/tests.
|
||||
|
||||
### Verification
|
||||
|
||||
```sh
|
||||
go test ./internal/adapters/inbound/httpapi/presenter
|
||||
```
|
||||
|
||||
## Stage 5: HTTP Endpoint Behavior And Tests
|
||||
|
||||
### Handler Behavior
|
||||
|
||||
Keep route registration and handler structure unchanged unless compile updates require mechanical edits.
|
||||
|
||||
Ensure endpoint responses reflect the updated presenter/app behavior:
|
||||
|
||||
- `/outlooks/convective` returns latest run with v2 shape.
|
||||
- `/outlooks/convective/active` applies active filter and trims discussions.
|
||||
- `/outlooks/convective/location` applies active local filter and trims discussions.
|
||||
- `data: null` remains unchanged when no run exists.
|
||||
- Filtered no-match response returns data object with empty outlook and discussion arrays.
|
||||
|
||||
### Endpoint Tests
|
||||
|
||||
Update `internal/adapters/inbound/httpapi/endpoints_test.go`:
|
||||
|
||||
- test fakes build `model.WeatherOutlookRun` with `Discussions`.
|
||||
- JSON success asserts run-level `discussions` are present.
|
||||
- JSON success asserts outlook polygons do not include polygon-level prose.
|
||||
- XML success renders run-level discussions without errors.
|
||||
- Text success renders run-level discussion content.
|
||||
- Timezone test checks conversion of:
|
||||
- run `asOf`;
|
||||
- run `issuedAt`;
|
||||
- outlook times;
|
||||
- discussion `updatedAt`.
|
||||
- Null data test remains unchanged.
|
||||
- Filtered no-match test expects both `outlooks` and `discussions` empty.
|
||||
- Query acceptance still covers `units`, `format`, `tz` / `TZ`, `day`, `outlookType`, and allowed `containsLocation`.
|
||||
- Query rejection still covers `precision`, unknown params, invalid day, invalid outlookType, invalid containsLocation, invalid timezone, conflicting `tz` / `TZ`, and `containsLocation` on `/location`.
|
||||
- Active/location route tests continue using injectable `outlookNow`.
|
||||
|
||||
### Verification
|
||||
|
||||
```sh
|
||||
go test ./internal/adapters/inbound/httpapi
|
||||
```
|
||||
|
||||
## Stage 6: Documentation Updates
|
||||
|
||||
After code behavior is updated, update current-behavior documentation. Do not leave v2 behavior only in roadmap files.
|
||||
|
||||
### Public Docs
|
||||
|
||||
Update `docs/api.md`:
|
||||
|
||||
- State outlook endpoints serve weatherfeeder `weather.outlook.v2` data.
|
||||
- Run fields include `discussions`.
|
||||
- Add discussion field table:
|
||||
- `day`;
|
||||
- `headline`;
|
||||
- `summary`;
|
||||
- `discussion`;
|
||||
- `updatedAt`.
|
||||
- Remove polygon-level `headline`, `summary`, and `discussion` from outlook fields.
|
||||
- State v2 outlooks are already location-filtered by weatherfeeder.
|
||||
- State `containsLocation` is expected to be true for v2 outlooks.
|
||||
- Explain `/outlooks/convective/location` remains an active local-outlook compatibility route under v2.
|
||||
- State endpoint filters also filter `discussions` to days represented by retained outlooks.
|
||||
- State current endpoints use latest-run semantics and do not accumulate historical active outlook rows.
|
||||
- Update examples to show run-level `discussions`.
|
||||
- Ensure examples use valid GeoJSON polygon or multipolygon, not a point, if demonstrating SPC geometry.
|
||||
|
||||
Update `README.md` only if its overview implies all-polygons or old response shape.
|
||||
|
||||
### Integration/Internal Docs
|
||||
|
||||
Update `docs/integrations/weatherfeeder-postgres.md`:
|
||||
|
||||
- Update dependency version.
|
||||
- Table family for convective outlook includes `outlook_runs`, `outlooks`, and `outlook_discussions`.
|
||||
- Latest run selection remains `as_of DESC, event_emitted_at DESC`.
|
||||
- Child ordering includes:
|
||||
- outlooks by `outlook_index ASC`;
|
||||
- outlook discussions by `discussion_index ASC`.
|
||||
- `outlook_runs` includes `discussion_count` if listed.
|
||||
- `outlooks` no longer includes `headline`, `summary`, or `discussion`.
|
||||
- Add `outlook_discussions` columns.
|
||||
- State weatherapi assumes weatherfeeder's outlook v2 table reset has already been applied.
|
||||
|
||||
Update `docs/internal/postgres-repository.md`:
|
||||
|
||||
- `LatestConvectiveOutlookRun` loads parent, outlook children, and discussion children.
|
||||
- Add outlook discussion child ordering.
|
||||
|
||||
Update `docs/internal/presenters.md`:
|
||||
|
||||
- Outlook presenter copies and timezone-converts run-level discussions.
|
||||
- Outlook presenter no longer handles polygon-level prose.
|
||||
|
||||
Update `docs/internal/http-adapter.md`:
|
||||
|
||||
- Outlook filters trim discussions to retained outlook days.
|
||||
- `/location` is retained for compatibility and active local-outlook behavior.
|
||||
|
||||
Update `docs/operations.md` and `docs/troubleshooting.md` only if they mention the old weatherfeeder table shape or should warn operators that weatherapi requires weatherfeeder v2 outlook tables.
|
||||
|
||||
### Roadmap Docs
|
||||
|
||||
After implementation is complete, replace or update `docs/roadmap/outlook.md` and `docs/roadmap/implementation.md` according to repository convention:
|
||||
|
||||
- Either mark the roadmap complete and point to current docs.
|
||||
- Or move any remaining deferred ideas to a future roadmap file.
|
||||
|
||||
Do not leave roadmap files claiming unimplemented work after the implementation has shipped.
|
||||
|
||||
### Documentation Checks
|
||||
|
||||
Run searches for stale outlook v1/current behavior:
|
||||
|
||||
```sh
|
||||
rg "weather\.outlook\.v1|outlooks\.headline|outlooks\.summary|outlooks\.discussion|polygon-level|all stored outlook|all polygons|headline, summary, discussion" docs README.md internal templates
|
||||
```
|
||||
|
||||
Allowed matches:
|
||||
|
||||
- explicit historical/legacy notes, if any;
|
||||
- unrelated alert or forecast discussion prose fields;
|
||||
- roadmap files that are intentionally historical.
|
||||
|
||||
## Stage 7: Full Verification
|
||||
|
||||
Run focused tests:
|
||||
|
||||
```sh
|
||||
go test ./internal/app
|
||||
go test ./internal/adapters/outbound/postgres
|
||||
go test ./internal/adapters/inbound/httpapi/presenter
|
||||
go test ./internal/adapters/inbound/httpapi
|
||||
```
|
||||
|
||||
Run the full suite:
|
||||
|
||||
```sh
|
||||
go test ./...
|
||||
```
|
||||
|
||||
Optional build check:
|
||||
|
||||
```sh
|
||||
go build ./cmd/weatherapi
|
||||
```
|
||||
|
||||
Manual verification against a database populated by weatherfeeder outlook v2 tables:
|
||||
|
||||
```http
|
||||
GET /outlooks/convective
|
||||
GET /outlooks/convective/active
|
||||
GET /outlooks/convective/location
|
||||
GET /outlooks/convective?day=1
|
||||
GET /outlooks/convective?outlookType=tornado
|
||||
GET /outlooks/convective?containsLocation=false
|
||||
GET /outlooks/convective?format=text&tz=America/Chicago
|
||||
```
|
||||
|
||||
Expected manual results:
|
||||
|
||||
- Latest run includes run-level `discussions`.
|
||||
- Active route filters outlooks and discussions together.
|
||||
- Location route returns active local outlooks and remains valid.
|
||||
- `containsLocation=false` returns an empty run for v2 data.
|
||||
- Text format renders discussions without template errors.
|
||||
- XML format renders without errors.
|
||||
- No endpoint queries historical active rows across older runs.
|
||||
|
||||
## Assumptions
|
||||
|
||||
- A weatherfeeder release containing outlook v2 exists before final implementation is committed.
|
||||
- Operators have reset/recreated weatherfeeder outlook tables according to weatherfeeder transition docs.
|
||||
- Existing weatherapi route names remain stable for external consumers.
|
||||
- Keeping `containsLocation` query support on non-location routes is useful backward compatibility even though v2 data should always be local.
|
||||
- Latest-run semantics are correct for current convective outlook endpoints.
|
||||
|
||||
## Open Questions
|
||||
|
||||
None. This plan fixes the route, dependency, storage, filtering, presentation, and documentation decisions required to support weatherfeeder outlook v2 while preserving weatherapi's existing public route family.
|
||||
@@ -1,36 +0,0 @@
|
||||
# Weatherfeeder Outlook V2 Support
|
||||
|
||||
## Status
|
||||
|
||||
Implemented in current behavior docs and code. The authoritative implemented
|
||||
contracts now live in:
|
||||
|
||||
- [`docs/api.md`](../api.md) for public outlook routes, query parameters, and
|
||||
response fields;
|
||||
- [`docs/integrations/weatherfeeder-postgres.md`](../integrations/weatherfeeder-postgres.md)
|
||||
for weatherfeeder-owned table assumptions;
|
||||
- [`docs/internal/postgres-repository.md`](../internal/postgres-repository.md),
|
||||
[`docs/internal/http-adapter.md`](../internal/http-adapter.md), and
|
||||
[`docs/internal/presenters.md`](../internal/presenters.md) for internal
|
||||
behavior.
|
||||
|
||||
`docs/roadmap/implementation.md` remains as the implementation checklist and
|
||||
verification record for this compatibility update.
|
||||
|
||||
## Delivered Behavior
|
||||
|
||||
- Existing public routes remain available:
|
||||
- `GET /outlooks/convective`
|
||||
- `GET /outlooks/convective/active`
|
||||
- `GET /outlooks/convective/location`
|
||||
- The Postgres repository reads weatherfeeder outlook v2 tables:
|
||||
`outlook_runs`, `outlooks`, and `outlook_discussions`.
|
||||
- Outlook polygons no longer include prose fields.
|
||||
- Run-level `discussions` are loaded, copied, presented, and timezone-converted.
|
||||
- Application filtering trims `discussions` to days represented by retained
|
||||
outlooks.
|
||||
- Missing latest data still returns `data: null`.
|
||||
- Filtered no-match responses return a run object with `outlooks: []` and
|
||||
`discussions: []`.
|
||||
- `weatherapi` remains read-only and does not create, migrate, or repair
|
||||
weatherfeeder tables.
|
||||
@@ -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
|
||||
GET {{baseUrl}}/outlooks/convective/location?format=text&tz=CDT
|
||||
### Active convective outlooks as text
|
||||
GET {{baseUrl}}/outlooks/convective/active?format=text&tz=CDT
|
||||
|
||||
### Hourly forecast in US units
|
||||
GET {{baseUrl}}/forecast/hourly?units=us&precision=1&tz=Chicago
|
||||
|
||||
@@ -4,6 +4,7 @@ package httpapi
|
||||
|
||||
import (
|
||||
"context"
|
||||
"time"
|
||||
|
||||
"gitea.maximumdirect.net/ejr/feedapi/endpoint"
|
||||
"gitea.maximumdirect.net/ejr/feedapi/render"
|
||||
@@ -11,12 +12,14 @@ import (
|
||||
"gitea.maximumdirect.net/ejr/weatherapi/internal/adapters/inbound/httpapi/presenter"
|
||||
)
|
||||
|
||||
var alertNow = time.Now
|
||||
|
||||
func alertsDefinition(svc Service) endpoint.Definition {
|
||||
return endpoint.GET(
|
||||
"/alerts/active",
|
||||
bindQuery,
|
||||
func(ctx context.Context, req queryRequest) (any, error) {
|
||||
run, err := svc.LatestAlertRun(ctx)
|
||||
run, err := svc.LatestActiveAlertRun(ctx, alertNow().UTC())
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
@@ -30,6 +30,7 @@ type fakeService struct {
|
||||
weatherStoryRun *model.WeatherStoryRun
|
||||
weatherStory *model.WeatherStory
|
||||
alerts *model.WeatherAlertRun
|
||||
activeAlertAt []time.Time
|
||||
outlookRun *model.WeatherOutlookRun
|
||||
outlookFilters []app.OutlookFilter
|
||||
conditions *app.CurrentConditions
|
||||
@@ -64,6 +65,11 @@ func (s *fakeService) LatestAlertRun(context.Context) (*model.WeatherAlertRun, e
|
||||
return s.alerts, s.err
|
||||
}
|
||||
|
||||
func (s *fakeService) LatestActiveAlertRun(_ context.Context, activeAt time.Time) (*model.WeatherAlertRun, error) {
|
||||
s.activeAlertAt = append(s.activeAlertAt, activeAt)
|
||||
return s.alerts, s.err
|
||||
}
|
||||
|
||||
func (s *fakeService) LatestConvectiveOutlook(_ context.Context, filter app.OutlookFilter) (*model.WeatherOutlookRun, error) {
|
||||
s.outlookFilters = append(s.outlookFilters, filter)
|
||||
return s.outlookRun, s.err
|
||||
@@ -73,6 +79,46 @@ func (s *fakeService) CurrentConditions(context.Context) (*app.CurrentConditions
|
||||
return s.conditions, s.err
|
||||
}
|
||||
|
||||
type alertRepository struct {
|
||||
alerts *model.WeatherAlertRun
|
||||
}
|
||||
|
||||
func (r *alertRepository) LatestObservation(context.Context) (*model.WeatherObservation, error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (r *alertRepository) LatestHourlyForecast(context.Context) (*model.WeatherForecastRun, error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (r *alertRepository) LatestNarrativeForecast(context.Context) (*model.WeatherForecastRun, error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (r *alertRepository) LatestForecastDiscussion(context.Context) (*model.WeatherForecastDiscussion, error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (r *alertRepository) LatestWeatherStoryRun(context.Context) (*model.WeatherStoryRun, error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (r *alertRepository) LatestWeatherStory(context.Context) (*model.WeatherStory, error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (r *alertRepository) LatestAlertRun(context.Context) (*model.WeatherAlertRun, error) {
|
||||
return r.alerts, nil
|
||||
}
|
||||
|
||||
func (r *alertRepository) LatestConvectiveOutlookRun(context.Context) (*model.WeatherOutlookRun, error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (r *alertRepository) CurrentConditions(context.Context, int) (*app.CurrentConditions, error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func TestObservationsRejectUnknownQueryParameter(t *testing.T) {
|
||||
h := newHandler(t, &fakeService{}, "/observations")
|
||||
|
||||
@@ -315,6 +361,153 @@ func TestAlertsUSUnitsKeepSchema(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestAlertsRouteRegistered(t *testing.T) {
|
||||
def := definitionForPath(t, Definitions(&fakeService{}), "/alerts/active")
|
||||
if len(def.Methods) != 1 || def.Methods[0] != http.MethodGet {
|
||||
t.Fatalf("expected GET definition, got %+v", def.Methods)
|
||||
}
|
||||
}
|
||||
|
||||
func TestAlertsHandlerPassesCurrentUTCInstant(t *testing.T) {
|
||||
now := time.Date(2026, 6, 11, 7, 30, 0, 0, time.FixedZone("LOCAL", -5*60*60))
|
||||
setAlertNowForTest(t, now)
|
||||
svc := &fakeService{
|
||||
alerts: &model.WeatherAlertRun{AsOf: time.Now().UTC()},
|
||||
}
|
||||
h := newHandler(t, svc, "/alerts/active")
|
||||
|
||||
w := httptest.NewRecorder()
|
||||
req := httptest.NewRequest(http.MethodGet, "/alerts/active", nil)
|
||||
h.ServeHTTP(w, req)
|
||||
|
||||
if w.Code != http.StatusOK {
|
||||
t.Fatalf("expected 200, got %d", w.Code)
|
||||
}
|
||||
if len(svc.activeAlertAt) != 1 {
|
||||
t.Fatalf("expected one active-alert service call, got %d", len(svc.activeAlertAt))
|
||||
}
|
||||
want := now.UTC()
|
||||
if !svc.activeAlertAt[0].Equal(want) {
|
||||
t.Fatalf("expected activeAt %v, got %v", want, svc.activeAlertAt[0])
|
||||
}
|
||||
if svc.activeAlertAt[0].Location() != time.UTC {
|
||||
t.Fatalf("expected UTC location, got %v", svc.activeAlertAt[0].Location())
|
||||
}
|
||||
}
|
||||
|
||||
func TestAlertsNoDataReturnsNullEnvelopeData(t *testing.T) {
|
||||
h := newHandler(t, &fakeService{}, "/alerts/active")
|
||||
|
||||
w := httptest.NewRecorder()
|
||||
req := httptest.NewRequest(http.MethodGet, "/alerts/active", nil)
|
||||
h.ServeHTTP(w, req)
|
||||
|
||||
if w.Code != http.StatusOK {
|
||||
t.Fatalf("expected 200, got %d", w.Code)
|
||||
}
|
||||
|
||||
var payload struct {
|
||||
Data *json.RawMessage `json:"data"`
|
||||
}
|
||||
if err := json.Unmarshal(w.Body.Bytes(), &payload); err != nil {
|
||||
t.Fatalf("decode envelope: %v", err)
|
||||
}
|
||||
if payload.Data != nil {
|
||||
t.Fatalf("expected data null, got %s", string(*payload.Data))
|
||||
}
|
||||
}
|
||||
|
||||
func TestAlertsTextRendersNoData(t *testing.T) {
|
||||
h := newHandler(t, &fakeService{}, "/alerts/active")
|
||||
|
||||
w := httptest.NewRecorder()
|
||||
req := httptest.NewRequest(http.MethodGet, "/alerts/active?format=text", nil)
|
||||
h.ServeHTTP(w, req)
|
||||
|
||||
if w.Code != http.StatusOK {
|
||||
t.Fatalf("expected 200, got %d", w.Code)
|
||||
}
|
||||
if !strings.Contains(w.Body.String(), "No active alerts data available.") {
|
||||
t.Fatalf("expected no-data alert text, got %q", w.Body.String())
|
||||
}
|
||||
}
|
||||
|
||||
func TestAlertsTextRendersEmptyActiveSet(t *testing.T) {
|
||||
h := newHandler(t, &fakeService{
|
||||
alerts: &model.WeatherAlertRun{
|
||||
AsOf: time.Date(2026, 6, 11, 12, 0, 0, 0, time.UTC),
|
||||
Alerts: []model.WeatherAlert{},
|
||||
},
|
||||
}, "/alerts/active")
|
||||
|
||||
w := httptest.NewRecorder()
|
||||
req := httptest.NewRequest(http.MethodGet, "/alerts/active?format=text", nil)
|
||||
h.ServeHTTP(w, req)
|
||||
|
||||
if w.Code != http.StatusOK {
|
||||
t.Fatalf("expected 200, got %d", w.Code)
|
||||
}
|
||||
if !strings.Contains(w.Body.String(), "Alerts: 0") {
|
||||
t.Fatalf("expected empty alert count in text body, got %q", w.Body.String())
|
||||
}
|
||||
}
|
||||
|
||||
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)
|
||||
expiredAtBoundary := activeAt
|
||||
repo := &alertRepository{
|
||||
alerts: &model.WeatherAlertRun{
|
||||
AsOf: activeAt,
|
||||
Alerts: []model.WeatherAlert{
|
||||
{
|
||||
ID: "active-alert",
|
||||
Headline: "Active warning",
|
||||
MessageType: "Alert",
|
||||
Effective: &effective,
|
||||
Expires: &activeExpires,
|
||||
},
|
||||
{
|
||||
ID: "expired-alert",
|
||||
Headline: "Expired warning",
|
||||
MessageType: "Alert",
|
||||
Effective: &effective,
|
||||
Expires: &expiredAtBoundary,
|
||||
},
|
||||
{
|
||||
ID: "canceled-alert",
|
||||
Headline: "Canceled warning",
|
||||
MessageType: " cancel ",
|
||||
Effective: &effective,
|
||||
Expires: &activeExpires,
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
h := newHandler(t, app.NewService(repo), "/alerts/active")
|
||||
|
||||
w := httptest.NewRecorder()
|
||||
req := httptest.NewRequest(http.MethodGet, "/alerts/active?format=text", nil)
|
||||
h.ServeHTTP(w, req)
|
||||
|
||||
if w.Code != http.StatusOK {
|
||||
t.Fatalf("expected 200, got %d", w.Code)
|
||||
}
|
||||
body := w.Body.String()
|
||||
for _, want := range []string{"Alerts: 1", "active-alert", "Active warning"} {
|
||||
if !strings.Contains(body, want) {
|
||||
t.Fatalf("expected %q in text body, got %q", want, body)
|
||||
}
|
||||
}
|
||||
for _, notWant := range []string{"expired-alert", "Expired warning", "canceled-alert", "Canceled warning"} {
|
||||
if strings.Contains(body, notWant) {
|
||||
t.Fatalf("did not expect %q in text body, got %q", notWant, body)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestObservationUSUnitsWithXMLFormat(t *testing.T) {
|
||||
h := newHandler(t, &fakeService{
|
||||
observation: &model.WeatherObservation{
|
||||
@@ -1265,17 +1458,24 @@ func TestPrecisionValidationRange(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestAlertsRejectPrecisionQueryParameter(t *testing.T) {
|
||||
func TestAlertsRejectUnsupportedQueryParameters(t *testing.T) {
|
||||
h := newHandler(t, &fakeService{
|
||||
alerts: &model.WeatherAlertRun{AsOf: time.Now().UTC()},
|
||||
}, "/alerts/active")
|
||||
|
||||
w := httptest.NewRecorder()
|
||||
req := httptest.NewRequest(http.MethodGet, "/alerts/active?precision=1", nil)
|
||||
h.ServeHTTP(w, req)
|
||||
for _, rawURL := range []string{
|
||||
"/alerts/active?precision=1",
|
||||
"/alerts/active?tz=CDT",
|
||||
"/alerts/active?TZ=CDT",
|
||||
"/alerts/active?bogus=1",
|
||||
} {
|
||||
w := httptest.NewRecorder()
|
||||
req := httptest.NewRequest(http.MethodGet, rawURL, nil)
|
||||
h.ServeHTTP(w, req)
|
||||
|
||||
if w.Code != http.StatusBadRequest {
|
||||
t.Fatalf("expected 400, got %d", w.Code)
|
||||
if w.Code != http.StatusBadRequest {
|
||||
t.Fatalf("%s: expected 400, got %d", rawURL, w.Code)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1284,13 +1484,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) {
|
||||
@@ -1299,7 +1501,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)
|
||||
@@ -1476,7 +1677,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 {
|
||||
@@ -1492,15 +1693,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)
|
||||
|
||||
@@ -1516,28 +1714,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) {
|
||||
@@ -1548,10 +1724,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])
|
||||
@@ -2240,6 +2416,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()
|
||||
|
||||
@@ -2263,7 +2448,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": "Alerts text",
|
||||
"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}}",
|
||||
"conditions_current.txt.tmpl": "Conditions text",
|
||||
} {
|
||||
tmpl, err := template.New(name).Parse(body)
|
||||
@@ -2297,6 +2482,13 @@ func setOutlookNowForTest(t *testing.T, now time.Time) {
|
||||
t.Cleanup(func() { outlookNow = original })
|
||||
}
|
||||
|
||||
func setAlertNowForTest(t *testing.T, now time.Time) {
|
||||
t.Helper()
|
||||
original := alertNow
|
||||
alertNow = func() time.Time { return now }
|
||||
t.Cleanup(func() { alertNow = original })
|
||||
}
|
||||
|
||||
func testOutlookRun() *model.WeatherOutlookRun {
|
||||
issuedAt := time.Date(2026, 6, 11, 12, 0, 0, 0, time.UTC)
|
||||
discussionUpdatedAt := issuedAt.Add(30 * time.Minute)
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -337,6 +337,22 @@ func TestMetricCopyAndNilHandling(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestAlertsPayloadPassThrough(t *testing.T) {
|
||||
run := &model.WeatherAlertRun{
|
||||
LocationID: "stl",
|
||||
AsOf: time.Date(2026, 6, 11, 12, 0, 0, 0, time.UTC),
|
||||
Alerts: []model.WeatherAlert{{
|
||||
ID: "alert-1",
|
||||
Headline: "Storm warning",
|
||||
}},
|
||||
}
|
||||
|
||||
payload := AlertsPayload(run, UnitsUS)
|
||||
if payload != run {
|
||||
t.Fatalf("expected alerts payload to pass through input run")
|
||||
}
|
||||
}
|
||||
|
||||
func TestCurrentConditionsPayloadMetricAndUS(t *testing.T) {
|
||||
conditions := &app.CurrentConditions{
|
||||
TemperatureC: float64Ptr(20),
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ package httpapi
|
||||
|
||||
import (
|
||||
"context"
|
||||
"time"
|
||||
|
||||
"gitea.maximumdirect.net/ejr/weatherapi/internal/app"
|
||||
"gitea.maximumdirect.net/ejr/weatherfeeder/model"
|
||||
@@ -18,6 +19,7 @@ type Service interface {
|
||||
LatestWeatherStoryRun(ctx context.Context) (*model.WeatherStoryRun, error)
|
||||
LatestWeatherStory(ctx context.Context) (*model.WeatherStory, error)
|
||||
LatestAlertRun(ctx context.Context) (*model.WeatherAlertRun, error)
|
||||
LatestActiveAlertRun(ctx context.Context, activeAt time.Time) (*model.WeatherAlertRun, error)
|
||||
LatestConvectiveOutlook(ctx context.Context, filter app.OutlookFilter) (*model.WeatherOutlookRun, error)
|
||||
CurrentConditions(ctx context.Context) (*app.CurrentConditions, error)
|
||||
}
|
||||
|
||||
@@ -25,10 +25,9 @@ type Repository interface {
|
||||
|
||||
// OutlookFilter selects outlook entries from the latest convective outlook run.
|
||||
type OutlookFilter struct {
|
||||
Day *int
|
||||
OutlookType string
|
||||
ContainsLocation *bool
|
||||
ActiveAt *time.Time
|
||||
Day *int
|
||||
OutlookType string
|
||||
ActiveAt *time.Time
|
||||
}
|
||||
|
||||
// Service provides weather read use-cases.
|
||||
@@ -68,6 +67,26 @@ func (s *Service) LatestAlertRun(ctx context.Context) (*model.WeatherAlertRun, e
|
||||
return s.repo.LatestAlertRun(ctx)
|
||||
}
|
||||
|
||||
func (s *Service) LatestActiveAlertRun(ctx context.Context, activeAt time.Time) (*model.WeatherAlertRun, error) {
|
||||
run, err := s.repo.LatestAlertRun(ctx)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if run == nil {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
out := cloneAlertRun(run)
|
||||
alerts := out.Alerts[:0]
|
||||
for _, alert := range out.Alerts {
|
||||
if isActiveAlert(alert, activeAt) {
|
||||
alerts = append(alerts, alert)
|
||||
}
|
||||
}
|
||||
out.Alerts = alerts
|
||||
return out, nil
|
||||
}
|
||||
|
||||
func (s *Service) LatestConvectiveOutlook(ctx context.Context, filter OutlookFilter) (*model.WeatherOutlookRun, error) {
|
||||
run, err := s.repo.LatestConvectiveOutlookRun(ctx)
|
||||
if err != nil {
|
||||
@@ -100,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
|
||||
}
|
||||
@@ -113,6 +129,53 @@ func normalizeOutlookType(value string) string {
|
||||
return strings.ToLower(strings.TrimSpace(value))
|
||||
}
|
||||
|
||||
func cloneAlertRun(run *model.WeatherAlertRun) *model.WeatherAlertRun {
|
||||
out := *run
|
||||
out.Latitude = copyFloat64(run.Latitude)
|
||||
out.Longitude = copyFloat64(run.Longitude)
|
||||
if run.Alerts != nil {
|
||||
out.Alerts = make([]model.WeatherAlert, len(run.Alerts))
|
||||
for i := range run.Alerts {
|
||||
out.Alerts[i] = cloneAlert(run.Alerts[i])
|
||||
}
|
||||
}
|
||||
return &out
|
||||
}
|
||||
|
||||
func cloneAlert(alert model.WeatherAlert) model.WeatherAlert {
|
||||
out := alert
|
||||
out.Sent = copyTime(alert.Sent)
|
||||
out.Effective = copyTime(alert.Effective)
|
||||
out.Onset = copyTime(alert.Onset)
|
||||
out.Expires = copyTime(alert.Expires)
|
||||
if alert.References != nil {
|
||||
out.References = make([]model.AlertReference, len(alert.References))
|
||||
for i := range alert.References {
|
||||
out.References[i] = cloneAlertReference(alert.References[i])
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
func cloneAlertReference(ref model.AlertReference) model.AlertReference {
|
||||
out := ref
|
||||
out.Sent = copyTime(ref.Sent)
|
||||
return out
|
||||
}
|
||||
|
||||
func isActiveAlert(alert model.WeatherAlert, activeAt time.Time) bool {
|
||||
if strings.EqualFold(strings.TrimSpace(alert.MessageType), "Cancel") {
|
||||
return false
|
||||
}
|
||||
if alert.Effective != nil && activeAt.Before(*alert.Effective) {
|
||||
return false
|
||||
}
|
||||
if alert.Expires != nil && !activeAt.Before(*alert.Expires) {
|
||||
return false
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
func cloneOutlookRun(run *model.WeatherOutlookRun) *model.WeatherOutlookRun {
|
||||
out := *run
|
||||
out.Latitude = copyFloat64(run.Latitude)
|
||||
|
||||
@@ -25,6 +25,7 @@ type fakeRepository struct {
|
||||
err error
|
||||
|
||||
currentConditionsWindow int
|
||||
alertRunCalls int
|
||||
outlookRunCalls int
|
||||
}
|
||||
|
||||
@@ -53,6 +54,7 @@ func (r *fakeRepository) LatestWeatherStory(context.Context) (*model.WeatherStor
|
||||
}
|
||||
|
||||
func (r *fakeRepository) LatestAlertRun(context.Context) (*model.WeatherAlertRun, error) {
|
||||
r.alertRunCalls++
|
||||
return r.alerts, r.err
|
||||
}
|
||||
|
||||
@@ -118,6 +120,137 @@ func TestServiceDelegatesAlerts(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestServiceLatestActiveAlertRunDelegatesAndFilters(t *testing.T) {
|
||||
activeAt := testTime(12)
|
||||
repo := &fakeRepository{alerts: testAlertRun()}
|
||||
svc := NewService(repo)
|
||||
|
||||
run, err := svc.LatestActiveAlertRun(context.Background(), activeAt)
|
||||
if err != nil {
|
||||
t.Fatalf("unexpected error: %v", err)
|
||||
}
|
||||
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"})
|
||||
}
|
||||
|
||||
func TestServiceLatestActiveAlertRunNoData(t *testing.T) {
|
||||
repo := &fakeRepository{}
|
||||
svc := NewService(repo)
|
||||
|
||||
run, err := svc.LatestActiveAlertRun(context.Background(), testTime(12))
|
||||
if err != nil {
|
||||
t.Fatalf("unexpected error: %v", err)
|
||||
}
|
||||
if run != nil {
|
||||
t.Fatalf("expected nil alert run, got %+v", run)
|
||||
}
|
||||
}
|
||||
|
||||
func TestServiceLatestActiveAlertRunPropagatesErrors(t *testing.T) {
|
||||
want := errors.New("alert read failed")
|
||||
repo := &fakeRepository{err: want}
|
||||
svc := NewService(repo)
|
||||
|
||||
run, err := svc.LatestActiveAlertRun(context.Background(), testTime(12))
|
||||
if !errors.Is(err, want) {
|
||||
t.Fatalf("expected error %v, got %v", want, err)
|
||||
}
|
||||
if run != nil {
|
||||
t.Fatalf("expected nil alert run on error, got %+v", run)
|
||||
}
|
||||
}
|
||||
|
||||
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("cancel", "Cancel", testTimePtr(9), testTimePtr(10), testTimePtr(11), testTimePtr(13)),
|
||||
testAlert("future", "Alert", testTimePtr(9), testTimePtr(13), testTimePtr(13), testTimePtr(14)),
|
||||
})}
|
||||
svc := NewService(repo)
|
||||
|
||||
run, err := svc.LatestActiveAlertRun(context.Background(), activeAt)
|
||||
if err != nil {
|
||||
t.Fatalf("unexpected error: %v", err)
|
||||
}
|
||||
if run == nil {
|
||||
t.Fatal("expected alert run")
|
||||
}
|
||||
if run.LocationID != "stl" || run.LocationName != "St. Louis" || !run.AsOf.Equal(testTime(10)) {
|
||||
t.Fatalf("unexpected run metadata: %+v", run)
|
||||
}
|
||||
if run.Latitude == nil || *run.Latitude != 38.62 {
|
||||
t.Fatalf("unexpected latitude: %v", run.Latitude)
|
||||
}
|
||||
if run.Longitude == nil || *run.Longitude != -90.2 {
|
||||
t.Fatalf("unexpected longitude: %v", run.Longitude)
|
||||
}
|
||||
if run.Alerts == nil {
|
||||
t.Fatal("expected empty alert slice, got nil")
|
||||
}
|
||||
if len(run.Alerts) != 0 {
|
||||
t.Fatalf("expected no alerts, got %+v", run.Alerts)
|
||||
}
|
||||
}
|
||||
|
||||
func TestServiceLatestActiveAlertRunDoesNotMutateRepositoryRun(t *testing.T) {
|
||||
original := testAlertRun()
|
||||
repo := &fakeRepository{alerts: original}
|
||||
svc := NewService(repo)
|
||||
|
||||
run, err := svc.LatestActiveAlertRun(context.Background(), testTime(12))
|
||||
if err != nil {
|
||||
t.Fatalf("unexpected error: %v", err)
|
||||
}
|
||||
if len(run.Alerts) == 0 {
|
||||
t.Fatal("expected active alerts")
|
||||
}
|
||||
|
||||
*run.Latitude = 99
|
||||
*run.Longitude = -99
|
||||
*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].References[0].Sent = testTime(5)
|
||||
run.Alerts[0].ID = "changed"
|
||||
run.Alerts[0].References[0].ID = "changed"
|
||||
run.Alerts = run.Alerts[:1]
|
||||
|
||||
if *original.Latitude != 38.62 {
|
||||
t.Fatalf("expected original latitude unchanged, got %v", *original.Latitude)
|
||||
}
|
||||
if *original.Longitude != -90.2 {
|
||||
t.Fatalf("expected original longitude unchanged, got %v", *original.Longitude)
|
||||
}
|
||||
if original.Alerts[0].ID != "current" {
|
||||
t.Fatalf("expected original alert ID unchanged, got %q", original.Alerts[0].ID)
|
||||
}
|
||||
if original.Alerts[0].Sent == nil || !original.Alerts[0].Sent.Equal(testTime(9)) {
|
||||
t.Fatalf("expected original sent unchanged, got %v", original.Alerts[0].Sent)
|
||||
}
|
||||
if original.Alerts[0].Effective == nil || !original.Alerts[0].Effective.Equal(testTime(10)) {
|
||||
t.Fatalf("expected original effective unchanged, got %v", original.Alerts[0].Effective)
|
||||
}
|
||||
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)) {
|
||||
t.Fatalf("expected original expires unchanged, got %v", original.Alerts[0].Expires)
|
||||
}
|
||||
if original.Alerts[0].References[0].ID != "ref-current" {
|
||||
t.Fatalf("expected original reference ID unchanged, got %q", original.Alerts[0].References[0].ID)
|
||||
}
|
||||
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 {
|
||||
t.Fatalf("expected original alert slice unchanged, got %d entries", len(original.Alerts))
|
||||
}
|
||||
}
|
||||
|
||||
func TestServiceDelegatesLatestConvectiveOutlookRun(t *testing.T) {
|
||||
repo := &fakeRepository{outlookRun: testOutlookRun()}
|
||||
svc := NewService(repo)
|
||||
@@ -225,32 +358,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()}
|
||||
@@ -266,16 +373,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,
|
||||
OutlookType: "categorical",
|
||||
ContainsLocation: &containsLocation,
|
||||
ActiveAt: &activeAt,
|
||||
Day: &day,
|
||||
OutlookType: "categorical",
|
||||
ActiveAt: &activeAt,
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("unexpected error: %v", err)
|
||||
@@ -402,6 +507,67 @@ 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("expired", "Update", testTimePtr(9), testTimePtr(10), testTimePtr(11), testTimePtr(12)),
|
||||
testAlert("future-effective", "Alert", testTimePtr(9), testTimePtr(13), testTimePtr(13), testTimePtr(15)),
|
||||
testAlert("canceled", " cancel ", testTimePtr(9), testTimePtr(10), testTimePtr(11), testTimePtr(13)),
|
||||
testAlert("effective-at-boundary", "Alert", testTimePtr(9), testTimePtr(12), testTimePtr(12), testTimePtr(14)),
|
||||
testAlert("missing-effective", "Alert", testTimePtr(9), nil, nil, testTimePtr(14)),
|
||||
testAlert("missing-expires", "Alert", testTimePtr(9), testTimePtr(10), nil, nil),
|
||||
testAlert("later-onset", "Alert", testTimePtr(9), testTimePtr(10), testTimePtr(13), testTimePtr(14)),
|
||||
})
|
||||
}
|
||||
|
||||
func testAlertRunWithAlerts(alerts []model.WeatherAlert) *model.WeatherAlertRun {
|
||||
latitude := 38.62
|
||||
longitude := -90.2
|
||||
return &model.WeatherAlertRun{
|
||||
LocationID: "stl",
|
||||
LocationName: "St. Louis",
|
||||
AsOf: testTime(10),
|
||||
Latitude: &latitude,
|
||||
Longitude: &longitude,
|
||||
Alerts: alerts,
|
||||
}
|
||||
}
|
||||
|
||||
func testAlert(id string, messageType string, sent *time.Time, effective *time.Time, onset *time.Time, expires *time.Time) model.WeatherAlert {
|
||||
refSent := testTime(8)
|
||||
return model.WeatherAlert{
|
||||
ID: id,
|
||||
Event: "Thunderstorm Warning",
|
||||
Headline: "Storm headline",
|
||||
Severity: "Severe",
|
||||
Urgency: "Immediate",
|
||||
Certainty: "Likely",
|
||||
Status: "Actual",
|
||||
MessageType: messageType,
|
||||
Category: "Met",
|
||||
Response: "Shelter",
|
||||
Description: "Storm description",
|
||||
Instruction: "Take shelter",
|
||||
Sent: sent,
|
||||
Effective: effective,
|
||||
Onset: onset,
|
||||
Expires: expires,
|
||||
AreaDescription: "St. Louis City",
|
||||
SenderName: "NWS St. Louis",
|
||||
References: []model.AlertReference{{
|
||||
ID: "ref-" + id,
|
||||
Identifier: "identifier-" + id,
|
||||
Sender: "sender-" + id,
|
||||
Sent: &refSent,
|
||||
}},
|
||||
}
|
||||
}
|
||||
|
||||
func testTimePtr(hour int) *time.Time {
|
||||
value := testTime(hour)
|
||||
return &value
|
||||
}
|
||||
|
||||
func testOutlookRun() *model.WeatherOutlookRun {
|
||||
latitude := 38.62
|
||||
longitude := -90.2
|
||||
@@ -493,3 +659,18 @@ func assertDiscussionDays(t *testing.T, run *model.WeatherOutlookRun, want []int
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func assertAlertIDs(t *testing.T, run *model.WeatherAlertRun, want []string) {
|
||||
t.Helper()
|
||||
if run == nil {
|
||||
t.Fatal("expected alert run")
|
||||
}
|
||||
if len(run.Alerts) != len(want) {
|
||||
t.Fatalf("expected alert IDs %v, got %+v", want, run.Alerts)
|
||||
}
|
||||
for i := range want {
|
||||
if run.Alerts[i].ID != want[i] {
|
||||
t.Fatalf("expected alert IDs %v, got %+v", want, run.Alerts)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user