Skip to content

Commit c1d260b

Browse files
committed
fix: message undelivered event
Signed-off-by: sarthakjdev <jsarthak448@gmail.com>
1 parent 8c3724b commit c1d260b

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

manager/webhook_manager.go

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ func (wh *WebhookManager) handleMessagesSubscriptionEvents(payload HandleMessage
372372
failedReason := ""
373373
if len(status.Errors) > 0 {
374374
for _, err := range status.Errors {
375-
failedReason = err.Message
375+
failedReason = err.Title
376376
break
377377
}
378378
}
@@ -381,6 +381,20 @@ func (wh *WebhookManager) handleMessagesSubscriptionEvents(payload HandleMessage
381381
Timestamp: status.Timestamp,
382382
}, status.Id, status.RecipientId, failedReason))
383383
}
384+
case string(MessageStatusUnDelivered):
385+
{
386+
undeliveredReason := ""
387+
if len(status.Errors) > 0 {
388+
for _, err := range status.Errors {
389+
undeliveredReason = err.Title
390+
break
391+
}
392+
}
393+
394+
wh.EventManager.Publish(events.MessageUndeliveredEventType, events.NewMessageUndeliveredEvent(events.BaseSystemEvent{
395+
Timestamp: status.Timestamp,
396+
}, status.Id, status.RecipientId, undeliveredReason))
397+
}
384398
}
385399

386400
}

pkg/events/message_undelivered_event.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@ type MessageUndeliveredEvent struct {
55
BaseSystemEvent `json:",inline"`
66
MessageId string `json:"messageId"`
77
SentTo string `json:"sentTo"`
8+
Reason string `json:"reason"`
89
}
910

1011
// NewMessageUndeliveredEvent creates a new instance of MessageUndeliveredEvent.
11-
func NewMessageUndeliveredEvent(baseSystemEvent BaseSystemEvent, messageId, sendTo string) *MessageUndeliveredEvent {
12+
func NewMessageUndeliveredEvent(baseSystemEvent BaseSystemEvent, messageId, sendTo, reason string) *MessageUndeliveredEvent {
1213
return &MessageUndeliveredEvent{
1314
BaseSystemEvent: baseSystemEvent,
1415
MessageId: messageId,
1516
SentTo: sendTo,
17+
Reason: reason,
1618
}
1719
}

0 commit comments

Comments
 (0)