Add filtering of teams by user ID

http/api/teams.go

@@ -2,11 +2,28 @@ package api
 
 import (
 	"zxq.co/ripple/misirlou-api/http"
+	"zxq.co/ripple/misirlou-api/models"
 )
 
 // Teams fetches the teams that are playing in the given tournament ID.
 func Teams(c *http.Context) {
-	teams, err := c.DB.Teams(c.QueryInt("tournament"), c.QueryInt("p"))
+	teams(c, models.TeamFilters{
+		Tournament: c.QueryInt("tournament"),
+	})
+}
+
+// TeamsInTournament returns all the teams in a tournament, which basically is
+// sugar for calling Teams giving a tournament.
+func TeamsInTournament(c *http.Context) {
+	teams(c, models.TeamFilters{
+		Tournament:      c.ParamInt("id"),
+		ForceTournament: true,
+	})
+}
+
+func teams(c *http.Context, filters models.TeamFilters) {
+	filters.Member = c.QueryInt("member")
+	teams, err := c.DB.Teams(filters, c.QueryInt("p"))
 	if err != nil {
 		c.Error(err)
 		return
@@ -28,6 +45,7 @@ func Team(c *http.Context) {
 }
 
 func init() {
+	http.GET("/tournaments/:id/teams", TeamsInTournament)
 	http.GET("/teams", Teams)
 	http.GET("/teams/:id", Team)
 }

models/team.go

@@ -1,6 +1,8 @@
 package models
 
-import "time"
+import (
+	"time"
+)
 
 // Team represents a team playing in Misirlou.
 type Team struct {
@@ -11,13 +13,23 @@ type Team struct {
 	CreatedAt  time.Time `json:"created_at"`
 }
 
-// TODO: we should check that the team's tournament is = 0.
+// TODO: we should check that the team's tournament status is not 0.
+
+// TeamFilters are options that can be passed to Teams for filtering teams.
+type TeamFilters struct {
+	Tournament      int
+	ForceTournament bool
+	Member          int
+}
 
 // Teams returns at most 50 teams with the specified page.
-func (db *DB) Teams(tournID, page int) ([]Team, error) {
+func (db *DB) Teams(filters TeamFilters, page int) ([]Team, error) {
 	d := db.db
-	if tournID != 0 {
-		d = d.Where("tournament = ?", tournID)
+	if filters.ForceTournament || filters.Tournament != 0 {
+		d = d.Where("tournament = ?", filters.Tournament)
+	}
+	if filters.Member != 0 {
+		d = d.Joins("INNER JOIN team_users ON team_users.team = teams.id AND team_users.user = ?", filters.Member)
 	}
 	teams := make([]Team, 0, 50)
 	d = d.Offset(positivePage(page) * 50).Limit(50).Find(&teams)