TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-11 20:37:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: remove userid unique constraint and fix user list query (#4632)

Browse Source 
* fix: remove userid unique constraint and fix user list query

* fix: improve instances query

* improve user queries

Co-authored-by: Silvan <silvan.reusser@gmail.com>
This commit is contained in:
Livio Spring
2022-11-07 10:33:22 +01:00
committed by GitHub
parent b432cf4963
commit 41c043bcd9
11 changed files with 384 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

318
internal/query/user_test.go
View File

@@ -17,44 +17,45 @@ import (
)
var (
userQuery = `SELECT projections.users4.id,` +
` projections.users4.creation_date,` +
` projections.users4.change_date,` +
` projections.users4.resource_owner,` +
` projections.users4.sequence,` +
` projections.users4.state,` +
` projections.users4.type,` +
` projections.users4.username,` +
userQuery = `SELECT projections.users5.id,` +
` projections.users5.creation_date,` +
` projections.users5.change_date,` +
` projections.users5.resource_owner,` +
` projections.users5.sequence,` +
` projections.users5.state,` +
` projections.users5.type,` +
` projections.users5.username,` +
` login_names.loginnames,` +
` preferred_login_name.login_name,` +
` projections.users4_humans.user_id,` +
` projections.users4_humans.first_name,` +
` projections.users4_humans.last_name,` +
` projections.users4_humans.nick_name,` +
` projections.users4_humans.display_name,` +
` projections.users4_humans.preferred_language,` +
` projections.users4_humans.gender,` +
` projections.users4_humans.avatar_key,` +
` projections.users4_humans.email,` +
` projections.users4_humans.is_email_verified,` +
` projections.users4_humans.phone,` +
` projections.users4_humans.is_phone_verified,` +
` projections.users4_machines.user_id,` +
` projections.users4_machines.name,` +
` projections.users4_machines.description,` +
` projections.users5_humans.user_id,` +
` projections.users5_humans.first_name,` +
` projections.users5_humans.last_name,` +
` projections.users5_humans.nick_name,` +
` projections.users5_humans.display_name,` +
` projections.users5_humans.preferred_language,` +
` projections.users5_humans.gender,` +
` projections.users5_humans.avatar_key,` +
` projections.users5_humans.email,` +
` projections.users5_humans.is_email_verified,` +
` projections.users5_humans.phone,` +
` projections.users5_humans.is_phone_verified,` +
` projections.users5_machines.user_id,` +
` projections.users5_machines.name,` +
` projections.users5_machines.description,` +
` COUNT(*) OVER ()` +
` FROM projections.users4` +
` LEFT JOIN projections.users4_humans ON projections.users4.id = projections.users4_humans.user_id AND projections.users4.instance_id = projections.users4_humans.instance_id` +
` LEFT JOIN projections.users4_machines ON projections.users4.id = projections.users4_machines.user_id AND projections.users4.instance_id = projections.users4_machines.instance_id` +
` FROM projections.users5` +
` LEFT JOIN projections.users5_humans ON projections.users5.id = projections.users5_humans.user_id AND projections.users5.instance_id = projections.users5_humans.instance_id` +
` LEFT JOIN projections.users5_machines ON projections.users5.id = projections.users5_machines.user_id AND projections.users5.instance_id = projections.users5_machines.instance_id` +
` LEFT JOIN` +
` (SELECT login_names.user_id, ARRAY_AGG(login_names.login_name)::TEXT[] AS loginnames` +
` (SELECT login_names.user_id, ARRAY_AGG(login_names.login_name) AS loginnames, login_names.instance_id` +
` FROM projections.login_names AS login_names` +
` WHERE login_names.instance_id = $1` +
` GROUP BY login_names.user_id) AS login_names` +
` ON login_names.user_id = projections.users4.id` +
` GROUP BY login_names.user_id, login_names.instance_id) AS login_names` +
` ON login_names.user_id = projections.users5.id AND login_names.instance_id = projections.users5.instance_id` +
` LEFT JOIN` +
` (SELECT preferred_login_name.user_id, preferred_login_name.login_name FROM projections.login_names AS preferred_login_name WHERE preferred_login_name.instance_id = $2 AND preferred_login_name.is_primary = $3) AS preferred_login_name` +
` ON preferred_login_name.user_id = projections.users4.id`
` (SELECT preferred_login_name.user_id, preferred_login_name.login_name, preferred_login_name.instance_id` +
` FROM projections.login_names AS preferred_login_name` +
` WHERE preferred_login_name.is_primary = $1) AS preferred_login_name` +
` ON preferred_login_name.user_id = projections.users5.id AND preferred_login_name.instance_id = projections.users5.instance_id`
userCols = []string{
"id",
"creation_date",
@@ -85,21 +86,21 @@ var (
"description",
"count",
}
profileQuery = `SELECT projections.users4.id,` +
` projections.users4.creation_date,` +
` projections.users4.change_date,` +
` projections.users4.resource_owner,` +
` projections.users4.sequence,` +
` projections.users4_humans.user_id,` +
` projections.users4_humans.first_name,` +
` projections.users4_humans.last_name,` +
` projections.users4_humans.nick_name,` +
` projections.users4_humans.display_name,` +
` projections.users4_humans.preferred_language,` +
` projections.users4_humans.gender,` +
` projections.users4_humans.avatar_key` +
` FROM projections.users4` +
` LEFT JOIN projections.users4_humans ON projections.users4.id = projections.users4_humans.user_id AND projections.users4.instance_id = projections.users4_humans.instance_id`
profileQuery = `SELECT projections.users5.id,` +
` projections.users5.creation_date,` +
` projections.users5.change_date,` +
` projections.users5.resource_owner,` +
` projections.users5.sequence,` +
` projections.users5_humans.user_id,` +
` projections.users5_humans.first_name,` +
` projections.users5_humans.last_name,` +
` projections.users5_humans.nick_name,` +
` projections.users5_humans.display_name,` +
` projections.users5_humans.preferred_language,` +
` projections.users5_humans.gender,` +
` projections.users5_humans.avatar_key` +
` FROM projections.users5` +
` LEFT JOIN projections.users5_humans ON projections.users5.id = projections.users5_humans.user_id AND projections.users5.instance_id = projections.users5_humans.instance_id`
profileCols = []string{
"id",
"creation_date",
@@ -115,16 +116,16 @@ var (
"gender",
"avatar_key",
}
emailQuery = `SELECT projections.users4.id,` +
` projections.users4.creation_date,` +
` projections.users4.change_date,` +
` projections.users4.resource_owner,` +
` projections.users4.sequence,` +
` projections.users4_humans.user_id,` +
` projections.users4_humans.email,` +
` projections.users4_humans.is_email_verified` +
` FROM projections.users4` +
` LEFT JOIN projections.users4_humans ON projections.users4.id = projections.users4_humans.user_id AND projections.users4.instance_id = projections.users4_humans.instance_id`
emailQuery = `SELECT projections.users5.id,` +
` projections.users5.creation_date,` +
` projections.users5.change_date,` +
` projections.users5.resource_owner,` +
` projections.users5.sequence,` +
` projections.users5_humans.user_id,` +
` projections.users5_humans.email,` +
` projections.users5_humans.is_email_verified` +
` FROM projections.users5` +
` LEFT JOIN projections.users5_humans ON projections.users5.id = projections.users5_humans.user_id AND projections.users5.instance_id = projections.users5_humans.instance_id`
emailCols = []string{
"id",
"creation_date",
@@ -135,16 +136,16 @@ var (
"email",
"is_email_verified",
}
phoneQuery = `SELECT projections.users4.id,` +
` projections.users4.creation_date,` +
` projections.users4.change_date,` +
` projections.users4.resource_owner,` +
` projections.users4.sequence,` +
` projections.users4_humans.user_id,` +
` projections.users4_humans.phone,` +
` projections.users4_humans.is_phone_verified` +
` FROM projections.users4` +
` LEFT JOIN projections.users4_humans ON projections.users4.id = projections.users4_humans.user_id AND projections.users4.instance_id = projections.users4_humans.instance_id`
phoneQuery = `SELECT projections.users5.id,` +
` projections.users5.creation_date,` +
` projections.users5.change_date,` +
` projections.users5.resource_owner,` +
` projections.users5.sequence,` +
` projections.users5_humans.user_id,` +
` projections.users5_humans.phone,` +
` projections.users5_humans.is_phone_verified` +
` FROM projections.users5` +
` LEFT JOIN projections.users5_humans ON projections.users5.id = projections.users5_humans.user_id AND projections.users5.instance_id = projections.users5_humans.instance_id`
phoneCols = []string{
"id",
"creation_date",
@@ -155,14 +156,14 @@ var (
"phone",
"is_phone_verified",
}
userUniqueQuery = `SELECT projections.users4.id,` +
` projections.users4.state,` +
` projections.users4.username,` +
` projections.users4_humans.user_id,` +
` projections.users4_humans.email,` +
` projections.users4_humans.is_email_verified` +
` FROM projections.users4` +
` LEFT JOIN projections.users4_humans ON projections.users4.id = projections.users4_humans.user_id AND projections.users4.instance_id = projections.users4_humans.instance_id`
userUniqueQuery = `SELECT projections.users5.id,` +
` projections.users5.state,` +
` projections.users5.username,` +
` projections.users5_humans.user_id,` +
` projections.users5_humans.email,` +
` projections.users5_humans.is_email_verified` +
` FROM projections.users5` +
` LEFT JOIN projections.users5_humans ON projections.users5.id = projections.users5_humans.user_id AND projections.users5.instance_id = projections.users5_humans.instance_id`
userUniqueCols = []string{
"id",
"state",
@@ -171,43 +172,44 @@ var (
"email",
"is_email_verified",
}
notifyUserQuery = `SELECT projections.users4.id,` +
` projections.users4.creation_date,` +
` projections.users4.change_date,` +
` projections.users4.resource_owner,` +
` projections.users4.sequence,` +
` projections.users4.state,` +
` projections.users4.type,` +
` projections.users4.username,` +
notifyUserQuery = `SELECT projections.users5.id,` +
` projections.users5.creation_date,` +
` projections.users5.change_date,` +
` projections.users5.resource_owner,` +
` projections.users5.sequence,` +
` projections.users5.state,` +
` projections.users5.type,` +
` projections.users5.username,` +
` login_names.loginnames,` +
` preferred_login_name.login_name,` +
` projections.users4_humans.user_id,` +
` projections.users4_humans.first_name,` +
` projections.users4_humans.last_name,` +
` projections.users4_humans.nick_name,` +
` projections.users4_humans.display_name,` +
` projections.users4_humans.preferred_language,` +
` projections.users4_humans.gender,` +
` projections.users4_humans.avatar_key,` +
` projections.users4_notifications.user_id,` +
` projections.users4_notifications.last_email,` +
` projections.users4_notifications.verified_email,` +
` projections.users4_notifications.last_phone,` +
` projections.users4_notifications.verified_phone,` +
` projections.users4_notifications.password_set,` +
` projections.users5_humans.user_id,` +
` projections.users5_humans.first_name,` +
` projections.users5_humans.last_name,` +
` projections.users5_humans.nick_name,` +
` projections.users5_humans.display_name,` +
` projections.users5_humans.preferred_language,` +
` projections.users5_humans.gender,` +
` projections.users5_humans.avatar_key,` +
` projections.users5_notifications.user_id,` +
` projections.users5_notifications.last_email,` +
` projections.users5_notifications.verified_email,` +
` projections.users5_notifications.last_phone,` +
` projections.users5_notifications.verified_phone,` +
` projections.users5_notifications.password_set,` +
` COUNT(*) OVER ()` +
` FROM projections.users4` +
` LEFT JOIN projections.users4_humans ON projections.users4.id = projections.users4_humans.user_id AND projections.users4.instance_id = projections.users4_humans.instance_id` +
` LEFT JOIN projections.users4_notifications ON projections.users4.id = projections.users4_notifications.user_id AND projections.users4.instance_id = projections.users4_notifications.instance_id` +
` FROM projections.users5` +
` LEFT JOIN projections.users5_humans ON projections.users5.id = projections.users5_humans.user_id AND projections.users5.instance_id = projections.users5_humans.instance_id` +
` LEFT JOIN projections.users5_notifications ON projections.users5.id = projections.users5_notifications.user_id AND projections.users5.instance_id = projections.users5_notifications.instance_id` +
` LEFT JOIN` +
` (SELECT login_names.user_id, ARRAY_AGG(login_names.login_name) AS loginnames` +
` (SELECT login_names.user_id, ARRAY_AGG(login_names.login_name) AS loginnames, login_names.instance_id` +
` FROM projections.login_names AS login_names` +
` WHERE login_names.instance_id = $1` +
` GROUP BY login_names.user_id) AS login_names` +
` ON login_names.user_id = projections.users4.id` +
` GROUP BY login_names.user_id, login_names.instance_id) AS login_names` +
` ON login_names.user_id = projections.users5.id AND login_names.instance_id = projections.users5.instance_id` +
` LEFT JOIN` +
` (SELECT preferred_login_name.user_id, preferred_login_name.login_name FROM projections.login_names AS preferred_login_name WHERE preferred_login_name.instance_id = $2 AND preferred_login_name.is_primary = $3) AS preferred_login_name` +
` ON preferred_login_name.user_id = projections.users4.id`
` (SELECT preferred_login_name.user_id, preferred_login_name.login_name, preferred_login_name.instance_id` +
` FROM projections.login_names AS preferred_login_name` +
` WHERE preferred_login_name.is_primary = $1) AS preferred_login_name` +
` ON preferred_login_name.user_id = projections.users5.id AND preferred_login_name.instance_id = projections.users5.instance_id`
notifyUserCols = []string{
"id",
"creation_date",
@@ -237,43 +239,45 @@ var (
"password_set",
"count",
}
usersQuery = `SELECT projections.users4.id,` +
` projections.users4.creation_date,` +
` projections.users4.change_date,` +
` projections.users4.resource_owner,` +
` projections.users4.sequence,` +
` projections.users4.state,` +
` projections.users4.type,` +
` projections.users4.username,` +
usersQuery = `SELECT projections.users5.id,` +
` projections.users5.creation_date,` +
` projections.users5.change_date,` +
` projections.users5.resource_owner,` +
` projections.users5.sequence,` +
` projections.users5.state,` +
` projections.users5.type,` +
` projections.users5.username,` +
` login_names.loginnames,` +
` preferred_login_name.login_name,` +
` projections.users4_humans.user_id,` +
` projections.users4_humans.first_name,` +
` projections.users4_humans.last_name,` +
` projections.users4_humans.nick_name,` +
` projections.users4_humans.display_name,` +
` projections.users4_humans.preferred_language,` +
` projections.users4_humans.gender,` +
` projections.users4_humans.avatar_key,` +
` projections.users4_humans.email,` +
` projections.users4_humans.is_email_verified,` +
` projections.users4_humans.phone,` +
` projections.users4_humans.is_phone_verified,` +
` projections.users4_machines.user_id,` +
` projections.users4_machines.name,` +
` projections.users4_machines.description,` +
` projections.users5_humans.user_id,` +
` projections.users5_humans.first_name,` +
` projections.users5_humans.last_name,` +
` projections.users5_humans.nick_name,` +
` projections.users5_humans.display_name,` +
` projections.users5_humans.preferred_language,` +
` projections.users5_humans.gender,` +
` projections.users5_humans.avatar_key,` +
` projections.users5_humans.email,` +
` projections.users5_humans.is_email_verified,` +
` projections.users5_humans.phone,` +
` projections.users5_humans.is_phone_verified,` +
` projections.users5_machines.user_id,` +
` projections.users5_machines.name,` +
` projections.users5_machines.description,` +
` COUNT(*) OVER ()` +
` FROM projections.users4` +
` LEFT JOIN projections.users4_humans ON projections.users4.id = projections.users4_humans.user_id AND projections.users4.instance_id = projections.users4_humans.instance_id` +
` LEFT JOIN projections.users4_machines ON projections.users4.id = projections.users4_machines.user_id AND projections.users4.instance_id = projections.users4_machines.instance_id` +
` FROM projections.users5` +
` LEFT JOIN projections.users5_humans ON projections.users5.id = projections.users5_humans.user_id AND projections.users5.instance_id = projections.users5_humans.instance_id` +
` LEFT JOIN projections.users5_machines ON projections.users5.id = projections.users5_machines.user_id AND projections.users5.instance_id = projections.users5_machines.instance_id` +
` LEFT JOIN` +
` (SELECT login_names.user_id, ARRAY_AGG(login_names.login_name) AS loginnames` +
` (SELECT login_names.user_id, ARRAY_AGG(login_names.login_name) AS loginnames, login_names.instance_id` +
` FROM projections.login_names AS login_names` +
` GROUP BY login_names.user_id) AS login_names` +
` ON login_names.user_id = projections.users4.id` +
` GROUP BY login_names.user_id, login_names.instance_id) AS login_names` +
` ON login_names.user_id = projections.users5.id AND login_names.instance_id = projections.users5.instance_id` +
` LEFT JOIN` +
` (SELECT preferred_login_name.user_id, preferred_login_name.login_name FROM projections.login_names AS preferred_login_name WHERE preferred_login_name.is_primary = $1) AS preferred_login_name` +
` ON preferred_login_name.user_id = projections.users4.id`
` (SELECT preferred_login_name.user_id, preferred_login_name.login_name, preferred_login_name.instance_id` +
` FROM projections.login_names AS preferred_login_name` +
` WHERE preferred_login_name.is_primary = $1) AS preferred_login_name` +
` ON preferred_login_name.user_id = projections.users5.id AND preferred_login_name.instance_id = projections.users5.instance_id`
usersCols = []string{
"id",
"creation_date",
@@ -320,7 +324,7 @@ func Test_UserPrepares(t *testing.T) {
{
name: "prepareUserQuery no result",
prepare: func() (sq.SelectBuilder, func(*sql.Row) (*User, error)) {
return prepareUserQuery("instanceID")
return prepareUserQuery()
},
want: want{
sqlExpectations: mockQuery(
@@ -340,7 +344,7 @@ func Test_UserPrepares(t *testing.T) {
{
name: "prepareUserQuery human found",
prepare: func() (sq.SelectBuilder, func(*sql.Row) (*User, error)) {
return prepareUserQuery("instanceID")
return prepareUserQuery()
},
want: want{
sqlExpectations: mockQuery(
@@ -407,7 +411,7 @@ func Test_UserPrepares(t *testing.T) {
{
name: "prepareUserQuery machine found",
prepare: func() (sq.SelectBuilder, func(*sql.Row) (*User, error)) {
return prepareUserQuery("instanceID")
return prepareUserQuery()
},
want: want{
sqlExpectations: mockQuery(
@@ -465,7 +469,7 @@ func Test_UserPrepares(t *testing.T) {
{
name: "prepareUserQuery sql err",
prepare: func() (sq.SelectBuilder, func(*sql.Row) (*User, error)) {
return prepareUserQuery("instanceID")
return prepareUserQuery()
},
want: want{
sqlExpectations: mockQueryErr(
@@ -832,7 +836,7 @@ func Test_UserPrepares(t *testing.T) {
{
name: "prepareNotifyUserQuery no result",
prepare: func() (sq.SelectBuilder, func(*sql.Row) (*NotifyUser, error)) {
return prepareNotifyUserQuery("instanceID")
return prepareNotifyUserQuery()
},
want: want{
sqlExpectations: mockQuery(
@@ -852,7 +856,7 @@ func Test_UserPrepares(t *testing.T) {
{
name: "prepareNotifyUserQuery notify found",
prepare: func() (sq.SelectBuilder, func(*sql.Row) (*NotifyUser, error)) {
return prepareNotifyUserQuery("instanceID")
return prepareNotifyUserQuery()
},
want: want{
sqlExpectations: mockQuery(
@@ -917,7 +921,7 @@ func Test_UserPrepares(t *testing.T) {
{
name: "prepareNotifyUserQuery not notify found (error)",
prepare: func() (sq.SelectBuilder, func(*sql.Row) (*NotifyUser, error)) {
return prepareNotifyUserQuery("instanceID")
return prepareNotifyUserQuery()
},
want: want{
sqlExpectations: mockQuery(
@@ -964,7 +968,7 @@ func Test_UserPrepares(t *testing.T) {
{
name: "prepareNotifyUserQuery sql err",
prepare: func() (sq.SelectBuilder, func(*sql.Row) (*NotifyUser, error)) {
return prepareNotifyUserQuery("instanceID")
return prepareNotifyUserQuery()
},
want: want{
sqlExpectations: mockQueryErr(
@@ -981,8 +985,10 @@ func Test_UserPrepares(t *testing.T) {
object: nil,
},
{
name: "prepareUsersQuery no result",
prepare: prepareUsersQuery,
name: "prepareUsersQuery no result",
prepare: func() (sq.SelectBuilder, func(*sql.Rows) (*Users, error)) {
return prepareUsersQuery()
},
want: want{
sqlExpectations: mockQueries(
regexp.QuoteMeta(usersQuery),
@@ -999,8 +1005,10 @@ func Test_UserPrepares(t *testing.T) {
object: &Users{Users: []*User{}},
},
{
name: "prepareUsersQuery one result",
prepare: prepareUsersQuery,
name: "prepareUsersQuery one result",
prepare: func() (sq.SelectBuilder, func(*sql.Rows) (*Users, error)) {
return prepareUsersQuery()
},
want: want{
sqlExpectations: mockQueries(
regexp.QuoteMeta(usersQuery),
@@ -1072,8 +1080,10 @@ func Test_UserPrepares(t *testing.T) {
},
},
{
name: "prepareUsersQuery multiple results",
prepare: prepareUsersQuery,
name: "prepareUsersQuery multiple results",
prepare: func() (sq.SelectBuilder, func(*sql.Rows) (*Users, error)) {
return prepareUsersQuery()
},
want: want{
sqlExpectations: mockQueries(
regexp.QuoteMeta(usersQuery),
@@ -1190,8 +1200,10 @@ func Test_UserPrepares(t *testing.T) {
},
},
{
name: "prepareUsersQuery sql err",
prepare: prepareUsersQuery,
name: "prepareUsersQuery sql err",
prepare: func() (sq.SelectBuilder, func(*sql.Rows) (*Users, error)) {
return prepareUsersQuery()
},
want: want{
sqlExpectations: mockQueryErr(
regexp.QuoteMeta(usersQuery),