Fix broken GraphQL queries due to editing Author struct

mislav · mislav · commit 1440fd81a1e7 · 2021-05-18T18:35:34.000+02:00
diff --git a/api/queries_issue.go b/api/queries_issue.go
@@ -104,8 +104,9 @@ type Owner struct {
 }
 
 type Author struct {
-	ID    string `json:"id,omitempty"`
-	Name  string `json:"name,omitempty"`
+	// adding these breaks generated GraphQL requests
+	//ID    string `json:"id,omitempty"`
+	//Name  string `json:"name,omitempty"`
 	Login string `json:"login"`
 }
 
diff --git a/api/query_builder.go b/api/query_builder.go
@@ -21,7 +21,7 @@ func shortenQuery(q string) string {
 var issueComments = shortenQuery(`
 	comments(first: 100) {
 		nodes {
-			author{login,...on User{id,name}},
+			author{login},
 			authorAssociation,
 			body,
 			createdAt,
@@ -177,11 +177,11 @@ func PullRequestGraphQL(fields []string) string {
 	for _, field := range fields {
 		switch field {
 		case "author":
-			q = append(q, `author{login,...on User{id,name}}`)
+			q = append(q, `author{login}`)
 		case "mergedBy":
-			q = append(q, `mergedBy{login,,...on User{id,name}}`)
+			q = append(q, `mergedBy{login}`)
 		case "headRepositoryOwner":
-			q = append(q, `headRepositoryOwner{id,login,,...on User{name}}`)
+			q = append(q, `headRepositoryOwner{id,login,...on User{name}}`)
 		case "headRepository":
 			q = append(q, `headRepository{id,name}`)
 		case "assignees":
diff --git a/api/query_builder_test.go b/api/query_builder_test.go
@@ -21,7 +21,7 @@ func TestPullRequestGraphQL(t *testing.T) {
 		{
 			name:   "fields with nested structures",
 			fields: []string{"author", "assignees"},
-			want:   "author{login,...on User{id,name}},assignees(first:100){nodes{id,login,name},totalCount}",
+			want:   "author{login},assignees(first:100){nodes{id,login,name},totalCount}",
 		},
 		{
 			name:   "compressed query",

Original file line number	Diff line number	Diff line change
`@@ -104,8 +104,9 @@ type Owner struct {`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`type Author struct {`
`107`		- ID string `json:"id,omitempty"`
`108`		- Name string `json:"name,omitempty"`
	`107`	`+ // adding these breaks generated GraphQL requests`
	`108`	+ //ID string `json:"id,omitempty"`
	`109`	+ //Name string `json:"name,omitempty"`
`109`	`110`	Login string `json:"login"`
`110`	`111`	`}`
`111`	`112`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ func TestPullRequestGraphQL(t *testing.T) {`
`21`	`21`	`{`
`22`	`22`	`name: "fields with nested structures",`
`23`	`23`	`fields: []string{"author", "assignees"},`
`24`		`- want: "author{login,...on User{id,name}},assignees(first:100){nodes{id,login,name},totalCount}",`
	`24`	`+ want: "author{login},assignees(first:100){nodes{id,login,name},totalCount}",`
`25`	`25`	`},`
`26`	`26`	`{`
`27`	`27`	`name: "compressed query",`