Report distributor notification outcomes in batches

internal/app/app.go

@@ -3,6 +3,7 @@ package app
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"path/filepath"
 	"time"
@@ -112,20 +113,23 @@ type BatchResult struct {
 }
 
 type BatchReportResult struct {
-	ReportID        report.ID       `json:"reportId"`
-	ReportName      string          `json:"reportName"`
-	PromptID        string          `json:"promptId"`
-	RunID           string          `json:"runId"`
-	Status          string          `json:"status"`
-	Error           string          `json:"error,omitempty"`
-	GeneratedAt     time.Time       `json:"generatedAt"`
-	ValidPeriod     timeutil.Period `json:"validPeriod"`
-	BriefingPath    string          `json:"briefingPath,omitempty"`
-	DataPackagePath string          `json:"dataPackagePath,omitempty"`
-	PreflightPath   string          `json:"preflightPath,omitempty"`
-	ReportPath      string          `json:"reportPath,omitempty"`
-	OutputPath      string          `json:"outputPath,omitempty"`
-	MetadataPath    string          `json:"metadataPath,omitempty"`
+	ReportID           report.ID       `json:"reportId"`
+	ReportName         string          `json:"reportName"`
+	PromptID           string          `json:"promptId"`
+	RunID              string          `json:"runId"`
+	Status             string          `json:"status"`
+	Error              string          `json:"error,omitempty"`
+	NotificationStatus string          `json:"notificationStatus,omitempty"`
+	NotificationRunID  string          `json:"notificationRunId,omitempty"`
+	NotificationError  string          `json:"notificationError,omitempty"`
+	GeneratedAt        time.Time       `json:"generatedAt"`
+	ValidPeriod        timeutil.Period `json:"validPeriod"`
+	BriefingPath       string          `json:"briefingPath,omitempty"`
+	DataPackagePath    string          `json:"dataPackagePath,omitempty"`
+	PreflightPath      string          `json:"preflightPath,omitempty"`
+	ReportPath         string          `json:"reportPath,omitempty"`
+	OutputPath         string          `json:"outputPath,omitempty"`
+	MetadataPath       string          `json:"metadataPath,omitempty"`
 }
 
 type BatchError struct {
@@ -164,6 +168,25 @@ type NotificationResult struct {
 	Status         string
 }
 
+type NotificationError struct {
+	Request NotificationRequest
+	Err     error
+}
+
+func (e *NotificationError) Error() string {
+	if e == nil || e.Err == nil {
+		return "notification failed"
+	}
+	return e.Err.Error()
+}
+
+func (e *NotificationError) Unwrap() error {
+	if e == nil {
+		return nil
+	}
+	return e.Err
+}
+
 func Generate(ctx context.Context, req GenerateRequest) error {
 	now := req.Now
 	if now.IsZero() {
@@ -242,6 +265,11 @@ func RunBatchDetailed(ctx context.Context, req BatchRequest) (*BatchResult, erro
 			if err != nil {
 				item.Status = "failed"
 				item.Error = err.Error()
+				var notificationErr *NotificationError
+				if errors.As(err, &notificationErr) {
+					item.NotificationStatus = "failed"
+					item.NotificationError = notificationErr.Error()
+				}
 				result.Failed++
 			} else {
 				item.Status = "succeeded"
@@ -251,6 +279,10 @@ func RunBatchDetailed(ctx context.Context, req BatchRequest) (*BatchResult, erro
 				item.ReportPath = reportResult.ReportPath
 				item.OutputPath = reportResult.OutputPath
 				item.MetadataPath = reportResult.MetadataPath
+				if reportResult.Notification != nil {
+					item.NotificationStatus = reportResult.Notification.Status
+					item.NotificationRunID = reportResult.Notification.RunID
+				}
 				result.Succeeded++
 			}
 			result.Reports = append(result.Reports, item)
@@ -542,7 +574,10 @@ func notifyReport(ctx context.Context, cfg config.Config, resolved report.Resolv
 	}
 	result, err := notifier.Notify(ctx, notificationRequest)
 	if err != nil {
-		return nil, fmt.Errorf("notify report %q run %q from managed report %q: %w", resolved.Definition.ID, metadata.RunID, reportPath, err)
+		return nil, &NotificationError{
+			Request: notificationRequest,
+			Err:     fmt.Errorf("notify report %q run %q from managed report %q: %w", resolved.Definition.ID, metadata.RunID, reportPath, err),
+		}
 	}
 	return result, nil
 }

internal/app/app_test.go

@@ -1247,11 +1247,20 @@ func TestRunBatchContinuesAfterNotificationFailure(t *testing.T) {
 			if item.Status == "failed" && strings.Contains(item.Error, "notify report") && strings.Contains(item.Error, "distributor unavailable") {
 				failedThreeDay = true
 			}
+			if item.NotificationStatus != "failed" {
+				t.Fatalf("3-day notification status = %q, want failed", item.NotificationStatus)
+			}
+			if !strings.Contains(item.NotificationError, "distributor unavailable") {
+				t.Fatalf("3-day notification error = %q, want distributor unavailable", item.NotificationError)
+			}
 			continue
 		}
 		if item.Status != "succeeded" {
 			t.Fatalf("report %s status = %s, want succeeded", item.ReportID, item.Status)
 		}
+		if item.NotificationStatus != "accepted" {
+			t.Fatalf("report %s notification status = %q, want accepted", item.ReportID, item.NotificationStatus)
+		}
 	}
 	if !failedThreeDay {
 		t.Fatalf("reports = %#v, want notification failure on 3-day item", result.Reports)