not that bad anymore

This commit is contained in:
adlerhurst
2025-03-15 11:29:11 +01:00
parent bc6b1d3fcf
commit fa02beb883
22 changed files with 466 additions and 383 deletions

View File

@@ -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
}

View File

@@ -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)
}