h/oslstats
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added team view to season_leagues

Browse Source
This commit is contained in:
Haelnorr
2026-02-20 19:57:06 +11:00
parent 98b110ee44
commit 53102f561a
25 changed files with 1018 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
internal/handlers/fixtures.go
View File

@@ -31,8 +31,7 @@ func GenerateFixtures(
return
}
var season *db.Season
var league *db.League
var sl *db.SeasonLeague
var fixtures []*db.Fixture
if ok := conn.WithNotifyTx(s, w, r, func(ctx context.Context, tx bun.Tx) (bool, error) {
_, err := db.NewRound(ctx, tx, seasonShortName, leagueShortName, round, db.NewAuditFromRequest(r))
@@ -43,7 +42,7 @@ func GenerateFixtures(
}
return false, errors.Wrap(err, "db.NewRound")
}
season, league, fixtures, err = db.GetFixtures(ctx, tx, seasonShortName, leagueShortName)
sl, fixtures, err = db.GetFixtures(ctx, tx, seasonShortName, leagueShortName)
if err != nil {
return false, errors.Wrap(err, "db.GetFixtures")
}
@@ -52,7 +51,7 @@ func GenerateFixtures(
return
}
renderSafely(seasonsview.SeasonLeagueManageFixtures(season, league, fixtures), s, r, w)
renderSafely(seasonsview.SeasonLeagueManageFixtures(sl.Season, sl.League, fixtures), s, r, w)
})
}
@@ -82,7 +81,7 @@ func UpdateFixtures(
if !conn.WithNotifyTx(s, w, r, func(ctx context.Context, tx bun.Tx) (bool, error) {
var err error
_, _, fixtures, err = db.GetFixtures(ctx, tx, seasonShortName, leagueShortName)
_, fixtures, err = db.GetFixtures(ctx, tx, seasonShortName, leagueShortName)
if err != nil {
if db.IsBadRequest(err) {
respond.BadRequest(w, errors.Wrap(err, "db.NewRound"))

6
internal/handlers/season_league_detail.go
View File

@@ -21,11 +21,11 @@ func SeasonLeaguePage(
seasonStr := r.PathValue("season_short_name")
leagueStr := r.PathValue("league_short_name")
var season *db.Season
var sl *db.SeasonLeague
if ok := conn.WithReadTx(s, w, r, func(ctx context.Context, tx bun.Tx) (bool, error) {
var err error
season, _, _, err = db.GetSeasonLeague(ctx, tx, seasonStr, leagueStr)
sl, err = db.GetSeasonLeague(ctx, tx, seasonStr, leagueStr)
if err != nil {
if db.IsBadRequest(err) {
throw.NotFound(s, w, r, r.URL.Path)
@@ -38,7 +38,7 @@ func SeasonLeaguePage(
return
}
defaultTab := season.GetDefaultTab()
defaultTab := sl.Season.GetDefaultTab()
redirectURL := fmt.Sprintf(
"/seasons/%s/leagues/%s/%s",
seasonStr, leagueStr, defaultTab,

7
internal/handlers/season_league_finals.go
View File

@@ -21,12 +21,11 @@ func SeasonLeagueFinalsPage(
seasonStr := r.PathValue("season_short_name")
leagueStr := r.PathValue("league_short_name")
var season *db.Season
var league *db.League
var sl *db.SeasonLeague
if ok := conn.WithReadTx(s, w, r, func(ctx context.Context, tx bun.Tx) (bool, error) {
var err error
season, league, _, err = db.GetSeasonLeague(ctx, tx, seasonStr, leagueStr)
sl, err = db.GetSeasonLeague(ctx, tx, seasonStr, leagueStr)
if err != nil {
if db.IsBadRequest(err) {
throw.NotFound(s, w, r, r.URL.Path)
@@ -40,7 +39,7 @@ func SeasonLeagueFinalsPage(
}
if r.Method == "GET" {
renderSafely(seasonsview.SeasonLeagueFinalsPage(season, league), s, r, w)
renderSafely(seasonsview.SeasonLeagueFinalsPage(sl.Season, sl.League), s, r, w)
} else {
renderSafely(seasonsview.SeasonLeagueFinals(), s, r, w)
}

23
internal/handlers/season_league_fixtures.go
View File

@@ -22,13 +22,12 @@ func SeasonLeagueFixturesPage(
seasonShortName := r.PathValue("season_short_name")
leagueShortName := r.PathValue("league_short_name")
var season *db.Season
var league *db.League
var sl *db.SeasonLeague
var fixtures []*db.Fixture
if ok := conn.WithReadTx(s, w, r, func(ctx context.Context, tx bun.Tx) (bool, error) {
var err error
season, league, fixtures, err = db.GetFixtures(ctx, tx, seasonShortName, leagueShortName)
sl, fixtures, err = db.GetFixtures(ctx, tx, seasonShortName, leagueShortName)
if err != nil {
if db.IsBadRequest(err) {
throw.NotFound(s, w, r, r.URL.Path)
@@ -42,9 +41,9 @@ func SeasonLeagueFixturesPage(
}
if r.Method == "GET" {
renderSafely(seasonsview.SeasonLeagueFixturesPage(season, league, fixtures), s, r, w)
renderSafely(seasonsview.SeasonLeagueFixturesPage(sl.Season, sl.League, fixtures), s, r, w)
} else {
renderSafely(seasonsview.SeasonLeagueFixtures(season, league, fixtures), s, r, w)
renderSafely(seasonsview.SeasonLeagueFixtures(sl.Season, sl.League, fixtures), s, r, w)
}
})
}
@@ -57,13 +56,12 @@ func SeasonLeagueManageFixturesPage(
seasonShortName := r.PathValue("season_short_name")
leagueShortName := r.PathValue("league_short_name")
var season *db.Season
var league *db.League
var sl *db.SeasonLeague
var fixtures []*db.Fixture
if ok := conn.WithReadTx(s, w, r, func(ctx context.Context, tx bun.Tx) (bool, error) {
var err error
season, league, fixtures, err = db.GetFixtures(ctx, tx, seasonShortName, leagueShortName)
sl, fixtures, err = db.GetFixtures(ctx, tx, seasonShortName, leagueShortName)
if err != nil {
if db.IsBadRequest(err) {
throw.NotFound(s, w, r, r.URL.Path)
@@ -76,7 +74,7 @@ func SeasonLeagueManageFixturesPage(
return
}
renderSafely(seasonsview.SeasonLeagueManageFixturesPage(season, league, fixtures), s, r, w)
renderSafely(seasonsview.SeasonLeagueManageFixturesPage(sl.Season, sl.League, fixtures), s, r, w)
})
}
@@ -88,8 +86,7 @@ func SeasonLeagueDeleteFixtures(
seasonShortName := r.PathValue("season_short_name")
leagueShortName := r.PathValue("league_short_name")
var season *db.Season
var league *db.League
var sl *db.SeasonLeague
var fixtures []*db.Fixture
if !conn.WithNotifyTx(s, w, r, func(ctx context.Context, tx bun.Tx) (bool, error) {
err := db.DeleteAllFixtures(ctx, tx, seasonShortName, leagueShortName, db.NewAuditFromRequest(r))
@@ -100,7 +97,7 @@ func SeasonLeagueDeleteFixtures(
}
return false, errors.Wrap(err, "db.DeleteAllFixtures")
}
season, league, fixtures, err = db.GetFixtures(ctx, tx, seasonShortName, leagueShortName)
sl, fixtures, err = db.GetFixtures(ctx, tx, seasonShortName, leagueShortName)
if err != nil {
return false, errors.Wrap(err, "db.GetFixtures")
}
@@ -109,6 +106,6 @@ func SeasonLeagueDeleteFixtures(
return
}
renderSafely(seasonsview.SeasonLeagueManageFixtures(season, league, fixtures), s, r, w)
renderSafely(seasonsview.SeasonLeagueManageFixtures(sl.Season, sl.League, fixtures), s, r, w)
})
}

7
internal/handlers/season_league_stats.go
View File

@@ -21,12 +21,11 @@ func SeasonLeagueStatsPage(
seasonStr := r.PathValue("season_short_name")
leagueStr := r.PathValue("league_short_name")
var season *db.Season
var league *db.League
var sl *db.SeasonLeague
if ok := conn.WithReadTx(s, w, r, func(ctx context.Context, tx bun.Tx) (bool, error) {
var err error
season, league, _, err = db.GetSeasonLeague(ctx, tx, seasonStr, leagueStr)
sl, err = db.GetSeasonLeague(ctx, tx, seasonStr, leagueStr)
if err != nil {
if db.IsBadRequest(err) {
throw.NotFound(s, w, r, r.URL.Path)
@@ -40,7 +39,7 @@ func SeasonLeagueStatsPage(
}
if r.Method == "GET" {
renderSafely(seasonsview.SeasonLeagueStatsPage(season, league), s, r, w)
renderSafely(seasonsview.SeasonLeagueStatsPage(sl.Season, sl.League), s, r, w)
} else {
renderSafely(seasonsview.SeasonLeagueStats(), s, r, w)
}

7
internal/handlers/season_league_table.go
View File

@@ -21,12 +21,11 @@ func SeasonLeagueTablePage(
seasonStr := r.PathValue("season_short_name")
leagueStr := r.PathValue("league_short_name")
var season *db.Season
var league *db.League
var sl *db.SeasonLeague
if ok := conn.WithReadTx(s, w, r, func(ctx context.Context, tx bun.Tx) (bool, error) {
var err error
season, league, _, err = db.GetSeasonLeague(ctx, tx, seasonStr, leagueStr)
sl, err = db.GetSeasonLeague(ctx, tx, seasonStr, leagueStr)
if err != nil {
if db.IsBadRequest(err) {
throw.NotFound(s, w, r, r.URL.Path)
@@ -39,7 +38,7 @@ func SeasonLeagueTablePage(
return
}
if r.Method == "GET" {
renderSafely(seasonsview.SeasonLeagueTablePage(season, league), s, r, w)
renderSafely(seasonsview.SeasonLeagueTablePage(sl.Season, sl.League), s, r, w)
} else {
renderSafely(seasonsview.SeasonLeagueTable(), s, r, w)
}

63
internal/handlers/season_league_team_detail.go Normal file
View File

@@ -0,0 +1,63 @@
package handlers
import (
"context"
"net/http"
"strconv"
"git.haelnorr.com/h/golib/hws"
"git.haelnorr.com/h/oslstats/internal/db"
"git.haelnorr.com/h/oslstats/internal/throw"
seasonsview "git.haelnorr.com/h/oslstats/internal/view/seasonsview"
"github.com/pkg/errors"
"github.com/uptrace/bun"
)
// SeasonLeagueTeamDetailPage renders the detail page for a team within a season league
func SeasonLeagueTeamDetailPage(
s *hws.Server,
conn *db.DB,
) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
seasonShortName := r.PathValue("season_short_name")
leagueShortName := r.PathValue("league_short_name")
teamIDStr := r.PathValue("team_id")
teamID, err := strconv.Atoi(teamIDStr)
if err != nil {
throw.NotFound(s, w, r, r.URL.Path)
return
}
var twr *db.TeamWithRoster
var fixtures []*db.Fixture
var available []*db.Player
if ok := conn.WithReadTx(s, w, r, func(ctx context.Context, tx bun.Tx) (bool, error) {
var err error
twr, err = db.GetTeamRoster(ctx, tx, seasonShortName, leagueShortName, teamID)
if err != nil {
if db.IsBadRequest(err) {
throw.NotFound(s, w, r, r.URL.Path)
return false, nil
}
return false, errors.Wrap(err, "db.GetTeamRoster")
}
fixtures, err = db.GetFixturesForTeam(ctx, tx, twr.Season.ID, twr.League.ID, twr.Team.ID)
if err != nil {
return false, errors.Wrap(err, "db.GetFixturesForTeam")
}
available, err = db.GetPlayersNotOnTeam(ctx, tx, twr.Season.ID, twr.League.ID)
if err != nil {
return false, errors.Wrap(err, "db.GetPlayersNotOnTeam")
}
return true, nil
}); !ok {
return
}
renderSafely(seasonsview.SeasonLeagueTeamDetailPage(twr, fixtures, available), s, r, w)
})
}

2
internal/handlers/season_league_teams.go
View File

@@ -28,7 +28,7 @@ func SeasonLeagueTeamsPage(
if ok := conn.WithReadTx(s, w, r, func(ctx context.Context, tx bun.Tx) (bool, error) {
var err error
season, league, teams, err = db.GetSeasonLeague(ctx, tx, seasonStr, leagueStr)
season, league, teams, err = db.GetSeasonLeagueWithTeams(ctx, tx, seasonStr, leagueStr)
if err != nil {
if db.IsBadRequest(err) {
throw.NotFound(s, w, r, r.URL.Path)

89
internal/handlers/team_roster_manage.go Normal file
View File

@@ -0,0 +1,89 @@
package handlers
import (
"context"
"net/http"
"git.haelnorr.com/h/golib/hws"
"git.haelnorr.com/h/oslstats/internal/db"
"git.haelnorr.com/h/oslstats/internal/notify"
"git.haelnorr.com/h/oslstats/internal/respond"
"git.haelnorr.com/h/oslstats/internal/validation"
seasonsview "git.haelnorr.com/h/oslstats/internal/view/seasonsview"
"github.com/pkg/errors"
"github.com/uptrace/bun"
)
// ManageTeamRoster handles saving a full team roster (manager + players)
func ManageTeamRoster(
s *hws.Server,
conn *db.DB,
) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
getter, ok := validation.ParseFormOrNotify(s, w, r)
if !ok {
respond.BadRequest(w, errors.New("failed to parse form"))
return
}
seasonID := getter.Int("season_id").Required().Value
leagueID := getter.Int("league_id").Required().Value
teamID := getter.Int("team_id").Required().Value
managerID := getter.Int("manager_id").Required().Value
playerIDs := getter.IntList("player_ids").Values()
if !getter.ValidateAndNotify(s, w, r) {
respond.BadRequest(w, errors.New("invalid form data"))
return
}
// Write transaction: manage the roster
if !conn.WithNotifyTx(s, w, r, func(ctx context.Context, tx bun.Tx) (bool, error) {
err := db.ManageTeamRoster(ctx, tx, seasonID, leagueID, teamID, managerID, playerIDs, db.NewAuditFromRequest(r))
if err != nil {
return false, errors.Wrap(err, "db.ManageTeamRoster")
}
return true, nil
}) {
return
}
// Re-fetch updated data for HTMX swap
var twr *db.TeamWithRoster
var available []*db.Player
if !conn.WithReadTx(s, w, r, func(ctx context.Context, tx bun.Tx) (bool, error) {
var err error
// We need season/league short names to call GetTeamRoster
season, err := db.GetByID[db.Season](tx, seasonID).Get(ctx)
if err != nil {
return false, errors.Wrap(err, "db.GetSeason")
}
league, err := db.GetByID[db.League](tx, leagueID).Get(ctx)
if err != nil {
return false, errors.Wrap(err, "db.GetLeague")
}
twr, err = db.GetTeamRoster(ctx, tx, season.ShortName, league.ShortName, teamID)
if err != nil {
return false, errors.Wrap(err, "db.GetTeamRoster")
}
available, err = db.GetPlayersNotOnTeam(ctx, tx, seasonID, leagueID)
if err != nil {
return false, errors.Wrap(err, "db.GetPlayersNotOnTeam")
}
return true, nil
}) {
return
}
// Respond with HTMX swap of the roster section
w.Header().Set("HX-Retarget", "#team-roster-section")
w.Header().Set("HX-Reswap", "outerHTML")
notify.Success(s, w, r, "Roster Updated", "Team roster has been saved successfully.", nil)
renderSafely(seasonsview.TeamRosterSection(twr, available), s, r, w)
})
}