funcodingdev
diff --git a/‎api/pkg/services/message_service.go‎
Lines changed: 2 additions & 1 deletion b/‎api/pkg/services/message_service.go‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎api/pkg/services/message_thread_service.go‎
Lines changed: 6 additions & 1 deletion b/‎api/pkg/services/message_thread_service.go‎
Lines changed: 6 additions & 1 deletion
@@ -489,7 +489,8 @@ func (service *MessageService) HandleMessageDelivered(ctx context.Context, param
 
 	if !message.IsSent() && !message.IsSending() && !message.IsExpired() && !message.IsScheduled() {
 		msg := fmt.Sprintf("message has wrong status [%s]. expected [%s, %s, %s, %s]", message.Status, entities.MessageStatusSent, entities.MessageStatusScheduled, entities.MessageStatusSending, entities.MessageStatusExpired)
-		return service.tracer.WrapErrorSpan(span, stacktrace.NewError(msg))
+		ctxLogger.Warn(stacktrace.NewError(msg))
+		return nil
 	}
 
 	if err = service.repository.Update(ctx, message.Delivered(params.Timestamp)); err != nil {
 
@@ -63,7 +63,12 @@ func (service *MessageThreadService) UpdateThread(ctx context.Context, params Me
 	}
 
 	if thread.OrderTimestamp.Unix() > params.Timestamp.Unix() && thread.Status != entities.MessageStatusSending {
-		ctxLogger.Info(fmt.Sprintf("thread [%s] has timestamp [%s] and status [%s] which is greater than timestamp [%s] for message [%s] and status [%s]", thread.ID, thread.OrderTimestamp, thread.Status, params.Timestamp, params.MessageID, params.Status))
+		ctxLogger.Warn(stacktrace.NewError(fmt.Sprintf("thread [%s] has timestamp [%s] and status [%s] which is greater than timestamp [%s] for message [%s] and status [%s]", thread.ID, thread.OrderTimestamp, thread.Status, params.Timestamp, params.MessageID, params.Status)))
+		return nil
+	}
+
+	if thread.Status == entities.MessageStatusDelivered {
+		ctxLogger.Warn(stacktrace.NewError(fmt.Sprintf("thread [%s] already has status [%s] not updating with status [%s] for message [%s]", thread.ID, thread.Status, params.Status, params.MessageID)))
 		return nil
 	}
Original file line number	Diff line number	Diff line change
`@@ -489,7 +489,8 @@ func (service *MessageService) HandleMessageDelivered(ctx context.Context, param`
`489`	`489`
`490`	`490`	`if !message.IsSent() && !message.IsSending() && !message.IsExpired() && !message.IsScheduled() {`
`491`	`491`	`msg := fmt.Sprintf("message has wrong status [%s]. expected [%s, %s, %s, %s]", message.Status, entities.MessageStatusSent, entities.MessageStatusScheduled, entities.MessageStatusSending, entities.MessageStatusExpired)`
`492`		`- return service.tracer.WrapErrorSpan(span, stacktrace.NewError(msg))`
	`492`	`+ ctxLogger.Warn(stacktrace.NewError(msg))`
	`493`	`+ return nil`
`493`	`494`	`}`
`494`	`495`
`495`	`496`	`if err = service.repository.Update(ctx, message.Delivered(params.Timestamp)); err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,12 @@ func (service *MessageThreadService) UpdateThread(ctx context.Context, params Me`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`if thread.OrderTimestamp.Unix() > params.Timestamp.Unix() && thread.Status != entities.MessageStatusSending {`
`66`		`- ctxLogger.Info(fmt.Sprintf("thread [%s] has timestamp [%s] and status [%s] which is greater than timestamp [%s] for message [%s] and status [%s]", thread.ID, thread.OrderTimestamp, thread.Status, params.Timestamp, params.MessageID, params.Status))`
	`66`	`+ ctxLogger.Warn(stacktrace.NewError(fmt.Sprintf("thread [%s] has timestamp [%s] and status [%s] which is greater than timestamp [%s] for message [%s] and status [%s]", thread.ID, thread.OrderTimestamp, thread.Status, params.Timestamp, params.MessageID, params.Status)))`
	`67`	`+ return nil`
	`68`	`+ }`
	`69`	`+`
	`70`	`+ if thread.Status == entities.MessageStatusDelivered {`
	`71`	`+ ctxLogger.Warn(stacktrace.NewError(fmt.Sprintf("thread [%s] already has status [%s] not updating with status [%s] for message [%s]", thread.ID, thread.Status, params.Status, params.MessageID)))`
`67`	`72`	`return nil`
`68`	`73`	`}`
`69`	`74`