Batch user role loading

internal/api/edit_integration_test.go

@@ -106,6 +106,7 @@ func (s *editTestRunner) testVotePermissionsPromotion() {
 
 func (s *editTestRunner) verifyUserRolePromotion(user *models.User) {
 	assert.Eventually(s.t, func() bool {
+		s.newRequest()
 		roles, _ := s.resolver.User().Roles(s.ctx, user)
 		for _, role := range roles {
 			if role == models.RoleEnumVote {

internal/api/resolver_model_user.go

@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/stashapp/stash-box/internal/auth"
+	"github.com/stashapp/stash-box/internal/converter"
 	"github.com/stashapp/stash-box/internal/dataloader"
 	"github.com/stashapp/stash-box/internal/models"
 )
@@ -22,7 +23,12 @@ func (r *userResolver) Roles(ctx context.Context, user *models.User) ([]models.R
 		}
 	}
 
-	return r.services.User().GetRoles(ctx, user.ID)
+	roleStrings, err := dataloader.For(ctx).UserRolesByID.Load(user.ID)
+	if err != nil {
+		return nil, err
+	}
+
+	return converter.StringsToRoleEnums(roleStrings), nil
 }
 
 func (r *userResolver) VoteCount(ctx context.Context, obj *models.User) (*models.UserVoteCount, error) {

internal/dataloader/loaders.go

@@ -51,6 +51,7 @@ type Loaders struct {
 	SceneEditsByID                 EditsLoader
 	EditCommentByID                EditCommentLoader
 	UserByID                       UserLoader
+	UserRolesByID                  StringsLoader
 }
 
 func Middleware(fac service.Factory) func(next http.Handler) http.Handler {
@@ -299,6 +300,14 @@ func GetLoaders(ctx context.Context, fac service.Factory) *Loaders {
 				return s.LoadIds(ctx, ids)
 			},
 		},
+		UserRolesByID: StringsLoader{
+			maxBatch: 1000,
+			wait:     1 * time.Millisecond,
+			fetch: func(ids []uuid.UUID) ([][]string, []error) {
+				s := fac.User()
+				return s.LoadRoles(ctx, ids)
+			},
+		},
 		SceneByID: SceneLoader{
 			maxBatch: 1000,
 			wait:     1 * time.Millisecond,

internal/queries/sql/user.sql

@@ -65,6 +65,9 @@ DELETE FROM user_roles WHERE user_id = $1;
 -- name: GetUserRoles :many
 SELECT role FROM user_roles WHERE user_id = $1;
 
+-- name: GetUserRolesByUserIDs :many
+SELECT user_id, role FROM user_roles WHERE user_id = ANY($1::UUID[]);
+
 -- name: CountVotesByType :many
 SELECT vote, COUNT(*) as count FROM edit_votes WHERE user_id = $1 GROUP BY vote;
 

internal/service/user/service.go

@@ -206,6 +206,26 @@ func (s *User) GetRoles(ctx context.Context, userID uuid.UUID) ([]models.RoleEnu
 	return converter.StringsToRoleEnums(roleStrings), nil
 }
 
+// LoadRoles fetches roles for multiple users in one query.
+func (s *User) LoadRoles(ctx context.Context, userIDs []uuid.UUID) ([][]string, []error) {
+	rows, err := s.queries.GetUserRolesByUserIDs(ctx, userIDs)
+	if err != nil {
+		return nil, errutil.DuplicateError(err, len(userIDs))
+	}
+
+	roleMap := make(map[uuid.UUID][]string, len(userIDs))
+	for _, row := range rows {
+		roleMap[row.UserID] = append(roleMap[row.UserID], row.Role)
+	}
+
+	roles := make([][]string, len(userIDs))
+	for i, userID := range userIDs {
+		roles[i] = roleMap[userID]
+	}
+
+	return roles, make([]error, len(userIDs))
+}
+
 // NewUser registers a new user. It returns the activation key only if
 // email verification is not required, otherwise it returns nil.
 func (s *User) NewUser(ctx context.Context, emailAddr string, inviteKey *uuid.UUID) (*uuid.UUID, error) {