ejr/weatherapi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Suppress superseded alerts in the /alerts/active endpoint
All checks were successful
ci/woodpecker/manual/build-image Pipeline was successful
Details

Browse Source
This commit is contained in:
Eric Rakestraw
2026-06-17 06:48:14 -05:00
parent 2a33fe01cf
commit 5a1134b955
4 changed files with 102 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
internal/app/service.go
View File

@@ -10,6 +10,8 @@ import (
"gitea.maximumdirect.net/ejr/weatherfeeder/model"
)
const nwsAlertURLPrefix = "https://api.weather.gov/alerts/"
// Repository defines outbound data access used by weatherapi use cases.
type Repository interface {
LatestObservation(ctx context.Context) (*model.WeatherObservation, error)
@@ -77,9 +79,10 @@ func (s *Service) LatestActiveAlertRun(ctx context.Context, activeAt time.Time)
}
out := cloneAlertRun(run)
supersededIDs := collectSupersededAlertIDs(out.Alerts)
alerts := out.Alerts[:0]
for _, alert := range out.Alerts {
if isActiveAlert(alert, activeAt) {
if isActiveAlert(alert, activeAt) && !isSupersededAlert(alert, supersededIDs) {
alerts = append(alerts, alert)
}
}
@@ -181,6 +184,41 @@ func isActiveAlert(alert model.WeatherAlert, activeAt time.Time) bool {
return true
}
func collectSupersededAlertIDs(alerts []model.WeatherAlert) map[string]struct{} {
supersededIDs := make(map[string]struct{})
for _, alert := range alerts {
for _, ref := range alert.References {
id := normalizeAlertID(referenceAlertID(ref))
if id != "" {
supersededIDs[id] = struct{}{}
}
}
}
return supersededIDs
}
func isSupersededAlert(alert model.WeatherAlert, supersededIDs map[string]struct{}) bool {
id := normalizeAlertID(alert.ID)
if id == "" {
return false
}
_, ok := supersededIDs[id]
return ok
}
func referenceAlertID(ref model.AlertReference) string {
if strings.TrimSpace(ref.Identifier) != "" {
return ref.Identifier
}
return ref.ID
}
func normalizeAlertID(value string) string {
value = strings.TrimSpace(value)
value = strings.TrimPrefix(value, nwsAlertURLPrefix)
return value
}
func cloneOutlookRun(run *model.WeatherOutlookRun) *model.WeatherOutlookRun {
out := *run
out.Latitude = copyFloat64(run.Latitude)

54
internal/app/service_test.go
View File

@@ -272,6 +272,60 @@ func TestServiceLatestActiveAlertRunUsesEndsBeforeExpires(t *testing.T) {
assertAlertIDs(t, run, []string{"ends-after-active-expires-before", "expires-fallback"})
}
func TestServiceLatestActiveAlertRunSuppressesReferencedOriginal(t *testing.T) {
activeAt := testTime(12)
original := testAlert("https://api.weather.gov/alerts/urn:oid:original", "Alert", testTimePtr(9), testTimePtr(10), nil, testTimePtr(13), testTimePtr(13))
update := testAlert("https://api.weather.gov/alerts/urn:oid:update", "Update", testTimePtr(11), testTimePtr(11), nil, testTimePtr(13), testTimePtr(13))
update.References = []model.AlertReference{{Identifier: "urn:oid:original"}}
unrelated := testAlert("https://api.weather.gov/alerts/urn:oid:unrelated", "Alert", testTimePtr(9), testTimePtr(10), nil, testTimePtr(13), testTimePtr(13))
repo := &fakeRepository{alerts: testAlertRunWithAlerts([]model.WeatherAlert{original, update, unrelated})}
svc := NewService(repo)
run, err := svc.LatestActiveAlertRun(context.Background(), activeAt)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
assertAlertIDs(t, run, []string{
"https://api.weather.gov/alerts/urn:oid:update",
"https://api.weather.gov/alerts/urn:oid:unrelated",
})
}
func TestServiceLatestActiveAlertRunCancelSuppressesReferencedOriginal(t *testing.T) {
activeAt := testTime(12)
original := testAlert("https://api.weather.gov/alerts/urn:oid:original", "Alert", testTimePtr(9), testTimePtr(10), nil, testTimePtr(13), testTimePtr(13))
cancel := testAlert("https://api.weather.gov/alerts/urn:oid:cancel", "Cancel", testTimePtr(11), testTimePtr(11), nil, testTimePtr(13), testTimePtr(13))
cancel.References = []model.AlertReference{{Identifier: "urn:oid:original"}}
repo := &fakeRepository{alerts: testAlertRunWithAlerts([]model.WeatherAlert{original, cancel})}
svc := NewService(repo)
run, err := svc.LatestActiveAlertRun(context.Background(), activeAt)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
assertAlertIDs(t, run, []string{})
}
func TestServiceLatestActiveAlertRunReferenceIdentifierPrecedenceAndIDFallback(t *testing.T) {
activeAt := testTime(12)
fromID := testAlert("urn:oid:from-id", "Alert", testTimePtr(9), testTimePtr(10), nil, testTimePtr(13), testTimePtr(13))
fromIdentifier := testAlert("urn:oid:from-identifier", "Alert", testTimePtr(9), testTimePtr(10), nil, testTimePtr(13), testTimePtr(13))
idFallback := testAlert("urn:oid:id-fallback", "Alert", testTimePtr(9), testTimePtr(10), nil, testTimePtr(13), testTimePtr(13))
update := testAlert("urn:oid:update", "Update", testTimePtr(11), testTimePtr(11), nil, testTimePtr(13), testTimePtr(13))
update.References = []model.AlertReference{
{ID: "urn:oid:from-id", Identifier: "urn:oid:from-identifier"},
{ID: "urn:oid:id-fallback"},
}
repo := &fakeRepository{alerts: testAlertRunWithAlerts([]model.WeatherAlert{fromID, fromIdentifier, idFallback, update})}
svc := NewService(repo)
run, err := svc.LatestActiveAlertRun(context.Background(), activeAt)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
assertAlertIDs(t, run, []string{"urn:oid:from-id", "urn:oid:update"})
}
func TestServiceDelegatesLatestConvectiveOutlookRun(t *testing.T) {
repo := &fakeRepository{outlookRun: testOutlookRun()}
svc := NewService(repo)