refactored db code

internal/db/discordtokens.go

@@ -2,7 +2,6 @@ package db
 
 import (
 	"context"
-	"database/sql"
 	"time"
 
 	"git.haelnorr.com/h/oslstats/internal/discord"
@@ -38,15 +37,14 @@ func (u *User) UpdateDiscordToken(ctx context.Context, tx bun.Tx, token *discord
 		TokenType:    token.TokenType,
 	}
 
-	_, err := tx.NewInsert().
-		Model(discordToken).
+	err := Insert(tx, discordToken).
 		On("CONFLICT (discord_id) DO UPDATE").
 		Set("access_token = EXCLUDED.access_token").
 		Set("refresh_token = EXCLUDED.refresh_token").
 		Set("expires_at = EXCLUDED.expires_at").
 		Exec(ctx)
 	if err != nil {
-		return errors.Wrap(err, "tx.NewInsert")
+		return errors.Wrap(err, "db.Insert")
 	}
 	return nil
 }
@@ -73,19 +71,7 @@ func (u *User) DeleteDiscordTokens(ctx context.Context, tx bun.Tx) (*DiscordToke
 
 // GetDiscordToken retrieves the users discord token from the database
 func (u *User) GetDiscordToken(ctx context.Context, tx bun.Tx) (*DiscordToken, error) {
-	token := new(DiscordToken)
-	err := tx.NewSelect().
-		Model(token).
-		Where("discord_id = ?", u.DiscordID).
-		Limit(1).
-		Scan(ctx)
-	if err != nil {
-		if errors.Is(err, sql.ErrNoRows) {
-			return nil, nil
-		}
-		return nil, errors.Wrap(err, "tx.NewSelect")
-	}
-	return token, nil
+	return GetByField[DiscordToken](tx, "discord_id", u.DiscordID).GetFirst(ctx)
 }
 
 // Convert reverts the token back into a *discord.Token