diff --git a/api.env b/api.env index 0a477e8..843383b 100644 --- a/api.env +++ b/api.env @@ -8,11 +8,6 @@ APP_ALLOWED_ORIGINS=http://localhost:5173, GRPC_SERVER_PORT=9050 GRPC_CLIENT_PORT=9060 -MEDIA_STORAGE_USER= -MEDIA_STORAGE_PASS= -MEDIA_STORAGE_HOST= -MEDIA_STORAGE_PORT= - DB_HOST= DB_PORT= DB_USER= diff --git a/cmd/main.go b/cmd/main.go index ddea055..462985b 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -10,7 +10,6 @@ import ( "merch-parser-api/internal/app" "merch-parser-api/internal/grpcService" "merch-parser-api/internal/interfaces" - "merch-parser-api/internal/mediaStorage" "merch-parser-api/internal/provider/auth" "merch-parser-api/internal/provider/token" "merch-parser-api/internal/router" @@ -28,8 +27,8 @@ import ( func main() { log.Debug("Starting merch-parser-api") //setup config - //c := config.NewConfig() - c := config.DevConfig() + c := config.NewConfig() + //c := config.DevConfig() ctx := context.Background() //log level @@ -52,17 +51,6 @@ func main() { utilsProvider := utils.NewUtils() log.Debug("Utils provider initialized") - mediaProvider := mediaStorage.NewHandler(mediaStorage.Deps{ - Host: c.MediaConf.Host, - Port: c.MediaConf.Port, - User: c.MediaConf.User, - Password: c.MediaConf.Password, - }) - log.WithFields(log.Fields{ - "address": c.MediaConf.Host + ":" + c.MediaConf.Port, - "provider": mediaProvider, - }).Debug("Media storage | Minio client created") - //deps providers routerHandler := router.NewRouter(router.Deps{ ApiPrefix: c.AppConf.ApiPrefix, @@ -94,7 +82,6 @@ func main() { merchModule := merch.NewHandler(merch.Deps{ DB: database, Utils: utilsProvider, - Media: mediaProvider, }) //collect modules diff --git a/config/config.go b/config/config.go index d57e264..2646db5 100644 --- a/config/config.go +++ b/config/config.go @@ -3,11 +3,10 @@ package config import "strings" type Config struct { - AppConf AppConfig - DBConf DatabaseConfig - JWTConf JWTConfig - GrpcConf GrpcConfig - MediaConf MediaConfig + AppConf AppConfig + DBConf DatabaseConfig + JWTConf JWTConfig + GrpcConf GrpcConfig } type AppConfig struct { @@ -41,13 +40,6 @@ type GrpcConfig struct { GrpcClientPort string } -type MediaConfig struct { - Host string - Port string - User string - Password string -} - func NewConfig() *Config { return &Config{ AppConf: AppConfig{ @@ -80,12 +72,5 @@ func NewConfig() *Config { GrpcServerPort: getEnv("GRPC_SERVER_PORT", ""), GrpcClientPort: getEnv("GRPC_CLIENT_PORT", ""), }, - - MediaConf: MediaConfig{ - Host: getEnv("MEDIA_STORAGE_HOST", ""), - Port: getEnv("MEDIA_STORAGE_PORT", ""), - User: getEnv("MEDIA_STORAGE_USER", ""), - Password: getEnv("MEDIA_STORAGE_PASSWORD", ""), - }, } } diff --git a/docs/docs.go b/docs/docs.go index 4901f76..ed5e263 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -95,207 +95,6 @@ const docTemplate = `{ } } } - }, - "put": { - "security": [ - { - "BearerAuth": [] - } - ], - "description": "Обновить информацию про мерч по его uuid в json-е", - "tags": [ - "Merch" - ], - "summary": "Обновить информацию про мерч", - "parameters": [ - { - "description": "merch_uuid", - "name": "body", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/merch.UpdateMerchDTO" - } - } - ], - "responses": { - "200": { - "description": "OK" - }, - "400": { - "description": "Bad Request", - "schema": { - "$ref": "#/definitions/responses.ErrorResponse400" - } - }, - "500": { - "description": "Internal Server Error", - "schema": { - "$ref": "#/definitions/responses.ErrorResponse500" - } - } - } - } - }, - "/merch/images/{uuid}": { - "get": { - "security": [ - { - "BearerAuth": [] - } - ], - "description": "Получить картинки по merch_uuid и query параметрам", - "tags": [ - "Merch images" - ], - "summary": "Получить картинки по merch_uuid и query параметрам", - "parameters": [ - { - "type": "string", - "description": "merch_uuid", - "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" - } - }, - "400": { - "description": "Bad Request", - "schema": { - "$ref": "#/definitions/responses.ErrorResponse400" - } - }, - "500": { - "description": "Internal Server Error", - "schema": { - "$ref": "#/definitions/responses.ErrorResponse500" - } - } - } - }, - "post": { - "security": [ - { - "BearerAuth": [] - } - ], - "description": "Загрузить картинки по merch_uuid и query параметрам", - "consumes": [ - "multipart/form-data" - ], - "produces": [ - "application/json" - ], - "tags": [ - "Merch images" - ], - "summary": "Загрузить картинки по merch_uuid и query параметрам", - "parameters": [ - { - "type": "string", - "description": "Merch UUID", - "name": "uuid", - "in": "path", - "required": true - }, - { - "type": "file", - "description": "Image file", - "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" - }, - "400": { - "description": "Bad Request", - "schema": { - "$ref": "#/definitions/responses.ErrorResponse400" - } - }, - "500": { - "description": "Internal Server Error", - "schema": { - "$ref": "#/definitions/responses.ErrorResponse500" - } - } - } - }, - "delete": { - "security": [ - { - "BearerAuth": [] - } - ], - "description": "Удалить (безвозвратно) картинки по merch_uuid и query параметрам", - "tags": [ - "Merch images" - ], - "summary": "Удалить (безвозвратно) картинки по merch_uuid и query параметрам", - "parameters": [ - { - "type": "string", - "description": "merch_uuid", - "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" - } - }, - "400": { - "description": "Bad Request", - "schema": { - "$ref": "#/definitions/responses.ErrorResponse400" - } - }, - "500": { - "description": "Internal Server Error", - "schema": { - "$ref": "#/definitions/responses.ErrorResponse500" - } - } - } } }, "/merch/{uuid}": { @@ -340,6 +139,49 @@ const docTemplate = `{ } } }, + "put": { + "security": [ + { + "BearerAuth": [] + } + ], + "description": "Обновить информацию про мерч по его uuid в json-е", + "tags": [ + "Merch" + ], + "summary": "Обновить информацию про мерч", + "parameters": [ + { + "description": "merch_uuid", + "name": "body", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/merch.MerchDTO" + } + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/merch.MerchDTO" + } + }, + "400": { + "description": "Bad Request", + "schema": { + "$ref": "#/definitions/responses.ErrorResponse400" + } + }, + "500": { + "description": "Internal Server Error", + "schema": { + "$ref": "#/definitions/responses.ErrorResponse500" + } + } + } + }, "delete": { "security": [ { @@ -864,23 +706,6 @@ const docTemplate = `{ } } }, - "merch.UpdateMerchDTO": { - "type": "object", - "properties": { - "link": { - "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 a1b5b73..068cc35 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -87,207 +87,6 @@ } } } - }, - "put": { - "security": [ - { - "BearerAuth": [] - } - ], - "description": "Обновить информацию про мерч по его uuid в json-е", - "tags": [ - "Merch" - ], - "summary": "Обновить информацию про мерч", - "parameters": [ - { - "description": "merch_uuid", - "name": "body", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/merch.UpdateMerchDTO" - } - } - ], - "responses": { - "200": { - "description": "OK" - }, - "400": { - "description": "Bad Request", - "schema": { - "$ref": "#/definitions/responses.ErrorResponse400" - } - }, - "500": { - "description": "Internal Server Error", - "schema": { - "$ref": "#/definitions/responses.ErrorResponse500" - } - } - } - } - }, - "/merch/images/{uuid}": { - "get": { - "security": [ - { - "BearerAuth": [] - } - ], - "description": "Получить картинки по merch_uuid и query параметрам", - "tags": [ - "Merch images" - ], - "summary": "Получить картинки по merch_uuid и query параметрам", - "parameters": [ - { - "type": "string", - "description": "merch_uuid", - "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" - } - }, - "400": { - "description": "Bad Request", - "schema": { - "$ref": "#/definitions/responses.ErrorResponse400" - } - }, - "500": { - "description": "Internal Server Error", - "schema": { - "$ref": "#/definitions/responses.ErrorResponse500" - } - } - } - }, - "post": { - "security": [ - { - "BearerAuth": [] - } - ], - "description": "Загрузить картинки по merch_uuid и query параметрам", - "consumes": [ - "multipart/form-data" - ], - "produces": [ - "application/json" - ], - "tags": [ - "Merch images" - ], - "summary": "Загрузить картинки по merch_uuid и query параметрам", - "parameters": [ - { - "type": "string", - "description": "Merch UUID", - "name": "uuid", - "in": "path", - "required": true - }, - { - "type": "file", - "description": "Image file", - "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" - }, - "400": { - "description": "Bad Request", - "schema": { - "$ref": "#/definitions/responses.ErrorResponse400" - } - }, - "500": { - "description": "Internal Server Error", - "schema": { - "$ref": "#/definitions/responses.ErrorResponse500" - } - } - } - }, - "delete": { - "security": [ - { - "BearerAuth": [] - } - ], - "description": "Удалить (безвозвратно) картинки по merch_uuid и query параметрам", - "tags": [ - "Merch images" - ], - "summary": "Удалить (безвозвратно) картинки по merch_uuid и query параметрам", - "parameters": [ - { - "type": "string", - "description": "merch_uuid", - "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" - } - }, - "400": { - "description": "Bad Request", - "schema": { - "$ref": "#/definitions/responses.ErrorResponse400" - } - }, - "500": { - "description": "Internal Server Error", - "schema": { - "$ref": "#/definitions/responses.ErrorResponse500" - } - } - } } }, "/merch/{uuid}": { @@ -332,6 +131,49 @@ } } }, + "put": { + "security": [ + { + "BearerAuth": [] + } + ], + "description": "Обновить информацию про мерч по его uuid в json-е", + "tags": [ + "Merch" + ], + "summary": "Обновить информацию про мерч", + "parameters": [ + { + "description": "merch_uuid", + "name": "body", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/merch.MerchDTO" + } + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/merch.MerchDTO" + } + }, + "400": { + "description": "Bad Request", + "schema": { + "$ref": "#/definitions/responses.ErrorResponse400" + } + }, + "500": { + "description": "Internal Server Error", + "schema": { + "$ref": "#/definitions/responses.ErrorResponse500" + } + } + } + }, "delete": { "security": [ { @@ -856,23 +698,6 @@ } } }, - "merch.UpdateMerchDTO": { - "type": "object", - "properties": { - "link": { - "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 2d9d9bc..20ed305 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -55,17 +55,6 @@ definitions: link: type: string type: object - merch.UpdateMerchDTO: - properties: - link: - type: string - merch_uuid: - type: string - name: - type: string - origin: - type: string - type: object responses.ErrorResponse400: properties: error: @@ -184,31 +173,6 @@ paths: summary: Получить все записи мерча tags: - Merch - put: - description: Обновить информацию про мерч по его uuid в json-е - parameters: - - description: merch_uuid - in: body - name: body - required: true - schema: - $ref: '#/definitions/merch.UpdateMerchDTO' - 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 /merch/{uuid}: delete: description: Пометить мерч как удаленный по его uuid @@ -262,25 +226,20 @@ paths: summary: Получить всю информацию про мерч tags: - Merch - /merch/images/{uuid}: - delete: - description: Удалить (безвозвратно) картинки по merch_uuid и query параметрам + put: + description: Обновить информацию про мерч по его uuid в json-е parameters: - description: merch_uuid - in: path - name: uuid + in: body + name: body required: true - type: string - - description: image type - in: query - name: type - required: true - type: string + schema: + $ref: '#/definitions/merch.MerchDTO' responses: "200": description: OK schema: - $ref: '#/definitions/merch.PricesResponse' + $ref: '#/definitions/merch.MerchDTO' "400": description: Bad Request schema: @@ -291,82 +250,9 @@ paths: $ref: '#/definitions/responses.ErrorResponse500' security: - BearerAuth: [] - summary: Удалить (безвозвратно) картинки по merch_uuid и query параметрам + summary: Обновить информацию про мерч tags: - - Merch images - get: - description: Получить картинки по merch_uuid и query параметрам - parameters: - - description: merch_uuid - in: path - 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: - $ref: '#/definitions/responses.ErrorResponse400' - "500": - description: Internal Server Error - schema: - $ref: '#/definitions/responses.ErrorResponse500' - security: - - BearerAuth: [] - summary: Получить картинки по merch_uuid и query параметрам - tags: - - Merch images - post: - consumes: - - multipart/form-data - description: Загрузить картинки по merch_uuid и query параметрам - parameters: - - description: Merch UUID - in: path - name: uuid - required: true - type: string - - description: Image file - in: formData - 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 - "400": - description: Bad Request - schema: - $ref: '#/definitions/responses.ErrorResponse400' - "500": - description: Internal Server Error - schema: - $ref: '#/definitions/responses.ErrorResponse500' - security: - - BearerAuth: [] - summary: Загрузить картинки по merch_uuid и query параметрам - tags: - - Merch images + - Merch /prices: get: description: Получить цены мерча за период diff --git a/go.mod b/go.mod index 2a71658..acd00c9 100644 --- a/go.mod +++ b/go.mod @@ -7,13 +7,12 @@ require ( github.com/gin-gonic/gin v1.11.0 github.com/golang-jwt/jwt/v5 v5.3.0 github.com/google/uuid v1.6.0 - github.com/minio/minio-go/v7 v7.0.95 github.com/sirupsen/logrus v1.9.3 github.com/swaggo/files v1.0.1 github.com/swaggo/gin-swagger v1.6.1 github.com/swaggo/swag v1.16.6 - golang.org/x/crypto v0.43.0 - google.golang.org/grpc v1.76.0 + golang.org/x/crypto v0.42.0 + google.golang.org/grpc v1.75.1 google.golang.org/protobuf v1.36.10 gorm.io/driver/postgres v1.6.0 gorm.io/gorm v1.31.0 @@ -25,11 +24,8 @@ require ( github.com/bytedance/sonic v1.14.1 // indirect github.com/bytedance/sonic/loader v0.3.0 // indirect github.com/cloudwego/base64x v0.1.6 // indirect - github.com/disintegration/imaging v1.6.2 // indirect - github.com/dustin/go-humanize v1.0.1 // indirect github.com/gabriel-vasile/mimetype v1.4.10 // indirect github.com/gin-contrib/sse v1.1.0 // indirect - github.com/go-ini/ini v1.67.0 // indirect github.com/go-openapi/jsonpointer v0.22.1 // indirect github.com/go-openapi/jsonreference v0.21.2 // indirect github.com/go-openapi/spec v0.22.0 // indirect @@ -42,7 +38,7 @@ require ( github.com/go-openapi/swag/yamlutils v0.25.1 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect - github.com/go-playground/validator/v10 v10.28.0 // indirect + github.com/go-playground/validator/v10 v10.27.0 // indirect github.com/goccy/go-json v0.10.5 // indirect github.com/goccy/go-yaml v1.18.0 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect @@ -52,32 +48,25 @@ 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/cpuid/v2 v2.3.0 // indirect github.com/leodido/go-urn v1.4.0 // indirect github.com/mattn/go-isatty v0.0.20 // indirect - github.com/minio/crc64nvme v1.0.2 // indirect - github.com/minio/md5-simd v1.1.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.2.4 // indirect - github.com/philhofer/fwd v1.2.0 // indirect github.com/quic-go/qpack v0.5.1 // indirect github.com/quic-go/quic-go v0.55.0 // indirect github.com/rogpeppe/go-internal v1.14.1 // indirect - github.com/rs/xid v1.6.0 // indirect - github.com/tinylib/msgp v1.3.0 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.3.0 // indirect go.uber.org/mock v0.6.0 // indirect go.yaml.in/yaml/v3 v3.0.4 // indirect - golang.org/x/arch v0.22.0 // indirect - golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 // indirect - golang.org/x/mod v0.29.0 // indirect - golang.org/x/net v0.46.0 // indirect + golang.org/x/arch v0.21.0 // indirect + golang.org/x/mod v0.28.0 // indirect + golang.org/x/net v0.44.0 // indirect golang.org/x/sync v0.17.0 // indirect - 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-20251007200510-49b9836ed3ff // indirect + golang.org/x/sys v0.36.0 // indirect + golang.org/x/text v0.29.0 // indirect + golang.org/x/tools v0.37.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20251002232023-7c0ddcbb5797 // indirect ) diff --git a/go.sum b/go.sum index 5aafef6..3563ce4 100644 --- a/go.sum +++ b/go.sum @@ -11,10 +11,6 @@ github.com/cloudwego/base64x v0.1.6/go.mod h1:OFcloc187FXDaYHvrNIjxSe8ncn0OOM8gE github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c= -github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4= -github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= -github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/gabriel-vasile/mimetype v1.4.10 h1:zyueNbySn/z8mJZHLt6IPw0KoZsiQNszIpU+bX4+ZK0= github.com/gabriel-vasile/mimetype v1.4.10/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s= github.com/gin-contrib/cors v1.7.6 h1:3gQ8GMzs1Ylpf70y8bMw4fVpycXIeX1ZemuSQIsnQQY= @@ -25,8 +21,6 @@ github.com/gin-contrib/sse v1.1.0 h1:n0w2GMuUpWDVp7qSpvze6fAu9iRxJY4Hmj6AmBOU05w github.com/gin-contrib/sse v1.1.0/go.mod h1:hxRZ5gVpWMT7Z0B0gSNYqqsSCNIJMjzvm6fqCz9vjwM= github.com/gin-gonic/gin v1.11.0 h1:OW/6PLjyusp2PPXtyxKHU0RbX6I/l28FTdDlae5ueWk= github.com/gin-gonic/gin v1.11.0/go.mod h1:+iq/FyxlGzII0KHiBGjuNn4UNENUlKbGlNmc+W50Dls= -github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A= -github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= @@ -60,8 +54,8 @@ github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/o github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= -github.com/go-playground/validator/v10 v10.28.0 h1:Q7ibns33JjyW48gHkuFT91qX48KG0ktULL6FgHdG688= -github.com/go-playground/validator/v10 v10.28.0/go.mod h1:GoI6I1SjPBh9p7ykNE/yj3fFYbyDOpwMn5KXd+m2hUU= +github.com/go-playground/validator/v10 v10.27.0 h1:w8+XrWVMhGkxOaaowyKH35gFydVHOvC0/uWoy2Fzwn4= +github.com/go-playground/validator/v10 v10.27.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo= github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4= github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/goccy/go-yaml v1.18.0 h1:8W7wMFS12Pcas7KU+VVkaiCng+kG8QiFeFwzFb+rwuw= @@ -89,9 +83,6 @@ 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/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= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= @@ -102,12 +93,6 @@ github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= -github.com/minio/crc64nvme v1.0.2 h1:6uO1UxGAD+kwqWWp7mBFsi5gAse66C4NXO8cmcVculg= -github.com/minio/crc64nvme v1.0.2/go.mod h1:eVfm2fAzLlxMdUGc0EEBGSMmPwmXD5XiNRpnu9J3bvg= -github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34= -github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM= -github.com/minio/minio-go/v7 v7.0.95 h1:ywOUPg+PebTMTzn9VDsoFJy32ZuARN9zhB+K3IYEvYU= -github.com/minio/minio-go/v7 v7.0.95/go.mod h1:wOOX3uxS334vImCNRVyIDdXX9OsXDm89ToynKgqUKlo= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -115,8 +100,6 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4= github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY= -github.com/philhofer/fwd v1.2.0 h1:e6DnBTl7vGY+Gz322/ASL4Gyp1FspeMvx1RNDoToZuM= -github.com/philhofer/fwd v1.2.0/go.mod h1:RqIHx9QI14HlwKwm98g9Re5prTQ6LdeRQn+gXJFxsJM= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/quic-go/qpack v0.5.1 h1:giqksBPnT/HDtZ6VhtFKgoLOWmlyo9Ei6u9PqzIMbhI= @@ -125,8 +108,6 @@ github.com/quic-go/quic-go v0.55.0 h1:zccPQIqYCXDt5NmcEabyYvOnomjs8Tlwl7tISjJh9M github.com/quic-go/quic-go v0.55.0/go.mod h1:DR51ilwU1uE164KuWXhinFcKWGlEjzys2l8zUl5Ss1U= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= -github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU= -github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -145,8 +126,6 @@ github.com/swaggo/gin-swagger v1.6.1 h1:Ri06G4gc9N4t4k8hekMigJ9zKTFSlqj/9paAQCQs github.com/swaggo/gin-swagger v1.6.1/go.mod h1:LQ+hJStHakCWRiK/YNYtJOu4mR2FP+pxLnILT/qNiTw= github.com/swaggo/swag v1.16.6 h1:qBNcx53ZaX+M5dxVyTrgQ0PJ/ACK+NzhwcbieTt+9yI= github.com/swaggo/swag v1.16.6/go.mod h1:ngP2etMK5a0P3QBizic5MEwpRmluJZPHjXcMoj4Xesg= -github.com/tinylib/msgp v1.3.0 h1:ULuf7GPooDaIlbyvgAxBV/FI7ynli6LZ1/nVUNu+0ww= -github.com/tinylib/msgp v1.3.0/go.mod h1:ykjzy2wzgrlvpDCRc4LA8UXy6D8bzMSuAF3WD57Gok0= github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/ugorji/go/codec v1.3.0 h1:Qd2W2sQawAfG8XSvzwhBeoGq71zXOC/Q1E9y/wUcsUA= @@ -168,23 +147,21 @@ go.uber.org/mock v0.6.0 h1:hyF9dfmbgIX5EfOdasqLsWD6xqpNZlXblLB/Dbnwv3Y= go.uber.org/mock v0.6.0/go.mod h1:KiVJ4BqZJaMj4svdfmHM0AUx4NJYO8ZNpPnZn1Z+BBU= go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= -golang.org/x/arch v0.22.0 h1:c/Zle32i5ttqRXjdLyyHZESLD/bB90DCU1g9l/0YBDI= -golang.org/x/arch v0.22.0/go.mod h1:dNHoOeKiyja7GTvF9NJS1l3Z2yntpQNzgrjh1cU103A= +golang.org/x/arch v0.21.0 h1:iTC9o7+wP6cPWpDWkivCvQFGAHDQ59SrSxsLPcnkArw= +golang.org/x/arch v0.21.0/go.mod h1:dNHoOeKiyja7GTvF9NJS1l3Z2yntpQNzgrjh1cU103A= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04= -golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0= -golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 h1:hVwzHzIUGRjiF7EcUjqNxk3NCfkPxbDKRdnNE1Rpg0U= -golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI= +golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA= -golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w= +golang.org/x/mod v0.28.0 h1:gQBtGhjxykdjY9YhZpSlZIsbnaE2+PgjfLWUQTnoZ1U= +golang.org/x/mod v0.28.0/go.mod h1:yfB/L0NOf/kmEbXjzCPOx1iK1fRutOydrCMsqRhEBxI= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4= -golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210= +golang.org/x/net v0.44.0 h1:evd8IRDyfNBMBTTY5XRF1vaZlD+EmWx6x8PkhR04H/I= +golang.org/x/net v0.44.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug= @@ -197,8 +174,8 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ= -golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k= +golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= @@ -206,20 +183,20 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k= -golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM= +golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk= +golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ= -golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs= +golang.org/x/tools v0.37.0 h1:DVSRzp7FwePZW356yEAChSdNcQo6Nsp+fex1SUW09lE= +golang.org/x/tools v0.37.0/go.mod h1:MBN5QPQtLMHVdvsbtarmTNukZDdgwdwlO5qGacAzF0w= 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-20251007200510-49b9836ed3ff h1:A90eA31Wq6HOMIQlLfzFwzqGKBTuaVztYu/g8sn+8Zc= -google.golang.org/genproto/googleapis/rpc v0.0.0-20251007200510-49b9836ed3ff/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/genproto/googleapis/rpc v0.0.0-20251002232023-7c0ddcbb5797 h1:CirRxTOwnRWVLKzDNrs0CXAaVozJoR4G9xvdRecrdpk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20251002232023-7c0ddcbb5797/go.mod h1:HSkG/KdJWusxU1F6CNrwNDjBMgisKxGnc5dAZfT0mjQ= +google.golang.org/grpc v1.75.1 h1:/ODCNEuf9VghjgO3rqLcfg8fiOP0nSluljWFlDxELLI= +google.golang.org/grpc v1.75.1/go.mod h1:JtPAzKiq4v1xcAB2hydNlWI2RnF85XXcV0mhKXr2ecQ= google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE= google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/internal/api/merch/controller.go b/internal/api/merch/controller.go index f0d8e8b..2b23c34 100644 --- a/internal/api/merch/controller.go +++ b/internal/api/merch/controller.go @@ -1,27 +1,23 @@ package merch import ( - "context" "github.com/gin-gonic/gin" log "github.com/sirupsen/logrus" "merch-parser-api/internal/interfaces" "merch-parser-api/pkg/responses" "net/http" "strings" - "time" ) type controller struct { service *service utils interfaces.Utils - expires time.Duration } -func newController(service *service, utils interfaces.Utils, expires time.Duration) *controller { +func newController(service *service, utils interfaces.Utils) *controller { return &controller{ service: service, utils: utils, - expires: expires, } } @@ -38,10 +34,6 @@ func (h *Handler) RegisterRoutes(r *gin.RouterGroup, authMW gin.HandlerFunc, ref chartsGroup.GET("", h.controller.getChartsPrices) chartsGroup.GET("/:uuid", h.controller.getDistinctPrices) - imagesGroup := merchGroup.Group("/images") - imagesGroup.POST("/:uuid", h.controller.uploadMerchImage) - imagesGroup.GET("/:uuid", h.controller.getMerchImage) - imagesGroup.DELETE("/:uuid", h.controller.deleteMerchImage) } // @Summary Добавить новый мерч @@ -142,10 +134,10 @@ func (co *controller) getAllMerch(c *gin.Context) { // @Description Обновить информацию про мерч по его uuid в json-е // @Tags Merch // @Security BearerAuth -// @Param body body UpdateMerchDTO true "merch_uuid" +// @Param body body UpdateMerchDTO true "merch_uuid" // @Success 200 -// @Failure 400 {object} responses.ErrorResponse400 -// @Failure 500 {object} responses.ErrorResponse500 +// @Failure 400 {object} responses.ErrorResponse400 +// @Failure 500 {object} responses.ErrorResponse500 // @Router /merch/ [put] func (co *controller) updateMerch(c *gin.Context) { var payload UpdateMerchDTO @@ -235,10 +227,10 @@ func (co *controller) getChartsPrices(c *gin.Context) { // @Tags Merch // @Security BearerAuth // @Param uuid path string true "merch_uuid" -// @Param days query string false "period in days" -// @Success 200 {object} PricesResponse -// @Failure 400 {object} responses.ErrorResponse400 -// @Failure 500 {object} responses.ErrorResponse500 +// @Param days query string false "period in days" +// @Success 200 {object} PricesResponse +// @Failure 400 {object} responses.ErrorResponse400 +// @Failure 500 {object} responses.ErrorResponse500 // @Router /prices/{uuid} [get] func (co *controller) getDistinctPrices(c *gin.Context) { daysQuery := strings.ToLower(c.DefaultQuery("days", "")) @@ -265,138 +257,3 @@ func (co *controller) getDistinctPrices(c *gin.Context) { c.JSON(http.StatusOK, response) } - -// @Summary Загрузить картинки по merch_uuid и query параметрам -// @Description Загрузить картинки по merch_uuid и query параметрам -// @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 -// @Failure 400 {object} responses.ErrorResponse400 -// @Failure 500 {object} responses.ErrorResponse500 -// @Router /merch/images/{uuid} [post] -func (co *controller) uploadMerchImage(c *gin.Context) { - 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.Error("Merch | Failed to get single merch") - 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 - } - - file, err := c.FormFile("file") - if err != nil { - c.JSON(http.StatusBadRequest, responses.ErrorResponse400{Error: "file is required"}) - log.WithError(err).Error("Merch | File is required") - return - } - - ctx, cancel := context.WithTimeout(c.Request.Context(), co.expires) - defer cancel() - - err = co.service.uploadMerchImage(ctx, userUuid, merchUuid, imageType, 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) -} - -// @Summary Получить картинки по merch_uuid и query параметрам -// @Description Получить картинки по merch_uuid и query параметрам -// @Tags Merch images -// @Security BearerAuth -// @Param uuid path string true "merch_uuid" -// @Param type query string true "image type" -// @Success 200 {object} ImageLink -// @Failure 400 {object} responses.ErrorResponse400 -// @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 - } - - 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.getMerchImage(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, ImageLink{Link: link.String()}) -} - -// @Summary Удалить (безвозвратно) картинки по merch_uuid и query параметрам -// @Description Удалить (безвозвратно) картинки по merch_uuid и query параметрам -// @Tags Merch images -// @Security BearerAuth -// @Param uuid path string true "merch_uuid" -// @Param type query string true "image type" -// @Success 200 {object} PricesResponse -// @Failure 400 {object} responses.ErrorResponse400 -// @Failure 500 {object} responses.ErrorResponse500 -// @Router /merch/images/{uuid} [delete] -func (co *controller) deleteMerchImage(c *gin.Context) { - 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() - - if err := co.service.deleteMerchImage(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 - } - c.Status(http.StatusOK) -} diff --git a/internal/api/merch/dto.go b/internal/api/merch/dto.go index 3f94688..6e872a2 100644 --- a/internal/api/merch/dto.go +++ b/internal/api/merch/dto.go @@ -53,7 +53,3 @@ type UpdateMerchDTO struct { Origin string `json:"origin"` Link string `json:"link"` } - -type ImageLink struct { - Link string `json:"link"` -} diff --git a/internal/api/merch/handler.go b/internal/api/merch/handler.go index e61e4e0..274ccdf 100644 --- a/internal/api/merch/handler.go +++ b/internal/api/merch/handler.go @@ -1,10 +1,8 @@ package merch import ( - log "github.com/sirupsen/logrus" "gorm.io/gorm" "merch-parser-api/internal/interfaces" - "time" ) type Handler struct { @@ -16,25 +14,12 @@ type Handler struct { type Deps struct { DB *gorm.DB Utils interfaces.Utils - Media interfaces.MediaStorage } func NewHandler(deps Deps) *Handler { - packageBucketName := "user-merch-images" - expires := time.Minute * 1 - r := NewRepo(deps.DB) - s := newService(r, deps.Media, packageBucketName, expires) - c := newController(s, deps.Utils, expires) - - media := deps.Media - log.WithFields(log.Fields{ - "addr": media, - }).Debug("Merch handler constructor | Media provider") - - if err := media.СreateBucketIfNotExists(packageBucketName); err != nil { - log.WithError(err).Fatal("Merch handler constructor | Failed to ensure bucket exists") - } + s := newService(r) + c := newController(s, deps.Utils) return &Handler{ repo: r, diff --git a/internal/api/merch/repository.go b/internal/api/merch/repository.go index 3c4ccfc..61a3bc5 100644 --- a/internal/api/merch/repository.go +++ b/internal/api/merch/repository.go @@ -21,7 +21,6 @@ func NewRepo(db *gorm.DB) *Repo { type repository interface { addMerch(bundle merchBundle) error - merchRecordExists(userUuid, merchUuid string) (bool, error) getSingleMerch(userUuid, merchUuid string) (merchBundle, error) getAllMerch(userUuid string) ([]ListResponse, error) @@ -55,19 +54,6 @@ func (r *Repo) addMerch(bundle merchBundle) error { return nil } -func (r *Repo) merchRecordExists(userUuid, merchUuid string) (bool, error) { - var exists bool - err := r.db.Raw(` - SELECT EXISTS ( - SELECT 1 - FROM merch - WHERE user_uuid = ? - AND merch_uuid = ? - );`, userUuid, merchUuid).Scan(&exists).Error - - return exists, err -} - func (r *Repo) getSingleMerch(userUuid, merchUuid string) (merchBundle, error) { var merch Merch if err := r.db. diff --git a/internal/api/merch/service.go b/internal/api/merch/service.go index de751ec..a0fe00f 100644 --- a/internal/api/merch/service.go +++ b/internal/api/merch/service.go @@ -1,49 +1,22 @@ package merch import ( - "bytes" - "context" "database/sql" "errors" - "fmt" - "github.com/disintegration/imaging" "github.com/google/uuid" - log "github.com/sirupsen/logrus" - "image" - "image/jpeg" - "io" - "merch-parser-api/internal/interfaces" - "mime/multipart" - "net/url" - "path/filepath" - "strings" "time" ) type service struct { - repo repository - media interfaces.MediaStorage - bucketName string - expires time.Duration + repo repository } -func newService(repo repository, media interfaces.MediaStorage, bucketName string, expires time.Duration) *service { +func newService(repo repository) *service { return &service{ - repo: repo, - media: media, - bucketName: bucketName, - expires: expires, + repo: repo, } } -type uploadImageParams struct { - ctx context.Context - src io.Reader - imageType string - object string - quality int -} - func (s *service) addMerch(payload MerchDTO, userUuid string) error { merchUuid := uuid.NewString() @@ -107,13 +80,6 @@ func (s *service) updateMerch(payload UpdateMerchDTO, userUuid string) error { } func (s *service) deleteMerch(userUuid, merchUuid string) error { - ctx, cancel := context.WithTimeout(context.Background(), s.expires) - defer cancel() - - if err := s.deleteMerchImage(ctx, userUuid, merchUuid); err != nil { - return err - } - return s.repo.deleteMerch(userUuid, merchUuid) } @@ -210,167 +176,3 @@ func (s *service) getDistinctPrices(userUuid, merchUuid, days string) (PricesRes Origins: []OriginWithPrices{originSurugaya, originMandarake}, }, nil } - -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 { - return err - } - - if !exists { - return fmt.Errorf("no merch found for user %s with uuid %s", userUuid, merchUuid) - } - - rawExt := filepath.Ext(file.Filename) - if rawExt == "" { - return errors.New("no file extension") - } - - ext := strings.ToLower(rawExt[1:]) - allowedTypes := map[string]struct{}{"jpeg": {}, "jpg": {}, "png": {}, "gif": {}} - if _, ok := allowedTypes[ext]; !ok { - return errors.New("invalid file type") - } - - getSrc := func() (io.ReadCloser, error) { - f, err := file.Open() - if err != nil { - log.WithError(err).Error("Merch | Failed to open file") - return nil, err - } - return f, nil - } - - switch imageType { - case "thumbnail": - src, err := getSrc() - if err != nil { - return err - } - return s._uploadToStorage(uploadImageParams{ - ctx: ctx, - src: src, - imageType: "thumbnail", - object: fmt.Sprintf("%s/merch/%s/thumbnail.jpg", userUuid, merchUuid), - quality: 80, - }) - - case "full": - src, err := getSrc() - if err != nil { - return err - } - return s._uploadToStorage(uploadImageParams{ - ctx: ctx, - src: src, - imageType: "full", - object: fmt.Sprintf("%s/merch/%s/full.jpg", userUuid, merchUuid), - quality: 90, - }) - - case "all": - src, err := getSrc() - if err != nil { - return err - } - if err = s._uploadToStorage(uploadImageParams{ - ctx: ctx, - src: src, - imageType: "thumbnail", - object: fmt.Sprintf("%s/merch/%s/thumbnail.jpg", userUuid, merchUuid), - quality: 80, - }); err != nil { - log.WithError(err).Error("Merch | Upload thumbnail and full image") - return err - } - - src2, err := getSrc() - if err != nil { - return err - } - if err = s._uploadToStorage(uploadImageParams{ - ctx: ctx, - src: src2, - imageType: "full", - object: fmt.Sprintf("%s/merch/%s/full.jpg", userUuid, merchUuid), - quality: 90, - }); err != nil { - log.WithError(err).Error("Merch | Upload thumbnail and full image") - return err - } - default: - return errors.New("invalid file type") - } - return nil -} - -func (s *service) getMerchImage(ctx context.Context, userUuid, merchUuid, imageType string) (*url.URL, error) { - exists, err := s.repo.merchRecordExists(userUuid, merchUuid) - if err != nil { - return nil, err - } - - if !exists { - return nil, 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 nil, fmt.Errorf("unknown image type %s", imageType) - } - - return s.media.Get(ctx, s.bucketName, object, s.expires, nil) -} - -func (s *service) deleteMerchImage(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) - } - - 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 -} - -func (s *service) _uploadToStorage(params uploadImageParams) error { - img, _, err := image.Decode(params.src) - if err != nil { - return fmt.Errorf("failed to decode image: %w", err) - } - - if params.imageType == "thumbnail" { - img = imaging.Resize(img, 300, 300, imaging.Lanczos) - } - - var buf bytes.Buffer - if err = jpeg.Encode(&buf, img, &jpeg.Options{Quality: params.quality}); err != nil { - return fmt.Errorf("failed to encode full image: %w", err) - } - - err = s.media.Upload(params.ctx, s.bucketName, params.object, &buf, -1) - if err != nil { - log.WithFields(log.Fields{ - "error": err, - "img type": "full", - }).Error("Merch | Failed to upload file to media storage") - return err - } - - return nil -} diff --git a/internal/interfaces/mediaStorage.go b/internal/interfaces/mediaStorage.go deleted file mode 100644 index ff185ed..0000000 --- a/internal/interfaces/mediaStorage.go +++ /dev/null @@ -1,15 +0,0 @@ -package interfaces - -import ( - "context" - "io" - "net/url" - "time" -) - -type MediaStorage interface { - СreateBucketIfNotExists(bucketName string) 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) - Delete(ctx context.Context, bucket, object string) error -} diff --git a/internal/mediaStorage/handler.go b/internal/mediaStorage/handler.go deleted file mode 100644 index 90732d0..0000000 --- a/internal/mediaStorage/handler.go +++ /dev/null @@ -1,35 +0,0 @@ -package mediaStorage - -import ( - "fmt" - "github.com/minio/minio-go/v7" - "github.com/minio/minio-go/v7/pkg/credentials" - log "github.com/sirupsen/logrus" -) - -type Handler struct { - *Service -} - -type Deps struct { - Host string - Port string - User string - Password string -} - -func NewHandler(deps Deps) *Handler { - endpoint := fmt.Sprintf("%s:%s", deps.Host, deps.Port) - minioClient, err := minio.New(endpoint, &minio.Options{ - Creds: credentials.NewStaticV4(deps.User, deps.Password, ""), - Secure: false, - }) - - if err != nil { - log.WithError(err).Fatal("Media storage | Failed to create minio client") - } - - return &Handler{ - newService(minioClient), - } -} diff --git a/internal/mediaStorage/service.go b/internal/mediaStorage/service.go deleted file mode 100644 index 1ae0e2b..0000000 --- a/internal/mediaStorage/service.go +++ /dev/null @@ -1,52 +0,0 @@ -package mediaStorage - -import ( - "context" - "errors" - "fmt" - "github.com/minio/minio-go/v7" - log "github.com/sirupsen/logrus" - "io" - "net/url" - "time" -) - -type Service struct { - client *minio.Client -} - -func newService(client *minio.Client) *Service { - return &Service{ - client: client, - } -} - -func (s *Service) СreateBucketIfNotExists(bucketName string) error { - ctx := context.Background() - err := s.client.MakeBucket(ctx, bucketName, minio.MakeBucketOptions{}) - if err != nil { - var minioErr minio.ErrorResponse - if errors.As(err, &minioErr) { - if minioErr.Code == "BucketAlreadyExists" || minioErr.Code == "BucketAlreadyOwnedByYou" { - log.Infof("Media storage | Bucket %s already exists, skipping creation", bucketName) - return nil - } - } - return fmt.Errorf("failed to create bucket: %w", err) - } - log.Infof("Media storage | Bucket %s created successfully", bucketName) - return nil -} - -func (s *Service) Upload(ctx context.Context, bucket, object string, reader io.Reader, size int64) error { - _, err := s.client.PutObject(ctx, bucket, object, reader, size, minio.PutObjectOptions{ContentType: "image/jpeg"}) - 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) Delete(ctx context.Context, bucket, object string) error { - return s.client.RemoveObject(ctx, bucket, object, minio.RemoveObjectOptions{}) -}