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

* 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>
2025-08-11 20:47:32 +00:00 · 2022-11-07 10:33:22 +01:00
parent b432cf4963
commit 41c043bcd9
11 changed files with 384 additions and 353 deletions
--- a/internal/query/user.go
+++ b/internal/query/user.go
@@ -302,14 +302,13 @@ func (q *Queries) GetUserByID(ctx context.Context, shouldTriggerBulk bool, userI
 		projection.LoginNameProjection.Trigger(ctx)
 	}

-	instanceID := authz.GetInstance(ctx).InstanceID()
-	query, scan := prepareUserQuery(instanceID)
+	query, scan := prepareUserQuery()
 	for _, q := range queries {
 		query = q.toQuery(query)
 	}
 	stmt, args, err := query.Where(sq.Eq{
 		UserIDCol.identifier():         userID,
-		UserInstanceIDCol.identifier(): instanceID,
+		UserInstanceIDCol.identifier(): authz.GetInstance(ctx).InstanceID(),
 	}).ToSql()
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "QUERY-FBg21", "Errors.Query.SQLStatment")
@@ -325,13 +324,12 @@ func (q *Queries) GetUser(ctx context.Context, shouldTriggerBulk bool, queries .
 		projection.LoginNameProjection.Trigger(ctx)
 	}

-	instanceID := authz.GetInstance(ctx).InstanceID()
-	query, scan := prepareUserQuery(instanceID)
+	query, scan := prepareUserQuery()
 	for _, q := range queries {
 		query = q.toQuery(query)
 	}
 	stmt, args, err := query.Where(sq.Eq{
-		UserInstanceIDCol.identifier(): instanceID,
+		UserInstanceIDCol.identifier(): authz.GetInstance(ctx).InstanceID(),
 	}).ToSql()
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "QUERY-Dnhr2", "Errors.Query.SQLStatment")
@@ -398,14 +396,13 @@ func (q *Queries) GetNotifyUserByID(ctx context.Context, shouldTriggered bool, u
 		projection.LoginNameProjection.Trigger(ctx)
 	}

-	instanceID := authz.GetInstance(ctx).InstanceID()
-	query, scan := prepareNotifyUserQuery(instanceID)
+	query, scan := prepareNotifyUserQuery()
 	for _, q := range queries {
 		query = q.toQuery(query)
 	}
 	stmt, args, err := query.Where(sq.Eq{
 		UserIDCol.identifier():         userID,
-		UserInstanceIDCol.identifier(): instanceID,
+		UserInstanceIDCol.identifier(): authz.GetInstance(ctx).InstanceID(),
 	}).ToSql()
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "QUERY-Err3g", "Errors.Query.SQLStatment")
@@ -421,13 +418,12 @@ func (q *Queries) GetNotifyUser(ctx context.Context, shouldTriggered bool, queri
 		projection.LoginNameProjection.Trigger(ctx)
 	}

-	instanceID := authz.GetInstance(ctx).InstanceID()
-	query, scan := prepareNotifyUserQuery(instanceID)
+	query, scan := prepareNotifyUserQuery()
 	for _, q := range queries {
 		query = q.toQuery(query)
 	}
 	stmt, args, err := query.Where(sq.Eq{
-		UserInstanceIDCol.identifier(): instanceID,
+		UserInstanceIDCol.identifier(): authz.GetInstance(ctx).InstanceID(),
 	}).ToSql()
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "QUERY-Err3g", "Errors.Query.SQLStatment")
@@ -442,7 +438,8 @@ func (q *Queries) SearchUsers(ctx context.Context, queries *UserSearchQueries) (
 	stmt, args, err := queries.toQuery(query).
 		Where(sq.Eq{
 			UserInstanceIDCol.identifier(): authz.GetInstance(ctx).InstanceID(),
-		}).ToSql()
+		}).
+		ToSql()
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "QUERY-Dgbg2", "Errors.Query.SQLStatment")
 	}
@@ -597,26 +594,27 @@ func NewUserLoginNameExistsQuery(value string, comparison TextComparison) (Searc
 	)
 }

