mirror of
https://github.com/andwati/zitadel.git
synced 2026-10-18 13:52:51 +00:00
# Which Problems Are Solved This PR implements the endpoints listed in #10445 using relational tables. - [x] UpdateOrganization - [x] ListOrganizations - [x] DeleteOrganization - [x] DeactivateOrganization - [x] ActivateOrganization # How the Problems Are Solved - **UpdateOrganization:** Implemented logic for `Validate()`, `Execute()` and `Events()`. On CQRS side, updating an organization emits events related to the organization and its domains. Separate commanders have been made for the domain events so that their logic is run accordingly and we keep separation of concerns. Implementation of the domains is left to its own ticket. Because some domain-related data is changed during the organization update, its original values are saved as pointers inside [UpdateOrgCommand](https://github.com/zitadel/zitadel/blob/4f87cd8d0cfd75f290aa13c342e4939cecebef73/backend/v3/domain/org_update.go#L20). These variables will be then used as input for the domain commanders (that will run after the update organization one). - **ListOrganizations:** Implemented logic for `Validate()`, `Execute()`. Utility methods have been made to parse the input queries. This commander is used both by the v2 and v2beta endpoint, so a translation layer has been put in place to translate all v2beta requests into v2. The commander strictly handles v2 request only. The translation layer between v2beta and v2 APIs was made so to make it simple to remove it once the v2beta APIs will be removed (a simple deletion should suffice). A `converter` package [is shipped](https://github.com/zitadel/zitadel/blob/4f87cd8d0cfd75f290aa13c342e4939cecebef73/backend/v3/api/org/v2/convert/README.md#L5) as well with instruction for removal. TODOs have been put in place all over the code to indicate that the related piece of code needs to be removed once v2beta -> v2 transition is complete. - **DeleteOrganization:** Implemented logic for `Validate()`, `Execute()` and `Events()`. The `Events()` method is mostly incomplete as it requires a lot of data that is currently not retrievable due to the lack of their relational tables. - **DeactivateOrganization** and **ActivateOrganization**: Implemented logic for `Validate()`, `Execute()` and `Events()`. No notable remarks. 👉 All endpoints return matching errors to the CQRS counterpart: this way allows re-using the integration tests and 👉 All endpoints have been unit-tested through DB mocking 👉 A bunch of TODOs have been put in place for future reworks that are needed (e.g. `Update()` method on repository should also return a timestamp) # Additional Changes - A test utility method to allow mocking query options have been made. This was necessary because `database.QueryOption` is a function and the only comparison possible with functions is `nil` check. So, to mock this, `database.QueryOption` is converted first to `database.QueryOpts`. See 2276742adaef1998ea4844e1f0dca2079e45ccfb - A `BaseCommand` has been created with the idea to collect methods that are going to be needed by other commands. For the moment, it only offers a method to convert query text operations from gRPC to `domain` model. See bb85456dd101282fa76d2e2ad165eed4c8ef61b9 - SQL operations have been reworked to allow for queries using `ContainsIgnoreCase`, `EndsWithIgnoreCase` and other `IgnoreCase` operations. This change is pending approval and might be reworked. See https://github.com/zitadel/zitadel/pull/10704#discussion_r2392886177 # Additional Context `UpdateOrganization` is partially working because the logic for handling domain updates is not done (there is only a draft of the commanders to showcase the call chain). See https://github.com/zitadel/zitadel/pull/10704#discussion_r2356143178 Permissions are not implemented as they are missing. See https://github.com/zitadel/zitadel/pull/10771 - Closes: #10445 --------- Co-authored-by: Silvan <[email protected]>
62 lines
1.8 KiB
Go
62 lines
1.8 KiB
Go
package domain
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
)
|
|
|
|
//go:generate mockgen -typed -package domainmock -destination ./mock/executor.mock.go . Executor
|
|
type Executor interface {
|
|
Execute(ctx context.Context, opts *InvokeOpts) (err error)
|
|
fmt.Stringer
|
|
}
|
|
|
|
// Commander is all that is needed to implement the command pattern.
|
|
// It is the interface all manipulations need to implement.
|
|
// If possible it should also be used for queries. We will find out if this is possible in the future.
|
|
//
|
|
//go:generate mockgen -typed -package domainmock -destination ./mock/commander.mock.go . Commander
|
|
type Commander interface {
|
|
Validator
|
|
EventProducer
|
|
Executor
|
|
}
|
|
|
|
// Querier used to query data.
|
|
//
|
|
//go:generate mockgen -typed -package domainmock -destination ./mock/querier.mock.go . Querier
|
|
type Querier[T any] interface {
|
|
Validator
|
|
Executor
|
|
// Result returns the result of the query.
|
|
// If `Execute` returns an error, the result is nil.
|
|
Result() T
|
|
}
|
|
|
|
// Invoke provides a way to execute commands within the domain package.
|
|
// It uses a chain of responsibility pattern to handle the command execution.
|
|
// The default chain includes logging, tracing, and event publishing.
|
|
// If you want to invoke multiple commands in a single transaction, you can use the [batchExecutor].
|
|
func Invoke(ctx context.Context, executor Executor, opts ...InvokeOpt) error {
|
|
invokeOpts := &InvokeOpts{
|
|
Invoker: newEventStoreInvoker(
|
|
newLoggingInvoker(
|
|
newTraceInvoker(
|
|
newValidatorInvoker(nil),
|
|
),
|
|
),
|
|
),
|
|
DB: pool,
|
|
}
|
|
for _, opt := range opts {
|
|
opt(invokeOpts)
|
|
}
|
|
return invokeOpts.Invoke(ctx, executor)
|
|
}
|
|
|
|
// Invoker is part of the command pattern.
|
|
// It is the interface that is used to execute commands.
|
|
type Invoker interface {
|
|
Invoke(ctx context.Context, command Executor, opts *InvokeOpts) error
|
|
}
|