Skip to content

Commit 12547e9

Browse files
committed
Add the event payload to webhook notification email
1 parent b0e54e3 commit 12547e9

3 files changed

Lines changed: 5 additions & 2 deletions

File tree

api/pkg/emails/hermes_notification_email_factory.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ func (factory *hermesNotificationEmailFactory) WebhookSendFailed(user *entities.
9191
{"Phone Number", factory.formatPhoneNumber(payload.Owner)},
9292
{"HTTP Response Code", factory.formatHTTPResponseCode(payload.HTTPResponseStatusCode)},
9393
{"Error Message / HTTP Response", payload.ErrorMessage},
94+
{"Event Payload", payload.EventPayload},
9495
},
9596
Actions: []hermes.Action{
9697
{

api/pkg/events/webhook_event_failed_event.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ type WebhookSendFailedPayload struct {
1616
UserID entities.UserID `json:"user_id"`
1717
EventID string `json:"event_id"`
1818
EventType string `json:"event_type"`
19+
EventPayload string `json:"event_payload"`
1920
HTTPResponseStatusCode *int `json:"http_response_status_code"`
2021
ErrorMessage string `json:"error_message"`
2122
}

api/pkg/services/webhook_service.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ func (service *WebhookService) sendNotification(ctx context.Context, event cloud
196196
ctx, span, ctxLogger := service.tracer.StartWithLogger(ctx, service.logger)
197197
defer span.End()
198198

199-
requestCtx, cancel := context.WithTimeout(ctx, 5*time.Second)
199+
requestCtx, cancel := context.WithTimeout(ctx, 10*time.Second)
200200
defer cancel()
201201

202202
request, err := service.createRequest(requestCtx, event, webhook)
@@ -331,12 +331,13 @@ func (service *WebhookService) handleWebhookSendFailed(ctx context.Context, even
331331
EventID: event.ID(),
332332
Owner: owner,
333333
EventType: event.Type(),
334+
EventPayload: string(event.Data()),
334335
HTTPResponseStatusCode: nil,
335336
ErrorMessage: err.Error(),
336337
}
337338

338339
if errors.Is(err, context.DeadlineExceeded) {
339-
payload.ErrorMessage = "TIMOUT after 5 seconds"
340+
payload.ErrorMessage = "TIMOUT after 10 seconds"
340341
}
341342

342343
if response != nil {

0 commit comments

Comments
 (0)