配列で返すのやめる

syou6162 · Nov 15, 2018 · b852884 · b852884
1 parent 48faaad
commit b852884
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/lib/web/web.go b/lib/web/web.go
@@ -12,8 +12,6 @@ import (
 	"os"
 	"strings"
 
-	"encoding/json"
-
 	"sort"
 
 	"syscall"
@@ -138,6 +136,10 @@ func getUrlsFromList(listName string) (example.Examples, error) {
 	return result, nil
 }
 
+type ExamplesFromList struct {
+	Examples example.Examples
+}
+
 func GetExamplesFromList(w http.ResponseWriter, r *http.Request) {
 	queryValues := r.URL.Query()
 	listName := queryValues.Get("listName")
@@ -154,7 +156,10 @@ func GetExamplesFromList(w http.ResponseWriter, r *http.Request) {
 
 	examples = util.FilterStatusCodeOkExamples(examples)
 	lightenExamples(examples)
-	json.NewEncoder(w).Encode(examples)
+
+	JSON(w, http.StatusOK, ExamplesFromList{
+		Examples: examples,
+	})
 }
 
 type ExampleWithSimilarExamples struct {

diff --git a/lib/web/web_test.go b/lib/web/web_test.go
@@ -125,10 +125,10 @@ func TestGetExamplesFromList(t *testing.T) {
 			status, http.StatusOK)
 	}
 
-	examples := example.Examples{}
-	json.Unmarshal(w.Body.Bytes(), &examples)
+	examplesFromList := web.ExamplesFromList{}
+	json.Unmarshal(w.Body.Bytes(), &examplesFromList)
 
-	if len(examples) == 0 {
+	if len(examplesFromList.Examples) == 0 {
 		t.Error("Result must not be empty")
 	}
 }

diff --git a/src/js/ListExample.vue b/src/js/ListExample.vue
@@ -85,7 +85,7 @@ export default {
 
       axios.get("/api/examples?listName=" + listname)
         .then(response => {
-          this.examples = response.data.map(e => NewExample(e));
+          this.examples = response.data.Examples.map(e => NewExample(e));
           this.listname = this.$route.params.listname;
           this.title = `ML News - ${this.listname}`;
           this.loading = false;