mirror of
https://github.com/andwati/zitadel.git
synced 2026-10-19 14:12:52 +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]>
257 lines
6.7 KiB
Go
257 lines
6.7 KiB
Go
package database
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestWrite(t *testing.T) {
|
|
type want struct {
|
|
stmt string
|
|
args []any
|
|
}
|
|
for _, test := range []struct {
|
|
name string
|
|
cond Condition
|
|
want want
|
|
}{
|
|
{
|
|
name: "no and condition",
|
|
cond: And(),
|
|
want: want{
|
|
stmt: "",
|
|
args: nil,
|
|
},
|
|
},
|
|
{
|
|
name: "one and condition",
|
|
cond: And(
|
|
NewColumnCondition(NewColumn("table", "column1"), NewColumn("other_table", "column2")),
|
|
),
|
|
want: want{
|
|
stmt: "table.column1 = other_table.column2",
|
|
args: nil,
|
|
},
|
|
},
|
|
{
|
|
name: "multiple and condition",
|
|
cond: And(
|
|
NewColumnCondition(NewColumn("table", "column1"), NewColumn("other_table", "column2")),
|
|
NewColumnCondition(NewColumn("table", "column3"), NewColumn("other_table", "column4")),
|
|
),
|
|
want: want{
|
|
stmt: "(table.column1 = other_table.column2 AND table.column3 = other_table.column4)",
|
|
args: nil,
|
|
},
|
|
},
|
|
{
|
|
name: "no or condition",
|
|
cond: Or(),
|
|
want: want{
|
|
stmt: "",
|
|
args: nil,
|
|
},
|
|
},
|
|
{
|
|
name: "one or condition",
|
|
cond: Or(
|
|
NewColumnCondition(NewColumn("table", "column1"), NewColumn("other_table", "column2")),
|
|
),
|
|
want: want{
|
|
stmt: "table.column1 = other_table.column2",
|
|
args: nil,
|
|
},
|
|
},
|
|
{
|
|
name: "multiple or condition",
|
|
cond: Or(
|
|
NewColumnCondition(NewColumn("table", "column1"), NewColumn("other_table", "column2")),
|
|
NewColumnCondition(NewColumn("table", "column3"), NewColumn("other_table", "column4")),
|
|
),
|
|
want: want{
|
|
stmt: "(table.column1 = other_table.column2 OR table.column3 = other_table.column4)",
|
|
args: nil,
|
|
},
|
|
},
|
|
{
|
|
name: "is null condition",
|
|
cond: IsNull(NewColumn("table", "column1")),
|
|
want: want{
|
|
stmt: "table.column1 IS NULL",
|
|
args: nil,
|
|
},
|
|
},
|
|
{
|
|
name: "is not null condition",
|
|
cond: IsNotNull(NewColumn("table", "column1")),
|
|
want: want{
|
|
stmt: "table.column1 IS NOT NULL",
|
|
args: nil,
|
|
},
|
|
},
|
|
{
|
|
name: "text condition",
|
|
cond: NewTextCondition(NewColumn("table", "column1"), TextOperationEqual, "some text"),
|
|
want: want{
|
|
stmt: "table.column1 = $1",
|
|
args: []any{"some text"},
|
|
},
|
|
},
|
|
{
|
|
name: "text condition with ignore case",
|
|
cond: NewTextCondition(NewColumn("table", "column1"), TextOperationEqualIgnoreCase, "some text"),
|
|
want: want{
|
|
stmt: "LOWER(table.column1) = LOWER($1)",
|
|
args: []any{"some text"},
|
|
},
|
|
},
|
|
{
|
|
name: "text ignore case condition",
|
|
cond: NewTextIgnoreCaseCondition(NewColumn("table", "column1"), TextOperationNotEqual, "some TEXT"),
|
|
want: want{
|
|
stmt: "LOWER(table.column1) <> LOWER($1)",
|
|
args: []any{"some TEXT"},
|
|
},
|
|
},
|
|
{
|
|
name: "number condition",
|
|
cond: NewNumberCondition(NewColumn("table", "column1"), NumberOperationEqual, 42),
|
|
want: want{
|
|
stmt: "table.column1 = $1",
|
|
args: []any{42},
|
|
},
|
|
},
|
|
{
|
|
name: "boolean condition",
|
|
cond: NewBooleanCondition(NewColumn("table", "column1"), true),
|
|
want: want{
|
|
stmt: "table.column1 = $1",
|
|
args: []any{true},
|
|
},
|
|
},
|
|
{
|
|
name: "bytes condition",
|
|
cond: NewBytesCondition[[]byte](NewColumn("table", "column1"), BytesOperationEqual, []byte{0x01, 0x02, 0x03}),
|
|
want: want{
|
|
stmt: "table.column1 = $1",
|
|
args: []any{[]byte{0x01, 0x02, 0x03}},
|
|
},
|
|
},
|
|
{
|
|
name: "column condition",
|
|
cond: NewColumnCondition(NewColumn("table", "column1"), NewColumn("other_table", "column2")),
|
|
want: want{
|
|
stmt: "table.column1 = other_table.column2",
|
|
args: nil,
|
|
},
|
|
},
|
|
{
|
|
name: "exists condition",
|
|
cond: Exists("table", And(
|
|
NewColumnCondition(NewColumn("table", "column1"), NewColumn("other_table", "column2")),
|
|
NewColumnCondition(NewColumn("table", "column3"), NewColumn("other_table", "column4")),
|
|
)),
|
|
want: want{
|
|
stmt: " EXISTS (SELECT 1 FROM table WHERE (table.column1 = other_table.column2 AND table.column3 = other_table.column4))",
|
|
args: nil,
|
|
},
|
|
},
|
|
} {
|
|
t.Run(test.name, func(t *testing.T) {
|
|
var builder StatementBuilder
|
|
test.cond.Write(&builder)
|
|
assert.Equal(t, test.want.stmt, builder.String())
|
|
require.Len(t, builder.Args(), len(test.want.args))
|
|
for i, arg := range test.want.args {
|
|
assert.Equal(t, arg, builder.Args()[i])
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestIsRestrictingColumn(t *testing.T) {
|
|
for _, test := range []struct {
|
|
name string
|
|
col Column
|
|
cond Condition
|
|
want bool
|
|
}{
|
|
{
|
|
name: "and with restricting column",
|
|
col: NewColumn("table", "column1"),
|
|
cond: And(
|
|
NewColumnCondition(NewColumn("table", "column1"), NewColumn("other_table", "column2")),
|
|
NewColumnCondition(NewColumn("table", "column1"), NewColumn("other_table", "column3")),
|
|
),
|
|
want: true,
|
|
},
|
|
{
|
|
name: "and without restricting column",
|
|
col: NewColumn("table", "column1"),
|
|
cond: And(
|
|
NewColumnCondition(NewColumn("table", "column2"), NewColumn("other_table", "column3")),
|
|
IsNull(NewColumn("table", "column4")),
|
|
IsNotNull(NewColumn("table", "column5")),
|
|
),
|
|
want: false,
|
|
},
|
|
{
|
|
name: "or with restricting column",
|
|
col: NewColumn("table", "column1"),
|
|
cond: Or(
|
|
NewColumnCondition(NewColumn("table", "column1"), NewColumn("other_table", "column2")),
|
|
NewColumnCondition(NewColumn("table", "column1"), NewColumn("other_table", "column3")),
|
|
),
|
|
want: true,
|
|
},
|
|
{
|
|
name: "or without restricting column",
|
|
col: NewColumn("table", "column1"),
|
|
cond: Or(
|
|
NewColumnCondition(NewColumn("table", "column1"), NewColumn("other_table", "column3")),
|
|
IsNotNull(NewColumn("table", "column4")),
|
|
IsNull(NewColumn("table", "column5")),
|
|
),
|
|
want: false,
|
|
},
|
|
{
|
|
name: "is null never restricts",
|
|
col: NewColumn("table", "column1"),
|
|
cond: IsNull(NewColumn("table", "column1")),
|
|
want: false,
|
|
},
|
|
{
|
|
name: "is not null never restricts",
|
|
col: NewColumn("table", "column1"),
|
|
cond: IsNotNull(NewColumn("table", "column1")),
|
|
want: false,
|
|
},
|
|
{
|
|
name: "exists with restricting column",
|
|
col: NewColumn("table", "column1"),
|
|
cond: Exists("table", And(
|
|
NewColumnCondition(NewColumn("table", "column1"), NewColumn("other_table", "column2")),
|
|
NewColumnCondition(NewColumn("table", "column1"), NewColumn("other_table", "column3")),
|
|
)),
|
|
want: true,
|
|
},
|
|
{
|
|
name: "exists without restricting column",
|
|
col: NewColumn("table", "column1"),
|
|
cond: Exists("table", Or(
|
|
NewColumnCondition(NewColumn("table", "column1"), NewColumn("other_table", "column3")),
|
|
IsNotNull(NewColumn("table", "column4")),
|
|
IsNull(NewColumn("table", "column5")),
|
|
)),
|
|
want: false,
|
|
},
|
|
} {
|
|
t.Run(test.name, func(t *testing.T) {
|
|
isRestricting := test.cond.IsRestrictingColumn(test.col)
|
|
assert.Equal(t, test.want, isRestricting)
|
|
})
|
|
}
|
|
}
|