Move common structs to libfic
This commit is contained in:
parent
d841542be4
commit
92b81e467f
10 changed files with 42 additions and 36 deletions
|
@ -4,6 +4,8 @@ import (
|
|||
"encoding/json"
|
||||
"fmt"
|
||||
"strconv"
|
||||
|
||||
"srs.epita.fr/fic-server/libfic"
|
||||
)
|
||||
|
||||
var ApiTeamsRouting = map[string]DispatchFunction{
|
||||
|
@ -25,7 +27,7 @@ type uploadedMember struct {
|
|||
}
|
||||
|
||||
func nginxGenTeam() (string, error) {
|
||||
if teams, err := GetTeams(); err != nil {
|
||||
if teams, err := fic.GetTeams(); err != nil {
|
||||
return "", err
|
||||
} else {
|
||||
ret := ""
|
||||
|
@ -43,14 +45,14 @@ func listTeam(args []string, body []byte) (interface{}, error) {
|
|||
return nginxGenTeam()
|
||||
} else if tid, err := strconv.Atoi(string(args[0])); err != nil {
|
||||
return nil, err
|
||||
} else if team, err := GetTeam(tid); err != nil {
|
||||
} else if team, err := fic.GetTeam(tid); err != nil {
|
||||
return nil, err
|
||||
} else {
|
||||
return team.GetMembers()
|
||||
}
|
||||
} else if len(args) == 0 {
|
||||
// List all teams
|
||||
return GetTeams()
|
||||
return fic.GetTeams()
|
||||
} else {
|
||||
return nil, nil
|
||||
}
|
||||
|
@ -64,7 +66,7 @@ func creationTeam(args []string, body []byte) (interface{}, error) {
|
|||
return nil, err
|
||||
}
|
||||
|
||||
return CreateTeam(ut.Name)
|
||||
return fic.CreateTeam(ut.Name)
|
||||
} else {
|
||||
return nil, nil
|
||||
}
|
||||
|
@ -75,7 +77,7 @@ func creationTeamMembers(args []string, body []byte) (interface{}, error) {
|
|||
// List given team
|
||||
if tid, err := strconv.Atoi(string(args[0])); err != nil {
|
||||
return nil, err
|
||||
} else if team, err := GetTeam(tid); err != nil {
|
||||
} else if team, err := fic.GetTeam(tid); err != nil {
|
||||
return nil, err
|
||||
} else {
|
||||
var member uploadedMember
|
||||
|
@ -94,7 +96,7 @@ func creationTeamMembers(args []string, body []byte) (interface{}, error) {
|
|||
return nil, err
|
||||
}
|
||||
|
||||
if team, err := CreateTeam(""); err != nil {
|
||||
if team, err := fic.CreateTeam(""); err != nil {
|
||||
return nil, err
|
||||
} else {
|
||||
for _, member := range members {
|
||||
|
@ -114,7 +116,7 @@ func deletionTeam(args []string, body []byte) (interface{}, error) {
|
|||
if len(args) == 1 {
|
||||
if tid, err := strconv.Atoi(string(args[0])); err != nil {
|
||||
return nil, err
|
||||
} else if team, err := GetTeam(tid); err != nil {
|
||||
} else if team, err := fic.GetTeam(tid); err != nil {
|
||||
return nil, err
|
||||
} else {
|
||||
return team.Delete()
|
||||
|
|
Reference in a new issue