mirror of
https://github.com/andwati/zitadel.git
synced 2026-11-21 20:38: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:
@@ -247,12 +247,7 @@ func TestCreateOrganization(t *testing.T) {
|
||||
|
||||
// check organization values
|
||||
organization, err = organizationRepo.Get(t.Context(), savepoint,
|
||||
database.WithCondition(
|
||||
database.And(
|
||||
organizationRepo.IDCondition(organization.ID),
|
||||
organizationRepo.InstanceIDCondition(organization.InstanceID),
|
||||
),
|
||||
),
|
||||
database.WithCondition(organizationRepo.PrimaryKeyCondition(organization.InstanceID, organization.ID)),
|
||||
)
|
||||
require.NoError(t, err)
|
||||
|
||||
@@ -342,12 +337,7 @@ func TestUpdateOrganization(t *testing.T) {
|
||||
require.NoError(t, err)
|
||||
|
||||
// delete instance
|
||||
_, err = organizationRepo.Delete(t.Context(), tx,
|
||||
database.And(
|
||||
organizationRepo.InstanceIDCondition(org.InstanceID),
|
||||
organizationRepo.IDCondition(org.ID),
|
||||
),
|
||||
)
|
||||
_, err = organizationRepo.Delete(t.Context(), tx, organizationRepo.PrimaryKeyCondition(org.InstanceID, org.ID))
|
||||
require.NoError(t, err)
|
||||
|
||||
return &org
|
||||
@@ -399,10 +389,7 @@ func TestUpdateOrganization(t *testing.T) {
|
||||
|
||||
// update org
|
||||
rowsAffected, err := organizationRepo.Update(t.Context(), tx,
|
||||
database.And(
|
||||
organizationRepo.InstanceIDCondition(createdOrg.InstanceID),
|
||||
organizationRepo.IDCondition(createdOrg.ID),
|
||||
),
|
||||
organizationRepo.PrimaryKeyCondition(createdOrg.InstanceID, createdOrg.ID),
|
||||
tt.update...,
|
||||
)
|
||||
afterUpdate := time.Now()
|
||||
@@ -417,10 +404,7 @@ func TestUpdateOrganization(t *testing.T) {
|
||||
// check organization values
|
||||
organization, err := organizationRepo.Get(t.Context(), tx,
|
||||
database.WithCondition(
|
||||
database.And(
|
||||
organizationRepo.IDCondition(createdOrg.ID),
|
||||
organizationRepo.InstanceIDCondition(createdOrg.InstanceID),
|
||||
),
|
||||
organizationRepo.PrimaryKeyCondition(createdOrg.InstanceID, createdOrg.ID),
|
||||
),
|
||||
)
|
||||
require.NoError(t, err)
|
||||
|
||||
Reference in New Issue
Block a user