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