[api] use 409 instead of 500 on ID conflict

android-sms-gateway · Jul 10, 2024 · f395a96 · f395a96
1 parent 1515eb3
commit f395a96
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 12 deletions.
diff --git a/api/swagger.json b/api/swagger.json
@@ -199,6 +199,12 @@
                             "$ref": "#/definitions/smsgateway.ErrorResponse"
                         }
                     },
+                    "409": {
+                        "description": "Message with such ID already exists",
+                        "schema": {
+                            "$ref": "#/definitions/smsgateway.ErrorResponse"
+                        }
+                    },
                     "500": {
                         "description": "Internal server error",
                         "schema": {

diff --git a/api/swagger.yaml b/api/swagger.yaml
@@ -444,6 +444,10 @@ paths:
           description: Unauthorized
           schema:
             $ref: '#/definitions/smsgateway.ErrorResponse'
+        "409":
+          description: Message with such ID already exists
+          schema:
+            $ref: '#/definitions/smsgateway.ErrorResponse'
         "500":
           description: Internal server error
           schema:

diff --git a/internal/sms-gateway/handlers/3rdparty.go b/internal/sms-gateway/handlers/3rdparty.go
@@ -94,6 +94,7 @@ func (h *thirdPartyHandler) getDevice(user models.User, c *fiber.Ctx) error {
 //	@Success		202					{object}	smsgateway.MessageState		"Message enqueued"
 //	@Failure		400					{object}	smsgateway.ErrorResponse	"Invalid request"
 //	@Failure		401					{object}	smsgateway.ErrorResponse	"Unauthorized"
+//	@Failure		409					{object}	smsgateway.ErrorResponse	"Message with such ID already exists"
 //	@Failure		500					{object}	smsgateway.ErrorResponse	"Internal server error"
 //	@Header			202					{string}	Location					"Get message state URL"
 //	@Router			/3rdparty/v1/message [post]
@@ -104,37 +105,36 @@ func (h *thirdPartyHandler) postMessage(user models.User, c *fiber.Ctx) error {
 	if err := h.BodyParserValidator(c, &req); err != nil {
 		return fiber.NewError(fiber.StatusBadRequest, err.Error())
 	}
-	if err := req.Validate(); err != nil {
-		return fiber.NewError(fiber.StatusBadRequest, err.Error())
-	}
 
 	skipPhoneValidation := c.QueryBool("skipPhoneValidation", false)
 
 	devices, err := h.devicesSvc.Select(devices.WithUserID(user.ID))
 	if err != nil {
-		return fmt.Errorf("can't select devices: %w", err)
+		h.Logger.Error("Failed to select devices", zap.Error(err), zap.String("user_id", user.ID))
+		return fiber.NewError(fiber.StatusInternalServerError, "Can't select devices. Please contact support")
 	}
 
 	if len(devices) < 1 {
-		return fiber.NewError(fiber.StatusBadRequest, "Нет ни одного устройства в учетной записи")
+		return fiber.NewError(fiber.StatusBadRequest, "No devices registered")
 	}
 
 	device := devices[0]
 	state, err := h.messagesSvc.Enqeue(device, req, messages.EnqueueOptions{SkipPhoneValidation: skipPhoneValidation})
 	if err != nil {
-		var err400 messages.ErrValidation
-		if errors.As(err, &err400) {
-			return fiber.NewError(fiber.StatusBadRequest, err.Error())
+		var errValidation messages.ErrValidation
+		if isBadRequest := errors.As(err, &errValidation); isBadRequest {
+			return fiber.NewError(fiber.StatusBadRequest, errValidation.Error())
+		}
+		if isConflict := errors.Is(err, messages.ErrMessageAlreadyExists); isConflict {
+			return fiber.NewError(fiber.StatusConflict, err.Error())
 		}
-
-		return err
 	}
 
 	location, err := c.GetRouteURL(route3rdPartyGetMessage, fiber.Map{
 		"id": state.ID,
 	})
 	if err != nil {
-		h.Logger.Error("Failed to get route URL", zap.String("route", route3rdPartyGetMessage), zap.Error(err))
+		h.Logger.Warn("Failed to get route URL", zap.String("route", route3rdPartyGetMessage), zap.Error(err))
 	} else {
 		c.Location(location)
 	}

diff --git a/internal/sms-gateway/modules/messages/service.go b/internal/sms-gateway/modules/messages/service.go
@@ -32,6 +32,8 @@ func (e ErrValidation) Error() string {
 	return string(e)
 }
 
+var ErrMessageAlreadyExists = repositories.ErrMessageAlreadyExists
+
 type EnqueueOptions struct {
 	SkipPhoneValidation bool
 }

diff --git a/internal/sms-gateway/repositories/messages.go b/internal/sms-gateway/repositories/messages.go
@@ -5,13 +5,15 @@ import (
 	"errors"
 
 	"github.com/capcom6/sms-gateway/internal/sms-gateway/models"
+	"github.com/go-sql-driver/mysql"
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
 )
 
 const HashingLockName = "36444143-1ace-4dbf-891c-cc505911497e"
 
 var ErrMessageNotFound = gorm.ErrRecordNotFound
+var ErrMessageAlreadyExists = errors.New("duplicate id")
 
 type MessagesRepository struct {
 	db *gorm.DB
@@ -54,7 +56,15 @@ func (r *MessagesRepository) Get(ID string, filter MessagesSelectFilter, options
 }
 
 func (r *MessagesRepository) Insert(message *models.Message) error {
-	return r.db.Omit("Device").Create(message).Error
+	err := r.db.Omit("Device").Create(message).Error
+	if err == nil {
+		return nil
+	}
+
+	if mysqlErr := err.(*mysql.MySQLError); mysqlErr != nil && mysqlErr.Number == 1062 {
+		return ErrMessageAlreadyExists
+	}
+	return err
 }
 
 func (r *MessagesRepository) UpdateState(message *models.Message) error {