From c09b7410ce708ea460e5e0c05e106a12cb0eacbd Mon Sep 17 00:00:00 2001 From: Eric Rakestraw Date: Fri, 12 Jun 2026 15:10:40 +0000 Subject: [PATCH] Add SPC convective modules to report defaults --- docs/config.md | 3 +++ examples/config.yml | 2 ++ internal/config/config_test.go | 18 +++++++++++++----- internal/report/daily_report.go | 4 ++++ internal/report/period_test.go | 10 ++++++++++ internal/report/storm_report.go | 2 ++ internal/report/three_day_report.go | 2 ++ internal/report/weekend_report.go | 2 ++ 8 files changed, 38 insertions(+), 5 deletions(-) diff --git a/docs/config.md b/docs/config.md index b05a17e..ae5c852 100644 --- a/docs/config.md +++ b/docs/config.md @@ -199,10 +199,13 @@ reports: - metadata - current_conditions - narrative_forecast + - alert_digest + - spc_convective_outlooks - id: area_forecast_discussion options: sections: - short_term + - spc_convective_discussion - hourly_forecast ``` diff --git a/examples/config.yml b/examples/config.yml index e3cb998..1357d0c 100644 --- a/examples/config.yml +++ b/examples/config.yml @@ -77,6 +77,7 @@ reports: - derived_daypart_summaries - precip_timing - alert_digest + - spc_convective_outlooks - id: area_forecast_discussion options: sections: @@ -84,6 +85,7 @@ reports: - key_messages - short_term - long_term + - spc_convective_discussion - weather_story - outdoor_windows - hourly_forecast diff --git a/internal/config/config_test.go b/internal/config/config_test.go index 56b7784..ad07fa1 100644 --- a/internal/config/config_test.go +++ b/internal/config/config_test.go @@ -126,10 +126,13 @@ reports: deterministic_modules: - metadata - current_conditions + - alert_digest + - spc_convective_outlooks - id: area_forecast_discussion options: sections: - short_term + - spc_convective_discussion `) cfg, err := LoadFile(path) @@ -138,15 +141,20 @@ reports: } overrides := cfg.ReportModuleOverrides() items := overrides[report.DailyToday] - if len(items) != 3 { - t.Fatalf("daily override length = %d, want 3", len(items)) + if len(items) != 6 { + t.Fatalf("daily override length = %d, want 6", len(items)) } - if items[0].ID != module.Metadata || items[1].ID != module.CurrentConditions || items[2].ID != module.AreaForecastDiscussion { + if items[0].ID != module.Metadata || + items[1].ID != module.CurrentConditions || + items[2].ID != module.AlertDigest || + items[3].ID != module.SPCConvectiveOutlooks || + items[4].ID != module.AreaForecastDiscussion || + items[5].ID != module.SPCConvectiveDiscussion { t.Fatalf("daily override = %#v, want configured module order", items) } - options, ok := items[2].Options.(module.AreaForecastDiscussionOptions) + options, ok := items[4].Options.(module.AreaForecastDiscussionOptions) if !ok { - t.Fatalf("AFD options type = %T, want AreaForecastDiscussionOptions", items[2].Options) + t.Fatalf("AFD options type = %T, want AreaForecastDiscussionOptions", items[4].Options) } if strings.Join(options.Sections, ",") != "short_term" { t.Fatalf("AFD sections = %#v, want short_term", options.Sections) diff --git a/internal/report/daily_report.go b/internal/report/daily_report.go index 686b0f5..94b18b6 100644 --- a/internal/report/daily_report.go +++ b/internal/report/daily_report.go @@ -46,7 +46,9 @@ func dailyTodayModules() []module.ConfigItem { module.DerivedDaypartSummaries, module.PrecipTiming, module.AlertDigest, + module.SPCConvectiveOutlooks, module.AreaForecastDiscussion, + module.SPCConvectiveDiscussion, module.WeatherStory, module.OutdoorWindows, module.HourlyForecast, @@ -62,7 +64,9 @@ func dailyTomorrowModules() []module.ConfigItem { module.DerivedDaypartSummaries, module.PrecipTiming, module.AlertDigest, + module.SPCConvectiveOutlooks, module.AreaForecastDiscussion, + module.SPCConvectiveDiscussion, module.WeatherStory, module.OutdoorWindows, module.TomorrowPlanning, diff --git a/internal/report/period_test.go b/internal/report/period_test.go index 31e5ade..cb402b4 100644 --- a/internal/report/period_test.go +++ b/internal/report/period_test.go @@ -267,7 +267,9 @@ func TestRegistryDefinitionsDeclareDefaultModules(t *testing.T) { module.DerivedDaypartSummaries, module.PrecipTiming, module.AlertDigest, + module.SPCConvectiveOutlooks, module.AreaForecastDiscussion, + module.SPCConvectiveDiscussion, module.WeatherStory, module.OutdoorWindows, module.HourlyForecast, @@ -283,7 +285,9 @@ func TestRegistryDefinitionsDeclareDefaultModules(t *testing.T) { module.DerivedDaypartSummaries, module.PrecipTiming, module.AlertDigest, + module.SPCConvectiveOutlooks, module.AreaForecastDiscussion, + module.SPCConvectiveDiscussion, module.WeatherStory, module.OutdoorWindows, module.TomorrowPlanning, @@ -298,7 +302,9 @@ func TestRegistryDefinitionsDeclareDefaultModules(t *testing.T) { module.DerivedDaypartSummaries, module.PrecipTiming, module.AlertDigest, + module.SPCConvectiveOutlooks, module.AreaForecastDiscussion, + module.SPCConvectiveDiscussion, module.WeatherStory, module.OutdoorWindows, }, @@ -311,7 +317,9 @@ func TestRegistryDefinitionsDeclareDefaultModules(t *testing.T) { module.DerivedDaypartSummaries, module.PrecipTiming, module.AlertDigest, + module.SPCConvectiveOutlooks, module.AreaForecastDiscussion, + module.SPCConvectiveDiscussion, module.WeatherStory, module.OutdoorWindows, }, @@ -323,7 +331,9 @@ func TestRegistryDefinitionsDeclareDefaultModules(t *testing.T) { module.CurrentConditions, module.PrecipTiming, module.AlertDigest, + module.SPCConvectiveOutlooks, module.AreaForecastDiscussion, + module.SPCConvectiveDiscussion, module.WeatherStory, }, }, diff --git a/internal/report/storm_report.go b/internal/report/storm_report.go index 4aa4243..68c29ca 100644 --- a/internal/report/storm_report.go +++ b/internal/report/storm_report.go @@ -29,7 +29,9 @@ func stormModules() []module.ConfigItem { module.CurrentConditions, module.PrecipTiming, module.AlertDigest, + module.SPCConvectiveOutlooks, module.AreaForecastDiscussion, + module.SPCConvectiveDiscussion, module.WeatherStory, ) } diff --git a/internal/report/three_day_report.go b/internal/report/three_day_report.go index 1f05bb6..7759023 100644 --- a/internal/report/three_day_report.go +++ b/internal/report/three_day_report.go @@ -30,7 +30,9 @@ func threeDayModules() []module.ConfigItem { module.DerivedDaypartSummaries, module.PrecipTiming, module.AlertDigest, + module.SPCConvectiveOutlooks, module.AreaForecastDiscussion, + module.SPCConvectiveDiscussion, module.WeatherStory, module.OutdoorWindows, ) diff --git a/internal/report/weekend_report.go b/internal/report/weekend_report.go index d1f7b52..b63a508 100644 --- a/internal/report/weekend_report.go +++ b/internal/report/weekend_report.go @@ -31,7 +31,9 @@ func weekendModules() []module.ConfigItem { module.DerivedDaypartSummaries, module.PrecipTiming, module.AlertDigest, + module.SPCConvectiveOutlooks, module.AreaForecastDiscussion, + module.SPCConvectiveDiscussion, module.WeatherStory, module.OutdoorWindows, )