From 0419c326f589814488b7f02ff6105070c499f583 Mon Sep 17 00:00:00 2001 From: Yonas Habteab Date: Mon, 22 Apr 2024 16:58:16 +0200 Subject: [PATCH] Send notifications for non-state events as well --- internal/incident/incident.go | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/internal/incident/incident.go b/internal/incident/incident.go index 28eaad87..b327e712 100644 --- a/internal/incident/incident.go +++ b/internal/incident/incident.go @@ -147,23 +147,15 @@ func (i *Incident) ProcessEvent(ctx context.Context, ev *event.Event) error { return errors.New("can't insert incident event to the database") } - if ev.Type == event.TypeAcknowledgementSet || ev.Type == event.TypeAcknowledgementCleared { - if err = i.processAcknowledgementEvent(ctx, tx, ev); err != nil { - return err - } - - if err = tx.Commit(); err != nil { - i.logger.Errorw("Can't commit db transaction", zap.Error(err)) - - return errors.New("can't commit db transaction") + switch ev.Type { + case event.TypeState: + if !isNew { + if err := i.processSeverityChangedEvent(ctx, tx, ev); err != nil { + return err + } } - - return nil - } - - if !isNew { - err := i.processSeverityChangedEvent(ctx, tx, ev) - if err != nil { + case event.TypeAcknowledgementSet, event.TypeAcknowledgementCleared: + if err := i.processAcknowledgementEvent(ctx, tx, ev); err != nil { return err } }