fixed relationship issues

internal/db/user.go

@@ -23,6 +23,8 @@ type User struct {
 	Username  string `bun:"username,unique"`     // Username (unique)
 	CreatedAt int64  `bun:"created_at"`          // Epoch timestamp when the user was added to the database
 	DiscordID string `bun:"discord_id,unique"`
+
+	Roles []*Role `bun:"m2m:user_roles,join:User=Role"`
 }
 
 type Users struct {
@@ -124,28 +126,35 @@ func IsUsernameUnique(ctx context.Context, tx bun.Tx, username string) (bool, er
 	return count == 0, nil
 }
 
-// GetRoles loads and returns all roles for this user
+// GetRoles loads all the roles for this user
 func (u *User) GetRoles(ctx context.Context, tx bun.Tx) ([]*Role, error) {
 	if u == nil {
 		return nil, errors.New("user cannot be nil")
 	}
-	return GetUserRoles(ctx, tx, u.ID)
+
+	err := tx.NewSelect().
+		Model(u).
+		Relation("Roles").
+		Where("id = ?", u.ID).
+		Scan(ctx)
+	if err != nil {
+		return nil, errors.Wrap(err, "tx.NewSelect")
+	}
+	return u.Roles, nil
 }
 
-// GetPermissions loads and returns all permissions for this user (via roles)
+// GetPermissions loads and returns all permissions for this user
 func (u *User) GetPermissions(ctx context.Context, tx bun.Tx) ([]*Permission, error) {
 	if u == nil {
 		return nil, errors.New("user cannot be nil")
 	}
 
-	// TODO: use proper m2m tables and relations instead of join
 	var permissions []*Permission
 	err := tx.NewSelect().
 		Model(&permissions).
-		Join("JOIN role_permissions AS rp ON rp.permission_id = p.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).
-		Where("ur.expires_at IS NULL OR ur.expires_at > ?", time.Now().Unix()).
 		Scan(ctx)
 	if err != nil && err != sql.ErrNoRows {
 		return nil, errors.Wrap(err, "tx.NewSelect")
@@ -192,22 +201,8 @@ func (u *User) IsAdmin(ctx context.Context, tx bun.Tx) (bool, error) {
 }
 
 func GetUsers(ctx context.Context, tx bun.Tx, pageOpts *PageOpts) (*Users, error) {
-	if pageOpts == nil {
-		pageOpts = &PageOpts{}
-	}
-	if pageOpts.Page == 0 {
-		pageOpts.Page = 1
-	}
-	if pageOpts.PerPage == 0 {
-		pageOpts.PerPage = 50
-	}
-	if pageOpts.Order == "" {
-		pageOpts.Order = bun.OrderAsc
-	}
-	if pageOpts.OrderBy == "" {
-		pageOpts.OrderBy = "id"
-	}
-	users := []*User{}
+	pageOpts = setDefaultPageOpts(pageOpts, 1, 50, bun.OrderAsc, "id")
+	users := new([]*User)
 	err := tx.NewSelect().
 		Model(users).
 		OrderBy(pageOpts.OrderBy, pageOpts.Order).
@@ -224,7 +219,7 @@ func GetUsers(ctx context.Context, tx bun.Tx, pageOpts *PageOpts) (*Users, error
 		return nil, errors.Wrap(err, "tx.NewSelect")
 	}
 	list := &Users{
-		Users:    users,
+		Users:    *users,
 		Total:    total,
 		PageOpts: *pageOpts,
 	}