-func prepareUserQuery(instanceID string) (sq.SelectBuilder, func(*sql.Row) (*User, error)) {
-	loginNamesQuery, loginNamesArgs, err := sq.Select(
+func prepareUserQuery() (sq.SelectBuilder, func(*sql.Row) (*User, error)) {
+	loginNamesQuery, _, err := sq.Select(
 		userLoginNamesUserIDCol.identifier(),
-		"ARRAY_AGG("+userLoginNamesNameCol.identifier()+")::TEXT[] AS "+userLoginNamesListCol.name).
+		"ARRAY_AGG("+userLoginNamesNameCol.identifier()+") AS "+userLoginNamesListCol.name,
+		userLoginNamesInstanceIDCol.identifier()).
 		From(userLoginNamesTable.identifier()).
-		GroupBy(userLoginNamesUserIDCol.identifier()).
-		Where(sq.Eq{
-			userLoginNamesInstanceIDCol.identifier(): instanceID,
-		}).ToSql()
+		GroupBy(userLoginNamesUserIDCol.identifier(), userLoginNamesInstanceIDCol.identifier()).
+		ToSql()
 	if err != nil {
 		return sq.SelectBuilder{}, nil
 	}
 	preferredLoginNameQuery, preferredLoginNameArgs, err := sq.Select(
 		userPreferredLoginNameUserIDCol.identifier(),
-		userPreferredLoginNameCol.identifier()).
+		userPreferredLoginNameCol.identifier(),
+		userPreferredLoginNameInstanceIDCol.identifier()).
 		From(userPreferredLoginNameTable.identifier()).
-		Where(sq.Eq{
-			userPreferredLoginNameIsPrimaryCol.identifier():  true,
-			userPreferredLoginNameInstanceIDCol.identifier(): instanceID,
-		}).ToSql()
+		Where(
+			sq.Eq{
+				userPreferredLoginNameIsPrimaryCol.identifier(): true,
+			}).
+		ToSql()
 	if err != nil {
 		return sq.SelectBuilder{}, nil
 	}
@@ -651,8 +649,13 @@ func prepareUserQuery(instanceID string) (sq.SelectBuilder, func(*sql.Row) (*Use
 			From(userTable.identifier()).
 			LeftJoin(join(HumanUserIDCol, UserIDCol)).
 			LeftJoin(join(MachineUserIDCol, UserIDCol)).
-			LeftJoin("("+loginNamesQuery+") AS "+userLoginNamesTable.alias+" ON "+userLoginNamesUserIDCol.identifier()+" = "+UserIDCol.identifier(), loginNamesArgs...).
-			LeftJoin("("+preferredLoginNameQuery+") AS "+userPreferredLoginNameTable.alias+" ON "+userPreferredLoginNameUserIDCol.identifier()+" = "+UserIDCol.identifier(), preferredLoginNameArgs...).
+			LeftJoin("("+loginNamesQuery+") AS "+userLoginNamesTable.alias+" ON "+
+				userLoginNamesUserIDCol.identifier()+" = "+UserIDCol.identifier()+" AND "+
+				userLoginNamesInstanceIDCol.identifier()+" = "+UserInstanceIDCol.identifier()).
+			LeftJoin("("+preferredLoginNameQuery+") AS "+userPreferredLoginNameTable.alias+" ON "+
+				userPreferredLoginNameUserIDCol.identifier()+" = "+UserIDCol.identifier()+" AND "+
+				userPreferredLoginNameInstanceIDCol.identifier()+" = "+UserInstanceIDCol.identifier(),
+				preferredLoginNameArgs...).
 			PlaceholderFormat(sq.Dollar),
 		func(row *sql.Row) (*User, error) {
 			u := new(User)
@@ -898,26 +901,27 @@ func preparePhoneQuery() (sq.SelectBuilder, func(*sql.Row) (*Phone, error)) {
 		}
 }

-func prepareNotifyUserQuery(instanceID string) (sq.SelectBuilder, func(*sql.Row) (*NotifyUser, error)) {
-	loginNamesQuery, loginNamesArgs, err := sq.Select(
+func prepareNotifyUserQuery() (sq.SelectBuilder, func(*sql.Row) (*NotifyUser, error)) {
+	loginNamesQuery, _, err := sq.Select(
 		userLoginNamesUserIDCol.identifier(),
-		"ARRAY_AGG("+userLoginNamesNameCol.identifier()+") AS "+userLoginNamesListCol.name).
+		"ARRAY_AGG("+userLoginNamesNameCol.identifier()+") AS "+userLoginNamesListCol.name,
+		userLoginNamesInstanceIDCol.identifier()).
 		From(userLoginNamesTable.identifier()).
-		GroupBy(userLoginNamesUserIDCol.identifier()).
-		Where(sq.Eq{
-			userLoginNamesInstanceIDCol.identifier(): instanceID,
-		}).ToSql()
+		GroupBy(userLoginNamesUserIDCol.identifier(), userLoginNamesInstanceIDCol.identifier()).
+		ToSql()
 	if err != nil {
 		return sq.SelectBuilder{}, nil
 	}
 	preferredLoginNameQuery, preferredLoginNameArgs, err := sq.Select(
 		userPreferredLoginNameUserIDCol.identifier(),
-		userPreferredLoginNameCol.identifier()).
+		userPreferredLoginNameCol.identifier(),
+		userPreferredLoginNameInstanceIDCol.identifier()).
 		From(userPreferredLoginNameTable.identifier()).
-		Where(sq.Eq{
-			userPreferredLoginNameIsPrimaryCol.identifier():  true,
-			userPreferredLoginNameInstanceIDCol.identifier(): instanceID,
-		}).ToSql()
+		Where(
+			sq.Eq{
+				userPreferredLoginNameIsPrimaryCol.identifier(): true,
+			}).
+		ToSql()
 	if err != nil {
 		return sq.SelectBuilder{}, nil
 	}
@@ -951,8 +955,13 @@ func prepareNotifyUserQuery(instanceID string) (sq.SelectBuilder, func(*sql.Row)
 			From(userTable.identifier()).
 			LeftJoin(join(HumanUserIDCol, UserIDCol)).
 			LeftJoin(join(NotifyUserIDCol, UserIDCol)).
-			LeftJoin("("+loginNamesQuery+") AS "+userLoginNamesTable.alias+" ON "+userLoginNamesUserIDCol.identifier()+" = "+UserIDCol.identifier(), loginNamesArgs...).
-			LeftJoin("("+preferredLoginNameQuery+") AS "+userPreferredLoginNameTable.alias+" ON "+userPreferredLoginNameUserIDCol.identifier()+" = "+UserIDCol.identifier(), preferredLoginNameArgs...).
+			LeftJoin("("+loginNamesQuery+") AS "+userLoginNamesTable.alias+" ON "+
+				userLoginNamesUserIDCol.identifier()+" = "+UserIDCol.identifier()+" AND "+
+				userLoginNamesInstanceIDCol.identifier()+" = "+UserInstanceIDCol.identifier()).
+			LeftJoin("("+preferredLoginNameQuery+") AS "+userPreferredLoginNameTable.alias+" ON "+
+				userPreferredLoginNameUserIDCol.identifier()+" = "+UserIDCol.identifier()+" AND "+
+				userPreferredLoginNameInstanceIDCol.identifier()+" = "+UserInstanceIDCol.identifier(),
+				preferredLoginNameArgs...).
 			PlaceholderFormat(sq.Dollar),
 		func(row *sql.Row) (*NotifyUser, error) {
 			u := new(NotifyUser)
@@ -1078,21 +1087,24 @@ func prepareUserUniqueQuery() (sq.SelectBuilder, func(*sql.Row) (bool, error)) {
 func prepareUsersQuery() (sq.SelectBuilder, func(*sql.Rows) (*Users, error)) {
 	loginNamesQuery, _, err := sq.Select(
 		userLoginNamesUserIDCol.identifier(),
-		"ARRAY_AGG("+userLoginNamesNameCol.identifier()+") AS "+userLoginNamesListCol.name).
+		"ARRAY_AGG("+userLoginNamesNameCol.identifier()+") AS "+userLoginNamesListCol.name,
+		userLoginNamesInstanceIDCol.identifier()).
 		From(userLoginNamesTable.identifier()).
-		GroupBy(userLoginNamesUserIDCol.identifier()).
+		GroupBy(userLoginNamesUserIDCol.identifier(), userLoginNamesInstanceIDCol.identifier()).
 		ToSql()
 	if err != nil {
 		return sq.SelectBuilder{}, nil
 	}
 	preferredLoginNameQuery, preferredLoginNameArgs, err := sq.Select(
 		userPreferredLoginNameUserIDCol.identifier(),
-		userPreferredLoginNameCol.identifier()).
+		userPreferredLoginNameCol.identifier(),
+		userPreferredLoginNameInstanceIDCol.identifier()).
 		From(userPreferredLoginNameTable.identifier()).
 		Where(
 			sq.Eq{
 				userPreferredLoginNameIsPrimaryCol.identifier(): true,
-			}).ToSql()
+			}).
+		ToSql()
 	if err != nil {
 		return sq.SelectBuilder{}, nil
 	}
@@ -1126,8 +1138,13 @@ func prepareUsersQuery() (sq.SelectBuilder, func(*sql.Rows) (*Users, error)) {
 			From(userTable.identifier()).
 			LeftJoin(join(HumanUserIDCol, UserIDCol)).
 			LeftJoin(join(MachineUserIDCol, UserIDCol)).
-			LeftJoin("("+loginNamesQuery+") AS "+userLoginNamesTable.alias+" ON "+userLoginNamesUserIDCol.identifier()+" = "+UserIDCol.identifier()).
-			LeftJoin("("+preferredLoginNameQuery+") AS "+userPreferredLoginNameTable.alias+" ON "+userPreferredLoginNameUserIDCol.identifier()+" = "+UserIDCol.identifier(), preferredLoginNameArgs...).
+			LeftJoin("("+loginNamesQuery+") AS "+userLoginNamesTable.alias+" ON "+
+				userLoginNamesUserIDCol.identifier()+" = "+UserIDCol.identifier()+" AND "+
+				userLoginNamesInstanceIDCol.identifier()+" = "+UserInstanceIDCol.identifier()).
+			LeftJoin("("+preferredLoginNameQuery+") AS "+userPreferredLoginNameTable.alias+" ON "+
+				userPreferredLoginNameUserIDCol.identifier()+" = "+UserIDCol.identifier()+" AND "+
+				userPreferredLoginNameInstanceIDCol.identifier()+" = "+UserInstanceIDCol.identifier(),
+				preferredLoginNameArgs...).
 			PlaceholderFormat(sq.Dollar),
 		func(rows *sql.Rows) (*Users, error) {
 			users := make([]*User, 0)