jan/openreplay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(pa): removed unnecessary s3 import

Browse source
This commit is contained in:
Alexander 2024-12-20 10:40:33 +01:00
parent fdae00c602
commit 93d51acfc4
3 changed files with 10 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
backend/pkg/analytics/api/handlers.go
View file

@ -10,14 +10,12 @@ import (
config "openreplay/backend/internal/config/analytics" config "openreplay/backend/internal/config/analytics"
"openreplay/backend/pkg/analytics/service" "openreplay/backend/pkg/analytics/service"
"openreplay/backend/pkg/logger" "openreplay/backend/pkg/logger"
"openreplay/backend/pkg/objectstorage"
"openreplay/backend/pkg/server/api" "openreplay/backend/pkg/server/api"
) )
type handlersImpl struct { type handlersImpl struct {
log logger.Logger log logger.Logger
responser *api.Responser responser *api.Responser
objStorage objectstorage.ObjectStorage
jsonSizeLimit int64 jsonSizeLimit int64
service service.Service service service.Service
} }
@ -41,11 +39,10 @@ func (e *handlersImpl) GetAll() []*api.Description {
} }
} }
func NewHandlers(log logger.Logger, cfg *config.Config, responser *api.Responser, objStore objectstorage.ObjectStorage, service service.Service) (api.Handlers, error) { func NewHandlers(log logger.Logger, cfg *config.Config, responser *api.Responser, service service.Service) (api.Handlers, error) {
return &handlersImpl{ return &handlersImpl{
log: log, log: log,
responser: responser, responser: responser,
objStorage: objStore,
jsonSizeLimit: cfg.JsonSizeLimit, jsonSizeLimit: cfg.JsonSizeLimit,
service: service, service: service,
}, nil }, nil

10
backend/pkg/analytics/builder.go
View file

@ -9,7 +9,6 @@ import (
"openreplay/backend/pkg/db/postgres/pool" "openreplay/backend/pkg/db/postgres/pool"
"openreplay/backend/pkg/logger" "openreplay/backend/pkg/logger"
"openreplay/backend/pkg/metrics/web" "openreplay/backend/pkg/metrics/web"
"openreplay/backend/pkg/objectstorage/store"
"openreplay/backend/pkg/server/api" "openreplay/backend/pkg/server/api"
"openreplay/backend/pkg/server/auth" "openreplay/backend/pkg/server/auth"
"openreplay/backend/pkg/server/limiter" "openreplay/backend/pkg/server/limiter"
@ -24,11 +23,6 @@ type ServicesBuilder struct {
} }
func NewServiceBuilder(log logger.Logger, cfg *analytics.Config, webMetrics web.Web, pgconn pool.Pool) (*ServicesBuilder, error) { func NewServiceBuilder(log logger.Logger, cfg *analytics.Config, webMetrics web.Web, pgconn pool.Pool) (*ServicesBuilder, error) {
objStore, err := store.NewStore(&cfg.ObjectsConfig)
if err != nil {
return nil, err
}
responser := api.NewResponser(webMetrics) responser := api.NewResponser(webMetrics)
audiTrail, err := tracer.NewTracer(log, pgconn) audiTrail, err := tracer.NewTracer(log, pgconn)
@ -36,12 +30,12 @@ func NewServiceBuilder(log logger.Logger, cfg *analytics.Config, webMetrics web.
return nil, err return nil, err
} }
analyticsService, err := service.NewService(log, pgconn, objStore) analyticsService, err := service.NewService(log, pgconn)
if err != nil { if err != nil {
return nil, err return nil, err
} }
handlers, err := analyticsAPI.NewHandlers(log, cfg, responser, objStore, analyticsService) handlers, err := analyticsAPI.NewHandlers(log, cfg, responser, analyticsService)
if err != nil { if err != nil {
return nil, err return nil, err
} }

19
backend/pkg/analytics/service/analytics.go
View file

@ -7,7 +7,6 @@ import (
"openreplay/backend/pkg/analytics/api/models" "openreplay/backend/pkg/analytics/api/models"
"openreplay/backend/pkg/db/postgres/pool" "openreplay/backend/pkg/db/postgres/pool"
"openreplay/backend/pkg/logger" "openreplay/backend/pkg/logger"
"openreplay/backend/pkg/objectstorage"
) )
type Service interface { type Service interface {
@ -30,26 +29,22 @@ type Service interface {
} }
type serviceImpl struct { type serviceImpl struct {
log logger.Logger log logger.Logger
pgconn pool.Pool pgconn pool.Pool
storage objectstorage.ObjectStorage ctx context.Context
ctx context.Context
} }
func NewService(log logger.Logger, conn pool.Pool, storage objectstorage.ObjectStorage) (Service, error) { func NewService(log logger.Logger, conn pool.Pool) (Service, error) {
switch { switch {
case log == nil: case log == nil:
return nil, errors.New("logger is empty") return nil, errors.New("logger is empty")
case conn == nil: case conn == nil:
return nil, errors.New("connection pool is empty") return nil, errors.New("connection pool is empty")
case storage == nil:
return nil, errors.New("object storage is empty")
} }
return &serviceImpl{ return &serviceImpl{
log: log, log: log,
pgconn: conn, pgconn: conn,
storage: storage, ctx: context.Background(),
ctx: context.Background(),
}, nil }, nil
} }