fixed fixture page to use htmx tab pattern

2026-03-07 12:34:49 +11:00
parent 8b414ff7f0
commit 9f6a2303a0
3 changed files with 382 additions and 88 deletions
--- a/internal/handlers/fixture_detail.go
+++ b/internal/handlers/fixture_detail.go
@@ -2,6 +2,7 @@ package handlers

 import (
 	"context"
+	"fmt"
 	"net/http"
 	"strconv"
 	"time"
@@ -20,8 +21,7 @@ import (
 	"github.com/uptrace/bun"
 )

-// FixtureDetailPage renders the fixture detail page with scheduling UI, history,
-// result display, and team rosters
+// FixtureDetailPage redirects to the default tab (overview)
 func FixtureDetailPage(
 	s *hws.Server,
 	conn *db.DB,
@@ -33,9 +33,230 @@ func FixtureDetailPage(
 			return
 		}

-		activeTab := r.URL.Query().Get("tab")
-		if activeTab == "" {
-			activeTab = "overview"
+		http.Redirect(w, r, fmt.Sprintf("/fixtures/%d/overview", fixtureID), http.StatusSeeOther)
+	})
+}
+
+// FixtureDetailOverviewPage renders the overview tab of the fixture detail page
+func FixtureDetailOverviewPage(
+	s *hws.Server,
+	conn *db.DB,
+) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		fixtureID, err := strconv.Atoi(r.PathValue("fixture_id"))
+		if err != nil {
+			throw.BadRequest(s, w, r, "Invalid fixture ID", err)
+			return
+		}
+
+		var fixture *db.Fixture
+		var currentSchedule *db.FixtureSchedule
+		var canSchedule bool
+		var userTeamID int
+		var result *db.FixtureResult
+		var rosters map[string][]*db.PlayerWithPlayStatus
+		var nominatedFreeAgents []*db.FixtureFreeAgent
+		var availableFreeAgents []*db.SeasonLeagueFreeAgent
+
+		if ok := conn.WithReadTx(s, w, r, func(ctx context.Context, tx bun.Tx) (bool, error) {
+			var err error
+			fixture, err = db.GetFixture(ctx, tx, fixtureID)
+			if err != nil {
+				if db.IsBadRequest(err) {
+					throw.NotFound(s, w, r, r.URL.Path)
+					return false, nil
+				}
+				return false, errors.Wrap(err, "db.GetFixture")
+			}
+			currentSchedule, err = db.GetCurrentFixtureSchedule(ctx, tx, fixtureID)
+			if err != nil {
+				return false, errors.Wrap(err, "db.GetCurrentFixtureSchedule")
+			}
+			user := db.CurrentUser(ctx)
+			canSchedule, userTeamID, err = fixture.CanSchedule(ctx, tx, user)
+			if err != nil {
+				return false, errors.Wrap(err, "fixture.CanSchedule")
+			}
+			result, err = db.GetFixtureResult(ctx, tx, fixtureID)
+			if err != nil {
+				return false, errors.Wrap(err, "db.GetFixtureResult")
+			}
+			rosters, err = db.GetFixtureTeamRosters(ctx, tx, fixture, result)
+			if err != nil {
+				return false, errors.Wrap(err, "db.GetFixtureTeamRosters")
+			}
+			nominatedFreeAgents, err = db.GetNominatedFreeAgents(ctx, tx, fixtureID)
+			if err != nil {
+				return false, errors.Wrap(err, "db.GetNominatedFreeAgents")
+			}
+			canManage := contexts.Permissions(ctx).HasPermission(permissions.FixturesManage)
+			if canSchedule || canManage {
+				availableFreeAgents, err = db.GetFreeAgentsForSeasonLeague(ctx, tx, fixture.SeasonID, fixture.LeagueID)
+				if err != nil {
+					return false, errors.Wrap(err, "db.GetFreeAgentsForSeasonLeague")
+				}
+			}
+			return true, nil
+		}); !ok {
+			return
+		}
+
+		if r.Method == "GET" {
+			renderSafely(seasonsview.FixtureDetailOverviewPage(
+				fixture, currentSchedule, canSchedule, userTeamID,
+				result, rosters, nominatedFreeAgents, availableFreeAgents,
+			), s, r, w)
+		} else {
+			renderSafely(seasonsview.FixtureDetailOverviewContent(
+				fixture, currentSchedule, canSchedule, userTeamID,
+				result, rosters, nominatedFreeAgents, availableFreeAgents,
+			), s, r, w)
+		}
+	})
+}
+
+// FixtureDetailPreviewPage renders the match preview tab of the fixture detail page
+func FixtureDetailPreviewPage(
+	s *hws.Server,
+	conn *db.DB,
+) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		fixtureID, err := strconv.Atoi(r.PathValue("fixture_id"))
+		if err != nil {
+			throw.BadRequest(s, w, r, "Invalid fixture ID", err)
+			return
+		}
+
+		var fixture *db.Fixture
+		var result *db.FixtureResult
+		var rosters map[string][]*db.PlayerWithPlayStatus
+		var previewData *db.MatchPreviewData
+
+		if ok := conn.WithReadTx(s, w, r, func(ctx context.Context, tx bun.Tx) (bool, error) {
+			var err error
+			fixture, err = db.GetFixture(ctx, tx, fixtureID)
+			if err != nil {
+				if db.IsBadRequest(err) {
+					throw.NotFound(s, w, r, r.URL.Path)
+					return false, nil
+				}
+				return false, errors.Wrap(err, "db.GetFixture")
+			}
+			result, err = db.GetFixtureResult(ctx, tx, fixtureID)
+			if err != nil {
+				return false, errors.Wrap(err, "db.GetFixtureResult")
+			}
+			rosters, err = db.GetFixtureTeamRosters(ctx, tx, fixture, result)
+			if err != nil {
+				return false, errors.Wrap(err, "db.GetFixtureTeamRosters")
+			}
+			previewData, err = db.ComputeMatchPreview(ctx, tx, fixture)
+			if err != nil {
+				return false, errors.Wrap(err, "db.ComputeMatchPreview")
+			}
+			return true, nil
+		}); !ok {
+			return
+		}
+
+		// If finalized, redirect to analysis instead
+		if result != nil && result.Finalized {
+			if r.Method == "GET" {
+				http.Redirect(w, r, fmt.Sprintf("/fixtures/%d/analysis", fixtureID), http.StatusSeeOther)
+			} else {
+				respond.HXRedirect(w, "/fixtures/%d/analysis", fixtureID)
+			}
+			return
+		}
+
+		if r.Method == "GET" {
+			renderSafely(seasonsview.FixtureDetailPreviewPage(
+				fixture, result, rosters, previewData,
+			), s, r, w)
+		} else {
+			renderSafely(seasonsview.FixtureDetailPreviewContent(
+				fixture, rosters, previewData,
+			), s, r, w)
+		}
+	})
+}
+
+// FixtureDetailAnalysisPage renders the match analysis tab of the fixture detail page
+func FixtureDetailAnalysisPage(
+	s *hws.Server,
+	conn *db.DB,
+) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		fixtureID, err := strconv.Atoi(r.PathValue("fixture_id"))
+		if err != nil {
+			throw.BadRequest(s, w, r, "Invalid fixture ID", err)
+			return
+		}
+
+		var fixture *db.Fixture
+		var result *db.FixtureResult
+		var rosters map[string][]*db.PlayerWithPlayStatus
+		var previewData *db.MatchPreviewData
+
+		if ok := conn.WithReadTx(s, w, r, func(ctx context.Context, tx bun.Tx) (bool, error) {
+			var err error
+			fixture, err = db.GetFixture(ctx, tx, fixtureID)
+			if err != nil {
+				if db.IsBadRequest(err) {
+					throw.NotFound(s, w, r, r.URL.Path)
+					return false, nil
+				}
+				return false, errors.Wrap(err, "db.GetFixture")
+			}
+			result, err = db.GetFixtureResult(ctx, tx, fixtureID)
+			if err != nil {
+				return false, errors.Wrap(err, "db.GetFixtureResult")
+			}
+			rosters, err = db.GetFixtureTeamRosters(ctx, tx, fixture, result)
+			if err != nil {
+				return false, errors.Wrap(err, "db.GetFixtureTeamRosters")
+			}
+			previewData, err = db.ComputeMatchPreview(ctx, tx, fixture)
+			if err != nil {
+				return false, errors.Wrap(err, "db.ComputeMatchPreview")
+			}
+			return true, nil
+		}); !ok {
+			return
+		}
+
+		// If not finalized, redirect to preview instead
+		if result == nil || !result.Finalized {
+			if r.Method == "GET" {
+				http.Redirect(w, r, fmt.Sprintf("/fixtures/%d/preview", fixtureID), http.StatusSeeOther)
+			} else {
+				respond.HXRedirect(w, "/fixtures/%d/preview", fixtureID)
+			}
+			return
+		}
+
+		if r.Method == "GET" {
+			renderSafely(seasonsview.FixtureDetailAnalysisPage(
+				fixture, result, rosters, previewData,
+			), s, r, w)
+		} else {
+			renderSafely(seasonsview.FixtureDetailAnalysisContent(
+				fixture, result, rosters, previewData,
+			), s, r, w)
+		}
+	})
+}
+
+// FixtureDetailSchedulePage renders the schedule tab of the fixture detail page
+func FixtureDetailSchedulePage(
+	s *hws.Server,
+	conn *db.DB,
+) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		fixtureID, err := strconv.Atoi(r.PathValue("fixture_id"))
+		if err != nil {
+			throw.BadRequest(s, w, r, "Invalid fixture ID", err)
+			return
 		}

 		var fixture *db.Fixture
