update

Dockerfile

@@ -1,14 +1,5 @@
 FROM golang:1.25.1-alpine3.22 AS builder
 
-RUN apk add --no-cache \
-    bash \
-    curl \
-    git \
-    ca-certificates
-
-
-RUN apk add --no-cache tzdata
-
 WORKDIR /app
 COPY go.mod go.sum ./
 RUN go mod download
@@ -16,19 +7,11 @@ COPY . .
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -trimpath -ldflags="-s -w" -o main "./cmd"
 
 
-FROM alpine:3.22
-
-RUN apk add --no-cache \
-    bash \
-    curl \
-    ca-certificates \
-    tzdata
+FROM ubuntu:24.04
 
 COPY --from=builder /app/main /usr/local/bin/app
 
 
 RUN chmod +x /usr/local/bin/app
-#RUN adduser -D -s /bin/bash appuser
-#USER appuser
 
 ENTRYPOINT ["app"]

api.env

@@ -12,6 +12,7 @@ MEDIA_STORAGE_USER=
 MEDIA_STORAGE_PASS=
 MEDIA_STORAGE_HOST=
 MEDIA_STORAGE_PORT=
+MEDIA_STORAGE_SECURE=false
 
 DB_HOST=
 DB_PORT=

internal/api/merch/controller.go

@@ -362,7 +362,7 @@ func (co *controller) getMerchImage(c *gin.Context) {
 		log.WithError(err).Error("Merch | Failed to get merch image")
 		return
 	}
-	c.JSON(http.StatusOK, ImageLink{Link: link.String()})
+	c.JSON(http.StatusOK, link)
 }
 
 // @Summary		Удалить (безвозвратно) картинки по merch_uuid и query параметрам

internal/api/merch/dto.go

@@ -56,4 +56,5 @@ type UpdateMerchDTO struct {
 
 type ImageLink struct {
 	Link string `json:"link"`
+	ETag string `json:"etag"`
 }

internal/api/merch/handler.go

@@ -32,10 +32,10 @@ func NewHandler(deps Deps) *Handler {
 		"addr": media,
 	}).Debug("Merch handler constructor | Media provider")
 
-	//exists, err := media.CheckBucketExists(packageBucketName)
-	//if err != nil || !exists {
-	//	log.WithError(err).Fatal("Merch handler constructor | Failed to ensure bucket exists")
-	//}
+	exists, err := media.CheckBucketExists(packageBucketName)
+	if err != nil || !exists {
+		log.WithError(err).Fatal("Merch handler constructor | Failed to ensure bucket exists")
+	}
 
 	return &Handler{
 		repo:       r,

internal/api/merch/service.go

@@ -14,7 +14,6 @@ import (
 	"io"
 	"merch-parser-api/internal/interfaces"
 	"mime/multipart"
-	"net/url"
 	"path/filepath"
 	"strings"
 	"time"
@@ -304,14 +303,14 @@ func (s *service) uploadMerchImage(ctx context.Context, userUuid, merchUuid, ima
 	return nil
 }
 
-func (s *service) getMerchImage(ctx context.Context, userUuid, merchUuid, imageType string) (*url.URL, error) {
+func (s *service) getMerchImage(ctx context.Context, userUuid, merchUuid, imageType string) (ImageLink, error) {
 	exists, err := s.repo.merchRecordExists(userUuid, merchUuid)
 	if err != nil {
-		return nil, err
+		return ImageLink{}, err
 	}
 
 	if !exists {
-		return nil, fmt.Errorf("no merch found for user %s with uuid %s", userUuid, merchUuid)
+		return ImageLink{}, fmt.Errorf("no merch found for user %s with uuid %s", userUuid, merchUuid)
 	}
 
 	var object string
@@ -321,10 +320,23 @@ func (s *service) getMerchImage(ctx context.Context, userUuid, merchUuid, imageT
 	case "full":
 		object = fmt.Sprintf("%s/merch/%s/full.jpg", userUuid, merchUuid)
 	default:
-		return nil, fmt.Errorf("unknown image type %s", imageType)
+		return ImageLink{}, fmt.Errorf("unknown image type %s", imageType)
 	}
 
-	return s.media.Get(ctx, s.bucketName, object, s.expires, nil)
+	link, err := s.media.Get(ctx, s.bucketName, object, s.expires, nil)
+	if err != nil {
+		return ImageLink{}, err
+	}
+
+	etag, err := s.media.GetObjectEtag(ctx, s.bucketName, object)
+	if err != nil {
+		return ImageLink{}, err
+	}
+
+	return ImageLink{
+		Link: link.String(),
+		ETag: etag,
+	}, nil
 }
 
 func (s *service) deleteMerchImage(ctx context.Context, userUuid, merchUuid string) error {
@@ -367,7 +379,7 @@ func (s *service) _uploadToStorage(params uploadImageParams) error {
 	if err != nil {
 		log.WithFields(log.Fields{
 			"error":    err,
-			"img type": "full",
+			"img type": params.imageType,
 		}).Error("Merch | Failed to upload file to media storage")
 		return err
 	}

internal/interfaces/mediaStorage.go

@@ -12,4 +12,5 @@ type MediaStorage interface {
 	Upload(ctx context.Context, bucket, object string, reader io.Reader, size int64) error
 	Get(ctx context.Context, bucket, object string, expires time.Duration, params url.Values) (*url.URL, error)
 	Delete(ctx context.Context, bucket, object string) error
+	GetObjectEtag(ctx context.Context, bucketName, object string) (string, error)
 }

internal/mediaStorage/service.go

@@ -42,3 +42,11 @@ func (s *Service) Get(ctx context.Context, bucket, object string, expires time.D
 func (s *Service) Delete(ctx context.Context, bucket, object string) error {
 	return s.client.RemoveObject(ctx, bucket, object, minio.RemoveObjectOptions{})
 }
+
+func (s *Service) GetObjectEtag(ctx context.Context, bucketName, object string) (string, error) {
+	info, err := s.client.StatObject(ctx, bucketName, object, minio.StatObjectOptions{})
+	if err != nil {
+		return "", err
+	}
+	return info.ETag, nil
+}