Backend: extract file generation and team renaming in dedicated files

admin/api_stats.go

@@ -25,9 +25,9 @@ func genStats() (interface{}, error) {
 			if exercices, err := theme.GetExercices(); err != nil {
 				return nil, err
 			} else {
-				exos := map[string]exportedExercice{}
+				exos := map[string]fic.ExportedExercice{}
 				for _, exercice := range exercices {
-					exos[fmt.Sprintf("%d", exercice.Id)] = exportedExercice{
+					exos[fmt.Sprintf("%d", exercice.Id)] = fic.ExportedExercice{
 						exercice.Title,
 						exercice.Gain,
 						exercice.SolvedCount(),

admin/api_team.go

@@ -29,37 +29,6 @@ func nginxGenTeam() (string, error) {
 	}
 }
 
-type exportedTeam struct {
-	Name    string       `json:"name"`
-	Color   string       `json:"color"`
-	Rank    int          `json:"rank"`
-	Points  int64        `json:"score"`
-}
-
-func exportTeams() (interface{}, error) {
-	if teams, err := fic.GetTeams(); err != nil {
-		return nil, err
-	} else if rank, err := fic.GetRank(); err != nil {
-		return nil, err
-	} else {
-		ret := map[string]exportedTeam{}
-		for _, team := range teams {
-			if points, err := team.GetPoints(); err != nil {
-				return nil, err
-			} else {
-				ret[fmt.Sprintf("%d", team.Id)] = exportedTeam{
-					team.Name,
-					fmt.Sprintf("#%x", team.Color),
-					rank[team.Id],
-					points,
-				}
-			}
-		}
-
-		return ret, nil
-	}
-}
-
 func bindingTeams() (string, error) {
 	if teams, err := fic.GetTeams(); err != nil {
 		return "", err
@@ -118,13 +87,13 @@ func listTeam(args []string, body []byte) (interface{}, error) {
 		}
 	} else if len(args) == 1 {
 		if args[0] == "teams.json" {
-			return exportTeams()
+			return fic.ExportTeams()
 		} else if args[0] == "nginx" {
 			return nginxGenTeam()
 		} else if args[0] == "binding" {
 			return bindingTeams()
 		} else if tid, err := strconv.Atoi(string(args[0])); err != nil {
-			return nil, err
+			return fic.GetTeamByInitialName(args[0])
 		} else if team, err := fic.GetTeam(tid); err != nil {
 			return nil, err
 		} else {

admin/api_theme.go

@@ -16,49 +16,6 @@ var ApiThemesRouting = map[string]DispatchFunction{
 	"DELETE": deletionTheme,
 }
 
-type exportedExercice struct {
-	Title  string `json:"title"`
-	Gain   int64  `json:"gain"`
-	Solved int64  `json:"solved"`
-	Tried  int64  `json:"tried"`
-}
-
-type exportedTheme struct {
-	Name      string                      `json:"name"`
-	Authors   string                      `json:"authors"`
-	Exercices map[string]exportedExercice `json:"exercices"`
-}
-
-func exportThemes() (interface{}, error) {
-	if themes, err := fic.GetThemes(); err != nil {
-		return nil, err
-	} else {
-		ret := map[string]exportedTheme{}
-		for _, theme := range themes {
-			if exercices, err := theme.GetExercices(); err != nil {
-				return nil, err
-			} else {
-				exos := map[string]exportedExercice{}
-				for _, exercice := range exercices {
-					exos[fmt.Sprintf("%d", exercice.Id)] = exportedExercice{
-						exercice.Title,
-						exercice.Gain,
-						exercice.SolvedCount(),
-						exercice.TriedTeamCount(),
-					}
-				}
-				ret[fmt.Sprintf("%d", theme.Id)] = exportedTheme{
-					theme.Name,
-					theme.Authors[:len(theme.Authors)-1],
-					exos,
-				}
-			}
-		}
-
-		return ret, nil
-	}
-}
-
 func bindingFiles() (string, error) {
 	if files, err := fic.GetFiles(); err != nil {
 		return "", err
@@ -114,7 +71,7 @@ func listTheme(args []string, body []byte) (interface{}, error) {
 		if args[0] == "files-bindings" {
 			return bindingFiles()
 		} else if args[0] == "themes.json" {
-			return exportThemes()
+			return fic.ExportThemes()
 		} else {
 			return getTheme(args)
 		}

backend/generation.go

@@ -0,0 +1,132 @@
+package main
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"path"
+
+	"srs.epita.fr/fic-server/libfic"
+)
+
+// Check if the challenge is started or not
+func isStarted() bool {
+	if _, err := os.Stat(path.Join(TeamsDir, "started")); os.IsNotExist(err) {
+		return false
+	}
+	return true
+}
+
+// Generate my.json and wait.json for a given team
+func genTeamMyFile(team fic.Team) error {
+	dirPath := path.Join(TeamsDir, team.InitialName)
+
+	if s, err := os.Stat(dirPath); os.IsNotExist(err) {
+		os.MkdirAll(dirPath, 0777)
+	} else if !s.IsDir() {
+		return errors.New(fmt.Sprintf("%s is not a directory", dirPath))
+	}
+
+	if my, err := fic.MyJSONTeam(&team, true); err != nil {
+		return err
+	} else if j, err := json.Marshal(my); err != nil {
+		return err
+	} else if err := ioutil.WriteFile(path.Join(dirPath, "my.json"), j, 0666); err != nil {
+		return err
+	}
+
+	if !isStarted() {
+		if my, err := fic.MyJSONTeam(&team, false); err != nil {
+			return err
+		} else if j, err := json.Marshal(my); err != nil {
+			return err
+		} else if err := ioutil.WriteFile(path.Join(dirPath, "wait.json"), j, 0666); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+// Generate public my.json file
+func genMyPublicFile() error {
+	dirPath := path.Join(TeamsDir, "_public")
+
+	if s, err := os.Stat(dirPath); os.IsNotExist(err) {
+		os.MkdirAll(dirPath, 0777)
+	} else if !s.IsDir() {
+		return errors.New(fmt.Sprintf("%s is not a directory", dirPath))
+	}
+
+	if my, err := fic.MyJSONTeam(nil, true); err != nil {
+		return err
+	} else if j, err := json.Marshal(my); err != nil {
+		return err
+	} else if err := ioutil.WriteFile(path.Join(dirPath, "my.json"), j, 0666); err != nil {
+		return err
+	}
+
+	os.Symlink("my.json", path.Join(dirPath, "wait.json"))
+
+	return nil
+}
+
+// Generate general teams.json file
+func genTeamsFile() error {
+	if teams, err := fic.ExportTeams(); err != nil {
+		return err
+	} else if j, err := json.Marshal(teams); err != nil {
+		return err
+	} else if err := ioutil.WriteFile(path.Join(TeamsDir, "teams.json"), j, 0666); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// Generate general themes.json file
+func genThemesFile() error {
+	if themes, err := fic.ExportThemes(); err != nil {
+		return err
+	} else if j, err := json.Marshal(themes); err != nil {
+		return err
+	} else if err := ioutil.WriteFile(path.Join(TeamsDir, "themes.json"), j, 0666); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func genTeamAll(team fic.Team) error {
+	if err := genThemesFile(); err != nil {
+		return err
+	} else if err := genTeamsFile(); err != nil {
+		return err
+	} else if err := genTeamMyFile(team); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func genAll() error {
+	if err := genThemesFile(); err != nil {
+		return err
+	} else if err := genTeamsFile(); err != nil {
+		return err
+	} else if err := genMyPublicFile(); err != nil {
+		return err
+	} else if teams, err := fic.GetTeams(); err != nil {
+		return err
+	} else {
+		for _, team := range(teams) {
+			if err := genTeamMyFile(team); err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
+}

backend/rename.go

@@ -0,0 +1,39 @@
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"log"
+	"io/ioutil"
+	"os"
+	"regexp"
+
+	"srs.epita.fr/fic-server/libfic"
+)
+
+func validTeamName(name string) bool {
+	match, err := regexp.MatchString("^[A-Za-z0-9 àéèêëîïôùûü_-]{1,32}$", name)
+	return err == nil && match
+}
+
+func treatRename(pathname string, team fic.Team) {
+	var keys map[string]string
+
+	if cnt_raw, err := ioutil.ReadFile(pathname); err != nil {
+		log.Println("[ERR]", err)
+	} else if err := json.Unmarshal(cnt_raw, &keys); err != nil {
+		log.Println("[ERR]", err)
+	} else if validTeamName(keys["newName"]) {
+		team.Name = keys["newName"]
+		if _, err := team.Update(); err != nil {
+			log.Println("[WRN] Unable to change team name:", err)
+		}
+		genTeamMyFile(team)
+		if _, err := fic.NewEvent(fmt.Sprintf("Souhaitons bonne chance à l'équipe <strong>%s</strong> qui vient de nous rejoindre !", team.Name), "alert-info"); err != nil {
+			log.Println("[WRN] Unable to create event:", err)
+		}
+		if err := os.Remove(pathname); err != nil {
+			log.Println("[ERR]", err)
+		}
+	}
+}

backend/submission.go

@@ -4,20 +4,17 @@ import (
 	"encoding/base64"
 	"encoding/binary"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"io/ioutil"
 	"log"
 	"math/rand"
 	"os"
-	"path"
-	"regexp"
 	"strconv"
 
 	"srs.epita.fr/fic-server/libfic"
 )
 
-func treatSubmission(pathname string, team_id string, exercice_id string) {
+func treatSubmission(pathname string, team fic.Team, exercice_id string) {
 	bid := make([]byte, 5)
 	binary.LittleEndian.PutUint32(bid, rand.Uint32())
 	id := "[" + base64.StdEncoding.EncodeToString(bid) + "]"
@@ -25,28 +22,10 @@ func treatSubmission(pathname string, team_id string, exercice_id string) {
 
 	var keys map[string]string
 
-	if tid, err := strconv.Atoi(team_id); err != nil {
+	if cnt_raw, err := ioutil.ReadFile(pathname); err != nil {
-		log.Println(id, "[ERR]", err)
-	} else if team, err := fic.GetTeam(tid); err != nil {
-		log.Println(id, "[ERR]", err)
-	} else if cnt_raw, err := ioutil.ReadFile(pathname); err != nil {
 		log.Println(id, "[ERR]", err)
 	} else if err := json.Unmarshal(cnt_raw, &keys); err != nil {
 		log.Println(id, "[ERR]", err)
-	} else if exercice_id == "name" {
-		if match, err := regexp.MatchString("^[A-Za-z0-9 àéèêëîïôùûü_-]{1,32}$", keys["newName"]); err == nil && match {
-			team.Name = keys["newName"]
-			if _, err := team.Update(); err != nil {
-				log.Println(id, "[WRN] Unable to change team name:", err)
-			}
-			genTeamMyFile(team)
-			if _, err := fic.NewEvent(fmt.Sprintf("Souhaitons bonne chance à l'équipe <strong>%s</strong> qui vient de nous rejoindre !", team.Name), "alert-info"); err != nil {
-				log.Println(id, "[WRN] Unable to create event:", err)
-			}
-		}
-		if err := os.Remove(pathname); err != nil {
-			log.Println(id, "[ERR]", err)
-		}
 	} else if eid, err := strconv.Atoi(exercice_id); err != nil {
 		log.Println(id, "[ERR]", err)
 	} else if exercice, err := fic.GetExercice(int64(eid)); err != nil {
@@ -54,10 +33,11 @@ func treatSubmission(pathname string, team_id string, exercice_id string) {
 	} else if theme, err := exercice.GetTheme(); err != nil {
 		log.Println(id, "[ERR]", err)
 	} else if s, tm, _ := team.HasSolved(exercice); s {
-		log.Printf("$s [WRN] Team %d ALREADY solved exercice %d ($s : $s)\n", id, team.Id, exercice.Id, theme.Name, exercice.Title)
+		log.Printf("%s [WRN] Team %d ALREADY solved exercice %d (%s : %s)\n", id, team.Id, exercice.Id, theme.Name, exercice.Title)
 	} else {
 		if solved, err := exercice.CheckResponse(keys, team); err != nil {
 			log.Println(id, "[ERR]", err)
+			genTeamMyFile(team)
 		} else if solved {
 			exercice.Solved(team)
 			log.Printf("%s Team %d SOLVED exercice %d (%s : %s)\n", id, team.Id, exercice.Id, theme.Name, exercice.Title)
@@ -71,6 +51,7 @@ func treatSubmission(pathname string, team_id string, exercice_id string) {
 			} else if _, err := fic.NewEvent(fmt.Sprintf("L'équipe %s a résolu le <strong>%d<sup>e</sup></strong> challenge %s !", team.Name, lvl, theme.Name), "alert-success"); err != nil {
 				log.Println(id, "[WRN] Unable to create event:", err)
 			}
+			genTeamAll(team)
 		} else {
 			log.Printf("%s Team %d submit an invalid solution for exercice %d (%s : %s)\n", id, team.Id, exercice.Id, theme.Name, exercice.Title)
 			if err := os.Remove(pathname); err != nil {
@@ -85,42 +66,7 @@ func treatSubmission(pathname string, team_id string, exercice_id string) {
 					log.Println(id, "[WRN] Unable to create event:", err)
 				}
 			}
-		}
+			genTeamMyFile(team)
-		genTeamMyFile(team)
-	}
-}
-
-func genTeamMyFile(team fic.Team) error {
-	dirPath := path.Join(TeamsDir, fmt.Sprintf("%d", team.Id))
-
-	started := true
-	if _, err := os.Stat(path.Join(TeamsDir, "started")); os.IsNotExist(err) {
-		started = false
-	}
-
-	if s, err := os.Stat(dirPath); os.IsNotExist(err) {
-		os.MkdirAll(dirPath, 0777)
-	} else if !s.IsDir() {
-		return errors.New("dirPath is not a directory")
-	}
-
-	if my, err := fic.MyJSONTeam(&team, true); err != nil {
-		return err
-	} else if j, err := json.Marshal(my); err != nil {
-		return err
-	} else if err := ioutil.WriteFile(path.Join(dirPath, "my.json"), j, 0666); err != nil {
-		return err
-	}
-
-	if !started {
-		if my, err := fic.MyJSONTeam(&team, false); err != nil {
-			return err
-		} else if j, err := json.Marshal(my); err != nil {
-			return err
-		} else if err := ioutil.WriteFile(path.Join(dirPath, "wait.json"), j, 0666); err != nil {
-			return err
 		}
 	}
-
-	return nil
 }

libfic/team.go

@@ -1,6 +1,7 @@
 package fic
 
 import (
+	"fmt"
 	"time"
 )
 
@@ -158,3 +159,35 @@ func (t Team) HasSolved(e Exercice) (bool, time.Time, int64) {
 		return true, *tm, *nb + 1
 	}
 }
+
+
+type exportedTeam struct {
+	Name    string       `json:"name"`
+	Color   string       `json:"color"`
+	Rank    int          `json:"rank"`
+	Points  int64        `json:"score"`
+}
+
+func ExportTeams() (interface{}, error) {
+	if teams, err := GetTeams(); err != nil {
+		return nil, err
+	} else if rank, err := GetRank(); err != nil {
+		return nil, err
+	} else {
+		ret := map[string]exportedTeam{}
+		for _, team := range teams {
+			if points, err := team.GetPoints(); err != nil {
+				return nil, err
+			} else {
+				ret[fmt.Sprintf("%d", team.Id)] = exportedTeam{
+					team.Name,
+					fmt.Sprintf("#%x", team.Color),
+					rank[team.Id],
+					points,
+				}
+			}
+		}
+
+		return ret, nil
+	}
+}

libfic/theme.go

@@ -1,6 +1,8 @@
 package fic
 
-import ()
+import (
+	"fmt"
+)
 
 type Theme struct {
 	Id      int64  `json:"id"`
@@ -68,3 +70,46 @@ func (t Theme) Delete() (int64, error) {
 		return nb, err
 	}
 }
+
+type ExportedExercice struct {
+	Title  string `json:"title"`
+	Gain   int64  `json:"gain"`
+	Solved int64  `json:"solved"`
+	Tried  int64  `json:"tried"`
+}
+
+type exportedTheme struct {
+	Name      string                      `json:"name"`
+	Authors   string                      `json:"authors"`
+	Exercices map[string]ExportedExercice `json:"exercices"`
+}
+
+func ExportThemes() (interface{}, error) {
+	if themes, err := GetThemes(); err != nil {
+		return nil, err
+	} else {
+		ret := map[string]exportedTheme{}
+		for _, theme := range themes {
+			if exercices, err := theme.GetExercices(); err != nil {
+				return nil, err
+			} else {
+				exos := map[string]ExportedExercice{}
+				for _, exercice := range exercices {
+					exos[fmt.Sprintf("%d", exercice.Id)] = ExportedExercice{
+						exercice.Title,
+						exercice.Gain,
+						exercice.SolvedCount(),
+						exercice.TriedTeamCount(),
+					}
+				}
+				ret[fmt.Sprintf("%d", theme.Id)] = exportedTheme{
+					theme.Name,
+					theme.Authors[:len(theme.Authors)-1],
+					exos,
+				}
+			}
+		}
+
+		return ret, nil
+	}
+}