From 1440fd81a1e76fa6a32b1c5cc6e97affbed420e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mislav=20Marohni=C4=87?= <mislav@github.com>
Date: Tue, 18 May 2021 18:35:34 +0200
Subject: [PATCH] Fix broken GraphQL queries due to editing Author struct

---
 api/queries_issue.go      | 5 +++--
 api/query_builder.go      | 8 ++++----
 api/query_builder_test.go | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/api/queries_issue.go b/api/queries_issue.go
index 1c4f122ec..c67ad3bcc 100644
--- 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
index 04d681d60..3bdbb8c9b 100644
--- 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
index 3c510d6da..7806f2d05 100644
--- 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",