chore: manager separate

database/database.go

@@ -136,3 +136,16 @@ func (d *DB) Shutdown() error {
 
 	return nil
 }
+
+const ContextSchemaKey = "schema"
+
+// GetDB returns base db for context.
+func GetDB(db Databaser, c DBContext) *pg.DB {
+	return db.DB()
+}
+
+// GetTenantDB returns base tenant db for context.
+func GetTenantDB(db Databaser, c DBContext) *pg.DB {
+	schema := c.Get(ContextSchemaKey).(string)
+	return db.TenantDB(schema)
+}

database/interface.go

@@ -2,6 +2,8 @@ package database
 
 import (
 	"net/http"
+
+	"github.com/go-pg/pg/v9"
 )
 
 //go:generate go run github.com/vektra/mockery/cmd/mockery -name DBContext
@@ -15,3 +17,11 @@ type DBContext interface {
 	// Request returns `*http.Request`.
 	Request() *http.Request
 }
+
+//go:generate go run github.com/vektra/mockery/cmd/mockery -name Databaser
+type Databaser interface {
+	DB() *pg.DB
+	TenantDB(schema string) *pg.DB
+}
+
+var _ Databaser = (*DB)(nil)

database/manager/live_manager.go

@@ -12,13 +12,13 @@ type LiveManager struct {
 }
 
 // NewLiveManager creates and returns new live manager.
-func (q *Factory) NewLiveManager(c database.DBContext) *LiveManager {
-	return &LiveManager{Manager: q.NewManager(c)}
+func NewLiveManager(db *database.DB, c database.DBContext) *LiveManager {
+	return &LiveManager{Manager: NewManager(db, c)}
 }
 
 // NewLiveTenantManager creates and returns new live tenant manager.
-func (q *Factory) NewLiveTenantManager(c database.DBContext) *LiveManager {
-	return &LiveManager{Manager: q.NewTenantManager(c)}
+func NewLiveTenantManager(db *database.DB, c database.DBContext) *LiveManager {
+	return &LiveManager{Manager: NewTenantManager(db, c)}
 }
 
 // Query returns only alive objects.

database/manager/manager.go

@@ -9,30 +9,30 @@ import (
 
 // Manager defines object manager.
 type Manager struct {
-	*Factory
+	db    *database.DB
 	dbCtx database.DBContext
 	curDB orm.DB
 	dbGet func(database.DBContext) orm.DB
 }
 
 // NewManager creates and returns new manager.
-func (q *Factory) NewManager(c database.DBContext) *Manager {
+func NewManager(db *database.DB, c database.DBContext) *Manager {
 	return &Manager{
-		Factory: q,
-		dbCtx:   c,
+		db:    db,
+		dbCtx: c,
 		dbGet: func(c database.DBContext) orm.DB {
-			return DB(q.db, c)
+			return database.GetDB(db, c)
 		},
 	}
 }
 
 // NewTenantManager creates and returns new tenant manager.
-func (q *Factory) NewTenantManager(c database.DBContext) *Manager {
+func NewTenantManager(db *database.DB, c database.DBContext) *Manager {
 	return &Manager{
-		Factory: q,
-		dbCtx:   c,
+		db:    db,
+		dbCtx: c,
 		dbGet: func(c database.DBContext) orm.DB {
-			return TenantDB(q.db, c)
+			return database.GetTenantDB(db, c)
 		},
 	}
 }