From 2feda33e26e2ee77692f65ae84b6b08f91ea2b33 Mon Sep 17 00:00:00 2001 From: nquidox Date: Thu, 16 Oct 2025 21:00:23 +0300 Subject: [PATCH 01/39] dev --- internal/api/merch/handler.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/api/merch/handler.go b/internal/api/merch/handler.go index b9b8227..a83f913 100644 --- a/internal/api/merch/handler.go +++ b/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, From d1542b274ee5a4e57d443f9e69b3e88ec53c3bdc Mon Sep 17 00:00:00 2001 From: nquidox Date: Fri, 17 Oct 2025 23:46:34 +0300 Subject: [PATCH 02/39] switch to ubuntu --- Dockerfile | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/Dockerfile b/Dockerfile index 33390eb..c05cbe3 100644 --- a/Dockerfile +++ b/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"] \ No newline at end of file From bc6621154b02cd9039b647c16870fad6f054b83b Mon Sep 17 00:00:00 2001 From: nquidox Date: Fri, 17 Oct 2025 23:47:48 +0300 Subject: [PATCH 03/39] return etag --- internal/api/merch/controller.go | 2 +- internal/api/merch/dto.go | 1 + internal/api/merch/handler.go | 8 ++++---- internal/api/merch/service.go | 26 +++++++++++++++++++------- internal/interfaces/mediaStorage.go | 1 + internal/mediaStorage/service.go | 8 ++++++++ 6 files changed, 34 insertions(+), 12 deletions(-) diff --git a/internal/api/merch/controller.go b/internal/api/merch/controller.go index f0d8e8b..d4e05f8 100644 --- a/internal/api/merch/controller.go +++ b/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 параметрам diff --git a/internal/api/merch/dto.go b/internal/api/merch/dto.go index 3f94688..bc1646e 100644 --- a/internal/api/merch/dto.go +++ b/internal/api/merch/dto.go @@ -56,4 +56,5 @@ type UpdateMerchDTO struct { type ImageLink struct { Link string `json:"link"` + ETag string `json:"etag"` } diff --git a/internal/api/merch/handler.go b/internal/api/merch/handler.go index a83f913..b9b8227 100644 --- a/internal/api/merch/handler.go +++ b/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, diff --git a/internal/api/merch/service.go b/internal/api/merch/service.go index de751ec..eb0c85d 100644 --- a/internal/api/merch/service.go +++ b/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 } diff --git a/internal/interfaces/mediaStorage.go b/internal/interfaces/mediaStorage.go index ef8e178..bf46f47 100644 --- a/internal/interfaces/mediaStorage.go +++ b/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) } diff --git a/internal/mediaStorage/service.go b/internal/mediaStorage/service.go index 39fedce..3a5b7aa 100644 --- a/internal/mediaStorage/service.go +++ b/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 +} From c2304f6a7dafe8ed73734545f187ff92d062a26e Mon Sep 17 00:00:00 2001 From: nquidox Date: Fri, 17 Oct 2025 23:48:05 +0300 Subject: [PATCH 04/39] update --- api.env | 1 + 1 file changed, 1 insertion(+) diff --git a/api.env b/api.env index 0a477e8..add3486 100644 --- a/api.env +++ b/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= From f561869b08071a5ee56c358835c03daa41d0351f Mon Sep 17 00:00:00 2001 From: nquidox Date: Sat, 18 Oct 2025 14:11:58 +0300 Subject: [PATCH 05/39] swagger docs update --- docs/docs.go | 25 +++++++++++++------------ docs/swagger.json | 25 +++++++++++++------------ docs/swagger.yaml | 16 ++++++++-------- internal/api/merch/controller.go | 3 +-- 4 files changed, 35 insertions(+), 34 deletions(-) diff --git a/docs/docs.go b/docs/docs.go index 4901f76..769c22b 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -169,7 +169,7 @@ const docTemplate = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/merch.PricesResponse" + "$ref": "#/definitions/merch.ImageLink" } }, "400": { @@ -267,21 +267,11 @@ const docTemplate = `{ "name": "uuid", "in": "path", "required": true - }, - { - "type": "string", - "description": "image type", - "name": "type", - "in": "query", - "required": true } ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/merch.PricesResponse" - } + "description": "OK" }, "400": { "description": "Bad Request", @@ -778,6 +768,17 @@ const docTemplate = `{ } }, "definitions": { + "merch.ImageLink": { + "type": "object", + "properties": { + "etag": { + "type": "string" + }, + "link": { + "type": "string" + } + } + }, "merch.ListResponse": { "type": "object", "properties": { diff --git a/docs/swagger.json b/docs/swagger.json index a1b5b73..d333c5a 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -161,7 +161,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/merch.PricesResponse" + "$ref": "#/definitions/merch.ImageLink" } }, "400": { @@ -259,21 +259,11 @@ "name": "uuid", "in": "path", "required": true - }, - { - "type": "string", - "description": "image type", - "name": "type", - "in": "query", - "required": true } ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/merch.PricesResponse" - } + "description": "OK" }, "400": { "description": "Bad Request", @@ -770,6 +760,17 @@ } }, "definitions": { + "merch.ImageLink": { + "type": "object", + "properties": { + "etag": { + "type": "string" + }, + "link": { + "type": "string" + } + } + }, "merch.ListResponse": { "type": "object", "properties": { diff --git a/docs/swagger.yaml b/docs/swagger.yaml index 2d9d9bc..c3f516b 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -1,5 +1,12 @@ basePath: /api/v2 definitions: + merch.ImageLink: + properties: + etag: + type: string + link: + type: string + type: object merch.ListResponse: properties: merch_uuid: @@ -271,16 +278,9 @@ paths: name: uuid required: true type: string - - description: image type - in: query - name: type - required: true - type: string responses: "200": description: OK - schema: - $ref: '#/definitions/merch.PricesResponse' "400": description: Bad Request schema: @@ -311,7 +311,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/merch.PricesResponse' + $ref: '#/definitions/merch.ImageLink' "400": description: Bad Request schema: diff --git a/internal/api/merch/controller.go b/internal/api/merch/controller.go index d4e05f8..6d7cd5d 100644 --- a/internal/api/merch/controller.go +++ b/internal/api/merch/controller.go @@ -370,8 +370,7 @@ func (co *controller) getMerchImage(c *gin.Context) { // @Tags Merch images // @Security BearerAuth // @Param uuid path string true "merch_uuid" -// @Param type query string true "image type" -// @Success 200 {object} PricesResponse +// @Success 200 // @Failure 400 {object} responses.ErrorResponse400 // @Failure 500 {object} responses.ErrorResponse500 // @Router /merch/images/{uuid} [delete] From 0348dda5cd5a5c5426790b3dcd9574453af9be4a Mon Sep 17 00:00:00 2001 From: nquidox Date: Sat, 18 Oct 2025 14:57:43 +0300 Subject: [PATCH 06/39] switch back to alpine --- Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c05cbe3..941ced8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,11 @@ COPY . . RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -trimpath -ldflags="-s -w" -o main "./cmd" -FROM ubuntu:24.04 +FROM alpine:3.22 + +RUN apk add --no-cache \ + tzdata \ + ca-certificates COPY --from=builder /app/main /usr/local/bin/app From bb305eab9ed9ea3518d385b12912261f74a2122f Mon Sep 17 00:00:00 2001 From: nquidox Date: Sat, 18 Oct 2025 15:30:59 +0300 Subject: [PATCH 07/39] replace domain for links --- api.env | 3 ++- cmd/main.go | 2 ++ config/config.go | 2 ++ internal/api/merch/service.go | 2 +- internal/interfaces/mediaStorage.go | 2 +- internal/mediaStorage/handler.go | 3 ++- internal/mediaStorage/service.go | 23 +++++++++++++++++++---- 7 files changed, 29 insertions(+), 8 deletions(-) diff --git a/api.env b/api.env index add3486..563fd50 100644 --- a/api.env +++ b/api.env @@ -9,9 +9,10 @@ GRPC_SERVER_PORT=9050 GRPC_CLIENT_PORT=9060 MEDIA_STORAGE_USER= -MEDIA_STORAGE_PASS= +MEDIA_STORAGE_PASSWORD= MEDIA_STORAGE_HOST= MEDIA_STORAGE_PORT= +MEDIA_STORAGE_DOMAIN= MEDIA_STORAGE_SECURE=false DB_HOST= diff --git a/cmd/main.go b/cmd/main.go index 8a2e607..d5e74cc 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -56,6 +56,8 @@ func main() { Port: c.MediaConf.Port, User: c.MediaConf.User, Password: c.MediaConf.Password, + Domain: c.MediaConf.Domain, + Secure: c.MediaConf.Secure, }) log.WithFields(log.Fields{ "address": c.MediaConf.Host + ":" + c.MediaConf.Port, diff --git a/config/config.go b/config/config.go index 9ec076a..0e71b33 100644 --- a/config/config.go +++ b/config/config.go @@ -46,6 +46,7 @@ type MediaConfig struct { Port string User string Password string + Domain string Secure string } @@ -87,6 +88,7 @@ func NewConfig() *Config { Port: getEnv("MEDIA_STORAGE_PORT", ""), User: getEnv("MEDIA_STORAGE_USER", ""), Password: getEnv("MEDIA_STORAGE_PASSWORD", ""), + Domain: getEnv("MEDIA_STORAGE_DOMAIN", ""), Secure: getEnv("MEDIA_STORAGE_SECURE", ""), }, } diff --git a/internal/api/merch/service.go b/internal/api/merch/service.go index eb0c85d..31aced3 100644 --- a/internal/api/merch/service.go +++ b/internal/api/merch/service.go @@ -334,7 +334,7 @@ func (s *service) getMerchImage(ctx context.Context, userUuid, merchUuid, imageT } return ImageLink{ - Link: link.String(), + Link: link, ETag: etag, }, nil } diff --git a/internal/interfaces/mediaStorage.go b/internal/interfaces/mediaStorage.go index bf46f47..b332a5f 100644 --- a/internal/interfaces/mediaStorage.go +++ b/internal/interfaces/mediaStorage.go @@ -10,7 +10,7 @@ import ( type MediaStorage interface { CheckBucketExists(bucketName string) (bool, error) 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) + Get(ctx context.Context, bucket, object string, expires time.Duration, params url.Values) (string, error) Delete(ctx context.Context, bucket, object string) error GetObjectEtag(ctx context.Context, bucketName, object string) (string, error) } diff --git a/internal/mediaStorage/handler.go b/internal/mediaStorage/handler.go index ab1331e..e6293ba 100644 --- a/internal/mediaStorage/handler.go +++ b/internal/mediaStorage/handler.go @@ -16,6 +16,7 @@ type Deps struct { Port string User string Password string + Domain string Secure string } @@ -40,6 +41,6 @@ func NewHandler(deps Deps) *Handler { }).Debug("Media storage | Created minio client") return &Handler{ - newService(minioClient), + newService(minioClient, deps.Domain, endpoint), } } diff --git a/internal/mediaStorage/service.go b/internal/mediaStorage/service.go index 3a5b7aa..a55b6fc 100644 --- a/internal/mediaStorage/service.go +++ b/internal/mediaStorage/service.go @@ -2,20 +2,25 @@ package mediaStorage import ( "context" + "fmt" "github.com/minio/minio-go/v7" log "github.com/sirupsen/logrus" "io" "net/url" + "strings" "time" ) type Service struct { - client *minio.Client + client *minio.Client + domain string + endpoint string } -func newService(client *minio.Client) *Service { +func newService(client *minio.Client, domain, endpoint string) *Service { return &Service{ client: client, + domain: domain, } } @@ -35,8 +40,18 @@ func (s *Service) Upload(ctx context.Context, bucket, object string, reader io.R return err } -func (s *Service) Get(ctx context.Context, bucket, object string, expires time.Duration, params url.Values) (*url.URL, error) { - return s.client.PresignedGetObject(ctx, bucket, object, expires, params) +func (s *Service) Get(ctx context.Context, bucket, object string, expires time.Duration, params url.Values) (string, error) { + presigned, err := s.client.PresignedGetObject(ctx, bucket, object, expires, params) + if err != nil { + return "", err + } + + link := presigned.String() + if s.domain != "" { + link = strings.Replace(link, fmt.Sprintf("http://%s", s.endpoint), s.domain, 1) + } + + return link, nil } func (s *Service) Delete(ctx context.Context, bucket, object string) error { From f3d123ee3bacda8d4c7343e427814c2c7feea254 Mon Sep 17 00:00:00 2001 From: nquidox Date: Sat, 18 Oct 2025 16:07:56 +0300 Subject: [PATCH 08/39] replace domain for links --- internal/api/merch/handler.go | 2 +- internal/mediaStorage/service.go | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/internal/api/merch/handler.go b/internal/api/merch/handler.go index b9b8227..a442f9a 100644 --- a/internal/api/merch/handler.go +++ b/internal/api/merch/handler.go @@ -21,7 +21,7 @@ type Deps struct { func NewHandler(deps Deps) *Handler { packageBucketName := "user-merch-images" - expires := time.Minute * 1 + expires := time.Minute * 5 r := NewRepo(deps.DB) s := newService(r, deps.Media, packageBucketName, expires) diff --git a/internal/mediaStorage/service.go b/internal/mediaStorage/service.go index a55b6fc..3a3d7c5 100644 --- a/internal/mediaStorage/service.go +++ b/internal/mediaStorage/service.go @@ -7,7 +7,6 @@ import ( log "github.com/sirupsen/logrus" "io" "net/url" - "strings" "time" ) @@ -46,12 +45,21 @@ func (s *Service) Get(ctx context.Context, bucket, object string, expires time.D return "", err } - link := presigned.String() - if s.domain != "" { - link = strings.Replace(link, fmt.Sprintf("http://%s", s.endpoint), s.domain, 1) + u, err := url.Parse(presigned.String()) + if err != nil { + return "", err } - return link, nil + if s.domain != "" { + domainURL, err := url.Parse(s.domain) + if err != nil { + return "", fmt.Errorf("invalid domain URL: %w", err) + } + u.Scheme = domainURL.Scheme + u.Host = domainURL.Host + } + + return u.String(), nil } func (s *Service) Delete(ctx context.Context, bucket, object string) error { From 947220b65c0fa4534d52114c4cf98fc8651dda7d Mon Sep 17 00:00:00 2001 From: nquidox Date: Sat, 18 Oct 2025 16:38:21 +0300 Subject: [PATCH 09/39] endpoint env refactor --- api.env | 4 +--- cmd/main.go | 6 ++---- config/config.go | 8 ++------ internal/mediaStorage/handler.go | 11 ++++------- internal/mediaStorage/service.go | 20 ++------------------ 5 files changed, 11 insertions(+), 38 deletions(-) diff --git a/api.env b/api.env index 563fd50..8bb1d03 100644 --- a/api.env +++ b/api.env @@ -8,11 +8,9 @@ APP_ALLOWED_ORIGINS=http://localhost:5173, GRPC_SERVER_PORT=9050 GRPC_CLIENT_PORT=9060 +MEDIA_STORAGE_ENDPOINT= MEDIA_STORAGE_USER= MEDIA_STORAGE_PASSWORD= -MEDIA_STORAGE_HOST= -MEDIA_STORAGE_PORT= -MEDIA_STORAGE_DOMAIN= MEDIA_STORAGE_SECURE=false DB_HOST= diff --git a/cmd/main.go b/cmd/main.go index d5e74cc..3fb0010 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -52,15 +52,13 @@ func main() { log.Debug("Utils provider initialized") mediaProvider := mediaStorage.NewHandler(mediaStorage.Deps{ - Host: c.MediaConf.Host, - Port: c.MediaConf.Port, + Endpoint: c.MediaConf.Endpoint, User: c.MediaConf.User, Password: c.MediaConf.Password, - Domain: c.MediaConf.Domain, Secure: c.MediaConf.Secure, }) log.WithFields(log.Fields{ - "address": c.MediaConf.Host + ":" + c.MediaConf.Port, + "endpoint": c.MediaConf.Endpoint, "provider": mediaProvider, }).Debug("Media storage | Minio client created") diff --git a/config/config.go b/config/config.go index 0e71b33..5f2d4d5 100644 --- a/config/config.go +++ b/config/config.go @@ -42,11 +42,9 @@ type GrpcConfig struct { } type MediaConfig struct { - Host string - Port string + Endpoint string User string Password string - Domain string Secure string } @@ -84,11 +82,9 @@ func NewConfig() *Config { }, MediaConf: MediaConfig{ - Host: getEnv("MEDIA_STORAGE_HOST", ""), - Port: getEnv("MEDIA_STORAGE_PORT", ""), + Endpoint: getEnv("MEDIA_STORAGE_ENDPOINT", ""), User: getEnv("MEDIA_STORAGE_USER", ""), Password: getEnv("MEDIA_STORAGE_PASSWORD", ""), - Domain: getEnv("MEDIA_STORAGE_DOMAIN", ""), Secure: getEnv("MEDIA_STORAGE_SECURE", ""), }, } diff --git a/internal/mediaStorage/handler.go b/internal/mediaStorage/handler.go index e6293ba..c1586eb 100644 --- a/internal/mediaStorage/handler.go +++ b/internal/mediaStorage/handler.go @@ -1,7 +1,6 @@ package mediaStorage import ( - "fmt" "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" log "github.com/sirupsen/logrus" @@ -12,8 +11,7 @@ type Handler struct { } type Deps struct { - Host string - Port string + Endpoint string User string Password string Domain string @@ -26,8 +24,7 @@ func NewHandler(deps Deps) *Handler { secureMode = true } - endpoint := fmt.Sprintf("%s:%s", deps.Host, deps.Port) - minioClient, err := minio.New(endpoint, &minio.Options{ + minioClient, err := minio.New(deps.Endpoint, &minio.Options{ Creds: credentials.NewStaticV4(deps.User, deps.Password, ""), Secure: secureMode, }) @@ -36,11 +33,11 @@ func NewHandler(deps Deps) *Handler { } log.WithFields(log.Fields{ - "endpoint": endpoint, + "endpoint": deps.Endpoint, "secure": secureMode, }).Debug("Media storage | Created minio client") return &Handler{ - newService(minioClient, deps.Domain, endpoint), + newService(minioClient), } } diff --git a/internal/mediaStorage/service.go b/internal/mediaStorage/service.go index 3a3d7c5..6c4b03a 100644 --- a/internal/mediaStorage/service.go +++ b/internal/mediaStorage/service.go @@ -2,7 +2,6 @@ package mediaStorage import ( "context" - "fmt" "github.com/minio/minio-go/v7" log "github.com/sirupsen/logrus" "io" @@ -16,10 +15,9 @@ type Service struct { endpoint string } -func newService(client *minio.Client, domain, endpoint string) *Service { +func newService(client *minio.Client) *Service { return &Service{ client: client, - domain: domain, } } @@ -45,21 +43,7 @@ func (s *Service) Get(ctx context.Context, bucket, object string, expires time.D return "", err } - u, err := url.Parse(presigned.String()) - if err != nil { - return "", err - } - - if s.domain != "" { - domainURL, err := url.Parse(s.domain) - if err != nil { - return "", fmt.Errorf("invalid domain URL: %w", err) - } - u.Scheme = domainURL.Scheme - u.Host = domainURL.Host - } - - return u.String(), nil + return presigned.String(), nil } func (s *Service) Delete(ctx context.Context, bucket, object string) error { From 3298602a23bd9c343664d8d4a18cb8b9780fef64 Mon Sep 17 00:00:00 2001 From: nquidox Date: Sun, 19 Oct 2025 19:43:33 +0300 Subject: [PATCH 10/39] switch from pre-signed to public images --- internal/api/merch/controller.go | 2 +- internal/api/merch/helper.go | 12 +++++++++ internal/api/merch/service.go | 32 +++++++++++++++-------- internal/interfaces/mediaStorage.go | 3 ++- internal/mediaStorage/handler.go | 3 +-- internal/mediaStorage/service.go | 39 ++++++++++++++++++++++++----- 6 files changed, 71 insertions(+), 20 deletions(-) diff --git a/internal/api/merch/controller.go b/internal/api/merch/controller.go index 6d7cd5d..3fc8124 100644 --- a/internal/api/merch/controller.go +++ b/internal/api/merch/controller.go @@ -356,7 +356,7 @@ func (co *controller) getMerchImage(c *gin.Context) { ctx, cancel := context.WithTimeout(c.Request.Context(), co.expires) defer cancel() - link, err := co.service.getMerchImage(ctx, userUuid, merchUuid, typeQuery) + link, err := co.service.getPublicImageLink(ctx, userUuid, merchUuid, typeQuery) if err != nil { c.JSON(http.StatusInternalServerError, responses.ErrorResponse500{Error: err.Error()}) log.WithError(err).Error("Merch | Failed to get merch image") diff --git a/internal/api/merch/helper.go b/internal/api/merch/helper.go index 704cbbd..58e1866 100644 --- a/internal/api/merch/helper.go +++ b/internal/api/merch/helper.go @@ -1,6 +1,7 @@ package merch import ( + "fmt" "strconv" "time" ) @@ -17,3 +18,14 @@ func getPeriod(days string) time.Time { return time.Now().UTC().Add(-(time.Duration(daysInt) * time.Hour * 24)) } + +func (s *service) makeObject(userUuid, merchUuid, imageType string) (string, error) { + switch imageType { + case "thumbnail": + return fmt.Sprintf("%s/merch/%s/thumbnail.jpg", userUuid, merchUuid), nil + case "full": + return fmt.Sprintf("%s/merch/%s/full.jpg", userUuid, merchUuid), nil + default: + return "", fmt.Errorf("unknown image type %s", imageType) + } +} diff --git a/internal/api/merch/service.go b/internal/api/merch/service.go index 31aced3..481ca60 100644 --- a/internal/api/merch/service.go +++ b/internal/api/merch/service.go @@ -303,7 +303,24 @@ func (s *service) uploadMerchImage(ctx context.Context, userUuid, merchUuid, ima return nil } -func (s *service) getMerchImage(ctx context.Context, userUuid, merchUuid, imageType string) (ImageLink, error) { +func (s *service) getPublicImageLink(ctx context.Context, userUuid, merchUuid, imageType string) (ImageLink, error) { + object, err := s.makeObject(userUuid, merchUuid, imageType) + if err != nil { + return ImageLink{}, err + } + + link, etag, err := s.media.GetPublicLink(ctx, s.bucketName, object) + if err != nil { + return ImageLink{}, err + } + + return ImageLink{ + Link: link, + ETag: etag, + }, nil +} + +func (s *service) getPresignedImageLink(ctx context.Context, userUuid, merchUuid, imageType string) (ImageLink, error) { exists, err := s.repo.merchRecordExists(userUuid, merchUuid) if err != nil { return ImageLink{}, err @@ -313,17 +330,12 @@ func (s *service) getMerchImage(ctx context.Context, userUuid, merchUuid, imageT return ImageLink{}, fmt.Errorf("no merch found for user %s with uuid %s", userUuid, merchUuid) } - var object string - switch imageType { - case "thumbnail": - object = fmt.Sprintf("%s/merch/%s/thumbnail.jpg", userUuid, merchUuid) - case "full": - object = fmt.Sprintf("%s/merch/%s/full.jpg", userUuid, merchUuid) - default: - return ImageLink{}, fmt.Errorf("unknown image type %s", imageType) + object, err := s.makeObject(userUuid, merchUuid, imageType) + if err != nil { + return ImageLink{}, err } - link, err := s.media.Get(ctx, s.bucketName, object, s.expires, nil) + link, err := s.media.GetPresignedLink(ctx, s.bucketName, object, s.expires, nil) if err != nil { return ImageLink{}, err } diff --git a/internal/interfaces/mediaStorage.go b/internal/interfaces/mediaStorage.go index b332a5f..64fb50b 100644 --- a/internal/interfaces/mediaStorage.go +++ b/internal/interfaces/mediaStorage.go @@ -10,7 +10,8 @@ import ( type MediaStorage interface { CheckBucketExists(bucketName string) (bool, error) 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) (string, error) + GetPublicLink(ctx context.Context, bucket, object string) (string, string, error) + GetPresignedLink(ctx context.Context, bucket, object string, expires time.Duration, params url.Values) (string, error) Delete(ctx context.Context, bucket, object string) error GetObjectEtag(ctx context.Context, bucketName, object string) (string, error) } diff --git a/internal/mediaStorage/handler.go b/internal/mediaStorage/handler.go index c1586eb..ca88475 100644 --- a/internal/mediaStorage/handler.go +++ b/internal/mediaStorage/handler.go @@ -14,7 +14,6 @@ type Deps struct { Endpoint string User string Password string - Domain string Secure string } @@ -38,6 +37,6 @@ func NewHandler(deps Deps) *Handler { }).Debug("Media storage | Created minio client") return &Handler{ - newService(minioClient), + newService(minioClient, deps.Endpoint, secureMode), } } diff --git a/internal/mediaStorage/service.go b/internal/mediaStorage/service.go index 6c4b03a..a67a20c 100644 --- a/internal/mediaStorage/service.go +++ b/internal/mediaStorage/service.go @@ -2,22 +2,26 @@ package mediaStorage import ( "context" + "fmt" "github.com/minio/minio-go/v7" log "github.com/sirupsen/logrus" "io" "net/url" + "strings" "time" ) type Service struct { - client *minio.Client - domain string - endpoint string + client *minio.Client + endpoint string + secureMode bool } -func newService(client *minio.Client) *Service { +func newService(client *minio.Client, endpoint string, secureMode bool) *Service { return &Service{ - client: client, + client: client, + endpoint: endpoint, + secureMode: secureMode, } } @@ -37,7 +41,30 @@ func (s *Service) Upload(ctx context.Context, bucket, object string, reader io.R return err } -func (s *Service) Get(ctx context.Context, bucket, object string, expires time.Duration, params url.Values) (string, error) { +func (s *Service) GetPublicLink(ctx context.Context, bucket, object string) (string, string, error) { + stat, err := s.client.StatObject(ctx, bucket, object, minio.StatObjectOptions{}) + if err != nil { + log.WithFields(log.Fields{ + "error": err, + "key": bucket + "/" + object, + }).Error("Media storage | Failed to get public link") + return "", "", err + } + + var scheme string + if s.secureMode { + scheme = "https" + } else { + scheme = "http" + } + + link := fmt.Sprintf("%s://%s/%s/%s", scheme, strings.TrimRight(s.endpoint, "/"), bucket, object) + log.WithFields(log.Fields{"link": link}).Debug("Media storage | Get public link") + + return link, stat.ETag, nil +} + +func (s *Service) GetPresignedLink(ctx context.Context, bucket, object string, expires time.Duration, params url.Values) (string, error) { presigned, err := s.client.PresignedGetObject(ctx, bucket, object, expires, params) if err != nil { return "", err From dae627f4adcf1a9d31a94230b071351057bbe959 Mon Sep 17 00:00:00 2001 From: nquidox Date: Sun, 26 Oct 2025 19:52:46 +0300 Subject: [PATCH 11/39] image storage contract added --- proto/imageStorage.proto | 27 +++ proto/imageStorage/imageStorage.pb.go | 261 +++++++++++++++++++++ proto/imageStorage/imageStorage_grpc.pb.go | 160 +++++++++++++ 3 files changed, 448 insertions(+) create mode 100644 proto/imageStorage.proto create mode 100644 proto/imageStorage/imageStorage.pb.go create mode 100644 proto/imageStorage/imageStorage_grpc.pb.go diff --git a/proto/imageStorage.proto b/proto/imageStorage.proto new file mode 100644 index 0000000..97a5095 --- /dev/null +++ b/proto/imageStorage.proto @@ -0,0 +1,27 @@ +syntax="proto3"; + +import "google/protobuf/empty.proto"; + +package imageStorage; +option go_package = "imageStorage/pkg/proto/imageStorage"; + +message UploadMerchImageRequest{ + bytes imageData = 1; + string userUuid = 2; + string merchUuid = 3; +} + +message UploadMerchImageResponse { + string fullImage = 1; + string thumbnail = 2; +} + +message DeleteImageRequest { + string userUuid = 1; + string merchUuid = 2; +} + +service ImageStorage { + rpc UploadImage(UploadMerchImageRequest) returns (UploadMerchImageResponse); + rpc DeleteImage(DeleteImageRequest) returns (google.protobuf.Empty); +} \ No newline at end of file diff --git a/proto/imageStorage/imageStorage.pb.go b/proto/imageStorage/imageStorage.pb.go new file mode 100644 index 0000000..be1d5e5 --- /dev/null +++ b/proto/imageStorage/imageStorage.pb.go @@ -0,0 +1,261 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.36.8 +// protoc v6.32.1 +// source: imageStorage.proto + +package imageStorage + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + emptypb "google.golang.org/protobuf/types/known/emptypb" + reflect "reflect" + sync "sync" + unsafe "unsafe" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type UploadMerchImageRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + ImageData []byte `protobuf:"bytes,1,opt,name=imageData,proto3" json:"imageData,omitempty"` + UserUuid string `protobuf:"bytes,2,opt,name=userUuid,proto3" json:"userUuid,omitempty"` + MerchUuid string `protobuf:"bytes,3,opt,name=merchUuid,proto3" json:"merchUuid,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *UploadMerchImageRequest) Reset() { + *x = UploadMerchImageRequest{} + mi := &file_imageStorage_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *UploadMerchImageRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UploadMerchImageRequest) ProtoMessage() {} + +func (x *UploadMerchImageRequest) ProtoReflect() protoreflect.Message { + mi := &file_imageStorage_proto_msgTypes[0] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use UploadMerchImageRequest.ProtoReflect.Descriptor instead. +func (*UploadMerchImageRequest) Descriptor() ([]byte, []int) { + return file_imageStorage_proto_rawDescGZIP(), []int{0} +} + +func (x *UploadMerchImageRequest) GetImageData() []byte { + if x != nil { + return x.ImageData + } + return nil +} + +func (x *UploadMerchImageRequest) GetUserUuid() string { + if x != nil { + return x.UserUuid + } + return "" +} + +func (x *UploadMerchImageRequest) GetMerchUuid() string { + if x != nil { + return x.MerchUuid + } + return "" +} + +type UploadMerchImageResponse struct { + state protoimpl.MessageState `protogen:"open.v1"` + FullImage string `protobuf:"bytes,1,opt,name=fullImage,proto3" json:"fullImage,omitempty"` + Thumbnail string `protobuf:"bytes,2,opt,name=thumbnail,proto3" json:"thumbnail,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *UploadMerchImageResponse) Reset() { + *x = UploadMerchImageResponse{} + mi := &file_imageStorage_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *UploadMerchImageResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UploadMerchImageResponse) ProtoMessage() {} + +func (x *UploadMerchImageResponse) ProtoReflect() protoreflect.Message { + mi := &file_imageStorage_proto_msgTypes[1] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use UploadMerchImageResponse.ProtoReflect.Descriptor instead. +func (*UploadMerchImageResponse) Descriptor() ([]byte, []int) { + return file_imageStorage_proto_rawDescGZIP(), []int{1} +} + +func (x *UploadMerchImageResponse) GetFullImage() string { + if x != nil { + return x.FullImage + } + return "" +} + +func (x *UploadMerchImageResponse) GetThumbnail() string { + if x != nil { + return x.Thumbnail + } + return "" +} + +type DeleteImageRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + UserUuid string `protobuf:"bytes,1,opt,name=userUuid,proto3" json:"userUuid,omitempty"` + MerchUuid string `protobuf:"bytes,2,opt,name=merchUuid,proto3" json:"merchUuid,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *DeleteImageRequest) Reset() { + *x = DeleteImageRequest{} + mi := &file_imageStorage_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *DeleteImageRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DeleteImageRequest) ProtoMessage() {} + +func (x *DeleteImageRequest) ProtoReflect() protoreflect.Message { + mi := &file_imageStorage_proto_msgTypes[2] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use DeleteImageRequest.ProtoReflect.Descriptor instead. +func (*DeleteImageRequest) Descriptor() ([]byte, []int) { + return file_imageStorage_proto_rawDescGZIP(), []int{2} +} + +func (x *DeleteImageRequest) GetUserUuid() string { + if x != nil { + return x.UserUuid + } + return "" +} + +func (x *DeleteImageRequest) GetMerchUuid() string { + if x != nil { + return x.MerchUuid + } + return "" +} + +var File_imageStorage_proto protoreflect.FileDescriptor + +const file_imageStorage_proto_rawDesc = "" + + "\n" + + "\x12imageStorage.proto\x12\fimageStorage\x1a\x1bgoogle/protobuf/empty.proto\"q\n" + + "\x17UploadMerchImageRequest\x12\x1c\n" + + "\timageData\x18\x01 \x01(\fR\timageData\x12\x1a\n" + + "\buserUuid\x18\x02 \x01(\tR\buserUuid\x12\x1c\n" + + "\tmerchUuid\x18\x03 \x01(\tR\tmerchUuid\"V\n" + + "\x18UploadMerchImageResponse\x12\x1c\n" + + "\tfullImage\x18\x01 \x01(\tR\tfullImage\x12\x1c\n" + + "\tthumbnail\x18\x02 \x01(\tR\tthumbnail\"N\n" + + "\x12DeleteImageRequest\x12\x1a\n" + + "\buserUuid\x18\x01 \x01(\tR\buserUuid\x12\x1c\n" + + "\tmerchUuid\x18\x02 \x01(\tR\tmerchUuid2\xb5\x01\n" + + "\fImageStorage\x12\\\n" + + "\vUploadImage\x12%.imageStorage.UploadMerchImageRequest\x1a&.imageStorage.UploadMerchImageResponse\x12G\n" + + "\vDeleteImage\x12 .imageStorage.DeleteImageRequest\x1a\x16.google.protobuf.EmptyB%Z#imageStorage/pkg/proto/imageStorageb\x06proto3" + +var ( + file_imageStorage_proto_rawDescOnce sync.Once + file_imageStorage_proto_rawDescData []byte +) + +func file_imageStorage_proto_rawDescGZIP() []byte { + file_imageStorage_proto_rawDescOnce.Do(func() { + file_imageStorage_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_imageStorage_proto_rawDesc), len(file_imageStorage_proto_rawDesc))) + }) + return file_imageStorage_proto_rawDescData +} + +var file_imageStorage_proto_msgTypes = make([]protoimpl.MessageInfo, 3) +var file_imageStorage_proto_goTypes = []any{ + (*UploadMerchImageRequest)(nil), // 0: imageStorage.UploadMerchImageRequest + (*UploadMerchImageResponse)(nil), // 1: imageStorage.UploadMerchImageResponse + (*DeleteImageRequest)(nil), // 2: imageStorage.DeleteImageRequest + (*emptypb.Empty)(nil), // 3: google.protobuf.Empty +} +var file_imageStorage_proto_depIdxs = []int32{ + 0, // 0: imageStorage.ImageStorage.UploadImage:input_type -> imageStorage.UploadMerchImageRequest + 2, // 1: imageStorage.ImageStorage.DeleteImage:input_type -> imageStorage.DeleteImageRequest + 1, // 2: imageStorage.ImageStorage.UploadImage:output_type -> imageStorage.UploadMerchImageResponse + 3, // 3: imageStorage.ImageStorage.DeleteImage:output_type -> google.protobuf.Empty + 2, // [2:4] is the sub-list for method output_type + 0, // [0:2] is the sub-list for method input_type + 0, // [0:0] is the sub-list for extension type_name + 0, // [0:0] is the sub-list for extension extendee + 0, // [0:0] is the sub-list for field type_name +} + +func init() { file_imageStorage_proto_init() } +func file_imageStorage_proto_init() { + if File_imageStorage_proto != nil { + return + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_imageStorage_proto_rawDesc), len(file_imageStorage_proto_rawDesc)), + NumEnums: 0, + NumMessages: 3, + NumExtensions: 0, + NumServices: 1, + }, + GoTypes: file_imageStorage_proto_goTypes, + DependencyIndexes: file_imageStorage_proto_depIdxs, + MessageInfos: file_imageStorage_proto_msgTypes, + }.Build() + File_imageStorage_proto = out.File + file_imageStorage_proto_goTypes = nil + file_imageStorage_proto_depIdxs = nil +} diff --git a/proto/imageStorage/imageStorage_grpc.pb.go b/proto/imageStorage/imageStorage_grpc.pb.go new file mode 100644 index 0000000..761d8cb --- /dev/null +++ b/proto/imageStorage/imageStorage_grpc.pb.go @@ -0,0 +1,160 @@ +// Code generated by protoc-gen-go-grpc. DO NOT EDIT. +// versions: +// - protoc-gen-go-grpc v1.5.1 +// - protoc v6.32.1 +// source: imageStorage.proto + +package imageStorage + +import ( + context "context" + grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" + emptypb "google.golang.org/protobuf/types/known/emptypb" +) + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the grpc package it is being compiled against. +// Requires gRPC-Go v1.64.0 or later. +const _ = grpc.SupportPackageIsVersion9 + +const ( + ImageStorage_UploadImage_FullMethodName = "/imageStorage.ImageStorage/UploadImage" + ImageStorage_DeleteImage_FullMethodName = "/imageStorage.ImageStorage/DeleteImage" +) + +// ImageStorageClient is the client API for ImageStorage service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. +type ImageStorageClient interface { + UploadImage(ctx context.Context, in *UploadMerchImageRequest, opts ...grpc.CallOption) (*UploadMerchImageResponse, error) + DeleteImage(ctx context.Context, in *DeleteImageRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) +} + +type imageStorageClient struct { + cc grpc.ClientConnInterface +} + +func NewImageStorageClient(cc grpc.ClientConnInterface) ImageStorageClient { + return &imageStorageClient{cc} +} + +func (c *imageStorageClient) UploadImage(ctx context.Context, in *UploadMerchImageRequest, opts ...grpc.CallOption) (*UploadMerchImageResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(UploadMerchImageResponse) + err := c.cc.Invoke(ctx, ImageStorage_UploadImage_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *imageStorageClient) DeleteImage(ctx context.Context, in *DeleteImageRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(emptypb.Empty) + err := c.cc.Invoke(ctx, ImageStorage_DeleteImage_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +// ImageStorageServer is the server API for ImageStorage service. +// All implementations must embed UnimplementedImageStorageServer +// for forward compatibility. +type ImageStorageServer interface { + UploadImage(context.Context, *UploadMerchImageRequest) (*UploadMerchImageResponse, error) + DeleteImage(context.Context, *DeleteImageRequest) (*emptypb.Empty, error) + mustEmbedUnimplementedImageStorageServer() +} + +// UnimplementedImageStorageServer must be embedded to have +// forward compatible implementations. +// +// NOTE: this should be embedded by value instead of pointer to avoid a nil +// pointer dereference when methods are called. +type UnimplementedImageStorageServer struct{} + +func (UnimplementedImageStorageServer) UploadImage(context.Context, *UploadMerchImageRequest) (*UploadMerchImageResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method UploadImage not implemented") +} +func (UnimplementedImageStorageServer) DeleteImage(context.Context, *DeleteImageRequest) (*emptypb.Empty, error) { + return nil, status.Errorf(codes.Unimplemented, "method DeleteImage not implemented") +} +func (UnimplementedImageStorageServer) mustEmbedUnimplementedImageStorageServer() {} +func (UnimplementedImageStorageServer) testEmbeddedByValue() {} + +// UnsafeImageStorageServer may be embedded to opt out of forward compatibility for this service. +// Use of this interface is not recommended, as added methods to ImageStorageServer will +// result in compilation errors. +type UnsafeImageStorageServer interface { + mustEmbedUnimplementedImageStorageServer() +} + +func RegisterImageStorageServer(s grpc.ServiceRegistrar, srv ImageStorageServer) { + // If the following call pancis, it indicates UnimplementedImageStorageServer was + // embedded by pointer and is nil. This will cause panics if an + // unimplemented method is ever invoked, so we test this at initialization + // time to prevent it from happening at runtime later due to I/O. + if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { + t.testEmbeddedByValue() + } + s.RegisterService(&ImageStorage_ServiceDesc, srv) +} + +func _ImageStorage_UploadImage_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(UploadMerchImageRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ImageStorageServer).UploadImage(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: ImageStorage_UploadImage_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ImageStorageServer).UploadImage(ctx, req.(*UploadMerchImageRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _ImageStorage_DeleteImage_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(DeleteImageRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ImageStorageServer).DeleteImage(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: ImageStorage_DeleteImage_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ImageStorageServer).DeleteImage(ctx, req.(*DeleteImageRequest)) + } + return interceptor(ctx, in, info, handler) +} + +// ImageStorage_ServiceDesc is the grpc.ServiceDesc for ImageStorage service. +// It's only intended for direct use with grpc.RegisterService, +// and not to be introspected or modified (even as a copy) +var ImageStorage_ServiceDesc = grpc.ServiceDesc{ + ServiceName: "imageStorage.ImageStorage", + HandlerType: (*ImageStorageServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "UploadImage", + Handler: _ImageStorage_UploadImage_Handler, + }, + { + MethodName: "DeleteImage", + Handler: _ImageStorage_DeleteImage_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "imageStorage.proto", +} From e90852cc950a5845bff08705c8ef2ffb6ade0a3f Mon Sep 17 00:00:00 2001 From: nquidox Date: Sun, 26 Oct 2025 19:53:14 +0300 Subject: [PATCH 12/39] factor out tp methods --- internal/grpcService/handler.go | 92 +------------------------- internal/grpcService/taskProcessor.go | 95 +++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 90 deletions(-) create mode 100644 internal/grpcService/taskProcessor.go diff --git a/internal/grpcService/handler.go b/internal/grpcService/handler.go index 6af20cf..1ec9841 100644 --- a/internal/grpcService/handler.go +++ b/internal/grpcService/handler.go @@ -1,106 +1,18 @@ package grpcService import ( - log "github.com/sirupsen/logrus" "google.golang.org/grpc" - "google.golang.org/protobuf/types/known/emptypb" - "io" "merch-parser-api/internal/interfaces" - "merch-parser-api/internal/shared" pb "merch-parser-api/proto/taskProcessor" - "time" ) -type repoServer struct { - pb.UnimplementedTaskProcessorServer - taskProvider interfaces.TaskProvider -} - func NewGrpcServer(taskProvider interfaces.TaskProvider) *grpc.Server { srv := grpc.NewServer() + repoSrv := &repoServer{ taskProvider: taskProvider, } - pb.RegisterTaskProcessorServer(srv, repoSrv) + return srv } - -func (r *repoServer) RequestTask(_ *emptypb.Empty, stream pb.TaskProcessor_RequestTaskServer) error { - tasks, err := r.taskProvider.PrepareTasks() - if err != nil { - log.WithField("err", err).Error("gRPC Server | Request task error") - return err - } - - for _, task := range tasks { - if err = stream.Send(&pb.Task{ - MerchUuid: task.MerchUuid, - OriginSurugayaLink: task.OriginSurugayaLink, - OriginMandarakeLink: task.OriginMandarakeLink, - }); err != nil { - log.WithField("err", err).Error("gRPC Server | Stream send error") - return err - } - } - return nil -} - -func (r *repoServer) SendResult(stream pb.TaskProcessor_SendResultServer) error { - saveInterval := time.Second * 2 - batch := make([]shared.TaskResult, 0) - - ticker := time.NewTicker(saveInterval) - defer ticker.Stop() - - done := make(chan struct{}) - - go func() { - for { - select { - case <-done: - return - case <-ticker.C: - if len(batch) > 0 { - err := r.taskProvider.InsertPrices(batch) - if err != nil { - log.WithField("err", err).Error("gRPC Server | Batch insert") - } - } - } - } - }() - - for { - response, err := stream.Recv() - if err == io.EOF { - log.Debug("gRPC EOF") - break - } - - if err != nil { - log.WithField("err", err).Error("gRPC Server | Receive") - return err - } - - entry := shared.TaskResult{ - MerchUuid: response.MerchUuid, - Origin: response.OriginName, - Price: response.Price, - } - - batch = append(batch, entry) - log.WithField("response", entry).Debug("gRPC Server | Receive success") - } - - close(done) - if len(batch) > 0 { - err := r.taskProvider.InsertPrices(batch) - if err != nil { - log.WithField("err", err).Error("gRPC Server | Last data batch insert") - return err - } - } - - return nil -} diff --git a/internal/grpcService/taskProcessor.go b/internal/grpcService/taskProcessor.go new file mode 100644 index 0000000..93986bb --- /dev/null +++ b/internal/grpcService/taskProcessor.go @@ -0,0 +1,95 @@ +package grpcService + +import ( + log "github.com/sirupsen/logrus" + "google.golang.org/protobuf/types/known/emptypb" + "io" + "merch-parser-api/internal/interfaces" + "merch-parser-api/internal/shared" + pb "merch-parser-api/proto/taskProcessor" + "time" +) + +type repoServer struct { + pb.UnimplementedTaskProcessorServer + taskProvider interfaces.TaskProvider +} + +func (r *repoServer) RequestTask(_ *emptypb.Empty, stream pb.TaskProcessor_RequestTaskServer) error { + tasks, err := r.taskProvider.PrepareTasks() + if err != nil { + log.WithField("err", err).Error("gRPC Server | Request task error") + return err + } + + for _, task := range tasks { + if err = stream.Send(&pb.Task{ + MerchUuid: task.MerchUuid, + OriginSurugayaLink: task.OriginSurugayaLink, + OriginMandarakeLink: task.OriginMandarakeLink, + }); err != nil { + log.WithField("err", err).Error("gRPC Server | Stream send error") + return err + } + } + return nil +} + +func (r *repoServer) SendResult(stream pb.TaskProcessor_SendResultServer) error { + saveInterval := time.Second * 2 + batch := make([]shared.TaskResult, 0) + + ticker := time.NewTicker(saveInterval) + defer ticker.Stop() + + done := make(chan struct{}) + + go func() { + for { + select { + case <-done: + return + case <-ticker.C: + if len(batch) > 0 { + err := r.taskProvider.InsertPrices(batch) + if err != nil { + log.WithField("err", err).Error("gRPC Server | Batch insert") + } + } + } + } + }() + + for { + response, err := stream.Recv() + if err == io.EOF { + log.Debug("gRPC EOF") + break + } + + if err != nil { + log.WithField("err", err).Error("gRPC Server | Receive") + return err + } + + entry := shared.TaskResult{ + MerchUuid: response.MerchUuid, + Origin: response.OriginName, + Price: response.Price, + } + + batch = append(batch, entry) + log.WithField("response", entry).Debug("gRPC Server | Receive success") + } + + close(done) + if len(batch) > 0 { + err := r.taskProvider.InsertPrices(batch) + if err != nil { + log.WithField("err", err).Error("gRPC Server | Last data batch insert") + return err + } + } + + return nil +} From a3fbd3b8e05df5580ba0041347841043fff9365e Mon Sep 17 00:00:00 2001 From: nquidox Date: Sun, 26 Oct 2025 19:53:32 +0300 Subject: [PATCH 13/39] error handling --- internal/mediaStorage/service.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/internal/mediaStorage/service.go b/internal/mediaStorage/service.go index a67a20c..72c2cc1 100644 --- a/internal/mediaStorage/service.go +++ b/internal/mediaStorage/service.go @@ -44,6 +44,9 @@ func (s *Service) Upload(ctx context.Context, bucket, object string, reader io.R func (s *Service) GetPublicLink(ctx context.Context, bucket, object string) (string, string, error) { stat, err := s.client.StatObject(ctx, bucket, object, minio.StatObjectOptions{}) if err != nil { + if err.Error() == minio.ToErrorResponse(err).Error() { + return "", "", nil + } log.WithFields(log.Fields{ "error": err, "key": bucket + "/" + object, From fa8990ed8c499baa93dc45473133749b5bea5456 Mon Sep 17 00:00:00 2001 From: nquidox Date: Sun, 26 Oct 2025 19:53:49 +0300 Subject: [PATCH 14/39] new image provider --- internal/imagesProvider/handler.go | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 internal/imagesProvider/handler.go diff --git a/internal/imagesProvider/handler.go b/internal/imagesProvider/handler.go new file mode 100644 index 0000000..622dec2 --- /dev/null +++ b/internal/imagesProvider/handler.go @@ -0,0 +1,27 @@ +package imagesProvider + +import ( + log "github.com/sirupsen/logrus" + "google.golang.org/grpc" + "google.golang.org/grpc/credentials/insecure" + is "merch-parser-api/proto/imageStorage" +) + +type Handler struct{} + +func NewClient(address string) is.ImageStorageClient { + var opts []grpc.DialOption + insec := grpc.WithTransportCredentials(insecure.NewCredentials()) + opts = append(opts, insec) + + conn, err := grpc.NewClient(address, opts...) + if err != nil { + log.Fatal(err) + } + + log.WithFields(log.Fields{ + "address": address, + }).Debug("gRPC | API client") + + return is.NewImageStorageClient(conn) +} From f5ca21ca68a43cc4463982486656fb37d29c2c70 Mon Sep 17 00:00:00 2001 From: nquidox Date: Sun, 26 Oct 2025 19:54:10 +0300 Subject: [PATCH 15/39] deprecated comment --- internal/interfaces/mediaStorage.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/internal/interfaces/mediaStorage.go b/internal/interfaces/mediaStorage.go index 64fb50b..5ad375a 100644 --- a/internal/interfaces/mediaStorage.go +++ b/internal/interfaces/mediaStorage.go @@ -7,6 +7,8 @@ import ( "time" ) +// MinIO service replaced by imagesProvider + type MediaStorage interface { CheckBucketExists(bucketName string) (bool, error) Upload(ctx context.Context, bucket, object string, reader io.Reader, size int64) error From 212ce0a5c4c755e61a6f6194725e9f418cda48bc Mon Sep 17 00:00:00 2001 From: nquidox Date: Sun, 26 Oct 2025 19:54:34 +0300 Subject: [PATCH 16/39] image storage added --- cmd/main.go | 10 ++- config/config.go | 11 +++ internal/api/merch/controller.go | 114 ++++++++++++++++++------------- internal/api/merch/handler.go | 16 +++-- internal/api/merch/repository.go | 1 + internal/api/merch/service.go | 103 +++++++++++++++++++++++++--- 6 files changed, 190 insertions(+), 65 deletions(-) diff --git a/cmd/main.go b/cmd/main.go index 3fb0010..8c0cb26 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -9,6 +9,7 @@ import ( "merch-parser-api/internal/api/user" "merch-parser-api/internal/app" "merch-parser-api/internal/grpcService" + "merch-parser-api/internal/imagesProvider" "merch-parser-api/internal/interfaces" "merch-parser-api/internal/mediaStorage" "merch-parser-api/internal/provider/auth" @@ -62,6 +63,8 @@ func main() { "provider": mediaProvider, }).Debug("Media storage | Minio client created") + imageProvider := imagesProvider.NewClient(c.ImageConf.Host + ":" + c.ImageConf.Port) + //deps providers routerHandler := router.NewRouter(router.Deps{ ApiPrefix: c.AppConf.ApiPrefix, @@ -91,9 +94,10 @@ func main() { }) merchModule := merch.NewHandler(merch.Deps{ - DB: database, - Utils: utilsProvider, - Media: mediaProvider, + DB: database, + Utils: utilsProvider, + Media: mediaProvider, + ImageStorage: imageProvider, }) //collect modules diff --git a/config/config.go b/config/config.go index 5f2d4d5..33be20e 100644 --- a/config/config.go +++ b/config/config.go @@ -8,6 +8,7 @@ type Config struct { JWTConf JWTConfig GrpcConf GrpcConfig MediaConf MediaConfig + ImageConf ImageStorageConfig } type AppConfig struct { @@ -48,6 +49,11 @@ type MediaConfig struct { Secure string } +type ImageStorageConfig struct { + Host string + Port string +} + func NewConfig() *Config { return &Config{ AppConf: AppConfig{ @@ -87,5 +93,10 @@ func NewConfig() *Config { Password: getEnv("MEDIA_STORAGE_PASSWORD", ""), Secure: getEnv("MEDIA_STORAGE_SECURE", ""), }, + + ImageConf: ImageStorageConfig{ + Host: getEnv("IMAGE_STORAGE_HOST", ""), + Port: getEnv("IMAGE_STORAGE_PORT", ""), + }, } } diff --git a/internal/api/merch/controller.go b/internal/api/merch/controller.go index 3fc8124..06fd408 100644 --- a/internal/api/merch/controller.go +++ b/internal/api/merch/controller.go @@ -266,16 +266,15 @@ func (co *controller) getDistinctPrices(c *gin.Context) { c.JSON(http.StatusOK, response) } -// @Summary Загрузить картинки по merch_uuid и query параметрам -// @Description Загрузить картинки по merch_uuid и query параметрам +// @Summary Загрузить картинку по merch_uuid +// @Description Загрузить картинку по merch_uuid. В ответ будут выданы ссылки на созданные картинки. // @Tags Merch images // @Security BearerAuth // @Accept multipart/form-data // @Produce json -// @Param uuid path string true "Merch UUID" -// @Param file formData file true "Image file" -// @Param imageType formData string true "Image type: thumbnail, full or all" Enums(thumbnail, full, all) -// @Success 200 +// @Param uuid path string true "Merch UUID" +// @Param file formData file true "Image file" +// @Success 200 {object} imageStorage.UploadMerchImageResponse // @Failure 400 {object} responses.ErrorResponse400 // @Failure 500 {object} responses.ErrorResponse500 // @Router /merch/images/{uuid} [post] @@ -294,13 +293,14 @@ func (co *controller) uploadMerchImage(c *gin.Context) { return } - imageType := c.PostForm("imageType") - types := map[string]struct{}{"thumbnail": {}, "full": {}, "all": {}} - if _, allowed := types[imageType]; !allowed { - c.JSON(http.StatusBadRequest, responses.ErrorResponse400{Error: "imageType must be one of: thumbnail, full, all"}) - log.WithError(err).Error("Merch | imageType must be one of: thumbnail, full, all") - return - } + //Uncomment for MinIO use + //imageType := c.PostForm("imageType") + //types := map[string]struct{}{"thumbnail": {}, "full": {}, "all": {}} + //if _, allowed := types[imageType]; !allowed { + // c.JSON(http.StatusBadRequest, responses.ErrorResponse400{Error: "imageType must be one of: thumbnail, full, all"}) + // log.WithError(err).Error("Merch | imageType must be one of: thumbnail, full, all") + // return + //} file, err := c.FormFile("file") if err != nil { @@ -312,14 +312,17 @@ func (co *controller) uploadMerchImage(c *gin.Context) { ctx, cancel := context.WithTimeout(c.Request.Context(), co.expires) defer cancel() - err = co.service.uploadMerchImage(ctx, userUuid, merchUuid, imageType, file) + //Uncomment for MinIO use + //err = co.service.uploadMerchImage(ctx, userUuid, merchUuid, imageType, file) + response, err := co.service.mtUploadMerchImage(ctx, userUuid, merchUuid, file) if err != nil { c.JSON(http.StatusInternalServerError, responses.ErrorResponse500{Error: err.Error()}) log.WithError(err).Error("Merch | Failed to upload merch image") return } - c.Status(http.StatusOK) + //c.Status(http.StatusOK) + c.JSON(http.StatusOK, response) } // @Summary Получить картинки по merch_uuid и query параметрам @@ -333,43 +336,53 @@ func (co *controller) uploadMerchImage(c *gin.Context) { // @Failure 500 {object} responses.ErrorResponse500 // @Router /merch/images/{uuid} [get] func (co *controller) getMerchImage(c *gin.Context) { - typeQuery := strings.ToLower(c.Query("type")) - if typeQuery == "" { - c.JSON(http.StatusBadRequest, responses.ErrorResponse400{Error: "Image type query param is empty"}) - return - } + //Uncomment for MinIO use - userUuid, err := co.utils.GetUserUuidFromContext(c) - if err != nil { - c.JSON(http.StatusInternalServerError, responses.ErrorResponse500{Error: err.Error()}) - log.WithError(err).Error("Merch | Failed to get user uuid from context") - return - } - - merchUuid := c.Param("uuid") - if merchUuid == "" { - c.JSON(http.StatusBadRequest, responses.ErrorResponse400{Error: "MerchUuid is empty"}) - log.WithError(err).Error("Merch | Failed to get single merch") - return - } - - ctx, cancel := context.WithTimeout(c.Request.Context(), co.expires) - defer cancel() - - link, err := co.service.getPublicImageLink(ctx, userUuid, merchUuid, typeQuery) - if err != nil { - c.JSON(http.StatusInternalServerError, responses.ErrorResponse500{Error: err.Error()}) - log.WithError(err).Error("Merch | Failed to get merch image") - return - } - c.JSON(http.StatusOK, link) + //typeQuery := strings.ToLower(c.Query("type")) + //if typeQuery == "" { + // c.JSON(http.StatusBadRequest, responses.ErrorResponse400{Error: "Image type query param is empty"}) + // return + //} + // + //userUuid, err := co.utils.GetUserUuidFromContext(c) + //if err != nil { + // c.JSON(http.StatusInternalServerError, responses.ErrorResponse500{Error: err.Error()}) + // log.WithError(err).Error("Merch | Failed to get user uuid from context") + // return + //} + // + //merchUuid := c.Param("uuid") + //if merchUuid == "" { + // c.JSON(http.StatusBadRequest, responses.ErrorResponse400{Error: "MerchUuid is empty"}) + // log.WithError(err).Error("Merch | Failed to get single merch") + // return + //} + // + //ctx, cancel := context.WithTimeout(c.Request.Context(), co.expires) + //defer cancel() + // + //link, err := co.service.getPublicImageLink(ctx, userUuid, merchUuid, typeQuery) + //if err != nil { + // c.JSON(http.StatusInternalServerError, responses.ErrorResponse500{Error: err.Error()}) + // log.WithError(err).Error("Merch | Failed to get merch image") + // return + //} + // + //if link.Link == "" { + // log.Debug("Merch | No image") + // c.Status(http.StatusNoContent) + // return + //} + // + //c.JSON(http.StatusOK, link) + c.JSON(http.StatusNotImplemented, gin.H{"msg": "Method deprecated. Request images from image storage."}) } -// @Summary Удалить (безвозвратно) картинки по merch_uuid и query параметрам -// @Description Удалить (безвозвратно) картинки по merch_uuid и query параметрам +// @Summary Удалить (безвозвратно) картинки по merch_uuid +// @Description Удалить (безвозвратно) картинки по merch_uuid // @Tags Merch images // @Security BearerAuth -// @Param uuid path string true "merch_uuid" +// @Param uuid path string true "merch_uuid" // @Success 200 // @Failure 400 {object} responses.ErrorResponse400 // @Failure 500 {object} responses.ErrorResponse500 @@ -385,14 +398,17 @@ func (co *controller) deleteMerchImage(c *gin.Context) { merchUuid := c.Param("uuid") if merchUuid == "" { c.JSON(http.StatusBadRequest, responses.ErrorResponse400{Error: "MerchUuid is empty"}) - log.WithError(err).Error("Merch | Failed to get single merch") + log.WithError(err).Error("Merch | Failed to get merch uuid") return } ctx, cancel := context.WithTimeout(c.Request.Context(), co.expires) defer cancel() - if err := co.service.deleteMerchImage(ctx, userUuid, merchUuid); err != nil { + //Uncomment for MinIO use + //if err := co.service.deleteMerchImage(ctx, userUuid, merchUuid); err != nil { + + if err := co.service.mtDeleteMerchImage(ctx, userUuid, merchUuid); err != nil { c.JSON(http.StatusInternalServerError, responses.ErrorResponse500{Error: err.Error()}) log.WithError(err).Error("Merch | Failed to delete merch image") return diff --git a/internal/api/merch/handler.go b/internal/api/merch/handler.go index a442f9a..6918be0 100644 --- a/internal/api/merch/handler.go +++ b/internal/api/merch/handler.go @@ -4,6 +4,7 @@ import ( log "github.com/sirupsen/logrus" "gorm.io/gorm" "merch-parser-api/internal/interfaces" + is "merch-parser-api/proto/imageStorage" "time" ) @@ -14,9 +15,10 @@ type Handler struct { } type Deps struct { - DB *gorm.DB - Utils interfaces.Utils - Media interfaces.MediaStorage + DB *gorm.DB + Utils interfaces.Utils + Media interfaces.MediaStorage + ImageStorage is.ImageStorageClient } func NewHandler(deps Deps) *Handler { @@ -24,7 +26,13 @@ func NewHandler(deps Deps) *Handler { expires := time.Minute * 5 r := NewRepo(deps.DB) - s := newService(r, deps.Media, packageBucketName, expires) + s := newService(serviceDeps{ + repo: r, + media: deps.Media, + bucketName: packageBucketName, + expires: expires, + imageStorage: deps.ImageStorage, + }) c := newController(s, deps.Utils, expires) media := deps.Media diff --git a/internal/api/merch/repository.go b/internal/api/merch/repository.go index 3c4ccfc..98d2695 100644 --- a/internal/api/merch/repository.go +++ b/internal/api/merch/repository.go @@ -63,6 +63,7 @@ func (r *Repo) merchRecordExists(userUuid, merchUuid string) (bool, error) { FROM merch WHERE user_uuid = ? AND merch_uuid = ? + AND deleted_at IS NULL );`, userUuid, merchUuid).Scan(&exists).Error return exists, err diff --git a/internal/api/merch/service.go b/internal/api/merch/service.go index 481ca60..e749d88 100644 --- a/internal/api/merch/service.go +++ b/internal/api/merch/service.go @@ -13,6 +13,7 @@ import ( "image/jpeg" "io" "merch-parser-api/internal/interfaces" + is "merch-parser-api/proto/imageStorage" "mime/multipart" "path/filepath" "strings" @@ -20,18 +21,28 @@ import ( ) type service struct { - repo repository - media interfaces.MediaStorage - bucketName string - expires time.Duration + repo repository + media interfaces.MediaStorage + bucketName string + expires time.Duration + imageStorage is.ImageStorageClient } -func newService(repo repository, media interfaces.MediaStorage, bucketName string, expires time.Duration) *service { +type serviceDeps struct { + repo repository + media interfaces.MediaStorage + bucketName string + expires time.Duration + imageStorage is.ImageStorageClient +} + +func newService(deps serviceDeps) *service { return &service{ - repo: repo, - media: media, - bucketName: bucketName, - expires: expires, + repo: deps.repo, + media: deps.media, + bucketName: deps.bucketName, + expires: deps.expires, + imageStorage: deps.imageStorage, } } @@ -210,6 +221,9 @@ func (s *service) getDistinctPrices(userUuid, merchUuid, days string) (PricesRes }, nil } +// uploadMerchImage +// Deprecated. +// Use only with MinIO storage. Use mtUploadMerchImage for merch-tracker images storage. func (s *service) uploadMerchImage(ctx context.Context, userUuid, merchUuid, imageType string, file *multipart.FileHeader) error { exists, err := s.repo.merchRecordExists(userUuid, merchUuid) if err != nil { @@ -303,6 +317,9 @@ func (s *service) uploadMerchImage(ctx context.Context, userUuid, merchUuid, ima return nil } +// getPublicImageLink +// Deprecated. +// Use only with MinIO storage. func (s *service) getPublicImageLink(ctx context.Context, userUuid, merchUuid, imageType string) (ImageLink, error) { object, err := s.makeObject(userUuid, merchUuid, imageType) if err != nil { @@ -320,6 +337,9 @@ func (s *service) getPublicImageLink(ctx context.Context, userUuid, merchUuid, i }, nil } +// getPresignedImageLink +// Deprecated. +// Use only with MinIO storage. func (s *service) getPresignedImageLink(ctx context.Context, userUuid, merchUuid, imageType string) (ImageLink, error) { exists, err := s.repo.merchRecordExists(userUuid, merchUuid) if err != nil { @@ -351,6 +371,9 @@ func (s *service) getPresignedImageLink(ctx context.Context, userUuid, merchUuid }, nil } +// deleteMerchImage +// Deprecated. +// Use only with MinIO storage. func (s *service) deleteMerchImage(ctx context.Context, userUuid, merchUuid string) error { exists, err := s.repo.merchRecordExists(userUuid, merchUuid) if err != nil { @@ -398,3 +421,65 @@ func (s *service) _uploadToStorage(params uploadImageParams) error { return nil } + +// mtUploadMerchImage +// Upload new/rewrite existing image to merch-tracker images storage +func (s *service) mtUploadMerchImage(ctx context.Context, userUuid, merchUuid string, file *multipart.FileHeader) (*is.UploadMerchImageResponse, error) { + const uploadMerchImage = "Merch service | Upload merch image" + + exists, err := s.repo.merchRecordExists(userUuid, merchUuid) + if err != nil { + log.WithError(err).Error(uploadMerchImage) + return nil, err + } + + if !exists { + err = fmt.Errorf("no merch found for user %s with uuid %s", userUuid, merchUuid) + log.WithError(err).Error(uploadMerchImage) + return nil, err + } + + f, err := file.Open() + if err != nil { + log.WithError(err).Error(uploadMerchImage) + return nil, err + } + defer f.Close() + + data, err := io.ReadAll(f) + if err != nil { + log.WithError(err).Error(uploadMerchImage) + return nil, err + } + + response, err := s.imageStorage.UploadImage(ctx, &is.UploadMerchImageRequest{ + ImageData: data, + UserUuid: userUuid, + MerchUuid: merchUuid, + }) + if err != nil { + log.WithError(err).Error(uploadMerchImage) + return nil, err + } + + return response, nil +} + +// mtDeleteMerchImage +// Delete all merch images for given user and merch uuid-s from merch-tracker images storage +func (s *service) mtDeleteMerchImage(ctx context.Context, userUuid, merchUuid string) error { + exists, err := s.repo.merchRecordExists(userUuid, merchUuid) + if err != nil { + return err + } + + if !exists { + return fmt.Errorf("no merch found for user %s with uuid %s", userUuid, merchUuid) + } + + s.imageStorage.DeleteImage(ctx, &is.DeleteImageRequest{ + UserUuid: userUuid, + MerchUuid: merchUuid, + }) + return nil +} From f13012b742c4990b46dc46f252c6cf1f01924247 Mon Sep 17 00:00:00 2001 From: nquidox Date: Sun, 26 Oct 2025 19:54:43 +0300 Subject: [PATCH 17/39] update --- api.env | 3 +++ 1 file changed, 3 insertions(+) diff --git a/api.env b/api.env index 8bb1d03..2baadc0 100644 --- a/api.env +++ b/api.env @@ -8,6 +8,9 @@ APP_ALLOWED_ORIGINS=http://localhost:5173, GRPC_SERVER_PORT=9050 GRPC_CLIENT_PORT=9060 +IMAGE_STORAGE_HOST= +IMAGE_STORAGE_PORT= + MEDIA_STORAGE_ENDPOINT= MEDIA_STORAGE_USER= MEDIA_STORAGE_PASSWORD= From 37a1dfbf52b0d327aac40dc3f57725af46bb270c Mon Sep 17 00:00:00 2001 From: nquidox Date: Sun, 26 Oct 2025 19:54:51 +0300 Subject: [PATCH 18/39] swagger docs update --- docs/docs.go | 36 +++++++++++++++++++----------------- docs/swagger.json | 36 +++++++++++++++++++----------------- docs/swagger.yaml | 27 ++++++++++++++------------- 3 files changed, 52 insertions(+), 47 deletions(-) diff --git a/docs/docs.go b/docs/docs.go index 769c22b..8e556d2 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -192,7 +192,7 @@ const docTemplate = `{ "BearerAuth": [] } ], - "description": "Загрузить картинки по merch_uuid и query параметрам", + "description": "Загрузить картинку по merch_uuid. В ответ будут выданы ссылки на созданные картинки.", "consumes": [ "multipart/form-data" ], @@ -202,7 +202,7 @@ const docTemplate = `{ "tags": [ "Merch images" ], - "summary": "Загрузить картинки по merch_uuid и query параметрам", + "summary": "Загрузить картинку по merch_uuid", "parameters": [ { "type": "string", @@ -217,23 +217,14 @@ const docTemplate = `{ "name": "file", "in": "formData", "required": true - }, - { - "enum": [ - "thumbnail", - "full", - "all" - ], - "type": "string", - "description": "Image type: thumbnail, full or all", - "name": "imageType", - "in": "formData", - "required": true } ], "responses": { "200": { - "description": "OK" + "description": "OK", + "schema": { + "$ref": "#/definitions/imageStorage.UploadMerchImageResponse" + } }, "400": { "description": "Bad Request", @@ -255,11 +246,11 @@ const docTemplate = `{ "BearerAuth": [] } ], - "description": "Удалить (безвозвратно) картинки по merch_uuid и query параметрам", + "description": "Удалить (безвозвратно) картинки по merch_uuid", "tags": [ "Merch images" ], - "summary": "Удалить (безвозвратно) картинки по merch_uuid и query параметрам", + "summary": "Удалить (безвозвратно) картинки по merch_uuid", "parameters": [ { "type": "string", @@ -768,6 +759,17 @@ const docTemplate = `{ } }, "definitions": { + "imageStorage.UploadMerchImageResponse": { + "type": "object", + "properties": { + "fullImage": { + "type": "string" + }, + "thumbnail": { + "type": "string" + } + } + }, "merch.ImageLink": { "type": "object", "properties": { diff --git a/docs/swagger.json b/docs/swagger.json index d333c5a..ea5dbf2 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -184,7 +184,7 @@ "BearerAuth": [] } ], - "description": "Загрузить картинки по merch_uuid и query параметрам", + "description": "Загрузить картинку по merch_uuid. В ответ будут выданы ссылки на созданные картинки.", "consumes": [ "multipart/form-data" ], @@ -194,7 +194,7 @@ "tags": [ "Merch images" ], - "summary": "Загрузить картинки по merch_uuid и query параметрам", + "summary": "Загрузить картинку по merch_uuid", "parameters": [ { "type": "string", @@ -209,23 +209,14 @@ "name": "file", "in": "formData", "required": true - }, - { - "enum": [ - "thumbnail", - "full", - "all" - ], - "type": "string", - "description": "Image type: thumbnail, full or all", - "name": "imageType", - "in": "formData", - "required": true } ], "responses": { "200": { - "description": "OK" + "description": "OK", + "schema": { + "$ref": "#/definitions/imageStorage.UploadMerchImageResponse" + } }, "400": { "description": "Bad Request", @@ -247,11 +238,11 @@ "BearerAuth": [] } ], - "description": "Удалить (безвозвратно) картинки по merch_uuid и query параметрам", + "description": "Удалить (безвозвратно) картинки по merch_uuid", "tags": [ "Merch images" ], - "summary": "Удалить (безвозвратно) картинки по merch_uuid и query параметрам", + "summary": "Удалить (безвозвратно) картинки по merch_uuid", "parameters": [ { "type": "string", @@ -760,6 +751,17 @@ } }, "definitions": { + "imageStorage.UploadMerchImageResponse": { + "type": "object", + "properties": { + "fullImage": { + "type": "string" + }, + "thumbnail": { + "type": "string" + } + } + }, "merch.ImageLink": { "type": "object", "properties": { diff --git a/docs/swagger.yaml b/docs/swagger.yaml index c3f516b..1afef07 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -1,5 +1,12 @@ basePath: /api/v2 definitions: + imageStorage.UploadMerchImageResponse: + properties: + fullImage: + type: string + thumbnail: + type: string + type: object merch.ImageLink: properties: etag: @@ -271,7 +278,7 @@ paths: - Merch /merch/images/{uuid}: delete: - description: Удалить (безвозвратно) картинки по merch_uuid и query параметрам + description: Удалить (безвозвратно) картинки по merch_uuid parameters: - description: merch_uuid in: path @@ -291,7 +298,7 @@ paths: $ref: '#/definitions/responses.ErrorResponse500' security: - BearerAuth: [] - summary: Удалить (безвозвратно) картинки по merch_uuid и query параметрам + summary: Удалить (безвозвратно) картинки по merch_uuid tags: - Merch images get: @@ -328,7 +335,8 @@ paths: post: consumes: - multipart/form-data - description: Загрузить картинки по merch_uuid и query параметрам + description: Загрузить картинку по merch_uuid. В ответ будут выданы ссылки на + созданные картинки. parameters: - description: Merch UUID in: path @@ -340,20 +348,13 @@ paths: name: file required: true type: file - - description: 'Image type: thumbnail, full or all' - enum: - - thumbnail - - full - - all - in: formData - name: imageType - required: true - type: string produces: - application/json responses: "200": description: OK + schema: + $ref: '#/definitions/imageStorage.UploadMerchImageResponse' "400": description: Bad Request schema: @@ -364,7 +365,7 @@ paths: $ref: '#/definitions/responses.ErrorResponse500' security: - BearerAuth: [] - summary: Загрузить картинки по merch_uuid и query параметрам + summary: Загрузить картинку по merch_uuid tags: - Merch images /prices: From 7937d182db6d8d19daf4466b39c76b6003e23766 Mon Sep 17 00:00:00 2001 From: nquidox Date: Sun, 26 Oct 2025 19:55:49 +0300 Subject: [PATCH 19/39] swagger docs update --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 9fbbf8e..be8c94b 100644 --- a/go.mod +++ b/go.mod @@ -52,7 +52,7 @@ require ( github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.18.0 // indirect + github.com/klauspost/compress v1.18.1 // indirect github.com/klauspost/cpuid/v2 v2.3.0 // indirect github.com/leodido/go-urn v1.4.0 // indirect github.com/mattn/go-isatty v0.0.20 // indirect @@ -79,5 +79,5 @@ require ( golang.org/x/sys v0.37.0 // indirect golang.org/x/text v0.30.0 // indirect golang.org/x/tools v0.38.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20251014184007-4626949a642f // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20251022142026-3a174f9686a8 // indirect ) diff --git a/go.sum b/go.sum index bdf49df..84f9202 100644 --- a/go.sum +++ b/go.sum @@ -89,8 +89,8 @@ github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= -github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo= -github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ= +github.com/klauspost/compress v1.18.1 h1:bcSGx7UbpBqMChDtsF28Lw6v/G94LPrrbMbdC3JH2co= +github.com/klauspost/compress v1.18.1/go.mod h1:ZQFFVG+MdnR0P+l6wpXgIL4NTtwiKIdBnrBd8Nrxr+0= github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y= github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= @@ -217,8 +217,8 @@ golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk= gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E= -google.golang.org/genproto/googleapis/rpc v0.0.0-20251014184007-4626949a642f h1:1FTH6cpXFsENbPR5Bu8NQddPSaUUE6NA2XdZdDSAJK4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20251014184007-4626949a642f/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20251022142026-3a174f9686a8 h1:M1rk8KBnUsBDg1oPGHNCxG4vc1f49epmTO7xscSajMk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20251022142026-3a174f9686a8/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk= google.golang.org/grpc v1.76.0 h1:UnVkv1+uMLYXoIz6o7chp59WfQUYA2ex/BXQ9rHZu7A= google.golang.org/grpc v1.76.0/go.mod h1:Ju12QI8M6iQJtbcsV+awF5a4hfJMLi4X0JLo94ULZ6c= google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE= From 489f749ce3b3d609b4e7813399c1727dd2042817 Mon Sep 17 00:00:00 2001 From: nquidox Date: Sun, 26 Oct 2025 21:59:49 +0300 Subject: [PATCH 20/39] minio disabled --- cmd/main.go | 6 +++--- internal/api/merch/handler.go | 29 ++++++++++++++--------------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/cmd/main.go b/cmd/main.go index 8c0cb26..ce397b1 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -94,9 +94,9 @@ func main() { }) merchModule := merch.NewHandler(merch.Deps{ - DB: database, - Utils: utilsProvider, - Media: mediaProvider, + DB: database, + Utils: utilsProvider, + //Media: mediaProvider, ImageStorage: imageProvider, }) diff --git a/internal/api/merch/handler.go b/internal/api/merch/handler.go index 6918be0..0239179 100644 --- a/internal/api/merch/handler.go +++ b/internal/api/merch/handler.go @@ -1,7 +1,6 @@ package merch import ( - log "github.com/sirupsen/logrus" "gorm.io/gorm" "merch-parser-api/internal/interfaces" is "merch-parser-api/proto/imageStorage" @@ -15,9 +14,9 @@ type Handler struct { } type Deps struct { - DB *gorm.DB - Utils interfaces.Utils - Media interfaces.MediaStorage + DB *gorm.DB + Utils interfaces.Utils + //Media interfaces.MediaStorage ImageStorage is.ImageStorageClient } @@ -27,23 +26,23 @@ func NewHandler(deps Deps) *Handler { r := NewRepo(deps.DB) s := newService(serviceDeps{ - repo: r, - media: deps.Media, + repo: r, + //media: deps.Media, bucketName: packageBucketName, expires: expires, imageStorage: deps.ImageStorage, }) c := newController(s, deps.Utils, expires) - media := deps.Media - log.WithFields(log.Fields{ - "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") - } + //media := deps.Media + //log.WithFields(log.Fields{ + // "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") + //} return &Handler{ repo: r, From 475ff9919bce9247f40c917e10dd13165dbf9ec1 Mon Sep 17 00:00:00 2001 From: nquidox Date: Tue, 28 Oct 2025 18:22:40 +0300 Subject: [PATCH 21/39] tables added --- migrations.sql | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/migrations.sql b/migrations.sql index c4df99c..bb270bc 100644 --- a/migrations.sql +++ b/migrations.sql @@ -55,4 +55,22 @@ CREATE TABLE prices( merch_uuid VARCHAR(36) NOT NULL, price INT NULL, origin INT -); \ No newline at end of file +); + +CREATE TABLE labels( + id BIGSERIAL PRIMARY KEY, + created_at TIMESTAMP WITH TIME ZONE NOT NULL, + updated_at TIMESTAMP WITH TIME ZONE NULL, + deleted_at TIMESTAMP WITH TIME ZONE NULL, + user_uuid VARCHAR(36) NOT NULL, + label_uuid VARCHAR(36) NOT NULL, + name VARCHAR(255), + color VARCHAR(32), + bg_color VARCHAR(32) +); + +CREATE TABLE card_label ( + user_uuid VARCHAR(36) NOT NULL, + label_uuid VARCHAR(36) NOT NULL, + merch_uuid VARCHAR(36) NOT NULL +); From 9895b86666df24a816bb88be33b2a8c8bcffa15d Mon Sep 17 00:00:00 2001 From: nquidox Date: Tue, 28 Oct 2025 20:06:32 +0300 Subject: [PATCH 22/39] labels crud added --- internal/api/merch/controller.go | 223 +++++++++++++++++++++++++++++++ internal/api/merch/dto.go | 12 ++ internal/api/merch/model.go | 18 +++ internal/api/merch/repository.go | 48 +++++++ internal/api/merch/service.go | 87 ++++++++++++ 5 files changed, 388 insertions(+) diff --git a/internal/api/merch/controller.go b/internal/api/merch/controller.go index 06fd408..ddf3bd6 100644 --- a/internal/api/merch/controller.go +++ b/internal/api/merch/controller.go @@ -2,6 +2,7 @@ package merch import ( "context" + "errors" "github.com/gin-gonic/gin" log "github.com/sirupsen/logrus" "merch-parser-api/internal/interfaces" @@ -42,6 +43,14 @@ func (h *Handler) RegisterRoutes(r *gin.RouterGroup, authMW gin.HandlerFunc, ref imagesGroup.POST("/:uuid", h.controller.uploadMerchImage) imagesGroup.GET("/:uuid", h.controller.getMerchImage) imagesGroup.DELETE("/:uuid", h.controller.deleteMerchImage) + + labelsGroup := merchGroup.Group("/labels") + labelsGroup.POST("/", h.controller.createLabel) + labelsGroup.GET("/", h.controller.getLabels) + labelsGroup.PUT("/:uuid", h.controller.updateLabel) + labelsGroup.DELETE("/:uuid", h.controller.deleteLabel) + labelsGroup.POST("/attach", h.controller.attachLabel) + labelsGroup.POST("/detach", h.controller.detachLabel) } // @Summary Добавить новый мерч @@ -415,3 +424,217 @@ func (co *controller) deleteMerchImage(c *gin.Context) { } c.Status(http.StatusOK) } + +// @Summary Создать новую метку для товара +// @Description Создать новую метку для товара +// @Tags Merch labels +// @Security BearerAuth +// @Param payload body LabelDTO true "payload" +// @Success 200 +// @Failure 400 {object} responses.ErrorResponse400 +// @Failure 500 {object} responses.ErrorResponse500 +// @Router /merch/labels [post] +func (co *controller) createLabel(c *gin.Context) { + const logMsg = "Merch | Create label" + + userUuid, err := co.utils.GetUserUuidFromContext(c) + if err != nil { + c.JSON(http.StatusInternalServerError, responses.ErrorResponse500{Error: err.Error()}) + log.WithError(err).Error(logMsg) + return + } + + var payload LabelDTO + if err = c.ShouldBindJSON(&payload); err != nil { + c.JSON(http.StatusBadRequest, responses.ErrorResponse400{Error: err.Error()}) + log.WithError(err).Error(logMsg) + return + } + + if err = co.service.createLabel(payload, userUuid); err != nil { + c.JSON(http.StatusInternalServerError, responses.ErrorResponse500{Error: err.Error()}) + log.WithError(err).Error(logMsg) + return + } + + c.Status(http.StatusOK) +} + +// @Summary Получить все метки товаров +// @Description Получить все метки товаров +// @Tags Merch labels +// @Security BearerAuth +// @Success 200 {array} LabelDTO +// @Failure 400 {object} responses.ErrorResponse400 +// @Failure 500 {object} responses.ErrorResponse500 +// @Router /merch/labels [get] +func (co *controller) getLabels(c *gin.Context) { + const logMsg = "Merch | Get labels" + + userUuid, err := co.utils.GetUserUuidFromContext(c) + if err != nil { + c.JSON(http.StatusInternalServerError, responses.ErrorResponse500{Error: err.Error()}) + log.WithError(err).Error(logMsg) + return + } + + response, err := co.service.getLabels(userUuid) + if err != nil { + c.JSON(http.StatusInternalServerError, responses.ErrorResponse500{Error: err.Error()}) + log.WithError(err).Error(logMsg) + return + } + + c.JSON(http.StatusOK, response) +} + +// @Summary Изменить метку +// @Description Изменить метку +// @Tags Merch labels +// @Security BearerAuth +// @Param uuid path string true "label uuid" +// @Param payload body LabelDTO true "payload" +// @Success 200 +// @Failure 400 {object} responses.ErrorResponse400 +// @Failure 500 {object} responses.ErrorResponse500 +// @Router /merch/labels/{uuid} [put] +func (co *controller) updateLabel(c *gin.Context) { + const logMsg = "Merch | Update label" + + userUuid, err := co.utils.GetUserUuidFromContext(c) + if err != nil { + c.JSON(http.StatusInternalServerError, responses.ErrorResponse500{Error: err.Error()}) + log.WithError(err).Error(logMsg) + return + } + + labelUuid := c.Param("uuid") + if labelUuid == "" { + c.JSON(http.StatusBadRequest, responses.ErrorResponse400{Error: "label uuid is empty"}) + log.WithError(err).Error(logMsg) + return + } + + var payload LabelDTO + if err = c.ShouldBindJSON(&payload); err != nil { + c.JSON(http.StatusBadRequest, responses.ErrorResponse400{Error: err.Error()}) + log.WithError(err).Error(logMsg) + return + } + + if labelUuid != payload.LabelUuid { + err = errors.New("label uuid is different") + c.JSON(http.StatusBadRequest, responses.ErrorResponse400{Error: err.Error()}) + log.WithError(err).Error(logMsg) + return + } + + if err = co.service.updateLabel(userUuid, payload); err != nil { + c.JSON(http.StatusInternalServerError, responses.ErrorResponse500{Error: err.Error()}) + log.WithError(err).Error(logMsg) + return + } + c.Status(http.StatusOK) +} + +// @Summary Пометить метку как удаленную +// @Description Пометить метку как удаленную +// @Tags Merch labels +// @Security BearerAuth +// @Param uuid path string true "label uuid" +// @Success 200 +// @Failure 400 {object} responses.ErrorResponse400 +// @Failure 500 {object} responses.ErrorResponse500 +// @Router /merch/labels/{uuid} [delete] +func (co *controller) deleteLabel(c *gin.Context) { + const logMsg = "Merch | Delete label" + + userUuid, err := co.utils.GetUserUuidFromContext(c) + if err != nil { + c.JSON(http.StatusInternalServerError, responses.ErrorResponse500{Error: err.Error()}) + log.WithError(err).Error(logMsg) + return + } + + labelUuid := c.Param("uuid") + if labelUuid == "" { + c.JSON(http.StatusBadRequest, responses.ErrorResponse400{Error: "label uuid is empty"}) + log.WithError(err).Error(logMsg) + return + } + + if err = co.service.deleteLabel(userUuid, labelUuid); err != nil { + c.JSON(http.StatusInternalServerError, responses.ErrorResponse500{Error: err.Error()}) + log.WithError(err).Error(logMsg) + return + } + c.Status(http.StatusOK) +} + +// @Summary Прикрепить метку к товару +// @Description Прикрепить метку к товару +// @Tags Merch labels +// @Security BearerAuth +// @Param payload body LabelLink true "payload" +// @Success 200 +// @Failure 400 {object} responses.ErrorResponse400 +// @Failure 500 {object} responses.ErrorResponse500 +// @Router /merch/labels/attach [post] +func (co *controller) attachLabel(c *gin.Context) { + const logMsg = "Merch | Attach label" + + userUuid, err := co.utils.GetUserUuidFromContext(c) + if err != nil { + c.JSON(http.StatusInternalServerError, responses.ErrorResponse500{Error: err.Error()}) + log.WithError(err).Error(logMsg) + return + } + + var payload LabelLink + if err = c.ShouldBindJSON(&payload); err != nil { + c.JSON(http.StatusBadRequest, responses.ErrorResponse400{Error: err.Error()}) + log.WithError(err).Error(logMsg) + return + } + + if err = co.service.attachLabel(userUuid, payload); err != nil { + c.JSON(http.StatusInternalServerError, responses.ErrorResponse500{Error: err.Error()}) + log.WithError(err).Error(logMsg) + return + } + c.Status(http.StatusOK) +} + +// @Summary Удалить привязку метки к товару +// @Description Удалить привязку метки к товару +// @Tags Merch labels +// @Security BearerAuth +// @Param payload body LabelLink true "payload" +// @Success 200 +// @Failure 400 {object} responses.ErrorResponse400 +// @Failure 500 {object} responses.ErrorResponse500 +// @Router /merch/labels/detach [post] +func (co *controller) detachLabel(c *gin.Context) { + const logMsg = "Merch | Detach label" + + userUuid, err := co.utils.GetUserUuidFromContext(c) + if err != nil { + c.JSON(http.StatusInternalServerError, responses.ErrorResponse500{Error: err.Error()}) + log.WithError(err).Error(logMsg) + return + } + + var payload LabelLink + if err = c.ShouldBindJSON(&payload); err != nil { + c.JSON(http.StatusBadRequest, responses.ErrorResponse400{Error: err.Error()}) + log.WithError(err).Error(logMsg) + return + } + + if err = co.service.detachLabel(userUuid, payload); err != nil { + c.JSON(http.StatusInternalServerError, responses.ErrorResponse500{Error: err.Error()}) + log.WithError(err).Error(logMsg) + return + } + c.Status(http.StatusOK) +} diff --git a/internal/api/merch/dto.go b/internal/api/merch/dto.go index bc1646e..fc1b077 100644 --- a/internal/api/merch/dto.go +++ b/internal/api/merch/dto.go @@ -58,3 +58,15 @@ type ImageLink struct { Link string `json:"link"` ETag string `json:"etag"` } + +type LabelDTO struct { + LabelUuid string `json:"label_uuid"` + Name string `json:"name"` + Color string `json:"color"` + BgColor string `json:"bg_color"` +} + +type LabelLink struct { + MerchUuid string `json:"merch_uuid"` + LabelUuid string `json:"label_uuid"` +} diff --git a/internal/api/merch/model.go b/internal/api/merch/model.go index 9322547..088cb39 100644 --- a/internal/api/merch/model.go +++ b/internal/api/merch/model.go @@ -50,3 +50,21 @@ type Price struct { Price int `json:"price" gorm:"column:price"` Origin Origin `json:"origin" gorm:"column:origin;type:integer"` } + +type Label struct { + Id uint `json:"-" gorm:"primary_key"` + CreatedAt time.Time `json:"created_at" gorm:"column:created_at"` + UpdatedAt time.Time `json:"updated_at" gorm:"column:updated_at"` + DeletedAt sql.NullTime `json:"deleted_at" gorm:"column:deleted_at"` + LabelUuid string `json:"label_uuid" gorm:"column:label_uuid"` + UserUuid string `json:"user_uuid" gorm:"column:user_uuid"` + Name string `json:"name" gorm:"column:name"` + Color string `json:"color" gorm:"column:color"` + BgColor string `json:"bg_color" gorm:"column:bg_color"` +} + +type CardLabel struct { + LabelUuid string `json:"label_uuid"` + UserUuid string `json:"user_uuid"` + MerchUuid string `json:"merch_uuid"` +} diff --git a/internal/api/merch/repository.go b/internal/api/merch/repository.go index 98d2695..24ff87b 100644 --- a/internal/api/merch/repository.go +++ b/internal/api/merch/repository.go @@ -32,6 +32,7 @@ type repository interface { getAllUserMerch(userUuid string) ([]Merch, error) prices + labels } type prices interface { @@ -39,6 +40,15 @@ type prices interface { getDistinctPrices(userUuid, merchUuid string, period time.Time) (prices []Price, err error) } +type labels interface { + createLabel(label Label) error + getLabels(userUuid string) ([]Label, error) + updateLabel(userUuid, labelUuid string, label map[string]string) error + deleteLabel(userUuid, labelUuid string) error + attachLabel(label CardLabel) error + detachLabel(label CardLabel) error +} + func (r *Repo) addMerch(bundle merchBundle) error { if err := r.db.Model(&Merch{}).Create(bundle.Merch).Error; err != nil { return err @@ -239,3 +249,41 @@ func (r *Repo) upsertOrigin(model any) error { DoUpdates: clause.AssignmentColumns([]string{"link"}), }).Create(model).Error } + +func (r *Repo) createLabel(label Label) error { + return r.db.Model(&Label{}).Create(label).Error +} +func (r *Repo) getLabels(userUuid string) ([]Label, error) { + var labels []Label + + if err := r.db. + Where("user_uuid = ?", userUuid). + Where("deleted_at IS NULL"). + Find(labels).Error; err != nil { + return nil, err + } + + return labels, nil +} + +func (r *Repo) updateLabel(userUuid, labelUuid string, label map[string]string) error { + return r.db.Model(&Label{}). + Where("user_uuid =? AND label_uuid = ?", userUuid, labelUuid). + Updates(label).Error +} + +func (r *Repo) deleteLabel(userUuid, labelUuid string) error { + return r.db.Model(&Label{}). + Where("user_uuid =? AND label_uuid = ?", userUuid, labelUuid). + Update("deleted_at", time.Now().UTC()).Error +} + +func (r *Repo) attachLabel(label CardLabel) error { + return r.db.Model(&CardLabel{}).Create(&label).Error +} + +func (r *Repo) detachLabel(label CardLabel) error { + return r.db. + Where("userUuid = ? AND label_uuid = ? AND merch_uuid = ?", label.UserUuid, label.LabelUuid, label.MerchUuid). + Delete(&CardLabel{}).Error +} diff --git a/internal/api/merch/service.go b/internal/api/merch/service.go index e749d88..bf49893 100644 --- a/internal/api/merch/service.go +++ b/internal/api/merch/service.go @@ -483,3 +483,90 @@ func (s *service) mtDeleteMerchImage(ctx context.Context, userUuid, merchUuid st }) return nil } + +func (s *service) createLabel(label LabelDTO, userUuid string) error { + now := time.Now().UTC() + + if label.Name == "" { + return fmt.Errorf("label name is required") + } + + newLabel := Label{ + CreatedAt: now, + UpdatedAt: now, + DeletedAt: sql.NullTime{Time: time.Time{}, Valid: false}, + LabelUuid: uuid.NewString(), + UserUuid: userUuid, + Name: label.Name, + Color: label.Color, + BgColor: label.BgColor, + } + + return s.repo.createLabel(newLabel) +} +func (s *service) getLabels(userUuid string) ([]LabelDTO, error) { + stored, err := s.repo.getLabels(userUuid) + if err != nil { + return nil, err + } + + response := make([]LabelDTO, 0, len(stored)) + for _, label := range stored { + response = append(response, LabelDTO{ + LabelUuid: label.LabelUuid, + Name: label.Name, + Color: label.Color, + BgColor: label.BgColor, + }) + } + + return response, nil +} +func (s *service) updateLabel(userUuid string, label LabelDTO) error { + updateMap := make(map[string]string, 3) + + if label.Name != "" { + updateMap["name"] = label.Name + } + + if label.Color != "" { + updateMap["color"] = label.Color + } + + if label.BgColor != "" { + updateMap["bgcolor"] = label.BgColor + } + + return s.repo.updateLabel(userUuid, label.LabelUuid, updateMap) +} + +func (s *service) deleteLabel(userUuid, labelUuid string) error { + return s.repo.deleteLabel(userUuid, labelUuid) +} + +func (s *service) attachLabel(userUuid string, label LabelLink) error { + if label.LabelUuid == "" || label.MerchUuid == "" { + return fmt.Errorf("both label and merch uuid-s are required") + } + + attach := CardLabel{ + LabelUuid: label.LabelUuid, + UserUuid: userUuid, + MerchUuid: label.MerchUuid, + } + + return s.repo.attachLabel(attach) +} + +func (s *service) detachLabel(userUuid string, label LabelLink) error { + if label.LabelUuid == "" || label.MerchUuid == "" { + return fmt.Errorf("both label and merch uuid-s are required") + } + + detach := CardLabel{ + LabelUuid: label.LabelUuid, + UserUuid: userUuid, + MerchUuid: label.MerchUuid, + } + return s.repo.detachLabel(detach) +} From 844561ef70ac62c9a952d7ecda7b5592a4e0e362 Mon Sep 17 00:00:00 2001 From: nquidox Date: Tue, 28 Oct 2025 20:28:40 +0300 Subject: [PATCH 23/39] update --- migrations.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migrations.sql b/migrations.sql index bb270bc..b5fd81c 100644 --- a/migrations.sql +++ b/migrations.sql @@ -69,7 +69,7 @@ CREATE TABLE labels( bg_color VARCHAR(32) ); -CREATE TABLE card_label ( +CREATE TABLE card_labels ( user_uuid VARCHAR(36) NOT NULL, label_uuid VARCHAR(36) NOT NULL, merch_uuid VARCHAR(36) NOT NULL From f7ec1bce1e38563e20a9cf5b552c405689894b56 Mon Sep 17 00:00:00 2001 From: nquidox Date: Tue, 28 Oct 2025 20:29:14 +0300 Subject: [PATCH 24/39] small fixes --- internal/api/merch/controller.go | 26 +++++++++----------------- internal/api/merch/dto.go | 10 ++++++++-- internal/api/merch/model.go | 8 ++++++++ internal/api/merch/repository.go | 16 +++++++++------- internal/api/merch/service.go | 12 ++++++------ 5 files changed, 40 insertions(+), 32 deletions(-) diff --git a/internal/api/merch/controller.go b/internal/api/merch/controller.go index ddf3bd6..7f0ae7a 100644 --- a/internal/api/merch/controller.go +++ b/internal/api/merch/controller.go @@ -2,7 +2,6 @@ package merch import ( "context" - "errors" "github.com/gin-gonic/gin" log "github.com/sirupsen/logrus" "merch-parser-api/internal/interfaces" @@ -45,8 +44,8 @@ func (h *Handler) RegisterRoutes(r *gin.RouterGroup, authMW gin.HandlerFunc, ref imagesGroup.DELETE("/:uuid", h.controller.deleteMerchImage) labelsGroup := merchGroup.Group("/labels") - labelsGroup.POST("/", h.controller.createLabel) - labelsGroup.GET("/", h.controller.getLabels) + labelsGroup.POST("", h.controller.createLabel) + labelsGroup.GET("", h.controller.getLabels) labelsGroup.PUT("/:uuid", h.controller.updateLabel) labelsGroup.DELETE("/:uuid", h.controller.deleteLabel) labelsGroup.POST("/attach", h.controller.attachLabel) @@ -431,8 +430,8 @@ func (co *controller) deleteMerchImage(c *gin.Context) { // @Security BearerAuth // @Param payload body LabelDTO true "payload" // @Success 200 -// @Failure 400 {object} responses.ErrorResponse400 -// @Failure 500 {object} responses.ErrorResponse500 +// @Failure 400 {object} responses.ErrorResponse400 +// @Failure 500 {object} responses.ErrorResponse500 // @Router /merch/labels [post] func (co *controller) createLabel(c *gin.Context) { const logMsg = "Merch | Create label" @@ -464,9 +463,9 @@ func (co *controller) createLabel(c *gin.Context) { // @Description Получить все метки товаров // @Tags Merch labels // @Security BearerAuth -// @Success 200 {array} LabelDTO -// @Failure 400 {object} responses.ErrorResponse400 -// @Failure 500 {object} responses.ErrorResponse500 +// @Success 200 {array} LabelsList +// @Failure 400 {object} responses.ErrorResponse400 +// @Failure 500 {object} responses.ErrorResponse500 // @Router /merch/labels [get] func (co *controller) getLabels(c *gin.Context) { const logMsg = "Merch | Get labels" @@ -492,7 +491,7 @@ func (co *controller) getLabels(c *gin.Context) { // @Description Изменить метку // @Tags Merch labels // @Security BearerAuth -// @Param uuid path string true "label uuid" +// @Param uuid path string true "label uuid" // @Param payload body LabelDTO true "payload" // @Success 200 // @Failure 400 {object} responses.ErrorResponse400 @@ -522,14 +521,7 @@ func (co *controller) updateLabel(c *gin.Context) { return } - if labelUuid != payload.LabelUuid { - err = errors.New("label uuid is different") - c.JSON(http.StatusBadRequest, responses.ErrorResponse400{Error: err.Error()}) - log.WithError(err).Error(logMsg) - return - } - - if err = co.service.updateLabel(userUuid, payload); err != nil { + if err = co.service.updateLabel(userUuid, labelUuid, payload); err != nil { c.JSON(http.StatusInternalServerError, responses.ErrorResponse500{Error: err.Error()}) log.WithError(err).Error(logMsg) return diff --git a/internal/api/merch/dto.go b/internal/api/merch/dto.go index fc1b077..32e72e4 100644 --- a/internal/api/merch/dto.go +++ b/internal/api/merch/dto.go @@ -60,10 +60,16 @@ type ImageLink struct { } type LabelDTO struct { + Name string `json:"name"` + Color string `json:"color,omitempty"` + BgColor string `json:"bg_color,omitempty"` +} + +type LabelsList struct { LabelUuid string `json:"label_uuid"` Name string `json:"name"` - Color string `json:"color"` - BgColor string `json:"bg_color"` + Color string `json:"color,omitempty"` + BgColor string `json:"bg_color,omitempty"` } type LabelLink struct { diff --git a/internal/api/merch/model.go b/internal/api/merch/model.go index 088cb39..935a194 100644 --- a/internal/api/merch/model.go +++ b/internal/api/merch/model.go @@ -63,8 +63,16 @@ type Label struct { BgColor string `json:"bg_color" gorm:"column:bg_color"` } +func (Label) TableName() string { + return "labels" +} + type CardLabel struct { LabelUuid string `json:"label_uuid"` UserUuid string `json:"user_uuid"` MerchUuid string `json:"merch_uuid"` } + +func (CardLabel) TableName() string { + return "card_labels" +} diff --git a/internal/api/merch/repository.go b/internal/api/merch/repository.go index 24ff87b..5b3c308 100644 --- a/internal/api/merch/repository.go +++ b/internal/api/merch/repository.go @@ -43,7 +43,7 @@ type prices interface { type labels interface { createLabel(label Label) error getLabels(userUuid string) ([]Label, error) - updateLabel(userUuid, labelUuid string, label map[string]string) error + updateLabel(userUuid, labelUuid string, label map[string]any) error deleteLabel(userUuid, labelUuid string) error attachLabel(label CardLabel) error detachLabel(label CardLabel) error @@ -251,22 +251,24 @@ func (r *Repo) upsertOrigin(model any) error { } func (r *Repo) createLabel(label Label) error { - return r.db.Model(&Label{}).Create(label).Error + return r.db.Model(&Label{}).Create(&label).Error } + func (r *Repo) getLabels(userUuid string) ([]Label, error) { - var labels []Label + var labelsList []Label if err := r.db. + Model(&Label{}). Where("user_uuid = ?", userUuid). Where("deleted_at IS NULL"). - Find(labels).Error; err != nil { + Find(&labelsList).Error; err != nil { return nil, err } - return labels, nil + return labelsList, nil } -func (r *Repo) updateLabel(userUuid, labelUuid string, label map[string]string) error { +func (r *Repo) updateLabel(userUuid, labelUuid string, label map[string]any) error { return r.db.Model(&Label{}). Where("user_uuid =? AND label_uuid = ?", userUuid, labelUuid). Updates(label).Error @@ -284,6 +286,6 @@ func (r *Repo) attachLabel(label CardLabel) error { func (r *Repo) detachLabel(label CardLabel) error { return r.db. - Where("userUuid = ? AND label_uuid = ? AND merch_uuid = ?", label.UserUuid, label.LabelUuid, label.MerchUuid). + Where("user_uuid = ? AND label_uuid = ? AND merch_uuid = ?", label.UserUuid, label.LabelUuid, label.MerchUuid). Delete(&CardLabel{}).Error } diff --git a/internal/api/merch/service.go b/internal/api/merch/service.go index bf49893..c6902ff 100644 --- a/internal/api/merch/service.go +++ b/internal/api/merch/service.go @@ -504,15 +504,15 @@ func (s *service) createLabel(label LabelDTO, userUuid string) error { return s.repo.createLabel(newLabel) } -func (s *service) getLabels(userUuid string) ([]LabelDTO, error) { +func (s *service) getLabels(userUuid string) ([]LabelsList, error) { stored, err := s.repo.getLabels(userUuid) if err != nil { return nil, err } - response := make([]LabelDTO, 0, len(stored)) + response := make([]LabelsList, 0, len(stored)) for _, label := range stored { - response = append(response, LabelDTO{ + response = append(response, LabelsList{ LabelUuid: label.LabelUuid, Name: label.Name, Color: label.Color, @@ -522,8 +522,8 @@ func (s *service) getLabels(userUuid string) ([]LabelDTO, error) { return response, nil } -func (s *service) updateLabel(userUuid string, label LabelDTO) error { - updateMap := make(map[string]string, 3) +func (s *service) updateLabel(userUuid, labelUuid string, label LabelDTO) error { + updateMap := make(map[string]any, 3) if label.Name != "" { updateMap["name"] = label.Name @@ -537,7 +537,7 @@ func (s *service) updateLabel(userUuid string, label LabelDTO) error { updateMap["bgcolor"] = label.BgColor } - return s.repo.updateLabel(userUuid, label.LabelUuid, updateMap) + return s.repo.updateLabel(userUuid, labelUuid, updateMap) } func (s *service) deleteLabel(userUuid, labelUuid string) error { From 565e019a67004ff2324585adf71df928741dd51d Mon Sep 17 00:00:00 2001 From: nquidox Date: Tue, 28 Oct 2025 20:30:05 +0300 Subject: [PATCH 25/39] swagger docs update --- docs/docs.go | 290 ++++++++++++++++++++++++++++++++++++++++++++++ docs/swagger.json | 290 ++++++++++++++++++++++++++++++++++++++++++++++ docs/swagger.yaml | 182 +++++++++++++++++++++++++++++ 3 files changed, 762 insertions(+) diff --git a/docs/docs.go b/docs/docs.go index 8e556d2..0111bc4 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -279,6 +279,254 @@ const docTemplate = `{ } } }, + "/merch/labels": { + "get": { + "security": [ + { + "BearerAuth": [] + } + ], + "description": "Получить все метки товаров", + "tags": [ + "Merch labels" + ], + "summary": "Получить все метки товаров", + "responses": { + "200": { + "description": "OK", + "schema": { + "type": "array", + "items": { + "$ref": "#/definitions/merch.LabelsList" + } + } + }, + "400": { + "description": "Bad Request", + "schema": { + "$ref": "#/definitions/responses.ErrorResponse400" + } + }, + "500": { + "description": "Internal Server Error", + "schema": { + "$ref": "#/definitions/responses.ErrorResponse500" + } + } + } + }, + "post": { + "security": [ + { + "BearerAuth": [] + } + ], + "description": "Создать новую метку для товара", + "tags": [ + "Merch labels" + ], + "summary": "Создать новую метку для товара", + "parameters": [ + { + "description": "payload", + "name": "payload", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/merch.LabelDTO" + } + } + ], + "responses": { + "200": { + "description": "OK" + }, + "400": { + "description": "Bad Request", + "schema": { + "$ref": "#/definitions/responses.ErrorResponse400" + } + }, + "500": { + "description": "Internal Server Error", + "schema": { + "$ref": "#/definitions/responses.ErrorResponse500" + } + } + } + } + }, + "/merch/labels/attach": { + "post": { + "security": [ + { + "BearerAuth": [] + } + ], + "description": "Прикрепить метку к товару", + "tags": [ + "Merch labels" + ], + "summary": "Прикрепить метку к товару", + "parameters": [ + { + "description": "payload", + "name": "payload", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/merch.LabelLink" + } + } + ], + "responses": { + "200": { + "description": "OK" + }, + "400": { + "description": "Bad Request", + "schema": { + "$ref": "#/definitions/responses.ErrorResponse400" + } + }, + "500": { + "description": "Internal Server Error", + "schema": { + "$ref": "#/definitions/responses.ErrorResponse500" + } + } + } + } + }, + "/merch/labels/detach": { + "post": { + "security": [ + { + "BearerAuth": [] + } + ], + "description": "Удалить привязку метки к товару", + "tags": [ + "Merch labels" + ], + "summary": "Удалить привязку метки к товару", + "parameters": [ + { + "description": "payload", + "name": "payload", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/merch.LabelLink" + } + } + ], + "responses": { + "200": { + "description": "OK" + }, + "400": { + "description": "Bad Request", + "schema": { + "$ref": "#/definitions/responses.ErrorResponse400" + } + }, + "500": { + "description": "Internal Server Error", + "schema": { + "$ref": "#/definitions/responses.ErrorResponse500" + } + } + } + } + }, + "/merch/labels/{uuid}": { + "put": { + "security": [ + { + "BearerAuth": [] + } + ], + "description": "Изменить метку", + "tags": [ + "Merch labels" + ], + "summary": "Изменить метку", + "parameters": [ + { + "type": "string", + "description": "label uuid", + "name": "uuid", + "in": "path", + "required": true + }, + { + "description": "payload", + "name": "payload", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/merch.LabelDTO" + } + } + ], + "responses": { + "200": { + "description": "OK" + }, + "400": { + "description": "Bad Request", + "schema": { + "$ref": "#/definitions/responses.ErrorResponse400" + } + }, + "500": { + "description": "Internal Server Error", + "schema": { + "$ref": "#/definitions/responses.ErrorResponse500" + } + } + } + }, + "delete": { + "security": [ + { + "BearerAuth": [] + } + ], + "description": "Пометить метку как удаленную", + "tags": [ + "Merch labels" + ], + "summary": "Пометить метку как удаленную", + "parameters": [ + { + "type": "string", + "description": "label uuid", + "name": "uuid", + "in": "path", + "required": true + } + ], + "responses": { + "200": { + "description": "OK" + }, + "400": { + "description": "Bad Request", + "schema": { + "$ref": "#/definitions/responses.ErrorResponse400" + } + }, + "500": { + "description": "Internal Server Error", + "schema": { + "$ref": "#/definitions/responses.ErrorResponse500" + } + } + } + } + }, "/merch/{uuid}": { "get": { "security": [ @@ -781,6 +1029,48 @@ const docTemplate = `{ } } }, + "merch.LabelDTO": { + "type": "object", + "properties": { + "bg_color": { + "type": "string" + }, + "color": { + "type": "string" + }, + "name": { + "type": "string" + } + } + }, + "merch.LabelLink": { + "type": "object", + "properties": { + "label_uuid": { + "type": "string" + }, + "merch_uuid": { + "type": "string" + } + } + }, + "merch.LabelsList": { + "type": "object", + "properties": { + "bg_color": { + "type": "string" + }, + "color": { + "type": "string" + }, + "label_uuid": { + "type": "string" + }, + "name": { + "type": "string" + } + } + }, "merch.ListResponse": { "type": "object", "properties": { diff --git a/docs/swagger.json b/docs/swagger.json index ea5dbf2..7b17bd7 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -271,6 +271,254 @@ } } }, + "/merch/labels": { + "get": { + "security": [ + { + "BearerAuth": [] + } + ], + "description": "Получить все метки товаров", + "tags": [ + "Merch labels" + ], + "summary": "Получить все метки товаров", + "responses": { + "200": { + "description": "OK", + "schema": { + "type": "array", + "items": { + "$ref": "#/definitions/merch.LabelsList" + } + } + }, + "400": { + "description": "Bad Request", + "schema": { + "$ref": "#/definitions/responses.ErrorResponse400" + } + }, + "500": { + "description": "Internal Server Error", + "schema": { + "$ref": "#/definitions/responses.ErrorResponse500" + } + } + } + }, + "post": { + "security": [ + { + "BearerAuth": [] + } + ], + "description": "Создать новую метку для товара", + "tags": [ + "Merch labels" + ], + "summary": "Создать новую метку для товара", + "parameters": [ + { + "description": "payload", + "name": "payload", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/merch.LabelDTO" + } + } + ], + "responses": { + "200": { + "description": "OK" + }, + "400": { + "description": "Bad Request", + "schema": { + "$ref": "#/definitions/responses.ErrorResponse400" + } + }, + "500": { + "description": "Internal Server Error", + "schema": { + "$ref": "#/definitions/responses.ErrorResponse500" + } + } + } + } + }, + "/merch/labels/attach": { + "post": { + "security": [ + { + "BearerAuth": [] + } + ], + "description": "Прикрепить метку к товару", + "tags": [ + "Merch labels" + ], + "summary": "Прикрепить метку к товару", + "parameters": [ + { + "description": "payload", + "name": "payload", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/merch.LabelLink" + } + } + ], + "responses": { + "200": { + "description": "OK" + }, + "400": { + "description": "Bad Request", + "schema": { + "$ref": "#/definitions/responses.ErrorResponse400" + } + }, + "500": { + "description": "Internal Server Error", + "schema": { + "$ref": "#/definitions/responses.ErrorResponse500" + } + } + } + } + }, + "/merch/labels/detach": { + "post": { + "security": [ + { + "BearerAuth": [] + } + ], + "description": "Удалить привязку метки к товару", + "tags": [ + "Merch labels" + ], + "summary": "Удалить привязку метки к товару", + "parameters": [ + { + "description": "payload", + "name": "payload", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/merch.LabelLink" + } + } + ], + "responses": { + "200": { + "description": "OK" + }, + "400": { + "description": "Bad Request", + "schema": { + "$ref": "#/definitions/responses.ErrorResponse400" + } + }, + "500": { + "description": "Internal Server Error", + "schema": { + "$ref": "#/definitions/responses.ErrorResponse500" + } + } + } + } + }, + "/merch/labels/{uuid}": { + "put": { + "security": [ + { + "BearerAuth": [] + } + ], + "description": "Изменить метку", + "tags": [ + "Merch labels" + ], + "summary": "Изменить метку", + "parameters": [ + { + "type": "string", + "description": "label uuid", + "name": "uuid", + "in": "path", + "required": true + }, + { + "description": "payload", + "name": "payload", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/merch.LabelDTO" + } + } + ], + "responses": { + "200": { + "description": "OK" + }, + "400": { + "description": "Bad Request", + "schema": { + "$ref": "#/definitions/responses.ErrorResponse400" + } + }, + "500": { + "description": "Internal Server Error", + "schema": { + "$ref": "#/definitions/responses.ErrorResponse500" + } + } + } + }, + "delete": { + "security": [ + { + "BearerAuth": [] + } + ], + "description": "Пометить метку как удаленную", + "tags": [ + "Merch labels" + ], + "summary": "Пометить метку как удаленную", + "parameters": [ + { + "type": "string", + "description": "label uuid", + "name": "uuid", + "in": "path", + "required": true + } + ], + "responses": { + "200": { + "description": "OK" + }, + "400": { + "description": "Bad Request", + "schema": { + "$ref": "#/definitions/responses.ErrorResponse400" + } + }, + "500": { + "description": "Internal Server Error", + "schema": { + "$ref": "#/definitions/responses.ErrorResponse500" + } + } + } + } + }, "/merch/{uuid}": { "get": { "security": [ @@ -773,6 +1021,48 @@ } } }, + "merch.LabelDTO": { + "type": "object", + "properties": { + "bg_color": { + "type": "string" + }, + "color": { + "type": "string" + }, + "name": { + "type": "string" + } + } + }, + "merch.LabelLink": { + "type": "object", + "properties": { + "label_uuid": { + "type": "string" + }, + "merch_uuid": { + "type": "string" + } + } + }, + "merch.LabelsList": { + "type": "object", + "properties": { + "bg_color": { + "type": "string" + }, + "color": { + "type": "string" + }, + "label_uuid": { + "type": "string" + }, + "name": { + "type": "string" + } + } + }, "merch.ListResponse": { "type": "object", "properties": { diff --git a/docs/swagger.yaml b/docs/swagger.yaml index 1afef07..3dadf18 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -14,6 +14,33 @@ definitions: link: type: string type: object + merch.LabelDTO: + properties: + bg_color: + type: string + color: + type: string + name: + type: string + type: object + merch.LabelLink: + properties: + label_uuid: + type: string + merch_uuid: + type: string + type: object + merch.LabelsList: + properties: + bg_color: + type: string + color: + type: string + label_uuid: + type: string + name: + type: string + type: object merch.ListResponse: properties: merch_uuid: @@ -368,6 +395,161 @@ paths: summary: Загрузить картинку по merch_uuid tags: - Merch images + /merch/labels: + get: + description: Получить все метки товаров + responses: + "200": + description: OK + schema: + items: + $ref: '#/definitions/merch.LabelsList' + type: array + "400": + description: Bad Request + schema: + $ref: '#/definitions/responses.ErrorResponse400' + "500": + description: Internal Server Error + schema: + $ref: '#/definitions/responses.ErrorResponse500' + security: + - BearerAuth: [] + summary: Получить все метки товаров + tags: + - Merch labels + post: + description: Создать новую метку для товара + parameters: + - description: payload + in: body + name: payload + required: true + schema: + $ref: '#/definitions/merch.LabelDTO' + responses: + "200": + description: OK + "400": + description: Bad Request + schema: + $ref: '#/definitions/responses.ErrorResponse400' + "500": + description: Internal Server Error + schema: + $ref: '#/definitions/responses.ErrorResponse500' + security: + - BearerAuth: [] + summary: Создать новую метку для товара + tags: + - Merch labels + /merch/labels/{uuid}: + delete: + description: Пометить метку как удаленную + parameters: + - description: label uuid + in: path + name: uuid + required: true + type: string + responses: + "200": + description: OK + "400": + description: Bad Request + schema: + $ref: '#/definitions/responses.ErrorResponse400' + "500": + description: Internal Server Error + schema: + $ref: '#/definitions/responses.ErrorResponse500' + security: + - BearerAuth: [] + summary: Пометить метку как удаленную + tags: + - Merch labels + put: + description: Изменить метку + parameters: + - description: label uuid + in: path + name: uuid + required: true + type: string + - description: payload + in: body + name: payload + required: true + schema: + $ref: '#/definitions/merch.LabelDTO' + responses: + "200": + description: OK + "400": + description: Bad Request + schema: + $ref: '#/definitions/responses.ErrorResponse400' + "500": + description: Internal Server Error + schema: + $ref: '#/definitions/responses.ErrorResponse500' + security: + - BearerAuth: [] + summary: Изменить метку + tags: + - Merch labels + /merch/labels/attach: + post: + description: Прикрепить метку к товару + parameters: + - description: payload + in: body + name: payload + required: true + schema: + $ref: '#/definitions/merch.LabelLink' + responses: + "200": + description: OK + "400": + description: Bad Request + schema: + $ref: '#/definitions/responses.ErrorResponse400' + "500": + description: Internal Server Error + schema: + $ref: '#/definitions/responses.ErrorResponse500' + security: + - BearerAuth: [] + summary: Прикрепить метку к товару + tags: + - Merch labels + /merch/labels/detach: + post: + description: Удалить привязку метки к товару + parameters: + - description: payload + in: body + name: payload + required: true + schema: + $ref: '#/definitions/merch.LabelLink' + responses: + "200": + description: OK + "400": + description: Bad Request + schema: + $ref: '#/definitions/responses.ErrorResponse400' + "500": + description: Internal Server Error + schema: + $ref: '#/definitions/responses.ErrorResponse500' + security: + - BearerAuth: [] + summary: Удалить привязку метки к товару + tags: + - Merch labels /prices: get: description: Получить цены мерча за период From 8ac753f63293092318f4967cfef813eb9f94f93d Mon Sep 17 00:00:00 2001 From: nquidox Date: Tue, 28 Oct 2025 21:46:40 +0300 Subject: [PATCH 26/39] labels added to dto --- internal/api/merch/dto.go | 5 +++-- internal/api/merch/repository.go | 11 +++++++++++ internal/api/merch/service.go | 29 ++++++++++++++++++++++++++++- 3 files changed, 42 insertions(+), 3 deletions(-) diff --git a/internal/api/merch/dto.go b/internal/api/merch/dto.go index 32e72e4..ad63c26 100644 --- a/internal/api/merch/dto.go +++ b/internal/api/merch/dto.go @@ -27,8 +27,9 @@ type SingleMerchResponse struct { } type ListResponse struct { - MerchUuid string `json:"merch_uuid"` - Name string `json:"name"` + MerchUuid string `json:"merch_uuid"` + Name string `json:"name"` + Labels []string `json:"labels,omitempty" gorm:"-"` } type PriceEntry struct { diff --git a/internal/api/merch/repository.go b/internal/api/merch/repository.go index 5b3c308..d1567de 100644 --- a/internal/api/merch/repository.go +++ b/internal/api/merch/repository.go @@ -47,6 +47,7 @@ type labels interface { deleteLabel(userUuid, labelUuid string) error attachLabel(label CardLabel) error detachLabel(label CardLabel) error + getAttachedLabelsByList(list []string) ([]CardLabel, error) } func (r *Repo) addMerch(bundle merchBundle) error { @@ -289,3 +290,13 @@ func (r *Repo) detachLabel(label CardLabel) error { Where("user_uuid = ? AND label_uuid = ? AND merch_uuid = ?", label.UserUuid, label.LabelUuid, label.MerchUuid). Delete(&CardLabel{}).Error } + +func (r *Repo) getAttachedLabelsByList(list []string) ([]CardLabel, error) { + var labelsList []CardLabel + + if err := r.db.Model(&CardLabel{}).Where("merch_uuid IN ?", list).Find(&labelsList).Error; err != nil { + return nil, err + } + + return labelsList, nil +} diff --git a/internal/api/merch/service.go b/internal/api/merch/service.go index c6902ff..1632329 100644 --- a/internal/api/merch/service.go +++ b/internal/api/merch/service.go @@ -101,7 +101,34 @@ func (s *service) getSingleMerch(userUuid, merchUuid string) (MerchDTO, error) { } func (s *service) getAllMerch(userUuid string) ([]ListResponse, error) { - return s.repo.getAllMerch(userUuid) + const logMsg = "Merch service | Get all merch" + + allMerch, err := s.repo.getAllMerch(userUuid) + if err != nil { + return nil, err + } + + ids := make([]string, 0, len(allMerch)) + for _, m := range allMerch { + ids = append(ids, m.MerchUuid) + } + + cardLabels, err := s.repo.getAttachedLabelsByList(ids) + if err != nil { + return nil, err + } + log.WithField("content", cardLabels).Debug(logMsg) + + clMap := make(map[string][]string) + for _, cl := range cardLabels { + clMap[cl.MerchUuid] = append(clMap[cl.MerchUuid], cl.LabelUuid) + } + + for item := range allMerch { + allMerch[item].Labels = clMap[allMerch[item].MerchUuid] + } + + return allMerch, nil } func (s *service) updateMerch(payload UpdateMerchDTO, userUuid string) error { From b6f787571026bdb758c807eb507b207dfc161cbc Mon Sep 17 00:00:00 2001 From: nquidox Date: Wed, 29 Oct 2025 20:55:51 +0300 Subject: [PATCH 27/39] update --- migrations.sql | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/migrations.sql b/migrations.sql index b5fd81c..1ffe7e5 100644 --- a/migrations.sql +++ b/migrations.sql @@ -70,7 +70,12 @@ CREATE TABLE labels( ); CREATE TABLE card_labels ( + id BIGSERIAL PRIMARY KEY, user_uuid VARCHAR(36) NOT NULL, label_uuid VARCHAR(36) NOT NULL, merch_uuid VARCHAR(36) NOT NULL ); + +ALTER TABLE card_labels + ADD CONSTRAINT card_labels_unique_user_label_merch + UNIQUE (user_uuid, label_uuid, merch_uuid); \ No newline at end of file From 8186d8a46cbfeddef48bb142fcccc6292a2bbc14 Mon Sep 17 00:00:00 2001 From: nquidox Date: Wed, 29 Oct 2025 20:56:26 +0300 Subject: [PATCH 28/39] getMerchLabels + fixes --- internal/api/merch/controller.go | 38 +++++++++++++++++++++++++++++++- internal/api/merch/dto.go | 1 + internal/api/merch/repository.go | 11 +++++++++ internal/api/merch/service.go | 31 +++++++++++++++++++------- 4 files changed, 72 insertions(+), 9 deletions(-) diff --git a/internal/api/merch/controller.go b/internal/api/merch/controller.go index 7f0ae7a..41a6983 100644 --- a/internal/api/merch/controller.go +++ b/internal/api/merch/controller.go @@ -43,13 +43,14 @@ func (h *Handler) RegisterRoutes(r *gin.RouterGroup, authMW gin.HandlerFunc, ref imagesGroup.GET("/:uuid", h.controller.getMerchImage) imagesGroup.DELETE("/:uuid", h.controller.deleteMerchImage) - labelsGroup := merchGroup.Group("/labels") + labelsGroup := merchGroup.Group("/labels", authMW) labelsGroup.POST("", h.controller.createLabel) labelsGroup.GET("", h.controller.getLabels) labelsGroup.PUT("/:uuid", h.controller.updateLabel) labelsGroup.DELETE("/:uuid", h.controller.deleteLabel) labelsGroup.POST("/attach", h.controller.attachLabel) labelsGroup.POST("/detach", h.controller.detachLabel) + labelsGroup.GET("/:uuid", h.controller.getMerchLabels) } // @Summary Добавить новый мерч @@ -630,3 +631,38 @@ func (co *controller) detachLabel(c *gin.Context) { } c.Status(http.StatusOK) } + +// @Summary Получить метки товара по его uuid +// @Description Получить метки товара по его uuid +// @Tags Merch labels +// @Security BearerAuth +// @Param uuid path string true "label uuid" +// @Success 200 +// @Failure 400 {object} responses.ErrorResponse400 +// @Failure 500 {object} responses.ErrorResponse500 +// @Router /merch/labels/{uuid} [get] +func (co *controller) getMerchLabels(c *gin.Context) { + const logMsg = "Merch | Get merch labels" + + userUuid, err := co.utils.GetUserUuidFromContext(c) + if err != nil { + c.JSON(http.StatusInternalServerError, responses.ErrorResponse500{Error: err.Error()}) + log.WithError(err).Error(logMsg) + return + } + + merchUuid := c.Param("uuid") + if merchUuid == "" { + c.JSON(http.StatusBadRequest, responses.ErrorResponse400{Error: "label uuid is empty"}) + log.WithError(err).Error(logMsg) + return + } + + response, err := co.service.getMerchLabels(userUuid, merchUuid) + if err != nil { + c.JSON(http.StatusInternalServerError, responses.ErrorResponse500{Error: err.Error()}) + log.WithError(err).Error(logMsg) + return + } + c.JSON(http.StatusOK, response) +} diff --git a/internal/api/merch/dto.go b/internal/api/merch/dto.go index ad63c26..2f267b1 100644 --- a/internal/api/merch/dto.go +++ b/internal/api/merch/dto.go @@ -10,6 +10,7 @@ type MerchDTO struct { Name string `json:"name"` OriginSurugaya SurugayaDTO `json:"origin_surugaya"` OriginMandarake MandarakeDTO `json:"origin_mandarake"` + Labels []string `json:"labels,omitempty" gorm:"-"` } type SurugayaDTO struct { diff --git a/internal/api/merch/repository.go b/internal/api/merch/repository.go index d1567de..b5ecf39 100644 --- a/internal/api/merch/repository.go +++ b/internal/api/merch/repository.go @@ -48,6 +48,7 @@ type labels interface { attachLabel(label CardLabel) error detachLabel(label CardLabel) error getAttachedLabelsByList(list []string) ([]CardLabel, error) + getAttachedLabelsByUuid(userUuid, merchUuid string) ([]CardLabel, error) } func (r *Repo) addMerch(bundle merchBundle) error { @@ -300,3 +301,13 @@ func (r *Repo) getAttachedLabelsByList(list []string) ([]CardLabel, error) { return labelsList, nil } + +func (r *Repo) getAttachedLabelsByUuid(userUuid, merchUuid string) ([]CardLabel, error) { + var labelsList []CardLabel + + if err := r.db.Model(&CardLabel{}).Where("user_uuid = ? AND merch_uuid = ?", userUuid, merchUuid).Find(&labelsList).Error; err != nil { + return nil, err + } + + return labelsList, nil +} diff --git a/internal/api/merch/service.go b/internal/api/merch/service.go index 1632329..4689453 100644 --- a/internal/api/merch/service.go +++ b/internal/api/merch/service.go @@ -411,13 +411,14 @@ func (s *service) deleteMerchImage(ctx context.Context, userUuid, merchUuid stri return fmt.Errorf("no merch found for user %s with uuid %s", userUuid, merchUuid) } - if err = s.media.Delete(ctx, s.bucketName, fmt.Sprintf("%s/merch/%s/thumbnail.jpg", userUuid, merchUuid)); err != nil { - return err - } - - if err = s.media.Delete(ctx, s.bucketName, fmt.Sprintf("%s/merch/%s/full.jpg", userUuid, merchUuid)); err != nil { - return err - } + //uncomment for MinIO + //if err = s.media.Delete(ctx, s.bucketName, fmt.Sprintf("%s/merch/%s/thumbnail.jpg", userUuid, merchUuid)); err != nil { + // return err + //} + // + //if err = s.media.Delete(ctx, s.bucketName, fmt.Sprintf("%s/merch/%s/full.jpg", userUuid, merchUuid)); err != nil { + // return err + //} return nil } @@ -561,7 +562,7 @@ func (s *service) updateLabel(userUuid, labelUuid string, label LabelDTO) error } if label.BgColor != "" { - updateMap["bgcolor"] = label.BgColor + updateMap["bg_color"] = label.BgColor } return s.repo.updateLabel(userUuid, labelUuid, updateMap) @@ -597,3 +598,17 @@ func (s *service) detachLabel(userUuid string, label LabelLink) error { } return s.repo.detachLabel(detach) } + +func (s *service) getMerchLabels(userUuid, merchUuid string) ([]string, error) { + getLabels, err := s.repo.getAttachedLabelsByUuid(userUuid, merchUuid) + if err != nil { + return nil, err + } + + response := make([]string, 0, len(getLabels)) + for _, label := range getLabels { + response = append(response, label.LabelUuid) + } + + return response, nil +} From 88fcbfe1a5067f121ff341dceb9ca1d6a04e2dff Mon Sep 17 00:00:00 2001 From: nquidox Date: Sun, 2 Nov 2025 20:59:25 +0300 Subject: [PATCH 29/39] routes + repo fix --- internal/api/user/controller.go | 8 ++++---- internal/api/user/repository.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/api/user/controller.go b/internal/api/user/controller.go index 212865a..48128f6 100644 --- a/internal/api/user/controller.go +++ b/internal/api/user/controller.go @@ -26,10 +26,10 @@ func newController(service *service, utils interfaces.Utils) *controller { func (h *Handler) RegisterRoutes(r *gin.RouterGroup, authMW gin.HandlerFunc, refreshMW gin.HandlerFunc) { userGroup := r.Group("/user") - userGroup.POST("/", h.controller.register) - userGroup.GET("/", authMW, h.controller.get) - userGroup.PUT("/", authMW, h.controller.update) - userGroup.DELETE("/", authMW, h.controller.delete) + userGroup.POST("", h.controller.register) + userGroup.GET("", authMW, h.controller.get) + userGroup.PUT("", authMW, h.controller.update) + userGroup.DELETE("", authMW, h.controller.delete) //auth h.controller.authPath = fmt.Sprintf("%s/user/auth", h.apiPrefix) diff --git a/internal/api/user/repository.go b/internal/api/user/repository.go index 87d2b2d..4b0b754 100644 --- a/internal/api/user/repository.go +++ b/internal/api/user/repository.go @@ -40,7 +40,7 @@ func (r *repo) getByUuid(userUuid string) (user User, err error) { } func (r *repo) update(user map[string]any) error { - return r.db.Where("uuid = ?", user["uuid"]).Updates(&user).Error + return r.db.Model(&User{}).Where("uuid = ?", user["uuid"]).Updates(&user).Error } func (r *repo) delete(userUuid string) error { From 93ce93770d3c37d59e238028eef64560cd69a723 Mon Sep 17 00:00:00 2001 From: nquidox Date: Sun, 2 Nov 2025 21:10:49 +0300 Subject: [PATCH 30/39] zero prices check added --- internal/api/merch/controller.go | 81 +++++++++++++++++++++++++++++++- internal/api/merch/dto.go | 13 +++++ internal/api/merch/model.go | 4 +- internal/api/merch/repository.go | 43 +++++++++++++++++ internal/api/merch/service.go | 8 ++++ 5 files changed, 146 insertions(+), 3 deletions(-) diff --git a/internal/api/merch/controller.go b/internal/api/merch/controller.go index 41a6983..63b28f2 100644 --- a/internal/api/merch/controller.go +++ b/internal/api/merch/controller.go @@ -27,7 +27,6 @@ func newController(service *service, utils interfaces.Utils, expires time.Durati func (h *Handler) RegisterRoutes(r *gin.RouterGroup, authMW gin.HandlerFunc, refreshMW gin.HandlerFunc) { merchGroup := r.Group("/merch", authMW) - merchGroup.POST("/", h.controller.addMerch) merchGroup.GET("/:uuid", h.controller.getSingleMerch) merchGroup.GET("/", h.controller.getAllMerch) @@ -51,6 +50,10 @@ func (h *Handler) RegisterRoutes(r *gin.RouterGroup, authMW gin.HandlerFunc, ref labelsGroup.POST("/attach", h.controller.attachLabel) labelsGroup.POST("/detach", h.controller.detachLabel) labelsGroup.GET("/:uuid", h.controller.getMerchLabels) + + zeroPricesGroup := merchGroup.Group("/zeroprices", authMW) + zeroPricesGroup.GET("", h.controller.getZeroPrices) + zeroPricesGroup.DELETE("", h.controller.deleteZeroPrices) } // @Summary Добавить новый мерч @@ -92,6 +95,7 @@ func (co *controller) addMerch(c *gin.Context) { // @Description Получить всю информацию про мерч по его uuid // @Tags Merch // @Security BearerAuth +// @Produce json // @Param uuid path string true "merch_uuid" // @Success 200 {object} MerchDTO // @Failure 400 {object} responses.ErrorResponse400 @@ -125,6 +129,7 @@ func (co *controller) getSingleMerch(c *gin.Context) { // @Description Получить все записи мерча // @Tags Merch // @Security BearerAuth +// @Produce json // @Success 200 {array} ListResponse // @Failure 400 {object} responses.ErrorResponse400 // @Failure 500 {object} responses.ErrorResponse500 @@ -151,6 +156,7 @@ func (co *controller) getAllMerch(c *gin.Context) { // @Description Обновить информацию про мерч по его uuid в json-е // @Tags Merch // @Security BearerAuth +// Accept json // @Param body body UpdateMerchDTO true "merch_uuid" // @Success 200 // @Failure 400 {object} responses.ErrorResponse400 @@ -214,6 +220,7 @@ func (co *controller) deleteMerch(c *gin.Context) { // @Description Получить цены мерча за период // @Tags Merch // @Security BearerAuth +// @Produce json // @Param days query string false "period in days" // @Success 200 {array} PricesResponse // @Failure 400 {object} responses.ErrorResponse400 @@ -243,6 +250,7 @@ func (co *controller) getChartsPrices(c *gin.Context) { // @Description Получить перепады цен мерча за период по его merch_uuid // @Tags Merch // @Security BearerAuth +// @Produce json // @Param uuid path string true "merch_uuid" // @Param days query string false "period in days" // @Success 200 {object} PricesResponse @@ -338,6 +346,7 @@ func (co *controller) uploadMerchImage(c *gin.Context) { // @Description Получить картинки по merch_uuid и query параметрам // @Tags Merch images // @Security BearerAuth +// @Produce json // @Param uuid path string true "merch_uuid" // @Param type query string true "image type" // @Success 200 {object} ImageLink @@ -429,6 +438,7 @@ func (co *controller) deleteMerchImage(c *gin.Context) { // @Description Создать новую метку для товара // @Tags Merch labels // @Security BearerAuth +// Accept json // @Param payload body LabelDTO true "payload" // @Success 200 // @Failure 400 {object} responses.ErrorResponse400 @@ -464,6 +474,7 @@ func (co *controller) createLabel(c *gin.Context) { // @Description Получить все метки товаров // @Tags Merch labels // @Security BearerAuth +// @Produce json // @Success 200 {array} LabelsList // @Failure 400 {object} responses.ErrorResponse400 // @Failure 500 {object} responses.ErrorResponse500 @@ -492,6 +503,7 @@ func (co *controller) getLabels(c *gin.Context) { // @Description Изменить метку // @Tags Merch labels // @Security BearerAuth +// Accept json // @Param uuid path string true "label uuid" // @Param payload body LabelDTO true "payload" // @Success 200 @@ -568,6 +580,7 @@ func (co *controller) deleteLabel(c *gin.Context) { // @Description Прикрепить метку к товару // @Tags Merch labels // @Security BearerAuth +// Accept json // @Param payload body LabelLink true "payload" // @Success 200 // @Failure 400 {object} responses.ErrorResponse400 @@ -602,6 +615,7 @@ func (co *controller) attachLabel(c *gin.Context) { // @Description Удалить привязку метки к товару // @Tags Merch labels // @Security BearerAuth +// Accept json // @Param payload body LabelLink true "payload" // @Success 200 // @Failure 400 {object} responses.ErrorResponse400 @@ -636,6 +650,7 @@ func (co *controller) detachLabel(c *gin.Context) { // @Description Получить метки товара по его uuid // @Tags Merch labels // @Security BearerAuth +// @Produce json // @Param uuid path string true "label uuid" // @Success 200 // @Failure 400 {object} responses.ErrorResponse400 @@ -666,3 +681,67 @@ func (co *controller) getMerchLabels(c *gin.Context) { } c.JSON(http.StatusOK, response) } + +// @Summary Получить нулевые цены +// @Description Получить нулевые цены +// @Tags Merch zero prices +// @Security BearerAuth +// @Produce json +// @Success 200 {array} ZeroPrice +// @Failure 400 {object} responses.ErrorResponse400 +// @Failure 500 {object} responses.ErrorResponse500 +// @Router /merch/zeroprices [get] +func (co *controller) getZeroPrices(c *gin.Context) { + const logMsg = "Merch | Get zero prices" + + userUuid, err := co.utils.GetUserUuidFromContext(c) + if err != nil { + c.JSON(http.StatusInternalServerError, responses.ErrorResponse500{Error: err.Error()}) + log.WithError(err).Error(logMsg) + return + } + + response, err := co.service.getZeroPrices(userUuid) + if err != nil { + c.JSON(http.StatusInternalServerError, responses.ErrorResponse500{Error: err.Error()}) + log.WithError(err).Error(logMsg) + return + } + + c.JSON(http.StatusOK, response) +} + +// @Summary Пометить нулевые цены как удаленные +// @Description Пометить нулевые цены как удаленные +// @Tags Merch zero prices +// @Security BearerAuth +// Accept json +// @Param payload body DeleteZeroPrices true "payload" +// @Success 200 +// @Failure 400 {object} responses.ErrorResponse400 +// @Failure 500 {object} responses.ErrorResponse500 +// @Router /merch/zeroprices [delete] +func (co *controller) deleteZeroPrices(c *gin.Context) { + const logMsg = "Merch | Delete zero prices" + + userUuid, err := co.utils.GetUserUuidFromContext(c) + if err != nil { + c.JSON(http.StatusInternalServerError, responses.ErrorResponse500{Error: err.Error()}) + log.WithError(err).Error(logMsg) + return + } + + var payload DeleteZeroPrices + if err = c.ShouldBindJSON(&payload); err != nil { + c.JSON(http.StatusBadRequest, responses.ErrorResponse400{Error: err.Error()}) + log.WithError(err).Error(logMsg) + return + } + + if err = co.service.deleteZeroPrices(userUuid, payload); err != nil { + c.JSON(http.StatusInternalServerError, responses.ErrorResponse500{Error: err.Error()}) + log.WithError(err).Error(logMsg) + return + } + c.Status(http.StatusOK) +} diff --git a/internal/api/merch/dto.go b/internal/api/merch/dto.go index 2f267b1..b10aa6b 100644 --- a/internal/api/merch/dto.go +++ b/internal/api/merch/dto.go @@ -1,5 +1,7 @@ package merch +import "time" + type merchBundle struct { Merch *Merch Surugaya *Surugaya @@ -78,3 +80,14 @@ type LabelLink struct { MerchUuid string `json:"merch_uuid"` LabelUuid string `json:"label_uuid"` } + +type ZeroPrice struct { + CreatedAt time.Time `json:"created_at"` + MerchUuid string `json:"merch_uuid"` + Name string `json:"name"` + Origin string `json:"origin"` +} + +type DeleteZeroPrices struct { + MerchUuids []string `json:"merch_uuids"` +} diff --git a/internal/api/merch/model.go b/internal/api/merch/model.go index 935a194..2dd6e0e 100644 --- a/internal/api/merch/model.go +++ b/internal/api/merch/model.go @@ -44,8 +44,8 @@ func (Mandarake) TableName() string { type Price struct { Id uint `json:"id" gorm:"primary_key"` CreatedAt time.Time `json:"created_at" gorm:"column:created_at"` - UpdatedAt sql.NullTime `json:"updated_at" gorm:"column:updated_at"` - DeletedAt sql.NullTime `json:"deleted_at" gorm:"column:deleted_at"` + UpdatedAt sql.NullTime `json:"updated_at,omitempty" gorm:"column:updated_at"` + DeletedAt sql.NullTime `json:"deleted_at,omitempty" gorm:"column:deleted_at"` MerchUuid string `json:"merch_uuid" gorm:"column:merch_uuid"` Price int `json:"price" gorm:"column:price"` Origin Origin `json:"origin" gorm:"column:origin;type:integer"` diff --git a/internal/api/merch/repository.go b/internal/api/merch/repository.go index b5ecf39..1af8df0 100644 --- a/internal/api/merch/repository.go +++ b/internal/api/merch/repository.go @@ -38,6 +38,9 @@ type repository interface { type prices interface { getPricesWithDays(userUuid string, period time.Time) ([]Price, error) getDistinctPrices(userUuid, merchUuid string, period time.Time) (prices []Price, err error) + + getZeroPrices(userUuid string) ([]ZeroPrice, error) + deleteZeroPrices(userUuid string, list []string) error } type labels interface { @@ -311,3 +314,43 @@ func (r *Repo) getAttachedLabelsByUuid(userUuid, merchUuid string) ([]CardLabel, return labelsList, nil } + +func (r *Repo) getZeroPrices(userUuid string) ([]ZeroPrice, error) { + var priceList []ZeroPrice + if err := r.db.Raw(` + WITH price_with_neighbors AS ( + SELECT + p.created_at, p.merch_uuid, p.price, p.origin, m.name, + LAG(price) OVER (PARTITION BY p.merch_uuid ORDER BY p.created_at, p.id) AS prev_price, + LEAD(price) OVER (PARTITION BY p.merch_uuid ORDER BY p.created_at, p.id) AS next_price + FROM prices AS p + JOIN merch as m ON m.merch_uuid = p.merch_uuid + WHERE p.deleted_at IS NULL + AND m.user_uuid = ?) + + SELECT + created_at, merch_uuid, origin, name + FROM price_with_neighbors + WHERE + price = 0 + AND prev_price IS NOT NULL + AND prev_price > 0 + AND next_price IS NOT NULL + AND next_price > 0; + `, userUuid).Scan(&priceList).Error; err != nil { + return nil, err + } + return priceList, nil +} + +func (r *Repo) deleteZeroPrices(userUuid string, list []string) error { + subQuery := r.db.Table("merch"). + Select("merch_uuid"). + Where("user_uuid = ?", userUuid) + + return r.db.Model(&Price{}). + Where("merch_uuid IN ?", list). + Where("merch_uuid IN (?)", subQuery). + Update("deleted_at", time.Now().UTC()). + Error +} diff --git a/internal/api/merch/service.go b/internal/api/merch/service.go index 4689453..259563d 100644 --- a/internal/api/merch/service.go +++ b/internal/api/merch/service.go @@ -612,3 +612,11 @@ func (s *service) getMerchLabels(userUuid, merchUuid string) ([]string, error) { return response, nil } + +func (s *service) getZeroPrices(userUuid string) ([]ZeroPrice, error) { + return s.repo.getZeroPrices(userUuid) +} + +func (s *service) deleteZeroPrices(userUuid string, list DeleteZeroPrices) error { + return s.repo.deleteZeroPrices(userUuid, list.MerchUuids) +} From a0e21db5a09e7e13d026611c1f068ca27fbe9ed1 Mon Sep 17 00:00:00 2001 From: nquidox Date: Sun, 2 Nov 2025 21:10:59 +0300 Subject: [PATCH 31/39] swagger docs update --- docs/docs.go | 179 ++++++++++++++++++++++++++++++++++++++++++++++ docs/swagger.json | 179 ++++++++++++++++++++++++++++++++++++++++++++++ docs/swagger.yaml | 114 +++++++++++++++++++++++++++++ 3 files changed, 472 insertions(+) diff --git a/docs/docs.go b/docs/docs.go index 0111bc4..b668308 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -68,6 +68,9 @@ const docTemplate = `{ } ], "description": "Получить все записи мерча", + "produces": [ + "application/json" + ], "tags": [ "Merch" ], @@ -145,6 +148,9 @@ const docTemplate = `{ } ], "description": "Получить картинки по merch_uuid и query параметрам", + "produces": [ + "application/json" + ], "tags": [ "Merch images" ], @@ -287,6 +293,9 @@ const docTemplate = `{ } ], "description": "Получить все метки товаров", + "produces": [ + "application/json" + ], "tags": [ "Merch labels" ], @@ -441,6 +450,47 @@ const docTemplate = `{ } }, "/merch/labels/{uuid}": { + "get": { + "security": [ + { + "BearerAuth": [] + } + ], + "description": "Получить метки товара по его uuid", + "produces": [ + "application/json" + ], + "tags": [ + "Merch labels" + ], + "summary": "Получить метки товара по его uuid", + "parameters": [ + { + "type": "string", + "description": "label uuid", + "name": "uuid", + "in": "path", + "required": true + } + ], + "responses": { + "200": { + "description": "OK" + }, + "400": { + "description": "Bad Request", + "schema": { + "$ref": "#/definitions/responses.ErrorResponse400" + } + }, + "500": { + "description": "Internal Server Error", + "schema": { + "$ref": "#/definitions/responses.ErrorResponse500" + } + } + } + }, "put": { "security": [ { @@ -527,6 +577,86 @@ const docTemplate = `{ } } }, + "/merch/zeroprices": { + "get": { + "security": [ + { + "BearerAuth": [] + } + ], + "description": "Получить нулевые цены", + "produces": [ + "application/json" + ], + "tags": [ + "Merch zero prices" + ], + "summary": "Получить нулевые цены", + "responses": { + "200": { + "description": "OK", + "schema": { + "type": "array", + "items": { + "$ref": "#/definitions/merch.ZeroPrice" + } + } + }, + "400": { + "description": "Bad Request", + "schema": { + "$ref": "#/definitions/responses.ErrorResponse400" + } + }, + "500": { + "description": "Internal Server Error", + "schema": { + "$ref": "#/definitions/responses.ErrorResponse500" + } + } + } + }, + "delete": { + "security": [ + { + "BearerAuth": [] + } + ], + "description": "Пометить нулевые цены как удаленные", + "tags": [ + "Merch zero prices" + ], + "summary": "Пометить нулевые цены как удаленные", + "parameters": [ + { + "description": "payload", + "name": "payload", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/merch.DeleteZeroPrices" + } + } + ], + "responses": { + "200": { + "description": "OK" + }, + "400": { + "description": "Bad Request", + "schema": { + "$ref": "#/definitions/responses.ErrorResponse400" + } + }, + "500": { + "description": "Internal Server Error", + "schema": { + "$ref": "#/definitions/responses.ErrorResponse500" + } + } + } + } + }, "/merch/{uuid}": { "get": { "security": [ @@ -535,6 +665,9 @@ const docTemplate = `{ } ], "description": "Получить всю информацию про мерч по его uuid", + "produces": [ + "application/json" + ], "tags": [ "Merch" ], @@ -619,6 +752,9 @@ const docTemplate = `{ } ], "description": "Получить цены мерча за период", + "produces": [ + "application/json" + ], "tags": [ "Merch" ], @@ -664,6 +800,9 @@ const docTemplate = `{ } ], "description": "Получить перепады цен мерча за период по его merch_uuid", + "produces": [ + "application/json" + ], "tags": [ "Merch" ], @@ -1018,6 +1157,17 @@ const docTemplate = `{ } } }, + "merch.DeleteZeroPrices": { + "type": "object", + "properties": { + "merch_uuids": { + "type": "array", + "items": { + "type": "string" + } + } + } + }, "merch.ImageLink": { "type": "object", "properties": { @@ -1074,6 +1224,12 @@ const docTemplate = `{ "merch.ListResponse": { "type": "object", "properties": { + "labels": { + "type": "array", + "items": { + "type": "string" + } + }, "merch_uuid": { "type": "string" }, @@ -1093,6 +1249,12 @@ const docTemplate = `{ "merch.MerchDTO": { "type": "object", "properties": { + "labels": { + "type": "array", + "items": { + "type": "string" + } + }, "merch_uuid": { "type": "string" }, @@ -1174,6 +1336,23 @@ const docTemplate = `{ } } }, + "merch.ZeroPrice": { + "type": "object", + "properties": { + "created_at": { + "type": "string" + }, + "merch_uuid": { + "type": "string" + }, + "name": { + "type": "string" + }, + "origin": { + "type": "string" + } + } + }, "responses.ErrorResponse400": { "type": "object", "properties": { diff --git a/docs/swagger.json b/docs/swagger.json index 7b17bd7..0df1704 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -60,6 +60,9 @@ } ], "description": "Получить все записи мерча", + "produces": [ + "application/json" + ], "tags": [ "Merch" ], @@ -137,6 +140,9 @@ } ], "description": "Получить картинки по merch_uuid и query параметрам", + "produces": [ + "application/json" + ], "tags": [ "Merch images" ], @@ -279,6 +285,9 @@ } ], "description": "Получить все метки товаров", + "produces": [ + "application/json" + ], "tags": [ "Merch labels" ], @@ -433,6 +442,47 @@ } }, "/merch/labels/{uuid}": { + "get": { + "security": [ + { + "BearerAuth": [] + } + ], + "description": "Получить метки товара по его uuid", + "produces": [ + "application/json" + ], + "tags": [ + "Merch labels" + ], + "summary": "Получить метки товара по его uuid", + "parameters": [ + { + "type": "string", + "description": "label uuid", + "name": "uuid", + "in": "path", + "required": true + } + ], + "responses": { + "200": { + "description": "OK" + }, + "400": { + "description": "Bad Request", + "schema": { + "$ref": "#/definitions/responses.ErrorResponse400" + } + }, + "500": { + "description": "Internal Server Error", + "schema": { + "$ref": "#/definitions/responses.ErrorResponse500" + } + } + } + }, "put": { "security": [ { @@ -519,6 +569,86 @@ } } }, + "/merch/zeroprices": { + "get": { + "security": [ + { + "BearerAuth": [] + } + ], + "description": "Получить нулевые цены", + "produces": [ + "application/json" + ], + "tags": [ + "Merch zero prices" + ], + "summary": "Получить нулевые цены", + "responses": { + "200": { + "description": "OK", + "schema": { + "type": "array", + "items": { + "$ref": "#/definitions/merch.ZeroPrice" + } + } + }, + "400": { + "description": "Bad Request", + "schema": { + "$ref": "#/definitions/responses.ErrorResponse400" + } + }, + "500": { + "description": "Internal Server Error", + "schema": { + "$ref": "#/definitions/responses.ErrorResponse500" + } + } + } + }, + "delete": { + "security": [ + { + "BearerAuth": [] + } + ], + "description": "Пометить нулевые цены как удаленные", + "tags": [ + "Merch zero prices" + ], + "summary": "Пометить нулевые цены как удаленные", + "parameters": [ + { + "description": "payload", + "name": "payload", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/merch.DeleteZeroPrices" + } + } + ], + "responses": { + "200": { + "description": "OK" + }, + "400": { + "description": "Bad Request", + "schema": { + "$ref": "#/definitions/responses.ErrorResponse400" + } + }, + "500": { + "description": "Internal Server Error", + "schema": { + "$ref": "#/definitions/responses.ErrorResponse500" + } + } + } + } + }, "/merch/{uuid}": { "get": { "security": [ @@ -527,6 +657,9 @@ } ], "description": "Получить всю информацию про мерч по его uuid", + "produces": [ + "application/json" + ], "tags": [ "Merch" ], @@ -611,6 +744,9 @@ } ], "description": "Получить цены мерча за период", + "produces": [ + "application/json" + ], "tags": [ "Merch" ], @@ -656,6 +792,9 @@ } ], "description": "Получить перепады цен мерча за период по его merch_uuid", + "produces": [ + "application/json" + ], "tags": [ "Merch" ], @@ -1010,6 +1149,17 @@ } } }, + "merch.DeleteZeroPrices": { + "type": "object", + "properties": { + "merch_uuids": { + "type": "array", + "items": { + "type": "string" + } + } + } + }, "merch.ImageLink": { "type": "object", "properties": { @@ -1066,6 +1216,12 @@ "merch.ListResponse": { "type": "object", "properties": { + "labels": { + "type": "array", + "items": { + "type": "string" + } + }, "merch_uuid": { "type": "string" }, @@ -1085,6 +1241,12 @@ "merch.MerchDTO": { "type": "object", "properties": { + "labels": { + "type": "array", + "items": { + "type": "string" + } + }, "merch_uuid": { "type": "string" }, @@ -1166,6 +1328,23 @@ } } }, + "merch.ZeroPrice": { + "type": "object", + "properties": { + "created_at": { + "type": "string" + }, + "merch_uuid": { + "type": "string" + }, + "name": { + "type": "string" + }, + "origin": { + "type": "string" + } + } + }, "responses.ErrorResponse400": { "type": "object", "properties": { diff --git a/docs/swagger.yaml b/docs/swagger.yaml index 3dadf18..fd4e41b 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -7,6 +7,13 @@ definitions: thumbnail: type: string type: object + merch.DeleteZeroPrices: + properties: + merch_uuids: + items: + type: string + type: array + type: object merch.ImageLink: properties: etag: @@ -43,6 +50,10 @@ definitions: type: object merch.ListResponse: properties: + labels: + items: + type: string + type: array merch_uuid: type: string name: @@ -55,6 +66,10 @@ definitions: type: object merch.MerchDTO: properties: + labels: + items: + type: string + type: array merch_uuid: type: string name: @@ -107,6 +122,17 @@ definitions: origin: type: string type: object + merch.ZeroPrice: + properties: + created_at: + type: string + merch_uuid: + type: string + name: + type: string + origin: + type: string + type: object responses.ErrorResponse400: properties: error: @@ -205,6 +231,8 @@ paths: /merch/: get: description: Получить все записи мерча + produces: + - application/json responses: "200": description: OK @@ -285,6 +313,8 @@ paths: name: uuid required: true type: string + produces: + - application/json responses: "200": description: OK @@ -341,6 +371,8 @@ paths: name: type required: true type: string + produces: + - application/json responses: "200": description: OK @@ -398,6 +430,8 @@ paths: /merch/labels: get: description: Получить все метки товаров + produces: + - application/json responses: "200": description: OK @@ -468,6 +502,32 @@ paths: summary: Пометить метку как удаленную tags: - Merch labels + get: + description: Получить метки товара по его uuid + parameters: + - description: label uuid + in: path + name: uuid + required: true + type: string + produces: + - application/json + responses: + "200": + description: OK + "400": + description: Bad Request + schema: + $ref: '#/definitions/responses.ErrorResponse400' + "500": + description: Internal Server Error + schema: + $ref: '#/definitions/responses.ErrorResponse500' + security: + - BearerAuth: [] + summary: Получить метки товара по его uuid + tags: + - Merch labels put: description: Изменить метку parameters: @@ -550,6 +610,56 @@ paths: summary: Удалить привязку метки к товару tags: - Merch labels + /merch/zeroprices: + delete: + description: Пометить нулевые цены как удаленные + parameters: + - description: payload + in: body + name: payload + required: true + schema: + $ref: '#/definitions/merch.DeleteZeroPrices' + responses: + "200": + description: OK + "400": + description: Bad Request + schema: + $ref: '#/definitions/responses.ErrorResponse400' + "500": + description: Internal Server Error + schema: + $ref: '#/definitions/responses.ErrorResponse500' + security: + - BearerAuth: [] + summary: Пометить нулевые цены как удаленные + tags: + - Merch zero prices + get: + description: Получить нулевые цены + produces: + - application/json + responses: + "200": + description: OK + schema: + items: + $ref: '#/definitions/merch.ZeroPrice' + type: array + "400": + description: Bad Request + schema: + $ref: '#/definitions/responses.ErrorResponse400' + "500": + description: Internal Server Error + schema: + $ref: '#/definitions/responses.ErrorResponse500' + security: + - BearerAuth: [] + summary: Получить нулевые цены + tags: + - Merch zero prices /prices: get: description: Получить цены мерча за период @@ -558,6 +668,8 @@ paths: in: query name: days type: string + produces: + - application/json responses: "200": description: OK @@ -591,6 +703,8 @@ paths: in: query name: days type: string + produces: + - application/json responses: "200": description: OK From 2728051fdeed24f957dae3e96a1bc0192be022b6 Mon Sep 17 00:00:00 2001 From: nquidox Date: Sun, 2 Nov 2025 23:27:23 +0300 Subject: [PATCH 32/39] fixes --- internal/api/merch/controller.go | 2 +- internal/api/merch/dto.go | 4 ++- internal/api/merch/repository.go | 44 ++++++++++++++++++++++---------- internal/api/merch/service.go | 25 ++++++++++++++++-- 4 files changed, 58 insertions(+), 17 deletions(-) diff --git a/internal/api/merch/controller.go b/internal/api/merch/controller.go index 63b28f2..33c194f 100644 --- a/internal/api/merch/controller.go +++ b/internal/api/merch/controller.go @@ -731,7 +731,7 @@ func (co *controller) deleteZeroPrices(c *gin.Context) { return } - var payload DeleteZeroPrices + var payload []DeleteZeroPrices if err = c.ShouldBindJSON(&payload); err != nil { c.JSON(http.StatusBadRequest, responses.ErrorResponse400{Error: err.Error()}) log.WithError(err).Error(logMsg) diff --git a/internal/api/merch/dto.go b/internal/api/merch/dto.go index b10aa6b..7ee7281 100644 --- a/internal/api/merch/dto.go +++ b/internal/api/merch/dto.go @@ -82,6 +82,7 @@ type LabelLink struct { } type ZeroPrice struct { + Id int `json:"id"` CreatedAt time.Time `json:"created_at"` MerchUuid string `json:"merch_uuid"` Name string `json:"name"` @@ -89,5 +90,6 @@ type ZeroPrice struct { } type DeleteZeroPrices struct { - MerchUuids []string `json:"merch_uuids"` + Id uint `json:"id"` + MerchUuid string `json:"merch_uuid"` } diff --git a/internal/api/merch/repository.go b/internal/api/merch/repository.go index 1af8df0..711b731 100644 --- a/internal/api/merch/repository.go +++ b/internal/api/merch/repository.go @@ -3,6 +3,7 @@ package merch import ( "database/sql" "errors" + "fmt" "gorm.io/gorm" "gorm.io/gorm/clause" "time" @@ -22,6 +23,7 @@ type repository interface { addMerch(bundle merchBundle) error merchRecordExists(userUuid, merchUuid string) (bool, error) + userOwnsMerchUuids(userUuid string, merchUuids []string) (bool, error) getSingleMerch(userUuid, merchUuid string) (merchBundle, error) getAllMerch(userUuid string) ([]ListResponse, error) @@ -40,7 +42,7 @@ type prices interface { getDistinctPrices(userUuid, merchUuid string, period time.Time) (prices []Price, err error) getZeroPrices(userUuid string) ([]ZeroPrice, error) - deleteZeroPrices(userUuid string, list []string) error + deleteZeroPrices(list []DeleteZeroPrices) error } type labels interface { @@ -84,6 +86,22 @@ func (r *Repo) merchRecordExists(userUuid, merchUuid string) (bool, error) { return exists, err } +func (r *Repo) userOwnsMerchUuids(userUuid string, merchUuids []string) (bool, error) { + var count int64 + + err := r.db.Model(&Merch{}). + Where("user_uuid = ?", userUuid). + Where("merch_uuid IN ?", merchUuids). + Where("deleted_at IS NULL"). + Count(&count).Error + fmt.Println("!!!!!!", count) + if err != nil { + return false, err + } + fmt.Println("!!!!!!", len(merchUuids)) + return count == int64(len(merchUuids)), nil +} + func (r *Repo) getSingleMerch(userUuid, merchUuid string) (merchBundle, error) { var merch Merch if err := r.db. @@ -320,16 +338,17 @@ func (r *Repo) getZeroPrices(userUuid string) ([]ZeroPrice, error) { if err := r.db.Raw(` WITH price_with_neighbors AS ( SELECT - p.created_at, p.merch_uuid, p.price, p.origin, m.name, + p.id, p.created_at, p.merch_uuid, p.price, p.origin, m.name, LAG(price) OVER (PARTITION BY p.merch_uuid ORDER BY p.created_at, p.id) AS prev_price, LEAD(price) OVER (PARTITION BY p.merch_uuid ORDER BY p.created_at, p.id) AS next_price FROM prices AS p JOIN merch as m ON m.merch_uuid = p.merch_uuid WHERE p.deleted_at IS NULL + AND m.deleted_at IS NULL AND m.user_uuid = ?) SELECT - created_at, merch_uuid, origin, name + id, created_at, merch_uuid, origin, name FROM price_with_neighbors WHERE price = 0 @@ -343,14 +362,13 @@ func (r *Repo) getZeroPrices(userUuid string) ([]ZeroPrice, error) { return priceList, nil } -func (r *Repo) deleteZeroPrices(userUuid string, list []string) error { - subQuery := r.db.Table("merch"). - Select("merch_uuid"). - Where("user_uuid = ?", userUuid) - - return r.db.Model(&Price{}). - Where("merch_uuid IN ?", list). - Where("merch_uuid IN (?)", subQuery). - Update("deleted_at", time.Now().UTC()). - Error +func (r *Repo) deleteZeroPrices(list []DeleteZeroPrices) error { + for _, item := range list { + if err := r.db.Model(&Price{}). + Where("id = ? AND merch_uuid = ?", item.Id, item.MerchUuid). + Update("deleted_at", time.Now().UTC()).Error; err != nil { + return err + } + } + return nil } diff --git a/internal/api/merch/service.go b/internal/api/merch/service.go index 259563d..4d06a37 100644 --- a/internal/api/merch/service.go +++ b/internal/api/merch/service.go @@ -16,6 +16,7 @@ import ( is "merch-parser-api/proto/imageStorage" "mime/multipart" "path/filepath" + "slices" "strings" "time" ) @@ -617,6 +618,26 @@ func (s *service) getZeroPrices(userUuid string) ([]ZeroPrice, error) { return s.repo.getZeroPrices(userUuid) } -func (s *service) deleteZeroPrices(userUuid string, list DeleteZeroPrices) error { - return s.repo.deleteZeroPrices(userUuid, list.MerchUuids) +func (s *service) deleteZeroPrices(userUuid string, list []DeleteZeroPrices) error { + if len(list) == 0 { + return nil + } + + ids := make([]string, 0, len(list)) + for _, item := range list { + ids = append(ids, item.MerchUuid) + fmt.Println(item.MerchUuid, ids) + } + slices.Compact(ids) + + owns, err := s.repo.userOwnsMerchUuids(userUuid, ids) + if err != nil { + return err + } + + if !owns { + return errors.New("wrong ids") + } + + return s.repo.deleteZeroPrices(list) } From 7fa79d770a20293799485e76c55fb66f4ca73f6f Mon Sep 17 00:00:00 2001 From: nquidox Date: Sun, 2 Nov 2025 23:39:25 +0300 Subject: [PATCH 33/39] swagger docs update --- docs/docs.go | 31 ++++++++++-- docs/swagger.json | 31 ++++++++++-- docs/swagger.yaml | 22 +++++++-- internal/api/merch/controller.go | 84 +++++++++++++++++--------------- 4 files changed, 114 insertions(+), 54 deletions(-) diff --git a/docs/docs.go b/docs/docs.go index b668308..b97688b 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -106,6 +106,9 @@ const docTemplate = `{ } ], "description": "Обновить информацию про мерч по его uuid в json-е", + "consumes": [ + "application/json" + ], "tags": [ "Merch" ], @@ -331,6 +334,9 @@ const docTemplate = `{ } ], "description": "Создать новую метку для товара", + "consumes": [ + "application/json" + ], "tags": [ "Merch labels" ], @@ -373,6 +379,9 @@ const docTemplate = `{ } ], "description": "Прикрепить метку к товару", + "consumes": [ + "application/json" + ], "tags": [ "Merch labels" ], @@ -415,6 +424,9 @@ const docTemplate = `{ } ], "description": "Удалить привязку метки к товару", + "consumes": [ + "application/json" + ], "tags": [ "Merch labels" ], @@ -498,6 +510,9 @@ const docTemplate = `{ } ], "description": "Изменить метку", + "consumes": [ + "application/json" + ], "tags": [ "Merch labels" ], @@ -623,6 +638,9 @@ const docTemplate = `{ } ], "description": "Пометить нулевые цены как удаленные", + "consumes": [ + "application/json" + ], "tags": [ "Merch zero prices" ], @@ -1160,11 +1178,11 @@ const docTemplate = `{ "merch.DeleteZeroPrices": { "type": "object", "properties": { - "merch_uuids": { - "type": "array", - "items": { - "type": "string" - } + "id": { + "type": "integer" + }, + "merch_uuid": { + "type": "string" } } }, @@ -1342,6 +1360,9 @@ const docTemplate = `{ "created_at": { "type": "string" }, + "id": { + "type": "integer" + }, "merch_uuid": { "type": "string" }, diff --git a/docs/swagger.json b/docs/swagger.json index 0df1704..f746266 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -98,6 +98,9 @@ } ], "description": "Обновить информацию про мерч по его uuid в json-е", + "consumes": [ + "application/json" + ], "tags": [ "Merch" ], @@ -323,6 +326,9 @@ } ], "description": "Создать новую метку для товара", + "consumes": [ + "application/json" + ], "tags": [ "Merch labels" ], @@ -365,6 +371,9 @@ } ], "description": "Прикрепить метку к товару", + "consumes": [ + "application/json" + ], "tags": [ "Merch labels" ], @@ -407,6 +416,9 @@ } ], "description": "Удалить привязку метки к товару", + "consumes": [ + "application/json" + ], "tags": [ "Merch labels" ], @@ -490,6 +502,9 @@ } ], "description": "Изменить метку", + "consumes": [ + "application/json" + ], "tags": [ "Merch labels" ], @@ -615,6 +630,9 @@ } ], "description": "Пометить нулевые цены как удаленные", + "consumes": [ + "application/json" + ], "tags": [ "Merch zero prices" ], @@ -1152,11 +1170,11 @@ "merch.DeleteZeroPrices": { "type": "object", "properties": { - "merch_uuids": { - "type": "array", - "items": { - "type": "string" - } + "id": { + "type": "integer" + }, + "merch_uuid": { + "type": "string" } } }, @@ -1334,6 +1352,9 @@ "created_at": { "type": "string" }, + "id": { + "type": "integer" + }, "merch_uuid": { "type": "string" }, diff --git a/docs/swagger.yaml b/docs/swagger.yaml index fd4e41b..883b177 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -9,10 +9,10 @@ definitions: type: object merch.DeleteZeroPrices: properties: - merch_uuids: - items: - type: string - type: array + id: + type: integer + merch_uuid: + type: string type: object merch.ImageLink: properties: @@ -126,6 +126,8 @@ definitions: properties: created_at: type: string + id: + type: integer merch_uuid: type: string name: @@ -254,6 +256,8 @@ paths: tags: - Merch put: + consumes: + - application/json description: Обновить информацию про мерч по его uuid в json-е parameters: - description: merch_uuid @@ -453,6 +457,8 @@ paths: tags: - Merch labels post: + consumes: + - application/json description: Создать новую метку для товара parameters: - description: payload @@ -529,6 +535,8 @@ paths: tags: - Merch labels put: + consumes: + - application/json description: Изменить метку parameters: - description: label uuid @@ -560,6 +568,8 @@ paths: - Merch labels /merch/labels/attach: post: + consumes: + - application/json description: Прикрепить метку к товару parameters: - description: payload @@ -586,6 +596,8 @@ paths: - Merch labels /merch/labels/detach: post: + consumes: + - application/json description: Удалить привязку метки к товару parameters: - description: payload @@ -612,6 +624,8 @@ paths: - Merch labels /merch/zeroprices: delete: + consumes: + - application/json description: Пометить нулевые цены как удаленные parameters: - description: payload diff --git a/internal/api/merch/controller.go b/internal/api/merch/controller.go index 33c194f..7ea9636 100644 --- a/internal/api/merch/controller.go +++ b/internal/api/merch/controller.go @@ -95,7 +95,7 @@ func (co *controller) addMerch(c *gin.Context) { // @Description Получить всю информацию про мерч по его uuid // @Tags Merch // @Security BearerAuth -// @Produce json +// @Produce json // @Param uuid path string true "merch_uuid" // @Success 200 {object} MerchDTO // @Failure 400 {object} responses.ErrorResponse400 @@ -129,7 +129,7 @@ func (co *controller) getSingleMerch(c *gin.Context) { // @Description Получить все записи мерча // @Tags Merch // @Security BearerAuth -// @Produce json +// @Produce json // @Success 200 {array} ListResponse // @Failure 400 {object} responses.ErrorResponse400 // @Failure 500 {object} responses.ErrorResponse500 @@ -156,7 +156,7 @@ func (co *controller) getAllMerch(c *gin.Context) { // @Description Обновить информацию про мерч по его uuid в json-е // @Tags Merch // @Security BearerAuth -// Accept json +// @Accept json // @Param body body UpdateMerchDTO true "merch_uuid" // @Success 200 // @Failure 400 {object} responses.ErrorResponse400 @@ -182,6 +182,7 @@ func (co *controller) updateMerch(c *gin.Context) { log.WithError(err).Error("Merch | Failed to get single merch") return } + c.Status(http.StatusOK) } // @Summary Пометить мерч как удаленный @@ -192,7 +193,8 @@ func (co *controller) updateMerch(c *gin.Context) { // @Success 200 {object} MerchDTO // @Failure 400 {object} responses.ErrorResponse400 // @Failure 500 {object} responses.ErrorResponse500 -// @Router /merch/{uuid} [delete] +// +// @Router /merch/{uuid} [delete] func (co *controller) deleteMerch(c *gin.Context) { merchUuid := c.Param("uuid") if merchUuid == "" { @@ -220,12 +222,16 @@ func (co *controller) deleteMerch(c *gin.Context) { // @Description Получить цены мерча за период // @Tags Merch // @Security BearerAuth -// @Produce json +// @Produce json // @Param days query string false "period in days" // @Success 200 {array} PricesResponse // @Failure 400 {object} responses.ErrorResponse400 // @Failure 500 {object} responses.ErrorResponse500 // @Router /prices [get] +// +// @Failure 400 {object} responses.ErrorResponse400 +// @Failure 500 {object} responses.ErrorResponse500 +// @Router /prices [get] func (co *controller) getChartsPrices(c *gin.Context) { daysQuery := strings.ToLower(c.DefaultQuery("days", "")) @@ -250,7 +256,7 @@ func (co *controller) getChartsPrices(c *gin.Context) { // @Description Получить перепады цен мерча за период по его merch_uuid // @Tags Merch // @Security BearerAuth -// @Produce json +// @Produce json // @Param uuid path string true "merch_uuid" // @Param days query string false "period in days" // @Success 200 {object} PricesResponse @@ -338,7 +344,6 @@ func (co *controller) uploadMerchImage(c *gin.Context) { return } - //c.Status(http.StatusOK) c.JSON(http.StatusOK, response) } @@ -346,7 +351,7 @@ func (co *controller) uploadMerchImage(c *gin.Context) { // @Description Получить картинки по merch_uuid и query параметрам // @Tags Merch images // @Security BearerAuth -// @Produce json +// @Produce json // @Param uuid path string true "merch_uuid" // @Param type query string true "image type" // @Success 200 {object} ImageLink @@ -393,7 +398,6 @@ func (co *controller) getMerchImage(c *gin.Context) { //} // //c.JSON(http.StatusOK, link) - c.JSON(http.StatusNotImplemented, gin.H{"msg": "Method deprecated. Request images from image storage."}) } // @Summary Удалить (безвозвратно) картинки по merch_uuid @@ -438,7 +442,7 @@ func (co *controller) deleteMerchImage(c *gin.Context) { // @Description Создать новую метку для товара // @Tags Merch labels // @Security BearerAuth -// Accept json +// @Accept json // @Param payload body LabelDTO true "payload" // @Success 200 // @Failure 400 {object} responses.ErrorResponse400 @@ -474,7 +478,7 @@ func (co *controller) createLabel(c *gin.Context) { // @Description Получить все метки товаров // @Tags Merch labels // @Security BearerAuth -// @Produce json +// @Produce json // @Success 200 {array} LabelsList // @Failure 400 {object} responses.ErrorResponse400 // @Failure 500 {object} responses.ErrorResponse500 @@ -503,7 +507,7 @@ func (co *controller) getLabels(c *gin.Context) { // @Description Изменить метку // @Tags Merch labels // @Security BearerAuth -// Accept json +// @Accept json // @Param uuid path string true "label uuid" // @Param payload body LabelDTO true "payload" // @Success 200 @@ -576,16 +580,16 @@ func (co *controller) deleteLabel(c *gin.Context) { c.Status(http.StatusOK) } -// @Summary Прикрепить метку к товару -// @Description Прикрепить метку к товару -// @Tags Merch labels -// @Security BearerAuth -// Accept json -// @Param payload body LabelLink true "payload" -// @Success 200 -// @Failure 400 {object} responses.ErrorResponse400 -// @Failure 500 {object} responses.ErrorResponse500 -// @Router /merch/labels/attach [post] +// @Summary Прикрепить метку к товару +// @Description Прикрепить метку к товару +// @Tags Merch labels +// @Security BearerAuth +// @Accept json +// @Param payload body LabelLink true "payload" +// @Success 200 +// @Failure 400 {object} responses.ErrorResponse400 +// @Failure 500 {object} responses.ErrorResponse500 +// @Router /merch/labels/attach [post] func (co *controller) attachLabel(c *gin.Context) { const logMsg = "Merch | Attach label" @@ -611,16 +615,16 @@ func (co *controller) attachLabel(c *gin.Context) { c.Status(http.StatusOK) } -// @Summary Удалить привязку метки к товару -// @Description Удалить привязку метки к товару -// @Tags Merch labels -// @Security BearerAuth -// Accept json -// @Param payload body LabelLink true "payload" -// @Success 200 -// @Failure 400 {object} responses.ErrorResponse400 -// @Failure 500 {object} responses.ErrorResponse500 -// @Router /merch/labels/detach [post] +// @Summary Удалить привязку метки к товару +// @Description Удалить привязку метки к товару +// @Tags Merch labels +// @Security BearerAuth +// @Accept json +// @Param payload body LabelLink true "payload" +// @Success 200 +// @Failure 400 {object} responses.ErrorResponse400 +// @Failure 500 {object} responses.ErrorResponse500 +// @Router /merch/labels/detach [post] func (co *controller) detachLabel(c *gin.Context) { const logMsg = "Merch | Detach label" @@ -650,7 +654,7 @@ func (co *controller) detachLabel(c *gin.Context) { // @Description Получить метки товара по его uuid // @Tags Merch labels // @Security BearerAuth -// @Produce json +// @Produce json // @Param uuid path string true "label uuid" // @Success 200 // @Failure 400 {object} responses.ErrorResponse400 @@ -686,10 +690,10 @@ func (co *controller) getMerchLabels(c *gin.Context) { // @Description Получить нулевые цены // @Tags Merch zero prices // @Security BearerAuth -// @Produce json -// @Success 200 {array} ZeroPrice -// @Failure 400 {object} responses.ErrorResponse400 -// @Failure 500 {object} responses.ErrorResponse500 +// @Produce json +// @Success 200 {array} ZeroPrice +// @Failure 400 {object} responses.ErrorResponse400 +// @Failure 500 {object} responses.ErrorResponse500 // @Router /merch/zeroprices [get] func (co *controller) getZeroPrices(c *gin.Context) { const logMsg = "Merch | Get zero prices" @@ -715,11 +719,11 @@ func (co *controller) getZeroPrices(c *gin.Context) { // @Description Пометить нулевые цены как удаленные // @Tags Merch zero prices // @Security BearerAuth -// Accept json +// @Accept json // @Param payload body DeleteZeroPrices true "payload" // @Success 200 -// @Failure 400 {object} responses.ErrorResponse400 -// @Failure 500 {object} responses.ErrorResponse500 +// @Failure 400 {object} responses.ErrorResponse400 +// @Failure 500 {object} responses.ErrorResponse500 // @Router /merch/zeroprices [delete] func (co *controller) deleteZeroPrices(c *gin.Context) { const logMsg = "Merch | Delete zero prices" From aeb5cb819b0d0bfcd192e9c13d3951946017b7dc Mon Sep 17 00:00:00 2001 From: nquidox Date: Tue, 4 Nov 2025 16:49:04 +0300 Subject: [PATCH 34/39] =?UTF-8?q?=D1=81hanged=20ownership=20validation=20f?= =?UTF-8?q?or=20user's=20merch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/api/merch/repository.go | 21 ++++++++++---------- internal/api/merch/service.go | 33 ++++++++++++++++++++++++++------ 2 files changed, 37 insertions(+), 17 deletions(-) diff --git a/internal/api/merch/repository.go b/internal/api/merch/repository.go index 711b731..e84f551 100644 --- a/internal/api/merch/repository.go +++ b/internal/api/merch/repository.go @@ -3,7 +3,6 @@ package merch import ( "database/sql" "errors" - "fmt" "gorm.io/gorm" "gorm.io/gorm/clause" "time" @@ -23,7 +22,7 @@ type repository interface { addMerch(bundle merchBundle) error merchRecordExists(userUuid, merchUuid string) (bool, error) - userOwnsMerchUuids(userUuid string, merchUuids []string) (bool, error) + userOwnsMerchUuids(userUuid string, merchUuids []string) ([]Merch, error) getSingleMerch(userUuid, merchUuid string) (merchBundle, error) getAllMerch(userUuid string) ([]ListResponse, error) @@ -86,20 +85,20 @@ func (r *Repo) merchRecordExists(userUuid, merchUuid string) (bool, error) { return exists, err } -func (r *Repo) userOwnsMerchUuids(userUuid string, merchUuids []string) (bool, error) { - var count int64 - +func (r *Repo) userOwnsMerchUuids(userUuid string, merchUuids []string) ([]Merch, error) { + var ownsUuids []Merch err := r.db.Model(&Merch{}). + Select("merch_uuid"). Where("user_uuid = ?", userUuid). - Where("merch_uuid IN ?", merchUuids). + Where("merch_uuid IN (?)", merchUuids). Where("deleted_at IS NULL"). - Count(&count).Error - fmt.Println("!!!!!!", count) + Find(&ownsUuids).Error + if err != nil { - return false, err + return nil, err } - fmt.Println("!!!!!!", len(merchUuids)) - return count == int64(len(merchUuids)), nil + + return ownsUuids, nil } func (r *Repo) getSingleMerch(userUuid, merchUuid string) (merchBundle, error) { diff --git a/internal/api/merch/service.go b/internal/api/merch/service.go index 4d06a37..d409b71 100644 --- a/internal/api/merch/service.go +++ b/internal/api/merch/service.go @@ -16,7 +16,6 @@ import ( is "merch-parser-api/proto/imageStorage" "mime/multipart" "path/filepath" - "slices" "strings" "time" ) @@ -619,6 +618,7 @@ func (s *service) getZeroPrices(userUuid string) ([]ZeroPrice, error) { } func (s *service) deleteZeroPrices(userUuid string, list []DeleteZeroPrices) error { + const delMsg = "Merch - service | Delete zero prices" if len(list) == 0 { return nil } @@ -626,18 +626,39 @@ func (s *service) deleteZeroPrices(userUuid string, list []DeleteZeroPrices) err ids := make([]string, 0, len(list)) for _, item := range list { ids = append(ids, item.MerchUuid) - fmt.Println(item.MerchUuid, ids) } - slices.Compact(ids) - owns, err := s.repo.userOwnsMerchUuids(userUuid, ids) + uniqueMap := make(map[string]struct{}, len(list)) + uniqueIds := make([]string, 0, len(list)) + for _, id := range ids { + if _, ok := uniqueMap[id]; !ok { + uniqueMap[id] = struct{}{} + uniqueIds = append(uniqueIds, id) + } + } + + log.WithField("uuid count", len(uniqueIds)).Debug(delMsg) + + owns, err := s.repo.userOwnsMerchUuids(userUuid, uniqueIds) if err != nil { return err } - if !owns { + if len(owns) < 1 { return errors.New("wrong ids") } - return s.repo.deleteZeroPrices(list) + ownsMap := make(map[string]struct{}, len(owns)) + for _, own := range owns { + ownsMap[own.MerchUuid] = struct{}{} + } + + toDelete := make([]DeleteZeroPrices, 0, len(owns)) + for _, item := range list { + if _, ok := ownsMap[item.MerchUuid]; ok { + toDelete = append(toDelete, item) + } + } + + return s.repo.deleteZeroPrices(toDelete) } From a338fd03b28378add0d8162217753c5dace9eb56 Mon Sep 17 00:00:00 2001 From: nquidox Date: Sat, 6 Dec 2025 17:32:45 +0300 Subject: [PATCH 35/39] added: time util --- internal/interfaces/utils.go | 6 +++++- pkg/utils/time.go | 11 +++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 pkg/utils/time.go diff --git a/internal/interfaces/utils.go b/internal/interfaces/utils.go index dd6b773..31cd891 100644 --- a/internal/interfaces/utils.go +++ b/internal/interfaces/utils.go @@ -1,6 +1,9 @@ package interfaces -import "github.com/gin-gonic/gin" +import ( + "github.com/gin-gonic/gin" + "time" +) type Utils interface { IsEmail(email string) bool @@ -8,4 +11,5 @@ type Utils interface { GetRefreshUuidFromContext(c *gin.Context) (string, error) HashPassword(password string) (string, error) ComparePasswords(hashedPassword string, plainPassword string) error + ParseTime(t string) (time.Time, error) } diff --git a/pkg/utils/time.go b/pkg/utils/time.go new file mode 100644 index 0000000..01bfaf6 --- /dev/null +++ b/pkg/utils/time.go @@ -0,0 +1,11 @@ +package utils + +import "time" + +func (u *Utils) ParseTime(t string) (time.Time, error) { + timeStr, err := time.Parse(time.RFC3339, t) + if err != nil { + return time.Time{}, err + } + return timeStr, nil +} From d997d8bfa4c0a57b68f12a36e66a1b5b3527b7b1 Mon Sep 17 00:00:00 2001 From: nquidox Date: Sat, 6 Dec 2025 17:33:18 +0300 Subject: [PATCH 36/39] added: delete zero prices in period --- internal/api/merch/controller.go | 101 ++++++++++++++++++++++--------- internal/api/merch/repository.go | 17 ++++++ internal/api/merch/service.go | 4 ++ 3 files changed, 94 insertions(+), 28 deletions(-) diff --git a/internal/api/merch/controller.go b/internal/api/merch/controller.go index 7ea9636..a9f922a 100644 --- a/internal/api/merch/controller.go +++ b/internal/api/merch/controller.go @@ -54,6 +54,9 @@ func (h *Handler) RegisterRoutes(r *gin.RouterGroup, authMW gin.HandlerFunc, ref zeroPricesGroup := merchGroup.Group("/zeroprices", authMW) zeroPricesGroup.GET("", h.controller.getZeroPrices) zeroPricesGroup.DELETE("", h.controller.deleteZeroPrices) + + zeroPricesGroup.DELETE("/period", h.controller.deleteZeroPricesPeriod) + } // @Summary Добавить новый мерч @@ -156,7 +159,7 @@ func (co *controller) getAllMerch(c *gin.Context) { // @Description Обновить информацию про мерч по его uuid в json-е // @Tags Merch // @Security BearerAuth -// @Accept json +// @Accept json // @Param body body UpdateMerchDTO true "merch_uuid" // @Success 200 // @Failure 400 {object} responses.ErrorResponse400 @@ -194,7 +197,7 @@ func (co *controller) updateMerch(c *gin.Context) { // @Failure 400 {object} responses.ErrorResponse400 // @Failure 500 {object} responses.ErrorResponse500 // -// @Router /merch/{uuid} [delete] +// @Router /merch/{uuid} [delete] func (co *controller) deleteMerch(c *gin.Context) { merchUuid := c.Param("uuid") if merchUuid == "" { @@ -229,9 +232,9 @@ func (co *controller) deleteMerch(c *gin.Context) { // @Failure 500 {object} responses.ErrorResponse500 // @Router /prices [get] // -// @Failure 400 {object} responses.ErrorResponse400 -// @Failure 500 {object} responses.ErrorResponse500 -// @Router /prices [get] +// @Failure 400 {object} responses.ErrorResponse400 +// @Failure 500 {object} responses.ErrorResponse500 +// @Router /prices [get] func (co *controller) getChartsPrices(c *gin.Context) { daysQuery := strings.ToLower(c.DefaultQuery("days", "")) @@ -442,7 +445,7 @@ func (co *controller) deleteMerchImage(c *gin.Context) { // @Description Создать новую метку для товара // @Tags Merch labels // @Security BearerAuth -// @Accept json +// @Accept json // @Param payload body LabelDTO true "payload" // @Success 200 // @Failure 400 {object} responses.ErrorResponse400 @@ -507,7 +510,7 @@ func (co *controller) getLabels(c *gin.Context) { // @Description Изменить метку // @Tags Merch labels // @Security BearerAuth -// @Accept json +// @Accept json // @Param uuid path string true "label uuid" // @Param payload body LabelDTO true "payload" // @Success 200 @@ -580,16 +583,16 @@ func (co *controller) deleteLabel(c *gin.Context) { c.Status(http.StatusOK) } -// @Summary Прикрепить метку к товару -// @Description Прикрепить метку к товару -// @Tags Merch labels -// @Security BearerAuth -// @Accept json -// @Param payload body LabelLink true "payload" -// @Success 200 -// @Failure 400 {object} responses.ErrorResponse400 -// @Failure 500 {object} responses.ErrorResponse500 -// @Router /merch/labels/attach [post] +// @Summary Прикрепить метку к товару +// @Description Прикрепить метку к товару +// @Tags Merch labels +// @Security BearerAuth +// @Accept json +// @Param payload body LabelLink true "payload" +// @Success 200 +// @Failure 400 {object} responses.ErrorResponse400 +// @Failure 500 {object} responses.ErrorResponse500 +// @Router /merch/labels/attach [post] func (co *controller) attachLabel(c *gin.Context) { const logMsg = "Merch | Attach label" @@ -615,16 +618,16 @@ func (co *controller) attachLabel(c *gin.Context) { c.Status(http.StatusOK) } -// @Summary Удалить привязку метки к товару -// @Description Удалить привязку метки к товару -// @Tags Merch labels -// @Security BearerAuth -// @Accept json -// @Param payload body LabelLink true "payload" -// @Success 200 -// @Failure 400 {object} responses.ErrorResponse400 -// @Failure 500 {object} responses.ErrorResponse500 -// @Router /merch/labels/detach [post] +// @Summary Удалить привязку метки к товару +// @Description Удалить привязку метки к товару +// @Tags Merch labels +// @Security BearerAuth +// @Accept json +// @Param payload body LabelLink true "payload" +// @Success 200 +// @Failure 400 {object} responses.ErrorResponse400 +// @Failure 500 {object} responses.ErrorResponse500 +// @Router /merch/labels/detach [post] func (co *controller) detachLabel(c *gin.Context) { const logMsg = "Merch | Detach label" @@ -719,7 +722,7 @@ func (co *controller) getZeroPrices(c *gin.Context) { // @Description Пометить нулевые цены как удаленные // @Tags Merch zero prices // @Security BearerAuth -// @Accept json +// @Accept json // @Param payload body DeleteZeroPrices true "payload" // @Success 200 // @Failure 400 {object} responses.ErrorResponse400 @@ -749,3 +752,45 @@ func (co *controller) deleteZeroPrices(c *gin.Context) { } c.Status(http.StatusOK) } + +// @Summary Пометить нулевые цены как удаленные за указанный период +// @Description Пометить нулевые цены как удаленные за указанный период +// @Tags Merch zero prices +// @Security BearerAuth +// @Param start query string true "start" +// @Param end query string true "end" +// @Success 200 +// @Failure 400 {object} responses.ErrorResponse400 +// @Failure 500 {object} responses.ErrorResponse500 +// @Router /merch/zeroprices/period [delete] +func (co *controller) deleteZeroPricesPeriod(c *gin.Context) { + const logMsg = "Merch | Delete zero prices period" + + userUuid, err := co.utils.GetUserUuidFromContext(c) + if err != nil { + c.JSON(http.StatusInternalServerError, responses.ErrorResponse500{Error: err.Error()}) + log.WithError(err).Error(logMsg) + return + } + + start, err := co.utils.ParseTime(c.Query("start")) + if err != nil { + c.JSON(http.StatusBadRequest, responses.ErrorResponse400{Error: err.Error()}) + log.WithError(err).Error(logMsg) + return + } + + end, err := co.utils.ParseTime(c.Query("end")) + if err != nil { + c.JSON(http.StatusBadRequest, responses.ErrorResponse400{Error: err.Error()}) + log.WithError(err).Error(logMsg) + return + } + + if err = co.service.deleteZeroPricesPeriod(userUuid, start, end); err != nil { + c.JSON(http.StatusInternalServerError, responses.ErrorResponse500{Error: err.Error()}) + log.WithError(err).Error(logMsg) + return + } + c.Status(http.StatusOK) +} diff --git a/internal/api/merch/repository.go b/internal/api/merch/repository.go index e84f551..4a5f3ce 100644 --- a/internal/api/merch/repository.go +++ b/internal/api/merch/repository.go @@ -42,6 +42,7 @@ type prices interface { getZeroPrices(userUuid string) ([]ZeroPrice, error) deleteZeroPrices(list []DeleteZeroPrices) error + deleteZeroPricesPeriod(userUuid string, start, end time.Time) error } type labels interface { @@ -371,3 +372,19 @@ func (r *Repo) deleteZeroPrices(list []DeleteZeroPrices) error { } return nil } + +func (r *Repo) deleteZeroPricesPeriod(userUuid string, start, end time.Time) error { + if err := r.db.Exec(` + UPDATE prices + SET deleted_at = ? + FROM merch + WHERE prices.merch_uuid = merch.merch_uuid + AND merch.user_uuid = ? + AND prices.price = 0 + AND prices.deleted_at IS NULL + AND prices.created_at BETWEEN ? AND ?; + `, time.Now().UTC(), userUuid, start, end).Error; err != nil { + return err + } + return nil +} diff --git a/internal/api/merch/service.go b/internal/api/merch/service.go index d409b71..ae6c2f5 100644 --- a/internal/api/merch/service.go +++ b/internal/api/merch/service.go @@ -662,3 +662,7 @@ func (s *service) deleteZeroPrices(userUuid string, list []DeleteZeroPrices) err return s.repo.deleteZeroPrices(toDelete) } + +func (s *service) deleteZeroPricesPeriod(userUuid string, start, end time.Time) error { + return s.repo.deleteZeroPricesPeriod(userUuid, start, end) +} From f9eac067be59003f3e0bff1c4012ef732313fe00 Mon Sep 17 00:00:00 2001 From: nquidox Date: Sat, 6 Dec 2025 17:33:29 +0300 Subject: [PATCH 37/39] swagger docs update --- docs/docs.go | 47 +++++++++++++++++++++++++++++++++++++++++++++++ docs/swagger.json | 47 +++++++++++++++++++++++++++++++++++++++++++++++ docs/swagger.yaml | 30 ++++++++++++++++++++++++++++++ 3 files changed, 124 insertions(+) diff --git a/docs/docs.go b/docs/docs.go index b97688b..a232b91 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -675,6 +675,53 @@ const docTemplate = `{ } } }, + "/merch/zeroprices/period": { + "delete": { + "security": [ + { + "BearerAuth": [] + } + ], + "description": "Пометить нулевые цены как удаленные за указанный период", + "tags": [ + "Merch zero prices" + ], + "summary": "Пометить нулевые цены как удаленные за указанный период", + "parameters": [ + { + "type": "string", + "description": "start", + "name": "start", + "in": "query", + "required": true + }, + { + "type": "string", + "description": "end", + "name": "end", + "in": "query", + "required": true + } + ], + "responses": { + "200": { + "description": "OK" + }, + "400": { + "description": "Bad Request", + "schema": { + "$ref": "#/definitions/responses.ErrorResponse400" + } + }, + "500": { + "description": "Internal Server Error", + "schema": { + "$ref": "#/definitions/responses.ErrorResponse500" + } + } + } + } + }, "/merch/{uuid}": { "get": { "security": [ diff --git a/docs/swagger.json b/docs/swagger.json index f746266..74a0031 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -667,6 +667,53 @@ } } }, + "/merch/zeroprices/period": { + "delete": { + "security": [ + { + "BearerAuth": [] + } + ], + "description": "Пометить нулевые цены как удаленные за указанный период", + "tags": [ + "Merch zero prices" + ], + "summary": "Пометить нулевые цены как удаленные за указанный период", + "parameters": [ + { + "type": "string", + "description": "start", + "name": "start", + "in": "query", + "required": true + }, + { + "type": "string", + "description": "end", + "name": "end", + "in": "query", + "required": true + } + ], + "responses": { + "200": { + "description": "OK" + }, + "400": { + "description": "Bad Request", + "schema": { + "$ref": "#/definitions/responses.ErrorResponse400" + } + }, + "500": { + "description": "Internal Server Error", + "schema": { + "$ref": "#/definitions/responses.ErrorResponse500" + } + } + } + } + }, "/merch/{uuid}": { "get": { "security": [ diff --git a/docs/swagger.yaml b/docs/swagger.yaml index 883b177..31eaa0d 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -674,6 +674,36 @@ paths: summary: Получить нулевые цены tags: - Merch zero prices + /merch/zeroprices/period: + delete: + description: Пометить нулевые цены как удаленные за указанный период + parameters: + - description: start + in: query + name: start + required: true + type: string + - description: end + in: query + name: end + required: true + type: string + responses: + "200": + description: OK + "400": + description: Bad Request + schema: + $ref: '#/definitions/responses.ErrorResponse400' + "500": + description: Internal Server Error + schema: + $ref: '#/definitions/responses.ErrorResponse500' + security: + - BearerAuth: [] + summary: Пометить нулевые цены как удаленные за указанный период + tags: + - Merch zero prices /prices: get: description: Получить цены мерча за период From 4c59ab3f58f5f1cbe2eedf3ec5543d93cb6e385e Mon Sep 17 00:00:00 2001 From: nquidox Date: Sat, 6 Dec 2025 19:14:21 +0300 Subject: [PATCH 38/39] return origin name instead of code --- internal/api/merch/dto.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/api/merch/dto.go b/internal/api/merch/dto.go index 7ee7281..5b9180c 100644 --- a/internal/api/merch/dto.go +++ b/internal/api/merch/dto.go @@ -86,7 +86,7 @@ type ZeroPrice struct { CreatedAt time.Time `json:"created_at"` MerchUuid string `json:"merch_uuid"` Name string `json:"name"` - Origin string `json:"origin"` + Origin Origin `json:"origin"` } type DeleteZeroPrices struct { From 8f2b0470b19e9dd4b4cece4a76c8b8e22f930077 Mon Sep 17 00:00:00 2001 From: nquidox Date: Sun, 7 Dec 2025 13:37:15 +0300 Subject: [PATCH 39/39] false zero price bugfix --- internal/api/merch/repository.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/api/merch/repository.go b/internal/api/merch/repository.go index 4a5f3ce..fe5dd7d 100644 --- a/internal/api/merch/repository.go +++ b/internal/api/merch/repository.go @@ -339,8 +339,8 @@ func (r *Repo) getZeroPrices(userUuid string) ([]ZeroPrice, error) { WITH price_with_neighbors AS ( SELECT p.id, p.created_at, p.merch_uuid, p.price, p.origin, m.name, - LAG(price) OVER (PARTITION BY p.merch_uuid ORDER BY p.created_at, p.id) AS prev_price, - LEAD(price) OVER (PARTITION BY p.merch_uuid ORDER BY p.created_at, p.id) AS next_price + LAG(price) OVER (PARTITION BY p.merch_uuid, p.origin ORDER BY p.created_at, p.id) AS prev_price, + LEAD(price) OVER (PARTITION BY p.merch_uuid, p.origin ORDER BY p.created_at, p.id) AS next_price FROM prices AS p JOIN merch as m ON m.merch_uuid = p.merch_uuid WHERE p.deleted_at IS NULL