refactored for maintainability

internal/handlers/season.go

@@ -3,10 +3,10 @@ package handlers
 import (
 	"context"
 	"net/http"
-	"time"
 
 	"git.haelnorr.com/h/golib/hws"
 	"git.haelnorr.com/h/oslstats/internal/db"
+	"git.haelnorr.com/h/oslstats/internal/throw"
 	"git.haelnorr.com/h/oslstats/internal/view/page"
 	"github.com/pkg/errors"
 	"github.com/uptrace/bun"
@@ -17,23 +17,20 @@ func SeasonPage(
 	conn *bun.DB,
 ) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		ctx, cancel := context.WithTimeout(r.Context(), 15*time.Second)
-		defer cancel()
-		tx, err := conn.BeginTx(ctx, nil)
-		if err != nil {
-			throwInternalServiceError(s, w, r, "Database error", errors.Wrap(err, "conn.BeginTx"))
-			return
-		}
-		defer tx.Rollback()
 		seasonStr := r.PathValue("season_short_name")
-		season, err := db.GetSeason(ctx, tx, seasonStr)
-		if err != nil {
-			throwInternalServiceError(s, w, r, "Database error", errors.Wrap(err, "db.GetSeason"))
+		var season *db.Season
+		if ok := db.WithReadTx(s, w, r, conn, func(ctx context.Context, tx bun.Tx) (bool, error) {
+			var err error
+			season, err = db.GetSeason(ctx, tx, seasonStr)
+			if err != nil {
+				return false, errors.Wrap(err, "db.GetSeason")
+			}
+			return true, nil
+		}); !ok {
 			return
 		}
-		tx.Commit()
 		if season == nil {
-			throwNotFound(s, w, r, r.URL.Path)
+			throw.NotFound(s, w, r, r.URL.Path)
 			return
 		}
 		renderSafely(page.SeasonPage(season), s, r, w)