This commit is contained in:
parent
7937d182db
commit
489f749ce3
2 changed files with 17 additions and 18 deletions
|
|
@ -96,7 +96,7 @@ 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,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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"
|
||||||
|
|
@ -17,7 +16,7 @@ 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
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -28,22 +27,22 @@ 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,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue