Fix exporting milestone for issues and PRs

mislav · mislav · commit a8e025291f62 · 2021-04-28T18:28:18.000+02:00
There was a weird pointer bug which would cause a null milestone to
erase "milestone" fields for previous entries in the list.
diff --git a/api/export_pr.go b/api/export_pr.go
@@ -6,7 +6,6 @@ import (
 )
 
 func (issue *Issue) ExportData(fields []string) *map[string]interface{} {
-	v := reflect.ValueOf(issue).Elem()
 	data := map[string]interface{}{}
 
 	for _, f := range fields {
@@ -26,6 +25,7 @@ func (issue *Issue) ExportData(fields []string) *map[string]interface{} {
 		case "projectCards":
 			data[f] = issue.ProjectCards.Nodes
 		default:
+			v := reflect.ValueOf(issue).Elem()
 			sf := fieldByName(v, f)
 			data[f] = sf.Interface()
 		}
@@ -35,7 +35,6 @@ func (issue *Issue) ExportData(fields []string) *map[string]interface{} {
 }
 
 func (pr *PullRequest) ExportData(fields []string) *map[string]interface{} {
-	v := reflect.ValueOf(pr).Elem()
 	data := map[string]interface{}{}
 
 	for _, f := range fields {
@@ -76,6 +75,7 @@ func (pr *PullRequest) ExportData(fields []string) *map[string]interface{} {
 			}
 			data[f] = &requests
 		default:
+			v := reflect.ValueOf(pr).Elem()
 			sf := fieldByName(v, f)
 			data[f] = sf.Interface()
 		}
@@ -86,16 +86,16 @@ func (pr *PullRequest) ExportData(fields []string) *map[string]interface{} {
 
 func ExportIssues(issues []Issue, fields []string) *[]interface{} {
 	data := make([]interface{}, len(issues))
-	for i, issue := range issues {
-		data[i] = issue.ExportData(fields)
+	for i := range issues {
+		data[i] = issues[i].ExportData(fields)
 	}
 	return &data
 }
 
 func ExportPRs(prs []PullRequest, fields []string) *[]interface{} {
 	data := make([]interface{}, len(prs))
-	for i, pr := range prs {
-		data[i] = pr.ExportData(fields)
+	for i := range prs {
+		data[i] = prs[i].ExportData(fields)
 	}
 	return &data
 }
diff --git a/api/export_pr_test.go b/api/export_pr_test.go
@@ -31,6 +31,21 @@ func TestIssue_ExportData(t *testing.T) {
 				}
 			`),
 		},
+		{
+			name:   "milestone",
+			fields: []string{"number", "milestone"},
+			inputJSON: heredoc.Doc(`
+				{ "number": 2345, "milestone": {"title": "The next big thing"} }
+			`),
+			outputJSON: heredoc.Doc(`
+				{
+					"milestone": {
+						"title": "The next big thing"
+					},
+					"number": 2345
+				}
+			`),
+		},
 		{
 			name:   "project cards",
 			fields: []string{"projectCards"},
@@ -75,6 +90,31 @@ func TestIssue_ExportData(t *testing.T) {
 	}
 }
 
+func TestExportIssues(t *testing.T) {
+	issues := []Issue{
+		{Milestone: Milestone{Title: "hi"}},
+		{},
+	}
+	exported := ExportIssues(issues, []string{"milestone"})
+
+	buf := bytes.Buffer{}
+	enc := json.NewEncoder(&buf)
+	enc.SetIndent("", "\t")
+	require.NoError(t, enc.Encode(exported))
+	assert.Equal(t, heredoc.Doc(`
+		[
+			{
+				"milestone": {
+					"title": "hi"
+				}
+			},
+			{
+				"milestone": null
+			}
+		]
+	`), buf.String())
+}
+
 func TestPullRequest_ExportData(t *testing.T) {
 	tests := []struct {
 		name       string
@@ -95,6 +135,21 @@ func TestPullRequest_ExportData(t *testing.T) {
 				}
 			`),
 		},
+		{
+			name:   "milestone",
+			fields: []string{"number", "milestone"},
+			inputJSON: heredoc.Doc(`
+				{ "number": 2345, "milestone": {"title": "The next big thing"} }
+			`),
+			outputJSON: heredoc.Doc(`
+				{
+					"milestone": {
+						"title": "The next big thing"
+					},
+					"number": 2345
+				}
+			`),
+		},
 		{
 			name:   "status checks",
 			fields: []string{"statusCheckRollup"},

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ import (`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`func (issue Issue) ExportData(fields []string) map[string]interface{} {`
`9`		`- v := reflect.ValueOf(issue).Elem()`
`10`	`9`	`data := map[string]interface{}{}`
`11`	`10`
`12`	`11`	`for _, f := range fields {`
`@@ -26,6 +25,7 @@ func (issue Issue) ExportData(fields []string) map[string]interface{} {`
`26`	`25`	`case "projectCards":`
`27`	`26`	`data[f] = issue.ProjectCards.Nodes`
`28`	`27`	`default:`
	`28`	`+ v := reflect.ValueOf(issue).Elem()`
`29`	`29`	`sf := fieldByName(v, f)`
`30`	`30`	`data[f] = sf.Interface()`
`31`	`31`	`}`
`@@ -35,7 +35,6 @@ func (issue Issue) ExportData(fields []string) map[string]interface{} {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`func (pr PullRequest) ExportData(fields []string) map[string]interface{} {`
`38`		`- v := reflect.ValueOf(pr).Elem()`
`39`	`38`	`data := map[string]interface{}{}`
`40`	`39`
`41`	`40`	`for _, f := range fields {`
`@@ -76,6 +75,7 @@ func (pr PullRequest) ExportData(fields []string) map[string]interface{} {`
`76`	`75`	`}`
`77`	`76`	`data[f] = &requests`
`78`	`77`	`default:`
	`78`	`+ v := reflect.ValueOf(pr).Elem()`
`79`	`79`	`sf := fieldByName(v, f)`
`80`	`80`	`data[f] = sf.Interface()`
`81`	`81`	`}`
`@@ -86,16 +86,16 @@ func (pr PullRequest) ExportData(fields []string) map[string]interface{} {`
`86`	`86`
`87`	`87`	`func ExportIssues(issues []Issue, fields []string) *[]interface{} {`
`88`	`88`	`data := make([]interface{}, len(issues))`
`89`		`- for i, issue := range issues {`
`90`		`- data[i] = issue.ExportData(fields)`
	`89`	`+ for i := range issues {`
	`90`	`+ data[i] = issues[i].ExportData(fields)`
`91`	`91`	`}`
`92`	`92`	`return &data`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`func ExportPRs(prs []PullRequest, fields []string) *[]interface{} {`
`96`	`96`	`data := make([]interface{}, len(prs))`
`97`		`- for i, pr := range prs {`
`98`		`- data[i] = pr.ExportData(fields)`
	`97`	`+ for i := range prs {`
	`98`	`+ data[i] = prs[i].ExportData(fields)`
`99`	`99`	`}`
`100`	`100`	`return &data`
`101`	`101`	`}`