refactored for maintainability

internal/handlers/seasons.go

@@ -3,7 +3,6 @@ package handlers
 import (
 	"context"
 	"net/http"
-	"time"
 
 	"git.haelnorr.com/h/golib/hws"
 	"git.haelnorr.com/h/oslstats/internal/db"
@@ -17,25 +16,21 @@ func SeasonsPage(
 	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"))
+		pageOpts := pageOptsFromQuery(s, w, r)
+		if pageOpts == nil {
 			return
 		}
-		defer tx.Rollback()
-		pageOpts, err := pageOptsFromQuery(r)
-		if err != nil {
-			throwBadRequest(s, w, r, "invalid query", err)
+		var seasons *db.SeasonList
+		if ok := db.WithReadTx(s, w, r, conn, func(ctx context.Context, tx bun.Tx) (bool, error) {
+			var err error
+			seasons, err = db.ListSeasons(ctx, tx, pageOpts)
+			if err != nil {
+				return false, errors.Wrap(err, "db.ListSeasons")
+			}
+			return true, nil
+		}); !ok {
 			return
 		}
-		seasons, err := db.ListSeasons(ctx, tx, pageOpts)
-		if err != nil {
-			throwInternalServiceError(s, w, r, "Database error", errors.Wrap(err, "db.ListSeasons"))
-			return
-		}
-		tx.Commit()
 		renderSafely(page.SeasonsPage(seasons), s, r, w)
 	})
 }
@@ -45,37 +40,21 @@ func SeasonsList(
 	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()
-
-		// Parse form values
-		if err := r.ParseForm(); err != nil {
-			throwBadRequest(s, w, r, "Invalid form data", err)
+		pageOpts := pageOptsFromForm(s, w, r)
+		if pageOpts == nil {
 			return
 		}
-
-		pageOpts, err := pageOptsFromForm(r)
-		if err != nil {
-			throwBadRequest(s, w, r, "invalid form data", err)
+		var seasons *db.SeasonList
+		if ok := db.WithReadTx(s, w, r, conn, func(ctx context.Context, tx bun.Tx) (bool, error) {
+			var err error
+			seasons, err = db.ListSeasons(ctx, tx, pageOpts)
+			if err != nil {
+				return false, errors.Wrap(err, "db.ListSeasons")
+			}
+			return true, nil
+		}); !ok {
 			return
 		}
-
-		// Database query
-		tx, err := conn.BeginTx(ctx, nil)
-		if err != nil {
-			throwInternalServiceError(s, w, r, "Database error", errors.Wrap(err, "conn.BeginTx"))
-			return
-		}
-		defer tx.Rollback()
-
-		seasons, err := db.ListSeasons(ctx, tx, pageOpts)
-		if err != nil {
-			throwInternalServiceError(s, w, r, "Database error", errors.Wrap(err, "db.ListSeasons"))
-			return
-		}
-		tx.Commit()
-
-		// Return only the list component (hx-push-url handles URL update client-side)
 		renderSafely(page.SeasonsList(seasons), s, r, w)
 	})
 }