fix(attachment): check download variant and readiness

This commit is contained in:
kk10
2026-11-06 15:44:33 +03:00
parent a11463c680
commit bca081428a
4 changed files with 24 additions and 1 deletions
+8
View File
@@ -14,6 +14,10 @@ type CreateAttachmentRequest struct {
Filename string
}
type GetAttachmentContentRequest struct {
Variant string
}
type VariantResponse struct {
Name string `json:"name"`
ContentType string `json:"content_type"`
@@ -52,6 +56,10 @@ func (r CreateAttachmentRequest) Validate() bool {
return true
}
func (r GetAttachmentContentRequest) Validate() bool {
return r.Variant == "" || r.Variant == "original"
}
func ToAttachmentResponse(a model.Attachment) AttachmentResponse {
variants := make([]VariantResponse, 0)
return AttachmentResponse{
+11
View File
@@ -113,8 +113,19 @@ func (h *AttachmentHandler) GetContent(w http.ResponseWriter, r *http.Request) {
return
}
req := dto.GetAttachmentContentRequest{
Variant: r.URL.Query().Get("variant"),
}
if !req.Validate() {
httpx.WriteError(w, http.StatusNotFound, dto.ErrorCodeNotFound, "not found", requestID)
return
}
data, contentType, err := h.service.GetContent(r.Context(), userID, attachmentID)
switch {
case errors.Is(err, service.ErrAttachmentNotReady):
httpx.WriteError(w, http.StatusConflict, dto.ErrorCodeConflict, "attachment not ready", requestID)
return
case errors.Is(err, service.ErrAttachmentNotFound):
httpx.WriteError(w, http.StatusNotFound, dto.ErrorCodeNotFound, "not found", requestID)
return
+5
View File
@@ -23,6 +23,7 @@ import (
var (
ErrAttachmentNotFound = errors.New("attachment not found")
ErrAttachmentNotReady = errors.New("attachment not ready")
ErrInvalidImage = errors.New("invalid image")
ErrInvalidSize = errors.New("invalid size")
ErrUploadReadTimeout = errors.New("upload body read timed out")
@@ -203,6 +204,10 @@ func (s *AttachmentService) GetContent(
return nil, "", err
}
if model.AttachmentStatus(row.Status) != model.AttachmentStatusReady {
return nil, "", ErrAttachmentNotReady
}
out, err := s.s3.Get(ctx, row.S3Key)
if err != nil {
return nil, "", err
-1
View File
@@ -20,7 +20,6 @@ import (
var (
ErrMessageChatNotFound = errors.New("chat not found")
ErrAttachmentNotReady = errors.New("attachment not ready")
ErrIdempotencyKeyConflict = errors.New("idempotency key reused with different request")
)