Return 404 error code when message does not exist

Author: AchoArnold

api/main.go

@@ -18,6 +18,7 @@ import (
 // @license.url  https://raw.githubusercontent.com/NdoleStudio/http-sms-manager/main/LICENSE
 //
 // @host     api.httpsms.com
+// @schemes  https
 // @BasePath /v1
 func main() {
 	if len(os.Args) == 1 {

api/pkg/handlers/message_handler.go

@@ -202,7 +202,6 @@ func (h *MessageHandler) PostEvent(c *fiber.Ctx) error {
 	}
 
 	request.MessageID = c.Params("messageID")
-	spew.Dump(request)
 	if errors := h.validator.ValidateMessageEvent(ctx, request); len(errors) != 0 {
 		msg := fmt.Sprintf("validation errors [%s], while storing event [%s] for message [%s]", spew.Sdump(errors), c.Body(), request.MessageID)
 		ctxLogger.Warn(stacktrace.NewError(msg))
@@ -214,10 +213,16 @@ func (h *MessageHandler) PostEvent(c *fiber.Ctx) error {
 		return h.responseNotFound(c, fmt.Sprintf("cannot find message with ID [%s]", request.MessageID))
 	}
 
+	if err != nil {
+		msg := fmt.Sprintf("cannot find message with id [%s]", request.MessageID)
+		ctxLogger.Error(h.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg)))
+		return h.responseInternalServerError(c)
+	}
+
 	message, err = h.service.StoreEvent(ctx, message, request.ToMessageStoreEventParams(c.OriginalURL()))
 	if err != nil {
 		msg := fmt.Sprintf("cannot store event for message [%s] with paylod [%s]", request.MessageID, c.Body())
-		ctxLogger.Error(stacktrace.Propagate(err, msg))
+		ctxLogger.Error(h.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg)))
 		return h.responseInternalServerError(c)
 	}
 

api/pkg/repositories/gorm_message_repository.go

@@ -2,6 +2,7 @@ package repositories
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
 	"gorm.io/gorm/clause"
@@ -73,7 +74,13 @@ func (repository *gormMessageRepository) Load(ctx context.Context, messageID uui
 	defer span.End()
 
 	message := new(entities.Message)
-	if err := repository.db.First(message, messageID).Error; err != nil {
+	err := repository.db.First(message, messageID).Error
+	if errors.Is(err, gorm.ErrRecordNotFound) {
+		msg := fmt.Sprintf("message with ID [%s] does not exist", message.ID)
+		return nil, repository.tracer.WrapErrorSpan(span, stacktrace.PropagateWithCode(err, ErrCodeNotFound, msg))
+	}
+
+	if err != nil {
 		msg := fmt.Sprintf("cannot load message with ID [%s]", messageID)
 		return nil, repository.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
 	}