mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-25 03:47:52 +00:00
not that bad anymore
This commit is contained in:
@@ -13,7 +13,8 @@ import (
|
||||
type Instance struct {
|
||||
db database.Pool
|
||||
|
||||
orchestrator instanceOrchestrator
|
||||
instance instanceOrchestrator
|
||||
user userOrchestrator
|
||||
}
|
||||
|
||||
type instanceOrchestrator interface {
|
||||
@@ -24,19 +25,20 @@ type instanceOrchestrator interface {
|
||||
|
||||
func NewInstance(db database.Pool, tracer *tracing.Tracer, logger *logging.Logger) *Instance {
|
||||
b := &Instance{
|
||||
db: db,
|
||||
orchestrator: orchestrate.Instance(),
|
||||
db: db,
|
||||
instance: orchestrate.Instance(),
|
||||
user: orchestrate.User(),
|
||||
}
|
||||
|
||||
return b
|
||||
}
|
||||
|
||||
func (b *Instance) ByID(ctx context.Context, id string) (*repository.Instance, error) {
|
||||
return b.orchestrator.ByID(ctx, b.db, id)
|
||||
return b.instance.ByID(ctx, b.db, id)
|
||||
}
|
||||
|
||||
func (b *Instance) ByDomain(ctx context.Context, domain string) (*repository.Instance, error) {
|
||||
return b.orchestrator.ByDomain(ctx, b.db, domain)
|
||||
return b.instance.ByDomain(ctx, b.db, domain)
|
||||
}
|
||||
|
||||
type SetUpInstance struct {
|
||||
@@ -52,9 +54,10 @@ func (b *Instance) SetUp(ctx context.Context, request *SetUpInstance) (err error
|
||||
defer func() {
|
||||
err = tx.End(ctx, err)
|
||||
}()
|
||||
_, err = b.orchestrator.SetUp(ctx, tx, request.Instance)
|
||||
_, err = b.instance.SetUp(ctx, tx, request.Instance)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return b.userCommandRepo(tx).Create(ctx, request.User)
|
||||
_, err = b.user.Create(ctx, tx, request.User)
|
||||
return err
|
||||
}
|
||||
|
@@ -1,39 +1,13 @@
|
||||
package domain
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"github.com/zitadel/zitadel/backend/repository"
|
||||
"github.com/zitadel/zitadel/backend/repository/event"
|
||||
"github.com/zitadel/zitadel/backend/repository/sql"
|
||||
"github.com/zitadel/zitadel/backend/repository/telemetry/logged"
|
||||
"github.com/zitadel/zitadel/backend/repository/telemetry/traced"
|
||||
"github.com/zitadel/zitadel/backend/storage/database"
|
||||
"github.com/zitadel/zitadel/backend/storage/eventstore"
|
||||
)
|
||||
|
||||
func (b *Instance) userCommandRepo(tx database.Transaction) repository.UserRepository {
|
||||
return logged.NewUser(
|
||||
b.logger,
|
||||
traced.NewUser(
|
||||
b.tracer,
|
||||
event.NewUser(
|
||||
eventstore.New(tx),
|
||||
sql.NewUser(tx),
|
||||
),
|
||||
),
|
||||
)
|
||||
}
|
||||
|
||||
func (b *Instance) userQueryRepo(tx database.QueryExecutor) repository.UserRepository {
|
||||
return logged.NewUser(
|
||||
b.logger,
|
||||
traced.NewUser(
|
||||
b.tracer,
|
||||
sql.NewUser(tx),
|
||||
),
|
||||
)
|
||||
}
|
||||
|
||||
type User struct {
|
||||
ID string
|
||||
Username string
|
||||
type userOrchestrator interface {
|
||||
Create(ctx context.Context, client database.Transaction, user *repository.User) (*repository.User, error)
|
||||
ByID(ctx context.Context, querier database.Querier, id string) (*repository.User, error)
|
||||
}
|
||||
|
Reference in New Issue
Block a user