mirror of
https://github.com/andwati/zitadel.git
synced 2026-10-18 05:52:51 +00:00
c4221a9c0f
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]>
46 lines
1.2 KiB
Go
46 lines
1.2 KiB
Go
package database
|
|
|
|
import "context"
|
|
|
|
// Transaction is an SQL transaction.
|
|
type Transaction interface {
|
|
// Commit marks a transaction as successful and commits it to the database.
|
|
Commit(ctx context.Context) error
|
|
// Rollback undoes all changes made in the transaction.
|
|
Rollback(ctx context.Context) error
|
|
// End commits the transaction if err is nil, otherwise rollbacks.
|
|
//
|
|
// If err is nil the returned error is from Commit.
|
|
// If err is not nil, and rollback is successful, the original err is returned.
|
|
// If err is not nil, and rollback fails, the two errors are joined using [errors.Join].
|
|
End(ctx context.Context, err error) error
|
|
// Begin starts a sub transaction.
|
|
Begin(ctx context.Context) (Transaction, error)
|
|
|
|
QueryExecutor
|
|
}
|
|
|
|
// Beginner can start a new transaction.
|
|
type Beginner interface {
|
|
Begin(ctx context.Context, opts *TransactionOptions) (Transaction, error)
|
|
}
|
|
|
|
type TransactionOptions struct {
|
|
IsolationLevel IsolationLevel
|
|
AccessMode AccessMode
|
|
}
|
|
|
|
type IsolationLevel uint8
|
|
|
|
const (
|
|
IsolationLevelSerializable IsolationLevel = iota
|
|
IsolationLevelReadCommitted
|
|
)
|
|
|
|
type AccessMode uint8
|
|
|
|
const (
|
|
AccessModeReadWrite AccessMode = iota
|
|
AccessModeReadOnly
|
|
)
|