mirror of
https://github.com/andwati/zitadel.git
synced 2026-10-18 21:52:54 +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]>
262 lines
8.6 KiB
Go
262 lines
8.6 KiB
Go
// Code generated by "enumer -type NumberOperation,TextOperation,BytesOperation -linecomment -output ./operators_enumer.go"; DO NOT EDIT.
|
|
|
|
package database
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
)
|
|
|
|
const _NumberOperationName = "=<><<=>>="
|
|
|
|
var _NumberOperationIndex = [...]uint8{0, 1, 3, 4, 6, 7, 9}
|
|
|
|
const _NumberOperationLowerName = "=<><<=>>="
|
|
|
|
func (i NumberOperation) String() string {
|
|
i -= 1
|
|
if i >= NumberOperation(len(_NumberOperationIndex)-1) {
|
|
return fmt.Sprintf("NumberOperation(%d)", i+1)
|
|
}
|
|
return _NumberOperationName[_NumberOperationIndex[i]:_NumberOperationIndex[i+1]]
|
|
}
|
|
|
|
// An "invalid array index" compiler error signifies that the constant values have changed.
|
|
// Re-run the stringer command to generate them again.
|
|
func _NumberOperationNoOp() {
|
|
var x [1]struct{}
|
|
_ = x[NumberOperationEqual-(1)]
|
|
_ = x[NumberOperationNotEqual-(2)]
|
|
_ = x[NumberOperationLessThan-(3)]
|
|
_ = x[NumberOperationAtLeast-(4)]
|
|
_ = x[NumberOperationGreaterThan-(5)]
|
|
_ = x[NumberOperationAtMost-(6)]
|
|
}
|
|
|
|
var _NumberOperationValues = []NumberOperation{NumberOperationEqual, NumberOperationNotEqual, NumberOperationLessThan, NumberOperationAtLeast, NumberOperationGreaterThan, NumberOperationAtMost}
|
|
|
|
var _NumberOperationNameToValueMap = map[string]NumberOperation{
|
|
_NumberOperationName[0:1]: NumberOperationEqual,
|
|
_NumberOperationLowerName[0:1]: NumberOperationEqual,
|
|
_NumberOperationName[1:3]: NumberOperationNotEqual,
|
|
_NumberOperationLowerName[1:3]: NumberOperationNotEqual,
|
|
_NumberOperationName[3:4]: NumberOperationLessThan,
|
|
_NumberOperationLowerName[3:4]: NumberOperationLessThan,
|
|
_NumberOperationName[4:6]: NumberOperationAtLeast,
|
|
_NumberOperationLowerName[4:6]: NumberOperationAtLeast,
|
|
_NumberOperationName[6:7]: NumberOperationGreaterThan,
|
|
_NumberOperationLowerName[6:7]: NumberOperationGreaterThan,
|
|
_NumberOperationName[7:9]: NumberOperationAtMost,
|
|
_NumberOperationLowerName[7:9]: NumberOperationAtMost,
|
|
}
|
|
|
|
var _NumberOperationNames = []string{
|
|
_NumberOperationName[0:1],
|
|
_NumberOperationName[1:3],
|
|
_NumberOperationName[3:4],
|
|
_NumberOperationName[4:6],
|
|
_NumberOperationName[6:7],
|
|
_NumberOperationName[7:9],
|
|
}
|
|
|
|
// NumberOperationString retrieves an enum value from the enum constants string name.
|
|
// Throws an error if the param is not part of the enum.
|
|
func NumberOperationString(s string) (NumberOperation, error) {
|
|
if val, ok := _NumberOperationNameToValueMap[s]; ok {
|
|
return val, nil
|
|
}
|
|
|
|
if val, ok := _NumberOperationNameToValueMap[strings.ToLower(s)]; ok {
|
|
return val, nil
|
|
}
|
|
return 0, fmt.Errorf("%s does not belong to NumberOperation values", s)
|
|
}
|
|
|
|
// NumberOperationValues returns all values of the enum
|
|
func NumberOperationValues() []NumberOperation {
|
|
return _NumberOperationValues
|
|
}
|
|
|
|
// NumberOperationStrings returns a slice of all String values of the enum
|
|
func NumberOperationStrings() []string {
|
|
strs := make([]string, len(_NumberOperationNames))
|
|
copy(strs, _NumberOperationNames)
|
|
return strs
|
|
}
|
|
|
|
// IsANumberOperation returns "true" if the value is listed in the enum definition. "false" otherwise
|
|
func (i NumberOperation) IsANumberOperation() bool {
|
|
for _, v := range _NumberOperationValues {
|
|
if i == v {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|
|
|
|
const _TextOperationName = "=<>LIKELIKELIKELIKELIKELIKE"
|
|
|
|
var _TextOperationIndex = [...]uint8{0, 1, 3, 7, 11, 15, 19, 23, 27}
|
|
|
|
const _TextOperationLowerName = "=<>likelikelikelikelikelike"
|
|
|
|
func (i TextOperation) String() string {
|
|
i -= 1
|
|
if i >= TextOperation(len(_TextOperationIndex)-1) {
|
|
return fmt.Sprintf("TextOperation(%d)", i+1)
|
|
}
|
|
return _TextOperationName[_TextOperationIndex[i]:_TextOperationIndex[i+1]]
|
|
}
|
|
|
|
// An "invalid array index" compiler error signifies that the constant values have changed.
|
|
// Re-run the stringer command to generate them again.
|
|
func _TextOperationNoOp() {
|
|
var x [1]struct{}
|
|
_ = x[TextOperationEqual-(1)]
|
|
_ = x[TextOperationNotEqual-(2)]
|
|
_ = x[TextOperationStartsWith-(3)]
|
|
_ = x[TextOperationContains-(4)]
|
|
_ = x[TextOperationEndsWith-(5)]
|
|
_ = x[TextOperationContainsIgnoreCase-(6)]
|
|
_ = x[TextOperationEndsWithIgnoreCase-(7)]
|
|
_ = x[TextOperationStartsWithIgnoreCase-(8)]
|
|
}
|
|
|
|
var _TextOperationValues = []TextOperation{TextOperationEqual, TextOperationNotEqual, TextOperationStartsWith, TextOperationContains, TextOperationEndsWith, TextOperationContainsIgnoreCase, TextOperationEndsWithIgnoreCase, TextOperationStartsWithIgnoreCase}
|
|
|
|
var _TextOperationNameToValueMap = map[string]TextOperation{
|
|
_TextOperationName[0:1]: TextOperationEqual,
|
|
_TextOperationLowerName[0:1]: TextOperationEqual,
|
|
_TextOperationName[1:3]: TextOperationNotEqual,
|
|
_TextOperationLowerName[1:3]: TextOperationNotEqual,
|
|
_TextOperationName[3:7]: TextOperationStartsWith,
|
|
_TextOperationLowerName[3:7]: TextOperationStartsWith,
|
|
_TextOperationName[7:11]: TextOperationContains,
|
|
_TextOperationLowerName[7:11]: TextOperationContains,
|
|
_TextOperationName[11:15]: TextOperationEndsWith,
|
|
_TextOperationLowerName[11:15]: TextOperationEndsWith,
|
|
_TextOperationName[15:19]: TextOperationContainsIgnoreCase,
|
|
_TextOperationLowerName[15:19]: TextOperationContainsIgnoreCase,
|
|
_TextOperationName[19:23]: TextOperationEndsWithIgnoreCase,
|
|
_TextOperationLowerName[19:23]: TextOperationEndsWithIgnoreCase,
|
|
_TextOperationName[23:27]: TextOperationStartsWithIgnoreCase,
|
|
_TextOperationLowerName[23:27]: TextOperationStartsWithIgnoreCase,
|
|
}
|
|
|
|
var _TextOperationNames = []string{
|
|
_TextOperationName[0:1],
|
|
_TextOperationName[1:3],
|
|
_TextOperationName[3:7],
|
|
_TextOperationName[7:11],
|
|
_TextOperationName[11:15],
|
|
_TextOperationName[15:19],
|
|
_TextOperationName[19:23],
|
|
_TextOperationName[23:27],
|
|
}
|
|
|
|
// TextOperationString retrieves an enum value from the enum constants string name.
|
|
// Throws an error if the param is not part of the enum.
|
|
func TextOperationString(s string) (TextOperation, error) {
|
|
if val, ok := _TextOperationNameToValueMap[s]; ok {
|
|
return val, nil
|
|
}
|
|
|
|
if val, ok := _TextOperationNameToValueMap[strings.ToLower(s)]; ok {
|
|
return val, nil
|
|
}
|
|
return 0, fmt.Errorf("%s does not belong to TextOperation values", s)
|
|
}
|
|
|
|
// TextOperationValues returns all values of the enum
|
|
func TextOperationValues() []TextOperation {
|
|
return _TextOperationValues
|
|
}
|
|
|
|
// TextOperationStrings returns a slice of all String values of the enum
|
|
func TextOperationStrings() []string {
|
|
strs := make([]string, len(_TextOperationNames))
|
|
copy(strs, _TextOperationNames)
|
|
return strs
|
|
}
|
|
|
|
// IsATextOperation returns "true" if the value is listed in the enum definition. "false" otherwise
|
|
func (i TextOperation) IsATextOperation() bool {
|
|
for _, v := range _TextOperationValues {
|
|
if i == v {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|
|
|
|
const _BytesOperationName = "=<>"
|
|
|
|
var _BytesOperationIndex = [...]uint8{0, 1, 3}
|
|
|
|
const _BytesOperationLowerName = "=<>"
|
|
|
|
func (i BytesOperation) String() string {
|
|
i -= 1
|
|
if i >= BytesOperation(len(_BytesOperationIndex)-1) {
|
|
return fmt.Sprintf("BytesOperation(%d)", i+1)
|
|
}
|
|
return _BytesOperationName[_BytesOperationIndex[i]:_BytesOperationIndex[i+1]]
|
|
}
|
|
|
|
// An "invalid array index" compiler error signifies that the constant values have changed.
|
|
// Re-run the stringer command to generate them again.
|
|
func _BytesOperationNoOp() {
|
|
var x [1]struct{}
|
|
_ = x[BytesOperationEqual-(1)]
|
|
_ = x[BytesOperationNotEqual-(2)]
|
|
}
|
|
|
|
var _BytesOperationValues = []BytesOperation{BytesOperationEqual, BytesOperationNotEqual}
|
|
|
|
var _BytesOperationNameToValueMap = map[string]BytesOperation{
|
|
_BytesOperationName[0:1]: BytesOperationEqual,
|
|
_BytesOperationLowerName[0:1]: BytesOperationEqual,
|
|
_BytesOperationName[1:3]: BytesOperationNotEqual,
|
|
_BytesOperationLowerName[1:3]: BytesOperationNotEqual,
|
|
}
|
|
|
|
var _BytesOperationNames = []string{
|
|
_BytesOperationName[0:1],
|
|
_BytesOperationName[1:3],
|
|
}
|
|
|
|
// BytesOperationString retrieves an enum value from the enum constants string name.
|
|
// Throws an error if the param is not part of the enum.
|
|
func BytesOperationString(s string) (BytesOperation, error) {
|
|
if val, ok := _BytesOperationNameToValueMap[s]; ok {
|
|
return val, nil
|
|
}
|
|
|
|
if val, ok := _BytesOperationNameToValueMap[strings.ToLower(s)]; ok {
|
|
return val, nil
|
|
}
|
|
return 0, fmt.Errorf("%s does not belong to BytesOperation values", s)
|
|
}
|
|
|
|
// BytesOperationValues returns all values of the enum
|
|
func BytesOperationValues() []BytesOperation {
|
|
return _BytesOperationValues
|
|
}
|
|
|
|
// BytesOperationStrings returns a slice of all String values of the enum
|
|
func BytesOperationStrings() []string {
|
|
strs := make([]string, len(_BytesOperationNames))
|
|
copy(strs, _BytesOperationNames)
|
|
return strs
|
|
}
|
|
|
|
// IsABytesOperation returns "true" if the value is listed in the enum definition. "false" otherwise
|
|
func (i BytesOperation) IsABytesOperation() bool {
|
|
for _, v := range _BytesOperationValues {
|
|
if i == v {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|