From e207e90c2ebd12008915c8b763cafc8c89c60ceb Mon Sep 17 00:00:00 2001
From: nemunaire <nemunaire@nemunai.re>
Date: Sun, 24 Jan 2016 11:42:26 +0100
Subject: [PATCH] my.json now contains team members, instead of teams.json

---
 admin/api_team.go | 4 ----
 libfic/team_my.go | 5 +++++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/admin/api_team.go b/admin/api_team.go
index ea346e7c..11cf16f2 100644
--- a/admin/api_team.go
+++ b/admin/api_team.go
@@ -34,7 +34,6 @@ type exportedTeam struct {
 	Color   string       `json:"color"`
 	Rank    int          `json:"rank"`
 	Points  int64        `json:"score"`
-	Members []fic.Member `json:"members"`
 }
 
 func exportTeams() (interface{}, error) {
@@ -47,15 +46,12 @@ func exportTeams() (interface{}, error) {
 		for _, team := range teams {
 			if points, err := team.GetPoints(); err != nil {
 				return nil, err
-			} else if members, err := team.GetMembers(); err != nil {
-				return nil, err
 			} else {
 				ret[fmt.Sprintf("%d", team.Id)] = exportedTeam{
 					team.Name,
 					fmt.Sprintf("#%x", team.Color),
 					rank[team.Id],
 					points,
-					members,
 				}
 			}
 		}
diff --git a/libfic/team_my.go b/libfic/team_my.go
index 17e67e12..7d9fc946 100644
--- a/libfic/team_my.go
+++ b/libfic/team_my.go
@@ -26,6 +26,7 @@ type myTeamExercice struct {
 type myTeam struct {
 	Id        int64                     `json:"team_id"`
 	Points    int64                     `json:"score"`
+	Members   []Member                  `json:"members"`
 	Exercices map[string]myTeamExercice `json:"exercices"`
 }
 
@@ -36,6 +37,10 @@ func MyJSONTeam(t *Team, started bool) (interface{}, error) {
 	} else {
 		ret.Id = t.Id
 		ret.Points, _ = t.GetPoints()
+		if members, err := t.GetMembers(); err == nil {
+			ret.Members = members
+		}
+
 	}
 	ret.Exercices = map[string]myTeamExercice{}