mirror of
https://github.com/andwati/zitadel.git
synced 2026-10-18 05:52:51 +00:00
This pull request refactors the command execution and transaction handling logic within the `domain` package. The primary goal is to simplify the invoker chain, clarify transaction management, and improve the overall structure for better maintainability and readability. ### Key Changes: - **Simplified Invoker Chain**: The previous chain of invokers has been refactored. A new `transactionInvoker` is introduced to explicitly manage database transactions for commands that require them. This responsibility is no longer spread across different parts of the invocation flow. - **`Transactional` Interface**: A new `Transactional` interface has been introduced. Commands that need to run within a database transaction now implement this interface. This provides a clear and explicit contract for transactional operations. - **Consolidated Transaction Logic**: The logic for starting, committing, and rolling back transactions is now centralized within the `transactionInvoker` and the `eventStoreInvoker`. The `EnsureTx` method on `InvokeOpts` has been removed, and transaction handling is now managed automatically by the invocation framework. - **Improved Event Handling**: The `eventStoreInvoker` and its `eventCollector` have been rewritten to be more robust and to correctly handle nested and batched commands, ensuring that all events are collected and published within the same transaction. - **Code Cleanup**: A significant amount of now-unused code, including the old `invoker_test.go`, has been removed. Various comments and variable declarations have also been cleaned up. - **Updated Command Implementations**: All commands in the `domain` package (e.g., `ActivateOrgCommand`, `DeactivateOrgCommand`, `DeleteOrgCommand`, `UpdateOrgCommand`) have been updated to use the new `Transactional` interface where appropriate, removing manual transaction management. - **Enhanced Testing**: Tests have been added and updated to cover the new transaction and event handling logic, ensuring the refactoring is sound. - **Use `PrimaryKeyCondition`**: Use the `repository.PrimaryKeyCondition(...)` method instead of using `database.And(...)` where possible. These changes lead to a cleaner, more decoupled architecture for command handling in ZITADEL. --------- Co-authored-by: Marco A. <[email protected]>
349 lines
8.5 KiB
Go
349 lines
8.5 KiB
Go
package database
|
|
|
|
import "go.uber.org/mock/gomock"
|
|
|
|
// Condition represents a SQL condition.
|
|
// Its written after the WHERE keyword in a SQL statement.
|
|
type Condition interface {
|
|
gomock.Matcher
|
|
Write(builder *StatementBuilder)
|
|
// IsRestrictingColumn is used to check if the condition filters for a specific column.
|
|
// It acts as a safeguard database operations that should be specific on the given column.
|
|
IsRestrictingColumn(col Column) bool
|
|
}
|
|
|
|
type and struct {
|
|
conditions []Condition
|
|
}
|
|
|
|
// Matches implements [Condition].
|
|
func (a *and) Matches(x any) bool {
|
|
toMatch, ok := x.(*and)
|
|
if !ok {
|
|
return false
|
|
}
|
|
if len(a.conditions) != len(toMatch.conditions) {
|
|
return false
|
|
}
|
|
for i, condition := range a.conditions {
|
|
if !condition.Matches(toMatch.conditions[i]) {
|
|
return false
|
|
}
|
|
}
|
|
return true
|
|
}
|
|
|
|
// String implements [Condition].
|
|
func (a *and) String() string {
|
|
return "database.and"
|
|
}
|
|
|
|
// Write implements [Condition].
|
|
func (a and) Write(builder *StatementBuilder) {
|
|
if len(a.conditions) > 1 {
|
|
builder.WriteString("(")
|
|
defer builder.WriteString(")")
|
|
}
|
|
for i, condition := range a.conditions {
|
|
if i > 0 {
|
|
builder.WriteString(" AND ")
|
|
}
|
|
condition.Write(builder)
|
|
}
|
|
}
|
|
|
|
// And combines multiple conditions with AND.
|
|
func And(conditions ...Condition) *and {
|
|
return &and{conditions: conditions}
|
|
}
|
|
|
|
// IsRestrictingColumn implements [Condition].
|
|
func (a and) IsRestrictingColumn(col Column) bool {
|
|
for _, condition := range a.conditions {
|
|
if condition.IsRestrictingColumn(col) {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|
|
|
|
var _ Condition = (*and)(nil)
|
|
|
|
type or struct {
|
|
conditions []Condition
|
|
}
|
|
|
|
// Matches implements [Condition].
|
|
func (o *or) Matches(x any) bool {
|
|
toMatch, ok := x.(*or)
|
|
if !ok {
|
|
return false
|
|
}
|
|
if len(o.conditions) != len(toMatch.conditions) {
|
|
return false
|
|
}
|
|
for i, condition := range o.conditions {
|
|
if !condition.Matches(toMatch.conditions[i]) {
|
|
return false
|
|
}
|
|
}
|
|
return true
|
|
}
|
|
|
|
// String implements [Condition].
|
|
func (o *or) String() string {
|
|
return "database.or"
|
|
}
|
|
|
|
// Write implements [Condition].
|
|
func (o or) Write(builder *StatementBuilder) {
|
|
if len(o.conditions) > 1 {
|
|
builder.WriteString("(")
|
|
defer builder.WriteString(")")
|
|
}
|
|
for i, condition := range o.conditions {
|
|
if i > 0 {
|
|
builder.WriteString(" OR ")
|
|
}
|
|
condition.Write(builder)
|
|
}
|
|
}
|
|
|
|
// Or combines multiple conditions with OR.
|
|
func Or(conditions ...Condition) *or {
|
|
return &or{conditions: conditions}
|
|
}
|
|
|
|
// IsRestrictingColumn implements [Condition].
|
|
// It returns true only if all conditions are restricting the given column.
|
|
func (o or) IsRestrictingColumn(col Column) bool {
|
|
for _, condition := range o.conditions {
|
|
if !condition.IsRestrictingColumn(col) {
|
|
return false
|
|
}
|
|
}
|
|
return true
|
|
}
|
|
|
|
var _ Condition = (*or)(nil)
|
|
|
|
type isNull struct {
|
|
column Column
|
|
}
|
|
|
|
// Matches implements [Condition].
|
|
func (i *isNull) Matches(x any) bool {
|
|
toMatch, ok := x.(*isNull)
|
|
if !ok {
|
|
return false
|
|
}
|
|
return i.column.Matches(toMatch.column)
|
|
}
|
|
|
|
// String implements [Condition].
|
|
func (i *isNull) String() string {
|
|
return "database.isNull"
|
|
}
|
|
|
|
// Write implements [Condition].
|
|
func (i isNull) Write(builder *StatementBuilder) {
|
|
i.column.WriteQualified(builder)
|
|
builder.WriteString(" IS NULL")
|
|
}
|
|
|
|
// IsNull creates a condition that checks if a column is NULL.
|
|
func IsNull(column Column) *isNull {
|
|
return &isNull{column: column}
|
|
}
|
|
|
|
// IsRestrictingColumn implements [Condition].
|
|
// It returns false because it cannot be used for restricting a column.
|
|
func (i isNull) IsRestrictingColumn(col Column) bool {
|
|
return false
|
|
}
|
|
|
|
var _ Condition = (*isNull)(nil)
|
|
|
|
type isNotNull struct {
|
|
column Column
|
|
}
|
|
|
|
// Matches implements [Condition].
|
|
func (i *isNotNull) Matches(x any) bool {
|
|
toMatch, ok := x.(*isNotNull)
|
|
if !ok {
|
|
return false
|
|
}
|
|
return i.column.Matches(toMatch.column)
|
|
}
|
|
|
|
// String implements [Condition].
|
|
func (i *isNotNull) String() string {
|
|
return "database.isNotNull"
|
|
}
|
|
|
|
// Write implements [Condition].
|
|
func (i isNotNull) Write(builder *StatementBuilder) {
|
|
i.column.WriteQualified(builder)
|
|
builder.WriteString(" IS NOT NULL")
|
|
}
|
|
|
|
// IsNotNull creates a condition that checks if a column is NOT NULL.
|
|
func IsNotNull(column Column) *isNotNull {
|
|
return &isNotNull{column: column}
|
|
}
|
|
|
|
// IsRestrictingColumn implements [Condition].
|
|
// It returns false because it cannot be used for restricting a column.
|
|
func (i isNotNull) IsRestrictingColumn(col Column) bool {
|
|
return false
|
|
}
|
|
|
|
var _ Condition = (*isNotNull)(nil)
|
|
|
|
type valueCondition struct {
|
|
write func(builder *StatementBuilder)
|
|
col Column
|
|
}
|
|
|
|
// Matches implements [Condition].
|
|
func (c valueCondition) Matches(x any) bool {
|
|
toMatch, ok := x.(valueCondition)
|
|
if !ok {
|
|
return false
|
|
}
|
|
if !c.col.Matches(toMatch.col) {
|
|
return false
|
|
}
|
|
var expectedStatement, inputStatement StatementBuilder
|
|
c.write(&expectedStatement)
|
|
toMatch.write(&inputStatement)
|
|
return expectedStatement.String() == inputStatement.String()
|
|
}
|
|
|
|
// String implements [Condition].
|
|
func (c valueCondition) String() string {
|
|
return "database.valueCondition"
|
|
}
|
|
|
|
// NewTextCondition creates a condition that compares a text column with a value.
|
|
// if `op.IsIgnoreCaseOperation()` is true the response is created using [NewTextIgnoreCaseCondition]
|
|
func NewTextCondition[T Text](col Column, op TextOperation, value T) Condition {
|
|
if op.IsIgnoreCaseOperation() {
|
|
return NewTextIgnoreCaseCondition(col, op.Value(), value)
|
|
}
|
|
return valueCondition{
|
|
col: col,
|
|
write: func(builder *StatementBuilder) {
|
|
writeTextOperation[T](builder, col, op, value)
|
|
},
|
|
}
|
|
}
|
|
|
|
// NewTextIgnoreCaseCondition creates a condition that compares a text column with a value, ignoring case by lowercasing both.
|
|
func NewTextIgnoreCaseCondition[T Text](col Column, op TextOperation, value T) Condition {
|
|
return valueCondition{
|
|
col: col,
|
|
write: func(builder *StatementBuilder) {
|
|
writeTextOperation[T](builder, LowerColumn(col), op, LowerValue(value))
|
|
},
|
|
}
|
|
}
|
|
|
|
// NewNumberCondition creates a condition that compares a numeric column with a value.
|
|
func NewNumberCondition[V Number](col Column, op NumberOperation, value V) Condition {
|
|
return valueCondition{
|
|
col: col,
|
|
write: func(builder *StatementBuilder) {
|
|
writeNumberOperation[V](builder, col, op, value)
|
|
},
|
|
}
|
|
}
|
|
|
|
// NewBooleanCondition creates a condition that compares a boolean column with a value.
|
|
func NewBooleanCondition[V Boolean](col Column, value V) Condition {
|
|
return valueCondition{
|
|
col: col,
|
|
write: func(builder *StatementBuilder) {
|
|
writeBooleanOperation[V](builder, col, value)
|
|
},
|
|
}
|
|
}
|
|
|
|
// NewBytesCondition creates a condition that compares a BYTEA column with a value.
|
|
func NewBytesCondition[V Bytes](col Column, op BytesOperation, value any) Condition {
|
|
return valueCondition{
|
|
col: col,
|
|
write: func(builder *StatementBuilder) {
|
|
writeBytesOperation[V](builder, col, op, value)
|
|
},
|
|
}
|
|
}
|
|
|
|
// NewColumnCondition creates a condition that compares two columns on equality.
|
|
func NewColumnCondition(col1, col2 Column) Condition {
|
|
return valueCondition{
|
|
col: col1,
|
|
write: func(builder *StatementBuilder) {
|
|
col1.WriteQualified(builder)
|
|
builder.WriteString(" = ")
|
|
col2.WriteQualified(builder)
|
|
},
|
|
}
|
|
}
|
|
|
|
// Write implements [Condition].
|
|
func (c valueCondition) Write(builder *StatementBuilder) {
|
|
c.write(builder)
|
|
}
|
|
|
|
// IsRestrictingColumn implements [Condition].
|
|
func (i valueCondition) IsRestrictingColumn(col Column) bool {
|
|
return i.col.Equals(col)
|
|
}
|
|
|
|
var _ Condition = (*valueCondition)(nil)
|
|
|
|
// existsCondition is a helper to write an EXISTS (SELECT 1 FROM <table> WHERE <condition>) clause.
|
|
// It implements [Condition] so it can be composed with other conditions using And/Or.
|
|
type existsCondition struct {
|
|
table string
|
|
condition Condition
|
|
}
|
|
|
|
// Matches implements [Condition].
|
|
func (e *existsCondition) Matches(x any) bool {
|
|
// Unimplemented
|
|
return false
|
|
}
|
|
|
|
// String implements [Condition].
|
|
func (e *existsCondition) String() string {
|
|
return "existsCondition"
|
|
}
|
|
|
|
// Exists creates a condition that checks for the existence of rows in a subquery.
|
|
func Exists(table string, condition Condition) Condition {
|
|
return &existsCondition{
|
|
table: table,
|
|
condition: condition,
|
|
}
|
|
}
|
|
|
|
// Write implements [Condition].
|
|
func (e existsCondition) Write(builder *StatementBuilder) {
|
|
builder.WriteString(" EXISTS (SELECT 1 FROM ")
|
|
builder.WriteString(e.table)
|
|
builder.WriteString(" WHERE ")
|
|
e.condition.Write(builder)
|
|
builder.WriteString(")")
|
|
}
|
|
|
|
// IsRestrictingColumn implements [Condition].
|
|
func (e existsCondition) IsRestrictingColumn(col Column) bool {
|
|
// Forward to the inner condition so safety checks (like instance_id presence) can still work.
|
|
return e.condition.IsRestrictingColumn(col)
|
|
}
|
|
|
|
var _ Condition = (*existsCondition)(nil)
|