mirror of
https://github.com/andwati/zitadel.git
synced 2026-11-20 11:58:47 +00:00
refactor: invoker implementations and clean up code (#10962)
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]>
This commit is contained in:
@@ -3,6 +3,7 @@ package database
|
||||
import (
|
||||
"fmt"
|
||||
"reflect"
|
||||
"slices"
|
||||
|
||||
"go.uber.org/mock/gomock"
|
||||
)
|
||||
@@ -148,17 +149,15 @@ func (q *QueryOpts) Matches(x any) bool {
|
||||
inputOpts.Write(inputBuilder)
|
||||
q.Write(expectedBuilder)
|
||||
|
||||
if len(inputBuilder.Args()) != len(expectedBuilder.Args()) {
|
||||
return false
|
||||
deepEq := func(input, expected any) int {
|
||||
if reflect.DeepEqual(input, expected) {
|
||||
return 0
|
||||
}
|
||||
return -1
|
||||
}
|
||||
|
||||
for i := range inputBuilder.Args() {
|
||||
argIn, argExp := inputBuilder.Args()[i], expectedBuilder.Args()[i]
|
||||
|
||||
isEqual := reflect.DeepEqual(argIn, argExp)
|
||||
if !isEqual {
|
||||
return false
|
||||
}
|
||||
if slices.CompareFunc(inputBuilder.Args(), expectedBuilder.Args(), deepEq) != 0 {
|
||||
return false
|
||||
}
|
||||
return inputBuilder.String() == expectedBuilder.String()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user