refactor: remove dbtx package

internal/playback/repository.go

@@ -3,8 +3,8 @@ package playback
 import (
 	"context"
 	"database/sql"
+	"errors"
 	"mal/internal/db"
-	"mal/internal/dbtx"
 	"mal/internal/domain"
 )
 
@@ -18,9 +18,24 @@ func NewPlaybackRepository(sqlDB *sql.DB, queries *db.Queries) domain.PlaybackRe
 }
 
 func (r *playbackRepository) InTx(ctx context.Context, fn func(ctx context.Context, repo domain.PlaybackRepository) error) error {
-	return dbtx.Run(ctx, r.sqlDB, domain.PlaybackRepository(r), func(tx *sql.Tx) domain.PlaybackRepository {
+	if r.sqlDB == nil {
-		return &playbackRepository{sqlDB: nil, queries: r.queries.WithTx(tx)}
+		return fn(ctx, r)
-	}, fn)
+	}
+
+	tx, err := r.sqlDB.BeginTx(ctx, nil)
+	if err != nil {
+		return err
+	}
+
+	txRepo := &playbackRepository{sqlDB: nil, queries: r.queries.WithTx(tx)}
+	if err := fn(ctx, txRepo); err != nil {
+		if rollbackErr := tx.Rollback(); rollbackErr != nil {
+			return errors.Join(err, rollbackErr)
+		}
+		return err
+	}
+
+	return tx.Commit()
 }
 
 func (r *playbackRepository) UpsertAnime(ctx context.Context, params db.UpsertAnimeParams) (db.Anime, error) {

internal/tx.go

@@ -1,4 +1,4 @@
-package dbtx
+package internal
 
 import (
 	"context"

internal/watchlist/repository.go

@@ -3,8 +3,8 @@ package watchlist
 import (
 	"context"
 	"database/sql"
+	"errors"
 	"mal/internal/db"
-	"mal/internal/dbtx"
 	"mal/internal/domain"
 )
 
@@ -18,9 +18,24 @@ func NewWatchlistRepository(sqlDB *sql.DB, queries *db.Queries) domain.Watchlist
 }
 
 func (r *watchlistRepository) InTx(ctx context.Context, fn func(ctx context.Context, repo domain.WatchlistRepository) error) error {
-	return dbtx.Run(ctx, r.sqlDB, domain.WatchlistRepository(r), func(tx *sql.Tx) domain.WatchlistRepository {
+	if r.sqlDB == nil {
-		return &watchlistRepository{sqlDB: nil, queries: r.queries.WithTx(tx)}
+		return fn(ctx, r)
-	}, fn)
+	}
+
+	tx, err := r.sqlDB.BeginTx(ctx, nil)
+	if err != nil {
+		return err
+	}
+
+	txRepo := &watchlistRepository{sqlDB: nil, queries: r.queries.WithTx(tx)}
+	if err := fn(ctx, txRepo); err != nil {
+		if rollbackErr := tx.Rollback(); rollbackErr != nil {
+			return errors.Join(err, rollbackErr)
+		}
+		return err
+	}
+
+	return tx.Commit()
 }
 
 func (r *watchlistRepository) UpsertAnime(ctx context.Context, arg db.UpsertAnimeParams) (db.Anime, error) {