more refactors

internal/db/user.go

@@ -2,7 +2,6 @@ package db
 
 import (
 	"context"
-	"database/sql"
 	"time"
 
 	"git.haelnorr.com/h/golib/hwsauth"
@@ -26,12 +25,6 @@ type User struct {
 	Roles []*Role `bun:"m2m:user_roles,join:User=Role"`
 }
 
-type Users struct {
-	Users    []*User
-	Total    int
-	PageOpts PageOpts
-}
-
 func (u *User) GetID() int {
 	return u.ID
 }
@@ -61,55 +54,25 @@ func CreateUser(ctx context.Context, tx bun.Tx, username string, discorduser *di
 // GetUserByID queries the database for a user matching the given ID
 // Returns nil, nil if no user is found
 func GetUserByID(ctx context.Context, tx bun.Tx, id int) (*User, error) {
-	user := new(User)
-	err := tx.NewSelect().
-		Model(user).
-		Where("id = ?", id).
-		Limit(1).
-		Scan(ctx)
-	if err != nil {
-		if err == sql.ErrNoRows {
-			return nil, nil
-		}
-		return nil, errors.Wrap(err, "tx.NewSelect")
-	}
-	return user, nil
+	return GetByID[User](tx, id).GetFirst(ctx)
 }
 
 // GetUserByUsername queries the database for a user matching the given username
 // Returns nil, nil if no user is found
 func GetUserByUsername(ctx context.Context, tx bun.Tx, username string) (*User, error) {
-	user := new(User)
-	err := tx.NewSelect().
-		Model(user).
-		Where("username = ?", username).
-		Limit(1).
-		Scan(ctx)
-	if err != nil {
-		if err == sql.ErrNoRows {
-			return nil, nil
-		}
-		return nil, errors.Wrap(err, "tx.NewSelect")
+	if username == "" {
+		return nil, errors.New("username not provided")
 	}
-	return user, nil
+	return GetByField[User](tx, "username", username).GetFirst(ctx)
 }
 
 // GetUserByDiscordID queries the database for a user matching the given discord id
 // Returns nil, nil if no user is found
 func GetUserByDiscordID(ctx context.Context, tx bun.Tx, discordID string) (*User, error) {
-	user := new(User)
-	err := tx.NewSelect().
-		Model(user).
-		Where("discord_id = ?", discordID).
-		Limit(1).
-		Scan(ctx)
-	if err != nil {
-		if err == sql.ErrNoRows {
-			return nil, nil
-		}
-		return nil, errors.Wrap(err, "tx.NewSelect")
+	if discordID == "" {
+		return nil, errors.New("discord_id not provided")
 	}
-	return user, nil
+	return GetByField[User](tx, "discord_id", discordID).GetFirst(ctx)
 }
 
 // GetRoles loads all the roles for this user
@@ -117,12 +80,8 @@ func (u *User) GetRoles(ctx context.Context, tx bun.Tx) ([]*Role, error) {
 	if u == nil {
 		return nil, errors.New("user cannot be nil")
 	}
-
-	err := tx.NewSelect().
-		Model(u).
-		Relation("Roles").
-		Where("id = ?", u.ID).
-		Scan(ctx)
+	u, err := GetByField[User](tx, "id", u.ID).
+		Relation("Roles").GetFirst(ctx)
 	if err != nil {
 		return nil, errors.Wrap(err, "tx.NewSelect")
 	}
@@ -134,18 +93,11 @@ func (u *User) GetPermissions(ctx context.Context, tx bun.Tx) ([]*Permission, er
 	if u == nil {
 		return nil, errors.New("user cannot be nil")
 	}
-
-	var permissions []*Permission
-	err := tx.NewSelect().
-		Model(&permissions).
+	permissions, err := GetByField[[]*Permission](tx, "ur.user_id", u.ID).
 		Join("JOIN role_permissions AS rp on rp.permission_id = p.id").
 		Join("JOIN user_roles AS ur ON ur.role_id = rp.role_id").
-		Where("ur.user_id = ?", u.ID).
-		Scan(ctx)
-	if err != nil && err != sql.ErrNoRows {
-		return nil, errors.Wrap(err, "tx.NewSelect")
-	}
-	return permissions, nil
+		GetAll(ctx)
+	return *permissions, err
 }
 
 // HasPermission checks if user has a specific permission (including wildcard check)
@@ -186,23 +138,7 @@ func (u *User) IsAdmin(ctx context.Context, tx bun.Tx) (bool, error) {
 	return u.HasRole(ctx, tx, "admin")
 }
 
-func GetUsers(ctx context.Context, tx bun.Tx, pageOpts *PageOpts) (*Users, error) {
-	users := new([]*User)
-	query := tx.NewSelect().
-		Model(users)
-	total, err := query.Count(ctx)
-	if err != nil {
-		return nil, errors.Wrap(err, "query.Count")
-	}
-	query, pageOpts = setPageOpts(query, pageOpts, 1, 50, bun.OrderAsc, "id")
-	err = query.Scan(ctx)
-	if err != nil && err != sql.ErrNoRows {
-		return nil, errors.Wrap(err, "query.Scan")
-	}
-	list := &Users{
-		Users:    *users,
-		Total:    total,
-		PageOpts: *pageOpts,
-	}
-	return list, nil
+func GetUsers(ctx context.Context, tx bun.Tx, pageOpts *PageOpts) (*List[User], error) {
+	defaults := &PageOpts{1, 50, bun.OrderAsc, "id"}
+	return GetList[User](tx, pageOpts, defaults).GetAll(ctx)
 }