diff --git a/internal/infrastructure/codec/mail_transport_registry_test.go b/internal/infrastructure/codec/mail_transport_registry_test.go index 71f802768..85208163d 100644 --- a/internal/infrastructure/codec/mail_transport_registry_test.go +++ b/internal/infrastructure/codec/mail_transport_registry_test.go @@ -175,7 +175,7 @@ func TestMailTransportCodecRegistryCompatibility(t *testing.T) { if url == "" { t.Skip("SR_URL must name an isolated local Schema Registry") } - generation, task, mailbox := uuid.New(), uuid.New(), uuid.New() + generation, worker, task, mailbox := uuid.New(), uuid.New(), uuid.New(), uuid.New() at := time.Now().UTC().Truncate(time.Millisecond) for _, tc := range []struct { name string @@ -188,7 +188,7 @@ func TestMailTransportCodecRegistryCompatibility(t *testing.T) { return v.(*models.WorkerEvent).Body.(*models.AddWorkerEmail).TransportGeneration }}, {"send", models.JobEvent{Type: models.JobEventTypeEmailSent, Body: models.SendEmailResult{TaskID: task, Success: true, SentAt: at, TransportGeneration: generation}}, models.JobEvent{}.Schema(), func() any { return &models.JobEvent{} }, func(v any) uuid.UUID { return v.(*models.JobEvent).Body.(models.SendEmailResult).TransportGeneration }}, - {"sync", models.JobEvent{Type: models.JobEventTypeSyncState, Body: &models.JobEventSyncState{WorkerID: &generation, ReportGeneration: generation, EmailID: mailbox, State: models.SyncState{LastSyncedAt: &at, FolderCoverageObservedAt: &at, TransportGeneration: generation}}}, models.JobEvent{}.Schema(), func() any { return &models.JobEvent{} }, func(v any) uuid.UUID { + {"sync", models.JobEvent{Type: models.JobEventTypeSyncState, Body: &models.JobEventSyncState{WorkerID: &worker, ReportGeneration: generation, EmailID: mailbox, State: models.SyncState{LastSyncedAt: &at, FolderCoverageObservedAt: &at, TransportGeneration: generation}}}, models.JobEvent{}.Schema(), func() any { return &models.JobEvent{} }, func(v any) uuid.UUID { return v.(*models.JobEvent).Body.(*models.JobEventSyncState).State.TransportGeneration }}, {"error", models.JobEvent{Type: models.JobEventTypeEmailServerError, Body: models.EmailErrorEvent{EmailAccountID: mailbox.String(), Operation: models.MailTransportSync, TransportGeneration: generation}}, models.JobEvent{}.Schema(), func() any { return &models.JobEvent{} }, func(v any) uuid.UUID { return v.(*models.JobEvent).Body.(models.EmailErrorEvent).TransportGeneration }}, @@ -223,6 +223,9 @@ func TestMailTransportCodecRegistryCompatibility(t *testing.T) { if tc.name == "sync" && target.(*models.JobEvent).Body.(*models.JobEventSyncState).WorkerID != nil { t.Fatal("old sync payload manufactured a reporting worker") } + if tc.name == "sync" && target.(*models.JobEvent).Body.(*models.JobEventSyncState).ReportGeneration != uuid.Nil { + t.Fatal("old sync payload manufactured a report generation") + } fresh, err := writer.Serialize(t.Context(), topic, tc.value) if err != nil { t.Fatal("FULL_TRANSITIVE registry rejected additive schema", err) @@ -235,10 +238,13 @@ func TestMailTransportCodecRegistryCompatibility(t *testing.T) { t.Fatal("typed wire lost generation") } if tc.name == "sync" { - workerID := target.(*models.JobEvent).Body.(*models.JobEventSyncState).WorkerID - if workerID == nil || *workerID != generation { + report := target.(*models.JobEvent).Body.(*models.JobEventSyncState) + if report.WorkerID == nil || *report.WorkerID != worker { t.Fatal("typed wire lost reporting worker") } + if report.ReportGeneration != generation { + t.Fatal("typed wire lost report generation") + } } id := mailbox if tc.name == "send" {