diff --git a/internal/app/handler.go b/internal/app/handler.go index 00c3535..855e1d9 100644 --- a/internal/app/handler.go +++ b/internal/app/handler.go @@ -58,9 +58,8 @@ func New(ctx context.Context, cfg config.Config) *App { var modules []Module m := merch.New(merch.Deps{ - DB: dbPool, - Utils: u, - UserProvider: userProv, + DB: dbPool, + Utils: u, }) modules = append(modules, m) diff --git a/internal/merch/handler.go b/internal/merch/handler.go index 2ed77d1..d212441 100644 --- a/internal/merch/handler.go +++ b/internal/merch/handler.go @@ -2,7 +2,6 @@ package merch import ( "github.com/jackc/pgx/v5/pgxpool" - "merch-api/internal/user" "merch-api/pkg/utils" ) @@ -12,14 +11,13 @@ type Handler struct { } type Deps struct { - DB *pgxpool.Pool - Utils utils.Utils - UserProvider user.Provider + DB *pgxpool.Pool + Utils utils.Utils } func New(deps Deps) *Handler { r := newRepo(deps.DB) - s := newService(r, deps.Utils, deps.UserProvider) + s := newService(r, deps.Utils) c := newController(s, deps.Utils) p := newProvider(s, deps.Utils) diff --git a/internal/merch/service.go b/internal/merch/service.go index 62f4629..d811e88 100644 --- a/internal/merch/service.go +++ b/internal/merch/service.go @@ -2,23 +2,20 @@ package merch import ( "context" - "merch-api/internal/user" "merch-api/pkg/utils" ) const serviceLogHeader string = "[Service]" type service struct { - repo Repository - utils utils.Utils - userProvider user.Provider + repo Repository + utils utils.Utils } -func newService(repo Repository, u utils.Utils, up user.Provider) *service { +func newService(repo Repository, u utils.Utils) *service { return &service{ - repo: repo, - utils: u, - userProvider: up, + repo: repo, + utils: u, } }