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]>
119 lines
3.3 KiB
Go
119 lines
3.3 KiB
Go
// Code generated by MockGen. DO NOT EDIT.
|
|
// Source: github.com/zitadel/zitadel/backend/v3/domain (interfaces: Executor)
|
|
//
|
|
// Generated by this command:
|
|
//
|
|
// mockgen -typed -package domainmock -destination ./mock/executor.mock.go . Executor
|
|
//
|
|
|
|
// Package domainmock is a generated GoMock package.
|
|
package domainmock
|
|
|
|
import (
|
|
context "context"
|
|
reflect "reflect"
|
|
|
|
domain "github.com/zitadel/zitadel/backend/v3/domain"
|
|
gomock "go.uber.org/mock/gomock"
|
|
)
|
|
|
|
// MockExecutor is a mock of Executor interface.
|
|
type MockExecutor struct {
|
|
ctrl *gomock.Controller
|
|
recorder *MockExecutorMockRecorder
|
|
isgomock struct{}
|
|
}
|
|
|
|
// MockExecutorMockRecorder is the mock recorder for MockExecutor.
|
|
type MockExecutorMockRecorder struct {
|
|
mock *MockExecutor
|
|
}
|
|
|
|
// NewMockExecutor creates a new mock instance.
|
|
func NewMockExecutor(ctrl *gomock.Controller) *MockExecutor {
|
|
mock := &MockExecutor{ctrl: ctrl}
|
|
mock.recorder = &MockExecutorMockRecorder{mock}
|
|
return mock
|
|
}
|
|
|
|
// EXPECT returns an object that allows the caller to indicate expected use.
|
|
func (m *MockExecutor) EXPECT() *MockExecutorMockRecorder {
|
|
return m.recorder
|
|
}
|
|
|
|
// Execute mocks base method.
|
|
func (m *MockExecutor) Execute(ctx context.Context, opts *domain.InvokeOpts) error {
|
|
m.ctrl.T.Helper()
|
|
ret := m.ctrl.Call(m, "Execute", ctx, opts)
|
|
ret0, _ := ret[0].(error)
|
|
return ret0
|
|
}
|
|
|
|
// Execute indicates an expected call of Execute.
|
|
func (mr *MockExecutorMockRecorder) Execute(ctx, opts any) *MockExecutorExecuteCall {
|
|
mr.mock.ctrl.T.Helper()
|
|
call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Execute", reflect.TypeOf((*MockExecutor)(nil).Execute), ctx, opts)
|
|
return &MockExecutorExecuteCall{Call: call}
|
|
}
|
|
|
|
// MockExecutorExecuteCall wrap *gomock.Call
|
|
type MockExecutorExecuteCall struct {
|
|
*gomock.Call
|
|
}
|
|
|
|
// Return rewrite *gomock.Call.Return
|
|
func (c *MockExecutorExecuteCall) Return(err error) *MockExecutorExecuteCall {
|
|
c.Call = c.Call.Return(err)
|
|
return c
|
|
}
|
|
|
|
// Do rewrite *gomock.Call.Do
|
|
func (c *MockExecutorExecuteCall) Do(f func(context.Context, *domain.InvokeOpts) error) *MockExecutorExecuteCall {
|
|
c.Call = c.Call.Do(f)
|
|
return c
|
|
}
|
|
|
|
// DoAndReturn rewrite *gomock.Call.DoAndReturn
|
|
func (c *MockExecutorExecuteCall) DoAndReturn(f func(context.Context, *domain.InvokeOpts) error) *MockExecutorExecuteCall {
|
|
c.Call = c.Call.DoAndReturn(f)
|
|
return c
|
|
}
|
|
|
|
// String mocks base method.
|
|
func (m *MockExecutor) String() string {
|
|
m.ctrl.T.Helper()
|
|
ret := m.ctrl.Call(m, "String")
|
|
ret0, _ := ret[0].(string)
|
|
return ret0
|
|
}
|
|
|
|
// String indicates an expected call of String.
|
|
func (mr *MockExecutorMockRecorder) String() *MockExecutorStringCall {
|
|
mr.mock.ctrl.T.Helper()
|
|
call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "String", reflect.TypeOf((*MockExecutor)(nil).String))
|
|
return &MockExecutorStringCall{Call: call}
|
|
}
|
|
|
|
// MockExecutorStringCall wrap *gomock.Call
|
|
type MockExecutorStringCall struct {
|
|
*gomock.Call
|
|
}
|
|
|
|
// Return rewrite *gomock.Call.Return
|
|
func (c *MockExecutorStringCall) Return(arg0 string) *MockExecutorStringCall {
|
|
c.Call = c.Call.Return(arg0)
|
|
return c
|
|
}
|
|
|
|
// Do rewrite *gomock.Call.Do
|
|
func (c *MockExecutorStringCall) Do(f func() string) *MockExecutorStringCall {
|
|
c.Call = c.Call.Do(f)
|
|
return c
|
|
}
|
|
|
|
// DoAndReturn rewrite *gomock.Call.DoAndReturn
|
|
func (c *MockExecutorStringCall) DoAndReturn(f func() string) *MockExecutorStringCall {
|
|
c.Call = c.Call.DoAndReturn(f)
|
|
return c
|
|
}
|