From 1695fa0f2feba704e12d409a9004fb02c1d277b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=93=D0=BE=D0=BB=D0=B8=D0=BA=D0=BE=D0=B2=20Maximillian?= =?UTF-8?q?=20=D0=90=D0=BD=D1=82=D0=BE=D0=BD?= Date: Tue, 6 Oct 2026 23:55:36 +0300 Subject: [PATCH] feat(httpapi): require Idempotency-Key on POST chat messages --- backend/cmd/server/main.go | 3 +- backend/internal/httpapi/handler/message.go | 23 ++++++++++- backend/internal/service/message.go | 44 +++++++++++++++++---- 3 files changed, 58 insertions(+), 12 deletions(-) diff --git a/backend/cmd/server/main.go b/backend/cmd/server/main.go index b72ab2f0..29ba4dfa 100644 --- a/backend/cmd/server/main.go +++ b/backend/cmd/server/main.go @@ -61,8 +61,7 @@ func main() { userSvc := service.NewUserService(store.Users(), hasher) sessionSvc := service.NewSessionService(store.Users(), sessionRepo, hasher, cfg.SessionTTL) chatSvc := service.NewChatService(store.Chats(), store.Users()) - messageSvc := service.NewMessageService(store.Messages(), store.Chats()) - + messageSvc := service.NewMessageService(store.Messages(), store.Chats(), cfg.IdempotencyTTL) healthChecks := []handler.HealthCheck{ func(ctx context.Context) error { return pool.Ping(ctx) }, } diff --git a/backend/internal/httpapi/handler/message.go b/backend/internal/httpapi/handler/message.go index 354c7ed7..e8de058b 100644 --- a/backend/internal/httpapi/handler/message.go +++ b/backend/internal/httpapi/handler/message.go @@ -2,6 +2,7 @@ package handler import ( "net/http" + "regexp" "github.com/gin-gonic/gin" @@ -10,6 +11,8 @@ import ( "high-loud-apps-labs/internal/service" ) +var idempotencyKeyPattern = regexp.MustCompile(`^[A-Za-z0-9._:-]{1,128}$`) + type MessageHandler struct { messages *service.MessageService } @@ -25,6 +28,14 @@ func (h *MessageHandler) Create(c *gin.Context) { return } + key := c.GetHeader("Idempotency-Key") + if key == "" || !idempotencyKeyPattern.MatchString(key) { + respondError(c, &badRequestError{ + msg: "Idempotency-Key обязателен и должен соответствовать ^[A-Za-z0-9._:-]{1,128}$", + }) + return + } + me := middleware.CurrentUser(c) chatID, err := parseUUIDPathParam(c, "chat_id") @@ -33,12 +44,20 @@ func (h *MessageHandler) Create(c *gin.Context) { return } - m, err := h.messages.Create(c.Request.Context(), me.ID, chatID, req.Text) + result, err := h.messages.Create( + c.Request.Context(), + me.ID, + chatID, + req.Text, + key, + c.Request.URL.Path, + ) if err != nil { respondError(c, err) return } - c.JSON(http.StatusCreated, dto.MessageFromDomain(m)) + + c.Data(result.Status, "application/json", result.Body) } func (h *MessageHandler) List(c *gin.Context) { diff --git a/backend/internal/service/message.go b/backend/internal/service/message.go index 1814d962..3c178cf2 100644 --- a/backend/internal/service/message.go +++ b/backend/internal/service/message.go @@ -2,6 +2,8 @@ package service import ( "context" + "encoding/json" + "net/http" "strings" "time" "unicode/utf8" @@ -9,18 +11,29 @@ import ( "github.com/google/uuid" "high-loud-apps-labs/internal/domain" + "high-loud-apps-labs/internal/httpapi/dto" ) type MessageService struct { - messages domain.MessageRepository - chats domain.ChatRepository + messages domain.MessageRepository + chats domain.ChatRepository + idempotencyTTL time.Duration } -func NewMessageService(messages domain.MessageRepository, chats domain.ChatRepository) *MessageService { - return &MessageService{messages: messages, chats: chats} +func NewMessageService( + messages domain.MessageRepository, + chats domain.ChatRepository, + idempotencyTTL time.Duration, +) *MessageService { + return &MessageService{ + messages: messages, + chats: chats, + idempotencyTTL: idempotencyTTL, + } } -func (s *MessageService) Create(ctx context.Context, senderID, chatID, text string) (*domain.Message, error) { +func (s *MessageService) Create(ctx context.Context, senderID, chatID, text, idempotencyKey, requestPath string, +) (*domain.CreateIdempotentResult, error) { if strings.TrimSpace(text) == "" { return nil, &domain.ValidationError{ Field: "text", @@ -38,17 +51,32 @@ func (s *MessageService) Create(ctx context.Context, senderID, chatID, text stri return nil, err } - m := &domain.Message{ + fresh := &domain.Message{ ID: uuid.NewString(), ChatID: chatID, SenderID: senderID, Text: text, CreatedAt: time.Now().UTC(), } - if err := s.messages.Create(ctx, m); err != nil { + + body, err := json.Marshal(dto.MessageFromDomain(fresh)) + if err != nil { return nil, err } - return m, nil + + return s.messages.CreateIdempotent( + ctx, + domain.IdempotencyScope{ + UserID: senderID, + Method: http.MethodPost, + Path: requestPath, + Key: idempotencyKey, + }, + domain.RequestHash(text), + fresh, + body, + s.idempotencyTTL, + ) } func (s *MessageService) List(ctx context.Context, userID, chatID string, limit int, cursor *string) ([]domain.Message, *string, error) {