fic/server
Archived
1
0
Fork 0
Code Issues Pull requests 10 Releases Wiki Activity

backend: use a new team field 'active', to avoid some team generation

Browse source
This commit is contained in:
nemunaire 2019-01-21 02:35:03 +01:00
parent bf426d2ed2
commit 48fcfec0d0
5 changed files with 31 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

26
libfic/team.go
View file

@ -17,11 +17,11 @@ type Team struct {
Id int64 `json:"id"`
Name string `json:"name"`
Color uint32 `json:"color"`
Active bool `json:"active"`
}
// GetTeams returns a list of registered Team from the database.
func GetTeams() ([]Team, error) {
if rows, err := DBQuery("SELECT id_team, name, color FROM teams"); err != nil {
func getTeams(filter string) ([]Team, error) {
if rows, err := DBQuery("SELECT id_team, name, color, active FROM teams " + filter); err != nil {
return nil, err
} else {
defer rows.Close()
@ -29,7 +29,7 @@ func GetTeams() ([]Team, error) {
var teams = make([]Team, 0)
for rows.Next() {
var t Team
if err := rows.Scan(&t.Id, &t.Name, &t.Color); err != nil {
if err := rows.Scan(&t.Id, &t.Name, &t.Color, &t.Active); err != nil {
return nil, err
}
teams = append(teams, t)
@ -42,10 +42,20 @@ func GetTeams() ([]Team, error) {
}
}
// GetTeams returns a list of registered Team from the database.
func GetTeams() ([]Team, error) {
return getTeams("")
}
// GetActiveTeams returns a list of registered Team from the database, limited to team to generate.
func GetActiveTeams() ([]Team, error) {
return getTeams("WHERE active = 1")
}
// GetTeam retrieves a Team from its identifier.
func GetTeam(id int64) (Team, error) {
var t Team
if err := DBQueryRow("SELECT id_team, name, color FROM teams WHERE id_team = ?", id).Scan(&t.Id, &t.Name, &t.Color); err != nil {
if err := DBQueryRow("SELECT id_team, name, color, active FROM teams WHERE id_team = ?", id).Scan(&t.Id, &t.Name, &t.Color, &t.Active); err != nil {
return t, err
}
@ -55,7 +65,7 @@ func GetTeam(id int64) (Team, error) {
// GetTeamBySerial retrieves a Team from one of its associated certificates.
func GetTeamBySerial(serial int64) (Team, error) {
var t Team
if err := DBQueryRow("SELECT T.id_team, T.name, T.color FROM certificates C INNER JOIN teams T ON T.id_team = C.id_team WHERE id_cert = ?", serial).Scan(&t.Id, &t.Name, &t.Color); err != nil {
if err := DBQueryRow("SELECT T.id_team, T.name, T.color, T.active FROM certificates C INNER JOIN teams T ON T.id_team = C.id_team WHERE id_cert = ?", serial).Scan(&t.Id, &t.Name, &t.Color, &t.Active); err != nil {
return t, err
}
@ -69,13 +79,13 @@ func CreateTeam(name string, color uint32) (Team, error) {
} else if tid, err := res.LastInsertId(); err != nil {
return Team{}, err
} else {
return Team{tid, name, color}, nil
return Team{tid, name, color, true}, nil
}
}
// Update applies modifications back to the database.
func (t Team) Update() (int64, error) {
if res, err := DBExec("UPDATE teams SET name = ?, color = ? WHERE id_team = ?", t.Name, t.Color, t.Id); err != nil {
if res, err := DBExec("UPDATE teams SET name = ?, color = ?, active = ? WHERE id_team = ?", t.Name, t.Color, t.Active, t.Id); err != nil {
return 0, err
} else if nb, err := res.RowsAffected(); err != nil {
return 0, err