refactored for maintainability

internal/handlers/admin_users.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"
@@ -15,30 +14,21 @@ import (
 // AdminUsersList shows all users
 func AdminUsersList(s *hws.Server, conn *bun.DB) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		ctx, cancel := context.WithTimeout(r.Context(), 10*time.Second)
-		defer cancel()
-
-		tx, err := conn.BeginTx(ctx, nil)
-		if err != nil {
-			throwInternalServiceError(s, w, r, "DB Transaction failed", errors.Wrap(err, "conn.BeginTx"))
+		var users *db.Users
+		pageOpts := pageOptsFromForm(s, w, r)
+		if pageOpts == nil {
 			return
 		}
-		defer func() { _ = tx.Rollback() }()
-
-		// Get all users
-		pageOpts, err := pageOptsFromForm(r)
-		if err != nil {
-			throwBadRequest(s, w, r, "invalid form data", err)
+		if ok := db.WithReadTx(s, w, r, conn, func(ctx context.Context, tx bun.Tx) (bool, error) {
+			var err error
+			users, err = db.GetUsers(ctx, tx, pageOpts)
+			if err != nil {
+				return false, errors.Wrap(err, "db.GetUsers")
+			}
+			return true, nil
+		}); !ok {
 			return
 		}
-		users, err := db.GetUsers(ctx, tx, pageOpts)
-		if err != nil {
-			throwInternalServiceError(s, w, r, "Failed to load users", errors.Wrap(err, "db.GetUsers"))
-			return
-		}
-
-		_ = tx.Commit()
-
 		renderSafely(admin.UserList(users), s, r, w)
 	})
 }