merch-tracker-v2/api
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

minio disabled
All checks were successful
/ Make image (push) Successful in 1m8s
Details

Browse source
This commit is contained in:
nquidox 2025-10-26 21:59:49 +03:00
parent 7937d182db
commit 489f749ce3
2 changed files with 17 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cmd/main.go
View file

@ -94,9 +94,9 @@ func main() {
}) })
merchModule := merch.NewHandler(merch.Deps{ merchModule := merch.NewHandler(merch.Deps{
DB: database, DB: database,
Utils: utilsProvider, Utils: utilsProvider,
Media: mediaProvider, //Media: mediaProvider,
ImageStorage: imageProvider, ImageStorage: imageProvider,
}) })

29
internal/api/merch/handler.go
View file

@ -1,7 +1,6 @@
package merch package merch
import ( import (
log "github.com/sirupsen/logrus"
"gorm.io/gorm" "gorm.io/gorm"
"merch-parser-api/internal/interfaces" "merch-parser-api/internal/interfaces"
is "merch-parser-api/proto/imageStorage" is "merch-parser-api/proto/imageStorage"
@ -15,9 +14,9 @@ type Handler struct {
} }
type Deps struct { type Deps struct {
DB *gorm.DB DB *gorm.DB
Utils interfaces.Utils Utils interfaces.Utils
Media interfaces.MediaStorage //Media interfaces.MediaStorage
ImageStorage is.ImageStorageClient ImageStorage is.ImageStorageClient
} }
@ -27,23 +26,23 @@ func NewHandler(deps Deps) *Handler {
r := NewRepo(deps.DB) r := NewRepo(deps.DB)
s := newService(serviceDeps{ s := newService(serviceDeps{
repo: r, repo: r,
media: deps.Media, //media: deps.Media,
bucketName: packageBucketName, bucketName: packageBucketName,
expires: expires, expires: expires,
imageStorage: deps.ImageStorage, imageStorage: deps.ImageStorage,
}) })
c := newController(s, deps.Utils, expires) c := newController(s, deps.Utils, expires)
media := deps.Media //media := deps.Media
log.WithFields(log.Fields{ //log.WithFields(log.Fields{
"addr": media, // "addr": media,
}).Debug("Merch handler constructor | Media provider") //}).Debug("Merch handler constructor | Media provider")
//
exists, err := media.CheckBucketExists(packageBucketName) //exists, err := media.CheckBucketExists(packageBucketName)
if err != nil || !exists { //if err != nil || !exists {
log.WithError(err).Fatal("Merch handler constructor | Failed to ensure bucket exists") // log.WithError(err).Fatal("Merch handler constructor | Failed to ensure bucket exists")
} //}
return &Handler{ return &Handler{
repo: r, repo: r,