kernelcode0
diff --git a/‎api/pkg/services/message_service.go‎
Lines changed: 6 additions & 1 deletion b/‎api/pkg/services/message_service.go‎
Lines changed: 6 additions & 1 deletion
@@ -317,7 +317,7 @@ func (service *MessageService) handleMessageDeliveredEvent(ctx context.Context,
 		return service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
 	}
 
-	if err = service.eventDispatcher.Dispatch(ctx, event); err != nil {
+	if _, err = service.eventDispatcher.DispatchWithTimeout(ctx, event, time.Second); err != nil {
 		msg := fmt.Sprintf("cannot dispatch event type [%s] and id [%s]", event.Type(), event.ID())
 		return service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
 	}
@@ -511,6 +511,11 @@ func (service *MessageService) HandleMessageSent(ctx context.Context, params Han
 		return service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
 	}
 
+	if message.IsSent() || message.IsDelivered() {
+		ctxLogger.Info(fmt.Sprintf("message [%s] for [%s] has already been processed with status [%s]", message.ID, message.UserID, message.Status))
+		return nil
+	}
+
 	if !message.IsSending() && !message.IsExpired() {
 		msg := fmt.Sprintf("message has wrong status [%s]. expected [%s, %s]", message.Status, entities.MessageStatusSending, entities.MessageStatusExpired)
 		return service.tracer.WrapErrorSpan(span, stacktrace.NewError(msg))
Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,7 @@ func (service *MessageService) handleMessageDeliveredEvent(ctx context.Context,`
`317`	`317`	`return service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))`
`318`	`318`	`}`
`319`	`319`
`320`		`- if err = service.eventDispatcher.Dispatch(ctx, event); err != nil {`
	`320`	`+ if _, err = service.eventDispatcher.DispatchWithTimeout(ctx, event, time.Second); err != nil {`
`321`	`321`	`msg := fmt.Sprintf("cannot dispatch event type [%s] and id [%s]", event.Type(), event.ID())`
`322`	`322`	`return service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))`
`323`	`323`	`}`
`@@ -511,6 +511,11 @@ func (service *MessageService) HandleMessageSent(ctx context.Context, params Han`
`511`	`511`	`return service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))`
`512`	`512`	`}`
`513`	`513`
	`514`	`+ if message.IsSent() \|\| message.IsDelivered() {`
	`515`	`+ ctxLogger.Info(fmt.Sprintf("message [%s] for [%s] has already been processed with status [%s]", message.ID, message.UserID, message.Status))`
	`516`	`+ return nil`
	`517`	`+ }`
	`518`	`+`
`514`	`519`	`if !message.IsSending() && !message.IsExpired() {`
`515`	`520`	`msg := fmt.Sprintf("message has wrong status [%s]. expected [%s, %s]", message.Status, entities.MessageStatusSending, entities.MessageStatusExpired)`
`516`	`521`	`return service.tracer.WrapErrorSpan(span, stacktrace.NewError(msg))`