From bb5f2fb23732a7e23101ab6c6cf3c3b03380f02e 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: Mon, 9 Nov 2026 14:51:17 +0300 Subject: [PATCH] feat(api): lab5 serve attachment variants in json and content endpoints --- backend/internal/domain/entity.go | 2 ++ backend/internal/httpapi/dto/attachment.go | 12 +++++++++++- backend/internal/httpapi/handler/attachment.go | 6 +----- backend/internal/service/attachment.go | 15 +++++++++++++-- 4 files changed, 27 insertions(+), 8 deletions(-) diff --git a/backend/internal/domain/entity.go b/backend/internal/domain/entity.go index 400e02c2..08f30960 100644 --- a/backend/internal/domain/entity.go +++ b/backend/internal/domain/entity.go @@ -65,4 +65,6 @@ type Attachment struct { LockedUntil *time.Time // lease; nil = не арендовано PipelineVersion int // guard в CompleteJob; в БД default 1 StagingKey string // S3-ключ оригинала до 202; "" в lab4-пути + + Variants []AttachmentVariant } diff --git a/backend/internal/httpapi/dto/attachment.go b/backend/internal/httpapi/dto/attachment.go index b608954a..0ce882b1 100644 --- a/backend/internal/httpapi/dto/attachment.go +++ b/backend/internal/httpapi/dto/attachment.go @@ -31,7 +31,17 @@ type AttachmentResponse struct { } func AttachmentFromDomain(a *domain.Attachment) AttachmentResponse { - variants := make([]VariantResponse, 0) + variants := make([]VariantResponse, len(a.Variants)) + for i, v := range a.Variants { + variants[i] = VariantResponse{ + Name: v.Name, + ContentType: v.ContentType, + SizeBytes: v.SizeBytes, + Width: v.Width, + Height: v.Height, + SHA256: hex.EncodeToString(v.SHA256), + } + } errCode := a.ErrorCode return AttachmentResponse{ ID: a.ID, diff --git a/backend/internal/httpapi/handler/attachment.go b/backend/internal/httpapi/handler/attachment.go index e390c6fc..24e9574f 100644 --- a/backend/internal/httpapi/handler/attachment.go +++ b/backend/internal/httpapi/handler/attachment.go @@ -82,12 +82,8 @@ func (h *AttachmentHandler) Content(c *gin.Context) { } variant := c.DefaultQuery("variant", "original") - if variant != "original" { - respondError(c, &domain.NotFoundError{Entity: "variant", ID: variant}) - return - } - rc, size, contentType, err := h.svc.Download(c.Request.Context(), me.ID, attachmentID) + rc, size, contentType, err := h.svc.Download(c.Request.Context(), me.ID, attachmentID, variant) if err != nil { respondError(c, err) return diff --git a/backend/internal/service/attachment.go b/backend/internal/service/attachment.go index 5a7ff696..358ed47a 100644 --- a/backend/internal/service/attachment.go +++ b/backend/internal/service/attachment.go @@ -167,7 +167,7 @@ func (s *AttachmentService) Get(ctx context.Context, userID, attachmentID string func (s *AttachmentService) Download( ctx context.Context, - userID, attachmentID string, + userID, attachmentID, variantName string, ) (io.ReadCloser, int64, string, error) { a, err := s.Get(ctx, userID, attachmentID) if err != nil { @@ -176,7 +176,18 @@ func (s *AttachmentService) Download( if a.Status != domain.AttachmentStatusReady { return nil, 0, "", &domain.ConflictError{Reason: "вложение не готово"} } - return s.storage.Get(ctx, a.ObjectKey) + + if variantName == "original" || variantName == "" { + return s.storage.Get(ctx, a.ObjectKey) + } + + for _, v := range a.Variants { + if v.Name == variantName { + return s.storage.Get(ctx, v.ObjectKey) + } + } + + return nil, 0, "", &domain.NotFoundError{Entity: "variant", ID: variantName} } func (s *AttachmentService) ensureMember(ctx context.Context, userID, chatID string) error {