Expose more fields for PR JSON export

mislav · mislav · commit e63904bacd8e · 2021-04-14T17:28:27.000+02:00
diff --git a/api/export_pr.go b/api/export_pr.go
@@ -64,6 +64,8 @@ func (pr *PullRequest) ExportData(fields []string) *map[string]interface{} {
 			data[f] = pr.ProjectCards.Nodes
 		case "reviews":
 			data[f] = pr.Reviews.Nodes
+		case "files":
+			data[f] = pr.Files.Nodes
 		case "reviewRequests":
 			requests := make([]interface{}, 0, len(pr.ReviewRequests.Nodes))
 			for _, req := range pr.ReviewRequests.Nodes {
diff --git a/api/queries_pr.go b/api/queries_pr.go
@@ -42,13 +42,22 @@ type PullRequest struct {
 	Mergeable        string
 	Additions        int
 	Deletions        int
+	ChangedFiles     int
 	MergeStateStatus string
 	CreatedAt        time.Time
 	UpdatedAt        time.Time
 	ClosedAt         *time.Time
 	MergedAt         *time.Time
 
+	MergeCommit          *Commit
+	PotentialMergeCommit *Commit
+
+	Files struct {
+		Nodes []PullRequestFile
+	}
+
 	Author              Author
+	MergedBy            *Author
 	HeadRepositoryOwner struct {
 		Login string `json:"login"`
 	}
@@ -104,6 +113,16 @@ type PullRequest struct {
 	ReviewRequests ReviewRequests
 }
 
+type Commit struct {
+	OID string `json:"oid"`
+}
+
+type PullRequestFile struct {
+	Path      string `json:"path"`
+	Additions int    `json:"additions"`
+	Deletions int    `json:"deletions"`
+}
+
 type ReviewRequests struct {
 	Nodes []struct {
 		RequestedReviewer struct {
diff --git a/api/queries_pr_review.go b/api/queries_pr_review.go
@@ -31,11 +31,11 @@ type PullRequestReview struct {
 	Author              Author         `json:"author"`
 	AuthorAssociation   string         `json:"authorAssociation"`
 	Body                string         `json:"body"`
-	CreatedAt           time.Time      `json:"createdAt"`
+	SubmittedAt         *time.Time     `json:"submittedAt"`
 	IncludesCreatedEdit bool           `json:"includesCreatedEdit"`
 	ReactionGroups      ReactionGroups `json:"reactionGroups"`
 	State               string         `json:"state"`
-	URL                 string         `json:"url"`
+	URL                 string         `json:"url,omitempty"`
 }
 
 func AddReview(client *Client, repo ghrepo.Interface, pr *PullRequest, input *PullRequestReviewInput) error {
@@ -115,7 +115,10 @@ func (prr PullRequestReview) Content() string {
 }
 
 func (prr PullRequestReview) Created() time.Time {
-	return prr.CreatedAt
+	if prr.SubmittedAt == nil {
+		return time.Time{}
+	}
+	return *prr.SubmittedAt
 }
 
 func (prr PullRequestReview) HiddenReason() string {
diff --git a/api/query_builder.go b/api/query_builder.go
@@ -46,6 +46,29 @@ var prReviewRequests = shortenQuery(`
 	}
 `)
 
+var prReviews = shortenQuery(`
+	reviews(last: 100) {
+		nodes {
+			author{login},
+			authorAssociation,
+			submittedAt,
+			body,
+			state,
+			reactionGroups{content,users{totalCount}}
+		}
+	}
+`)
+
+var prFiles = shortenQuery(`
+	files(first: 100) {
+		nodes {
+			additions,
+			deletions,
+			path
+		}
+	}
+`)
+
 var prStatusCheckRollup = shortenQuery(`
 	commits(last: 1) {
 		totalCount,
@@ -100,18 +123,24 @@ var IssueFields = []string{
 var PullRequestFields = append(IssueFields,
 	"additions",
 	"baseRefName",
+	"changedFiles",
 	"deletions",
+	"files",
 	"headRefName",
 	"headRepository",
 	"headRepositoryOwner",
 	"isCrossRepository",
 	"isDraft",
 	"maintainerCanModify",
 	"mergeable",
+	"mergeCommit",
 	"mergedAt",
+	"mergedBy",
 	"mergeStateStatus",
+	"potentialMergeCommit",
 	"reviewDecision",
 	"reviewRequests",
+	"reviews",
 	"statusCheckRollup",
 )
 
@@ -121,6 +150,8 @@ func PullRequestGraphQL(fields []string) string {
 		switch field {
 		case "author":
 			q = append(q, `author{login}`)
+		case "mergedBy":
+			q = append(q, `mergedBy{login}`)
 		case "headRepositoryOwner":
 			q = append(q, `headRepositoryOwner{login}`)
 		case "headRepository":
@@ -135,10 +166,18 @@ func PullRequestGraphQL(fields []string) string {
 			q = append(q, `milestone{title}`)
 		case "reactionGroups":
 			q = append(q, `reactionGroups{content,users{totalCount}}`)
+		case "mergeCommit":
+			q = append(q, `mergeCommit{oid}`)
+		case "potentialMergeCommit":
+			q = append(q, `potentialMergeCommit{oid}`)
 		case "comments":
 			q = append(q, issueComments)
 		case "reviewRequests":
 			q = append(q, prReviewRequests)
+		case "reviews":
+			q = append(q, prReviews)
+		case "files":
+			q = append(q, prFiles)
 		case "statusCheckRollup":
 			q = append(q, prStatusCheckRollup)
 		default:
