Merge pull request #23 from ystv/WEB-117-readable-team-urls

WEB-117: Readable team URLs
ystv · Oct 3, 2022 · 6bd0f7e · 6bd0f7e
2 parents dd246ed + 837e5ff
commit 6bd0f7e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 13 deletions.
diff --git a/controllers/v1/public/team.go b/controllers/v1/public/team.go
@@ -32,18 +32,14 @@ func (r *Repos) ListTeams(c echo.Context) error {
 // @Description Contains members and a range of descriptions
 // @ID get-public-team
 // @Tags public-teams
-// @Param teamid path int true "teamid"
+// @Param emailAlias path string true "emailAlias"
 // @Produce json
 // @Success 200 {object} public.Team
-// @Router /v1/public/teams/{teamid} [get]
+// @Router /v1/public/teams/{emailAlias} [get]
 func (r *Repos) GetTeam(c echo.Context) error {
-	teamID, err := strconv.Atoi(c.Param("teamid"))
-	if err != nil {
-		return echo.NewHTTPError(http.StatusBadRequest, "Bad teamid")
-	}
-	t, err := r.public.GetTeam(c.Request().Context(), teamID)
+	t, err := r.public.GetTeam(c.Request().Context(), c.Param("emailAlias"))
 	if err != nil {
-		err = fmt.Errorf("Public GetTeamByYear failed: %w", err)
+		err = fmt.Errorf("Public GetTeam failed: %w", err)
 		return echo.NewHTTPError(http.StatusInternalServerError, err)
 	}
 	return c.JSON(http.StatusOK, t)

diff --git a/routes/router.go b/routes/router.go
@@ -308,7 +308,7 @@ func (r *Router) loadRoutes() {
 			{
 				teams.GET("", r.public.ListTeams)
 				teams.GET("/officers", r.public.ListOfficers)
-				teams.GET("/:teamid", r.public.GetTeam)
+				teams.GET("/:emailAlias", r.public.GetTeam)
 				teams.GET("/:teamid/:year", r.public.GetTeamByYear)
 			}
 			stream := public.Group("/playout/channel")

diff --git a/services/public/public.go b/services/public/public.go
@@ -22,6 +22,7 @@ type (
 		GetSeriesFromPath(ctx context.Context, path string) (Series, error)
 		Search(ctx context.Context, query string) (Series, error)
 	}
+	// PlaylistRepo represents all playlist interactions
 	PlaylistRepo interface {
 		GetPlaylist(ctx context.Context, playlistID int) (Playlist, error)
 		GetPlaylistPopular(ctx context.Context, fromPeriod time.Time) (Playlist, error)
@@ -39,7 +40,7 @@ type (
 	// TeamRepo represents all team interactions
 	TeamRepo interface {
 		ListTeams(ctx context.Context) ([]Team, error)
-		GetTeam(ctx context.Context, teamID int) (Team, error)
+		GetTeam(ctx context.Context, emailAlias string) (Team, error)
 		GetTeamByYear(ctx context.Context, teamID, year int) (Team, error)
 		ListTeamMembers(ctx context.Context, teamID int) ([]TeamMember, error)
 		ListOfficers(ctx context.Context) ([]TeamMember, error)

diff --git a/services/public/teams.go b/services/public/teams.go
@@ -44,16 +44,16 @@ func (s *Store) ListTeams(ctx context.Context) ([]Team, error) {
 }
 
 // GetTeam returns a single team including it's members
-func (s *Store) GetTeam(ctx context.Context, teamID int) (Team, error) {
+func (s *Store) GetTeam(ctx context.Context, emailAlias string) (Team, error) {
 	t := Team{}
 	err := s.db.GetContext(ctx, &t, `
 		SELECT team_id, name, email_alias, short_description, full_description
 		FROM people.officership_teams
-		WHERE team_id = $1;`, teamID)
+		WHERE email_alias = $1;`, emailAlias)
 	if err != nil {
 		return t, fmt.Errorf("failed to get team: %w", err)
 	}
-	t.Members, err = s.ListTeamMembers(ctx, teamID)
+	t.Members, err = s.ListTeamMembers(ctx, t.TeamID)
 	if err != nil {
 		return t, fmt.Errorf("failed to get team members: %w", err)
 	}