From 8a868779a64bcad0c6051d6e84bf1fc646bc7182 Mon Sep 17 00:00:00 2001
From: Matthew Ruggio <mattruggio@github.com>
Date: Fri, 13 Oct 2023 07:56:42 -0500
Subject: [PATCH] Add status column for each projectItem object.

This should be comparable to classic project's notion of column, although not _exactly_ the same since new projects are much more configurable.
---
 api/export_pr.go      | 3 ++-
 api/export_pr_test.go | 8 ++++++++
 api/queries_issue.go  | 4 ++++
 api/query_builder.go  | 2 +-
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/api/export_pr.go b/api/export_pr.go
index c2ddb4277..218bf7c47 100644
--- a/api/export_pr.go
+++ b/api/export_pr.go
@@ -23,7 +23,8 @@ func (issue *Issue) ExportData(fields []string) map[string]interface{} {
 			items := make([]map[string]interface{}, 0, len(issue.ProjectItems.Nodes))
 			for _, n := range issue.ProjectItems.Nodes {
 				items = append(items, map[string]interface{}{
-					"title": n.Project.Title,
+					"status": n.Status,
+					"title":  n.Project.Title,
 				})
 			}
 			data[f] = items
diff --git a/api/export_pr_test.go b/api/export_pr_test.go
index e7d930078..94a672fbd 100644
--- a/api/export_pr_test.go
+++ b/api/export_pr_test.go
@@ -85,6 +85,10 @@ func TestIssue_ExportData(t *testing.T) {
 						"project": {
 							"id": "PVT_id",
 							"title": "Some Project"
+						},
+						"status": {
+							"name": "Todo",
+							"optionId": "abc123"
 						}
 					}
 				] } }
@@ -93,6 +97,10 @@ func TestIssue_ExportData(t *testing.T) {
 				{
 					"projectItems": [
 						{
+							"status": {
+								"optionId": "abc123",
+								"name": "Todo"
+							},
 							"title": "Some Project"
 						}
 					]
diff --git a/api/queries_issue.go b/api/queries_issue.go
index 58053f8df..b971845b9 100644
--- a/api/queries_issue.go
+++ b/api/queries_issue.go
@@ -106,6 +106,10 @@ type ProjectV2Item struct {
 		ID    string `json:"id"`
 		Title string `json:"title"`
 	}
+	Status struct {
+		OptionID string `json:"optionId"`
+		Name     string `json:"name"`
+	}
 }
 
 func (p ProjectCards) ProjectNames() []string {
diff --git a/api/query_builder.go b/api/query_builder.go
index bd2d2ece5..9c8aaac17 100644
--- a/api/query_builder.go
+++ b/api/query_builder.go
@@ -318,7 +318,7 @@ func IssueGraphQL(fields []string) string {
 		case "projectCards":
 			q = append(q, `projectCards(first:100){nodes{project{name}column{name}},totalCount}`)
 		case "projectItems":
-			q = append(q, `projectItems(first:100){nodes{id, project{id,title}},totalCount}`)
+			q = append(q, `projectItems(first:100){nodes{id, project{id,title}, status:fieldValueByName(name: "Status") { ... on ProjectV2ItemFieldSingleSelectValue{optionId,name}}},totalCount}`)
 		case "milestone":
 			q = append(q, `milestone{number,title,description,dueOn}`)
 		case "reactionGroups":