Do not throw error when message has been deleted before expired cehck

AchoArnold · AchoArnold · commit 2fab23c8e67d · 2024-02-10T09:03:29.000+02:00
diff --git a/api/pkg/listeners/message_listener.go b/api/pkg/listeners/message_listener.go
@@ -234,7 +234,7 @@ func (listener *MessageListener) onMessageSendExpiredCheck(ctx context.Context,
 		Source:    event.Source(),
 	}
 	if err := listener.service.CheckExpired(ctx, checkParams); err != nil {
-		msg := fmt.Sprintf("cannot check expiration for  ID [%s] and userID [%s]", checkParams.MessageID, checkParams.UserID)
+		msg := fmt.Sprintf("cannot check expiration for message with ID [%s] and userID [%s]", checkParams.MessageID, checkParams.UserID)
 		return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
 	}
 
diff --git a/api/pkg/services/message_service.go b/api/pkg/services/message_service.go
@@ -745,6 +745,11 @@ func (service *MessageService) CheckExpired(ctx context.Context, params MessageC
 	ctxLogger := service.tracer.CtxLogger(service.logger, span)
 
 	message, err := service.repository.Load(ctx, params.UserID, params.MessageID)
+	if stacktrace.GetCode(err) == repositories.ErrCodeNotFound {
+		ctxLogger.Info(fmt.Sprintf("message has been deleted for userID [%s] and messageID [%s]", params.UserID, params.MessageID))
+		return nil
+	}
+
 	if err != nil {
 		msg := fmt.Sprintf("cannot load message with userID [%s] and messageID [%s]", params.UserID, params.MessageID)
 		return service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))

Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ func (listener *MessageListener) onMessageSendExpiredCheck(ctx context.Context,`
`234`	`234`	`Source: event.Source(),`
`235`	`235`	`}`
`236`	`236`	`if err := listener.service.CheckExpired(ctx, checkParams); err != nil {`
`237`		`- msg := fmt.Sprintf("cannot check expiration for ID [%s] and userID [%s]", checkParams.MessageID, checkParams.UserID)`
	`237`	`+ msg := fmt.Sprintf("cannot check expiration for message with ID [%s] and userID [%s]", checkParams.MessageID, checkParams.UserID)`
`238`	`238`	`return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))`
`239`	`239`	`}`
`240`	`240`