DEV-000065 fix notification binding origin
CI / test (push) Successful in 16s
CI / test (pull_request) Successful in 15s

This commit is contained in:
m
2026-08-17 16:33:05 +03:00
parent a0dce634f3
commit 18fbc7f105
7 changed files with 123 additions and 1 deletions
+12
View File
@@ -21,6 +21,7 @@ type dueReminderRepository interface {
PendingAttention(context.Context, int) ([]continuity.AttentionItem, error)
MarkAttentionDelivering(context.Context, continuity.AttentionItemID, continuity.AttentionRevision) (continuity.AttentionItem, error)
MarkAttentionDelivered(context.Context, continuity.AttentionItemID, continuity.AttentionRevision, continuity.CommittedActionIntentID, continuity.CommittedAuthorizedActionID, continuity.CommittedActionAttemptID, string, int64) (continuity.AttentionItem, error)
MarkAttentionFailed(context.Context, continuity.AttentionItemID, continuity.AttentionRevision, continuity.CommittedActionIntentID, continuity.CommittedAuthorizedActionID, continuity.CommittedActionAttemptID, string) (continuity.AttentionItem, error)
Load(context.Context, continuity.ProspectiveItemID) (continuity.ProspectiveItem, error)
}
@@ -170,6 +171,17 @@ func (w dueReminderWorker) deliverPending(ctx context.Context, now time.Time) er
log.Printf("attention %s notification unavailable: %v", attention.ID, err)
continue
}
if result.State != commitcontract.ActionSucceeded {
_, err = w.repository.MarkAttentionFailed(ctx, delivering.ID, delivering.Revision,
continuity.CommittedActionIntentID(result.ActionIntentID),
continuity.CommittedAuthorizedActionID(result.AuthorizedActionID),
continuity.CommittedActionAttemptID(result.ActionAttemptID),
string(result.State))
if err != nil {
log.Printf("attention %s delivery failure outcome not persisted: %v", attention.ID, err)
}
continue
}
_, err = w.repository.MarkAttentionDelivered(ctx, delivering.ID, delivering.Revision,
continuity.CommittedActionIntentID(result.ActionIntentID),
continuity.CommittedAuthorizedActionID(result.AuthorizedActionID),
+33
View File
@@ -62,6 +62,18 @@ func (r *memoryDueRepo) MarkAttentionDelivered(_ context.Context, id continuity.
return r.attention, nil
}
func (r *memoryDueRepo) MarkAttentionFailed(_ context.Context, id continuity.AttentionItemID, revision continuity.AttentionRevision, intentID continuity.CommittedActionIntentID, authorizedID continuity.CommittedAuthorizedActionID, attemptID continuity.CommittedActionAttemptID, outcome string) (continuity.AttentionItem, error) {
if r.attention.ID == id && r.attention.Revision == revision {
r.attention.State = continuity.AttentionFailed
r.attention.Revision++
r.attention.ActionIntentID = intentID
r.attention.AuthorizedActionID = authorizedID
r.attention.ActionAttemptID = attemptID
r.attention.DeliveryOutcome = outcome
}
return r.attention, nil
}
func (r *memoryDueRepo) Load(context.Context, continuity.ProspectiveItemID) (continuity.ProspectiveItem, error) {
return r.item, nil
}
@@ -73,6 +85,13 @@ func (n *fakeDueNotifier) NotifyDue(context.Context, continuity.ProspectiveItem)
return dueNotificationResponse{ActionIntentID: "intent", AuthorizedActionID: "authorized", ActionAttemptID: "attempt", State: commitcontract.ActionSucceeded}, nil
}
type unknownDueNotifier struct{ calls int }
func (n *unknownDueNotifier) NotifyDue(context.Context, continuity.ProspectiveItem) (dueNotificationResponse, error) {
n.calls++
return dueNotificationResponse{ActionIntentID: "intent", AuthorizedActionID: "authorized", ActionAttemptID: "attempt", State: commitcontract.ActionUnknownOutcome}, nil
}
func TestDueReminderProducesAttentionAndNotificationOnce(t *testing.T) {
repo := &memoryDueRepo{item: continuity.ProspectiveItem{ID: "prospective", OwnerPrincipalID: identity.PrincipalID("owner"), ScopeID: authority.ScopeID("scope"), Summary: "проверить уведомление", TriggerAtUnixMillis: 10, State: continuity.ProspectiveArmed, Revision: 1}}
notifier := &fakeDueNotifier{}
@@ -90,3 +109,17 @@ func TestDueReminderProducesAttentionAndNotificationOnce(t *testing.T) {
t.Fatal("delivery evidence was not persisted")
}
}
func TestDueReminderUnknownOutcomeDoesNotMarkAttentionDelivered(t *testing.T) {
repo := &memoryDueRepo{item: continuity.ProspectiveItem{ID: "prospective", OwnerPrincipalID: identity.PrincipalID("owner"), ScopeID: authority.ScopeID("scope"), Summary: "проверить уведомление", TriggerAtUnixMillis: 10, State: continuity.ProspectiveArmed, Revision: 1}}
notifier := &unknownDueNotifier{}
now := time.UnixMilli(20)
worker := dueReminderWorker{repository: repo, commit: notifier, now: func() time.Time { return now }, newID: func() (ids.ID, error) { return ids.ID("attention"), nil }, limit: 10}
worker.process(context.Background())
if repo.attention.State != continuity.AttentionFailed {
t.Fatalf("unknown outcome must not be delivered, got %s", repo.attention.State)
}
if repo.attention.DeliveryOutcome != string(commitcontract.ActionUnknownOutcome) {
t.Fatalf("missing unknown outcome evidence: %#v", repo.attention)
}
}