@@ -44,10 +265,6 @@ func FixtureDetailPage(
 		var canSchedule bool
 		var userTeamID int
 		var result *db.FixtureResult
-		var rosters map[string][]*db.PlayerWithPlayStatus
-		var nominatedFreeAgents []*db.FixtureFreeAgent
-		var availableFreeAgents []*db.SeasonLeagueFreeAgent
-		var previewData *db.MatchPreviewData

 		if ok := conn.WithReadTx(s, w, r, func(ctx context.Context, tx bun.Tx) (bool, error) {
 			var err error
@@ -72,48 +289,34 @@ func FixtureDetailPage(
 			if err != nil {
 				return false, errors.Wrap(err, "fixture.CanSchedule")
 			}
-			// Fetch fixture result if it exists
 			result, err = db.GetFixtureResult(ctx, tx, fixtureID)
 			if err != nil {
 				return false, errors.Wrap(err, "db.GetFixtureResult")
 			}
-			// Fetch team rosters with play status
-			rosters, err = db.GetFixtureTeamRosters(ctx, tx, fixture, result)
-			if err != nil {
-				return false, errors.Wrap(err, "db.GetFixtureTeamRosters")
-			}
-			// Fetch free agent nominations for this fixture
-			nominatedFreeAgents, err = db.GetNominatedFreeAgents(ctx, tx, fixtureID)
-			if err != nil {
-				return false, errors.Wrap(err, "db.GetNominatedFreeAgents")
-			}
-			// Fetch available free agents for nomination (if user can schedule or manage fixtures)
-			canManage := contexts.Permissions(ctx).HasPermission(permissions.FixturesManage)
-			if canSchedule || canManage {
-				availableFreeAgents, err = db.GetFreeAgentsForSeasonLeague(ctx, tx, fixture.SeasonID, fixture.LeagueID)
-				if err != nil {
-					return false, errors.Wrap(err, "db.GetFreeAgentsForSeasonLeague")
-				}
-			}
-
-			// Fetch match preview data for preview and analysis tabs
-			if activeTab == "preview" || activeTab == "analysis" {
-				previewData, err = db.ComputeMatchPreview(ctx, tx, fixture)
-				if err != nil {
-					return false, errors.Wrap(err, "db.ComputeMatchPreview")
-				}
-			}
-
 			return true, nil
 		}); !ok {
 			return
 		}

-		renderSafely(seasonsview.FixtureDetailPage(
-			fixture, currentSchedule, history, canSchedule, userTeamID,
-			result, rosters, activeTab, nominatedFreeAgents, availableFreeAgents,
-			previewData,
-		), s, r, w)
+		// If finalized, redirect to overview (scheduling tab is hidden)
+		if result != nil && result.Finalized {
+			if r.Method == "GET" {
+				http.Redirect(w, r, fmt.Sprintf("/fixtures/%d/overview", fixtureID), http.StatusSeeOther)
+			} else {
+				respond.HXRedirect(w, "/fixtures/%d/overview", fixtureID)
+			}
+			return
+		}
+
+		if r.Method == "GET" {
+			renderSafely(seasonsview.FixtureDetailSchedulePage(
+				fixture, currentSchedule, history, canSchedule, userTeamID,
+			), s, r, w)
+		} else {
+			renderSafely(seasonsview.FixtureDetailScheduleContent(
+				fixture, currentSchedule, history, canSchedule, userTeamID,
+			), s, r, w)
+		}
 	})
 }