rbac system first stage

internal/handlers/seasons.go

@@ -2,9 +2,7 @@ package handlers
 
 import (
 	"context"
-	"fmt"
 	"net/http"
-	"strconv"
 	"time"
 
 	"git.haelnorr.com/h/golib/hws"
@@ -27,30 +25,10 @@ func SeasonsPage(
 			return
 		}
 		defer tx.Rollback()
-		var pageNum, perPage int
-		var order bun.Order
-		var orderBy string
-		if pageStr := r.URL.Query().Get("page"); pageStr != "" {
-			pageNum, err = strconv.Atoi(pageStr)
-			if err != nil {
-				throwBadRequest(s, w, r, "Invalid page number", err)
-				return
-			}
-		}
-		if perPageStr := r.URL.Query().Get("per_page"); perPageStr != "" {
-			perPage, err = strconv.Atoi(perPageStr)
-			if err != nil {
-				throwBadRequest(s, w, r, "Invalid per_page number", err)
-				return
-			}
-		}
-		order = bun.Order(r.URL.Query().Get("order"))
-		orderBy = r.URL.Query().Get("order_by")
-		pageOpts := &db.PageOpts{
-			Page:    pageNum,
-			PerPage: perPage,
-			Order:   order,
-			OrderBy: orderBy,
+		pageOpts, err := pageOptsFromQuery(r)
+		if err != nil {
+			throwBadRequest(s, w, r, "invalid query", err)
+			return
 		}
 		seasons, err := db.ListSeasons(ctx, tx, pageOpts)
 		if err != nil {
@@ -76,36 +54,11 @@ func SeasonsList(
 			return
 		}
 
-		// Extract pagination/sort params from form
-		var pageNum, perPage int
-		var order bun.Order
-		var orderBy string
-		var err error
-
-		if pageStr := r.FormValue("page"); pageStr != "" {
-			pageNum, err = strconv.Atoi(pageStr)
-			if err != nil {
-				throwBadRequest(s, w, r, "Invalid page number", err)
-				return
-			}
+		pageOpts, err := pageOptsFromForm(r)
+		if err != nil {
+			throwBadRequest(s, w, r, "invalid form data", err)
+			return
 		}
-		if perPageStr := r.FormValue("per_page"); perPageStr != "" {
-			perPage, err = strconv.Atoi(perPageStr)
-			if err != nil {
-				throwBadRequest(s, w, r, "Invalid per_page number", err)
-				return
-			}
-		}
-		order = bun.Order(r.FormValue("order"))
-		orderBy = r.FormValue("order_by")
-
-		pageOpts := &db.PageOpts{
-			Page:    pageNum,
-			PerPage: perPage,
-			Order:   order,
-			OrderBy: orderBy,
-		}
-		fmt.Println(pageOpts)
 
 		// Database query
 		tx, err := conn.BeginTx(ctx, nil)