added teams

internal/handlers/permtest.go

@@ -1,25 +0,0 @@
-package handlers
-
-import (
-	"net/http"
-	"strconv"
-
-	"git.haelnorr.com/h/golib/hws"
-	"git.haelnorr.com/h/oslstats/internal/db"
-	"git.haelnorr.com/h/oslstats/internal/roles"
-	"git.haelnorr.com/h/oslstats/internal/throw"
-	"github.com/uptrace/bun"
-)
-
-func PermTester(s *hws.Server, conn *bun.DB) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		user := db.CurrentUser(r.Context())
-		tx, _ := conn.BeginTx(r.Context(), nil)
-		isAdmin, err := user.HasRole(r.Context(), tx, roles.Admin)
-		tx.Rollback()
-		if err != nil {
-			throw.InternalServiceError(s, w, r, "Error", err)
-		}
-		_, _ = w.Write([]byte(strconv.FormatBool(isAdmin)))
-	})
-}

internal/handlers/season_detail.go

@@ -19,12 +19,23 @@ func SeasonPage(
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		seasonStr := r.PathValue("season_short_name")
 		var season *db.Season
+		var leaguesWithTeams []db.LeagueWithTeams
+
 		if ok := db.WithReadTx(s, w, r, conn, func(ctx context.Context, tx bun.Tx) (bool, error) {
 			var err error
 			season, err = db.GetSeason(ctx, tx, seasonStr)
 			if err != nil {
 				return false, errors.Wrap(err, "db.GetSeason")
 			}
+			if season == nil {
+				return true, nil
+			}
+
+			leaguesWithTeams, err = season.MapTeamsToLeagues(ctx, tx)
+			if err != nil {
+				return false, errors.Wrap(err, "season.MapTeamsToLeagues")
+			}
+
 			return true, nil
 		}); !ok {
 			return
@@ -33,6 +44,6 @@ func SeasonPage(
 			throw.NotFound(s, w, r, r.URL.Path)
 			return
 		}
-		renderSafely(seasonsview.DetailPage(season), s, r, w)
+		renderSafely(seasonsview.DetailPage(season, leaguesWithTeams), s, r, w)
 	})
 }

internal/handlers/season_league_add_team.go

@@ -0,0 +1,119 @@
+package handlers
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+
+	"git.haelnorr.com/h/golib/hws"
+	"git.haelnorr.com/h/oslstats/internal/auditlog"
+	"git.haelnorr.com/h/oslstats/internal/db"
+	"git.haelnorr.com/h/oslstats/internal/notify"
+	"git.haelnorr.com/h/oslstats/internal/validation"
+	"github.com/pkg/errors"
+	"github.com/uptrace/bun"
+)
+
+func SeasonLeagueAddTeam(
+	s *hws.Server,
+	conn *bun.DB,
+	audit *auditlog.Logger,
+) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		seasonStr := r.PathValue("season_short_name")
+		leagueStr := r.PathValue("league_short_name")
+
+		getter, ok := validation.ParseFormOrNotify(s, w, r)
+		if !ok {
+			return
+		}
+		teamID := getter.Int("team_id").Required().Value
+		if ok := getter.ValidateAndNotify(s, w, r); !ok {
+			return
+		}
+
+		var season *db.Season
+		var league *db.League
+		var team *db.Team
+
+		if ok := db.WithNotifyTx(s, w, r, conn, func(ctx context.Context, tx bun.Tx) (bool, error) {
+			var err error
+
+			// Get season
+			season, err = db.GetSeason(ctx, tx, seasonStr)
+			if err != nil {
+				return false, errors.Wrap(err, "db.GetSeason")
+			}
+			if season == nil {
+				notify.Warn(s, w, r, "Not Found", "Season not found.", nil)
+				return false, nil
+			}
+
+			// Get league
+			league, err = db.GetLeague(ctx, tx, leagueStr)
+			if err != nil {
+				return false, errors.Wrap(err, "db.GetLeague")
+			}
+			if league == nil {
+				notify.Warn(s, w, r, "Not Found", "League not found.", nil)
+				return false, nil
+			}
+
+			if !season.HasLeague(league.ID) {
+				notify.Warn(s, w, r, "Invalid League", "This league is not associated with this season.", nil)
+				return false, nil
+			}
+
+			// Get team
+			team, err = db.GetTeam(ctx, tx, teamID)
+			if err != nil {
+				return false, errors.Wrap(err, "db.GetTeam")
+			}
+			if team == nil {
+				notify.Warn(s, w, r, "Not Found", "Team not found.", nil)
+				return false, nil
+			}
+
+			// Check if team is already in this season (in any league)
+			var tpCount int
+			tpCount, err = tx.NewSelect().
+				Model((*db.TeamParticipation)(nil)).
+				Where("season_id = ? AND team_id = ?", season.ID, team.ID).
+				Count(ctx)
+			if err != nil {
+				return false, errors.Wrap(err, "tx.NewSelect")
+			}
+			if tpCount > 0 {
+				notify.Warn(s, w, r, "Already In Season", fmt.Sprintf(
+					"Team '%s' is already participating in this season.",
+					team.Name,
+				), nil)
+				return false, nil
+			}
+
+			// Add team to league
+			participation := &db.TeamParticipation{
+				SeasonID: season.ID,
+				LeagueID: league.ID,
+				TeamID:   team.ID,
+			}
+
+			err = db.Insert(tx, participation).WithAudit(r, audit.Callback()).Exec(ctx)
+			if err != nil {
+				return false, errors.Wrap(err, "db.Insert")
+			}
+
+			return true, nil
+		}); !ok {
+			return
+		}
+
+		// Redirect to refresh the page
+		w.Header().Set("HX-Redirect", fmt.Sprintf("/seasons/%s/leagues/%s", season.ShortName, league.ShortName))
+		w.WriteHeader(http.StatusOK)
+		notify.Success(s, w, r, "Team Added", fmt.Sprintf(
+			"Successfully added '%s' to the league.",
+			team.Name,
+		), nil)
+	})
+}

internal/handlers/season_league_detail.go

@@ -0,0 +1,53 @@
+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/throw"
+	seasonsview "git.haelnorr.com/h/oslstats/internal/view/seasonsview"
+	"github.com/pkg/errors"
+	"github.com/uptrace/bun"
+)
+
+func SeasonLeaguePage(
+	s *hws.Server,
+	conn *bun.DB,
+) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		seasonStr := r.PathValue("season_short_name")
+		leagueStr := r.PathValue("league_short_name")
+
+		var season *db.Season
+		var league *db.League
+		var teams []*db.Team
+		var allTeams []*db.Team
+
+		if ok := db.WithReadTx(s, w, r, conn, func(ctx context.Context, tx bun.Tx) (bool, error) {
+			var err error
+			season, league, teams, err = db.GetSeasonLeague(ctx, tx, seasonStr, leagueStr)
+			if err != nil {
+				return false, errors.Wrap(err, "db.GetSeasonLeague")
+			}
+
+			// Get all teams for the dropdown (to add teams)
+			allTeams, err = db.GetList[db.Team](tx).GetAll(ctx)
+			if err != nil {
+				return false, errors.Wrap(err, "db.GetList[Team]")
+			}
+
+			return true, nil
+		}); !ok {
+			return
+		}
+
+		if season == nil || league == nil {
+			throw.NotFound(s, w, r, r.URL.Path)
+			return
+		}
+
+		renderSafely(seasonsview.SeasonLeaguePage(season, league, teams, allTeams), s, r, w)
+	})
+}

internal/handlers/team_shortnames_unique.go

@@ -0,0 +1,57 @@
+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/validation"
+	"github.com/pkg/errors"
+	"github.com/uptrace/bun"
+)
+
+// IsTeamShortNamesUnique checks if the combination of short_name and alt_short_name is unique
+// and also validates that they are different from each other
+func IsTeamShortNamesUnique(
+	s *hws.Server,
+	conn *bun.DB,
+) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		getter, err := validation.ParseForm(r)
+		if err != nil {
+			w.WriteHeader(http.StatusBadRequest)
+			return
+		}
+
+		shortName := getter.String("short_name").TrimSpace().ToUpper().MaxLength(3).Value
+		altShortName := getter.String("alt_short_name").TrimSpace().ToUpper().MaxLength(3).Value
+
+		if shortName == "" || altShortName == "" {
+			w.WriteHeader(http.StatusOK)
+			return
+		}
+
+		if shortName == altShortName {
+			w.WriteHeader(http.StatusConflict)
+			return
+		}
+
+		var isUnique bool
+		if ok := db.WithReadTx(s, w, r, conn, func(ctx context.Context, tx bun.Tx) (bool, error) {
+			isUnique, err = db.TeamShortNamesUnique(ctx, tx, shortName, altShortName)
+			if err != nil {
+				return false, errors.Wrap(err, "db.TeamShortNamesUnique")
+			}
+			return true, nil
+		}); !ok {
+			return
+		}
+
+		if isUnique {
+			w.WriteHeader(http.StatusOK)
+		} else {
+			w.WriteHeader(http.StatusConflict)
+		}
+	})
+}

internal/handlers/teams_list.go

@@ -0,0 +1,62 @@
+package handlers
+
+import (
+	"context"
+	"net/http"
+
+	"git.haelnorr.com/h/golib/hws"
+	"git.haelnorr.com/h/oslstats/internal/db"
+	teamsview "git.haelnorr.com/h/oslstats/internal/view/teamsview"
+	"github.com/pkg/errors"
+	"github.com/uptrace/bun"
+)
+
+// TeamsPage renders the full page with the teams list, for use with GET requests
+func TeamsPage(
+	s *hws.Server,
+	conn *bun.DB,
+) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		pageOpts := pageOptsFromQuery(s, w, r)
+		if pageOpts == nil {
+			return
+		}
+		var teams *db.List[db.Team]
+		if ok := db.WithReadTx(s, w, r, conn, func(ctx context.Context, tx bun.Tx) (bool, error) {
+			var err error
+			teams, err = db.ListTeams(ctx, tx, pageOpts)
+			if err != nil {
+				return false, errors.Wrap(err, "db.ListTeams")
+			}
+			return true, nil
+		}); !ok {
+			return
+		}
+		renderSafely(teamsview.ListPage(teams), s, r, w)
+	})
+}
+
+// TeamsList renders just the teams list, for use with POST requests and HTMX
+func TeamsList(
+	s *hws.Server,
+	conn *bun.DB,
+) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		pageOpts := pageOptsFromForm(s, w, r)
+		if pageOpts == nil {
+			return
+		}
+		var teams *db.List[db.Team]
+		if ok := db.WithReadTx(s, w, r, conn, func(ctx context.Context, tx bun.Tx) (bool, error) {
+			var err error
+			teams, err = db.ListTeams(ctx, tx, pageOpts)
+			if err != nil {
+				return false, errors.Wrap(err, "db.ListTeams")
+			}
+			return true, nil
+		}); !ok {
+			return
+		}
+		renderSafely(teamsview.TeamsList(teams), s, r, w)
+	})
+}

internal/handlers/teams_new.go

@@ -0,0 +1,105 @@
+package handlers
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+
+	"git.haelnorr.com/h/golib/hws"
+	"github.com/pkg/errors"
+	"github.com/uptrace/bun"
+
+	"git.haelnorr.com/h/oslstats/internal/auditlog"
+	"git.haelnorr.com/h/oslstats/internal/db"
+	"git.haelnorr.com/h/oslstats/internal/notify"
+	"git.haelnorr.com/h/oslstats/internal/validation"
+	teamsview "git.haelnorr.com/h/oslstats/internal/view/teamsview"
+)
+
+func NewTeamPage(
+	s *hws.Server,
+	conn *bun.DB,
+) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		renderSafely(teamsview.NewPage(), s, r, w)
+	})
+}
+
+func NewTeamSubmit(
+	s *hws.Server,
+	conn *bun.DB,
+	audit *auditlog.Logger,
+) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		getter, ok := validation.ParseFormOrNotify(s, w, r)
+		if !ok {
+			return
+		}
+		name := getter.String("name").
+			TrimSpace().Required().
+			MaxLength(25).MinLength(3).Value
+		shortname := getter.String("short_name").
+			TrimSpace().Required().
+			MaxLength(3).MinLength(3).Value
+		altShortname := getter.String("alt_short_name").
+			TrimSpace().Required().
+			MaxLength(3).MinLength(3).Value
+		color := getter.String("color").
+			TrimSpace().MaxLength(7).Value
+		if !getter.ValidateAndNotify(s, w, r) {
+			return
+		}
+
+		// Check that short names are different
+		if shortname == altShortname {
+			notify.Warn(s, w, r, "Invalid Short Names", "Short name and alternative short name must be different.", nil)
+			return
+		}
+
+		nameUnique := false
+		shortNameComboUnique := false
+		var team *db.Team
+		if ok := db.WithNotifyTx(s, w, r, conn, func(ctx context.Context, tx bun.Tx) (bool, error) {
+			var err error
+			nameUnique, err = db.IsUnique(ctx, tx, (*db.Team)(nil), "name", name)
+			if err != nil {
+				return false, errors.Wrap(err, "db.IsTeamNameUnique")
+			}
+
+			shortNameComboUnique, err = db.TeamShortNamesUnique(ctx, tx, shortname, altShortname)
+			if err != nil {
+				return false, errors.Wrap(err, "db.TeamShortNamesUnique")
+			}
+
+			if !nameUnique || !shortNameComboUnique {
+				return true, nil
+			}
+			team = &db.Team{
+				Name:         name,
+				ShortName:    shortname,
+				AltShortName: altShortname,
+				Color:        color,
+			}
+			err = db.Insert(tx, team).WithAudit(r, audit.Callback()).Exec(ctx)
+			if err != nil {
+				return false, errors.Wrap(err, "db.Insert")
+			}
+			return true, nil
+		}); !ok {
+			return
+		}
+
+		if !nameUnique {
+			notify.Warn(s, w, r, "Duplicate Name", "This team name is already taken.", nil)
+			return
+		}
+
+		if !shortNameComboUnique {
+			notify.Warn(s, w, r, "Duplicate Short Names", "This combination of short names is already taken.", nil)
+			return
+		}
+		w.Header().Set("HX-Redirect", "/teams")
+		w.WriteHeader(http.StatusOK)
+		notify.SuccessWithDelay(s, w, r, "Team Created", fmt.Sprintf("Successfully created team: %s", name), nil)
+	})
+}