Centralize report name resolution

internal/cli/root.go

@@ -186,10 +186,10 @@ func (r Runner) resolveGenerate(args []string) (app.GenerateRequest, error) {
 	if len(args) == 0 {
 		return app.GenerateRequest{}, fmt.Errorf("generate requires a report name")
 	}
-	reportKind, ok := reportKind(args[0])
-	if !ok {
+	if _, err := report.IDForCommandName(args[0]); err != nil {
 		return app.GenerateRequest{}, fmt.Errorf("unknown generate report %q", args[0])
 	}
+	reportKind := app.ReportKind(args[0])
 
 	opts, err := parseGenerateFlags(reportKind, args[1:])
 	if err != nil {
@@ -250,10 +250,10 @@ func (r Runner) resolveRun(args []string) (app.BatchRequest, error) {
 	if len(args) == 0 {
 		return app.BatchRequest{}, fmt.Errorf("run requires a batch name")
 	}
-	batch, ok := batchKind(args[0])
-	if !ok {
+	if _, err := report.BatchForCommandName(args[0]); err != nil {
 		return app.BatchRequest{}, fmt.Errorf("unknown run batch %q", args[0])
 	}
+	batch := app.BatchKind(args[0])
 	opts, err := parseRunFlags(args[1:])
 	if err != nil {
 		return app.BatchRequest{}, err
@@ -380,33 +380,3 @@ func addCommonFlags(fs *flag.FlagSet, opts *commonOptions, includeOutput bool) {
 		fs.StringVar(&opts.Output, "out", "", "extra Markdown report copy path")
 	}
 }
-
-func reportKind(value string) (app.ReportKind, bool) {
-	switch value {
-	case string(app.ReportDaily):
-		return app.ReportDaily, true
-	case string(app.ReportTomorrow):
-		return app.ReportTomorrow, true
-	case string(app.ReportHourly):
-		return app.ReportHourly, true
-	case string(app.ReportThreeDay):
-		return app.ReportThreeDay, true
-	case string(app.ReportWeekend):
-		return app.ReportWeekend, true
-	case string(app.ReportStorm):
-		return app.ReportStorm, true
-	default:
-		return "", false
-	}
-}
-
-func batchKind(value string) (app.BatchKind, bool) {
-	switch value {
-	case string(app.BatchMorning):
-		return app.BatchMorning, true
-	case string(app.BatchEvening):
-		return app.BatchEvening, true
-	default:
-		return "", false
-	}
-}

internal/cli/root_test.go

@@ -13,6 +13,7 @@ import (
 	"time"
 
 	"gitea.maximumdirect.net/eric/weatherreporter/internal/app"
+	"gitea.maximumdirect.net/eric/weatherreporter/internal/report"
 	"gitea.maximumdirect.net/eric/weatherreporter/internal/timeutil"
 )
 
@@ -892,6 +893,36 @@ func TestResolveGenerateCommands(t *testing.T) {
 	}
 }
 
+func TestResolveGenerateSupportsEveryReportCommandName(t *testing.T) {
+	runner := Runner{Clock: fixedClock()}
+	for _, name := range report.CommandNames() {
+		t.Run(name, func(t *testing.T) {
+			args := []string{name}
+			if name == report.CommandNameDaily {
+				args = append(args, "--date", "2026-05-29")
+			}
+			if name == report.CommandNameStorm {
+				args = append(args, "--start", "2026-05-29T18:00", "--end", "2026-05-30T06:00")
+			}
+			req, err := runner.resolveGenerate(args)
+			if err != nil {
+				t.Fatalf("resolveGenerate() error = %v", err)
+			}
+			want, err := report.IDForCommandName(name)
+			if err != nil {
+				t.Fatalf("IDForCommandName() error = %v", err)
+			}
+			resolved, err := app.ResolveGenerate(req, req.Now)
+			if err != nil {
+				t.Fatalf("ResolveGenerate() error = %v", err)
+			}
+			if resolved.Definition.ID != want {
+				t.Fatalf("resolved ID = %q, want %q", resolved.Definition.ID, want)
+			}
+		})
+	}
+}
+
 func TestResolveGenerateHourlyAppliesSharedFlags(t *testing.T) {
 	runner := Runner{Clock: fixedClock()}
 	configPath := filepath.Join(t.TempDir(), "config.yml")