Merge pull request #652 from exercism/teams-download

Add --team flag to download command

Author: Katrina Owen

cmd/download.go

@@ -90,12 +90,20 @@ func runDownload(cfg config.Configuration, flags *pflag.FlagSet, args []string)
 		return err
 	}
 
+	team, err := flags.GetString("team")
+	if err != nil {
+		return err
+	}
+
 	if uuid == "" {
 		q := req.URL.Query()
 		q.Add("exercise_id", exercise)
 		if track != "" {
 			q.Add("track_id", track)
 		}
+		if team != "" {
+			q.Add("team_id", team)
+		}
 		req.URL.RawQuery = q.Encode()
 	}
 
@@ -127,6 +135,7 @@ func runDownload(cfg config.Configuration, flags *pflag.FlagSet, args []string)
 	solution := workspace.Solution{
 		AutoApprove: payload.Solution.Exercise.AutoApprove,
 		Track:       payload.Solution.Exercise.Track.ID,
+		Team:        payload.Solution.Team.Slug,
 		Exercise:    payload.Solution.Exercise.ID,
 		ID:          payload.Solution.ID,
 		URL:         payload.Solution.URL,
@@ -135,6 +144,9 @@ func runDownload(cfg config.Configuration, flags *pflag.FlagSet, args []string)
 	}
 
 	dir := usrCfg.GetString("workspace")
+	if solution.Team != "" {
+		dir = filepath.Join(dir, "teams", solution.Team)
+	}
 	if !solution.IsRequester {
 		dir = filepath.Join(dir, "users", solution.Handle)
 	}
@@ -205,6 +217,10 @@ type downloadPayload struct {
 	Solution struct {
 		ID   string `json:"id"`
 		URL  string `json:"url"`
+		Team struct {
+			Name string `json:"name"`
+			Slug string `json:"slug"`
+		} `json:"team"`
 		User struct {
 			Handle      string `json:"handle"`
 			IsRequester bool   `json:"is_requester"`
@@ -235,6 +251,7 @@ func setupDownloadFlags(flags *pflag.FlagSet) {
 	flags.StringP("uuid", "u", "", "the solution UUID")
 	flags.StringP("track", "t", "", "the track ID")
 	flags.StringP("exercise", "e", "", "the exercise slug")
+	flags.StringP("team", "T", "", "the team slug")
 }
 
 func init() {

cmd/download_test.go

@@ -107,14 +107,19 @@ func TestDownload(t *testing.T) {
 			expectedDir: filepath.Join("users", "alice"),
 			flags:       map[string]string{"uuid": "bogus-id"},
 		},
+		{
+			requester:   true,
+			expectedDir: filepath.Join("teams", "bogus-team"),
+			flags:       map[string]string{"exercise": "bogus-exercise", "track": "bogus-track", "team": "bogus-team"},
+		},
 	}
 
 	for _, tc := range testCases {
 		tmpDir, err := ioutil.TempDir("", "download-cmd")
 		defer os.RemoveAll(tmpDir)
 		assert.NoError(t, err)
 
-		ts := fakeDownloadServer(strconv.FormatBool(tc.requester))
+		ts := fakeDownloadServer(strconv.FormatBool(tc.requester), tc.flags["team"])
 		defer ts.Close()
 
 		v := viper.New()
@@ -149,7 +154,7 @@ func TestDownload(t *testing.T) {
 	}
 }
 
-func fakeDownloadServer(requestor string) *httptest.Server {
+func fakeDownloadServer(requestor, teamSlug string) *httptest.Server {
 	mux := http.NewServeMux()
 	server := httptest.NewServer(mux)
 
@@ -165,11 +170,16 @@ func fakeDownloadServer(requestor string) *httptest.Server {
 		fmt.Fprint(w, "")
 	})
 
-	payloadBody := fmt.Sprintf(payloadTemplate, requestor, server.URL+"/")
 	mux.HandleFunc("/solutions/latest", func(w http.ResponseWriter, r *http.Request) {
+		team := "null"
+		if teamSlug := r.FormValue("team_id"); teamSlug != "" {
+			team = fmt.Sprintf(`{"name": "Bogus Team", "slug": "%s"}`, teamSlug)
+		}
+		payloadBody := fmt.Sprintf(payloadTemplate, requestor, team, server.URL+"/")
 		fmt.Fprint(w, payloadBody)
 	})
 	mux.HandleFunc("/solutions/bogus-id", func(w http.ResponseWriter, r *http.Request) {
+		payloadBody := fmt.Sprintf(payloadTemplate, requestor, "null", server.URL+"/")
 		fmt.Fprint(w, payloadBody)
 	})
 
@@ -215,6 +225,7 @@ const payloadTemplate = `
 			"handle": "alice",
 			"is_requester": %s
 		},
+		"team": %s,
 		"exercise": {
 			"id": "bogus-exercise",
 			"instructions_url": "http://example.com/bogus-exercise",
@@ -226,9 +237,9 @@ const payloadTemplate = `
 		},
 		"file_download_base_url": "%s",
 		"files": [
-		"/file-1.txt",
-		"/subdir/file-2.txt",
-		"/file-3.txt"
+			"/file-1.txt",
+			"/subdir/file-2.txt",
+			"/file-3.txt"
 		],
 		"iteration": {
 			"submitted_at": "2017-08-21t10:11:12.130z"

workspace/solution.go

@@ -19,6 +19,7 @@ type Solution struct {
 	Track       string     `json:"track"`
 	Exercise    string     `json:"exercise"`
 	ID          string     `json:"id"`
+	Team        string     `json:"team,omitempty"`
 	URL         string     `json:"url"`
 	Handle      string     `json:"handle"`
 	IsRequester bool       `json:"is_requester"`