STACKITGit/cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Extract Project Status into fragment to fix unmarshal error

Browse source
This commit is contained in:
Sam Coe 2023-11-27 12:25:51 +00:00 • committed by William Martin
parent 65d63e1bc9
commit e843349a13
4 changed files with 123 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

4
api/export_pr.go
View file

@ -23,7 +23,7 @@ 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{}{
"status": n.Status,
"status": n.Status.StatusFragment,
"title": n.Project.Title,
})
}
@ -109,7 +109,7 @@ func (pr *PullRequest) ExportData(fields []string) map[string]interface{} {
items := make([]map[string]interface{}, 0, len(pr.ProjectItems.Nodes))
for _, n := range pr.ProjectItems.Nodes {
items = append(items, map[string]interface{}{
"status": n.Status,
"status": n.Status.StatusFragment,
"title": n.Project.Title,
})
}

169
api/export_pr_test.go
View file

@ -75,38 +75,6 @@ func TestIssue_ExportData(t *testing.T) {
}
`),
},
{
name: "project items",
fields: []string{"projectItems"},
inputJSON: heredoc.Doc(`
{ "projectItems": { "nodes": [
{
"id": "PVTI_id",
"project": {
"id": "PVT_id",
"title": "Some Project"
},
"status": {
"name": "Todo",
"optionId": "abc123"
}
}
] } }
`),
outputJSON: heredoc.Doc(`
{
"projectItems": [
{
"status": {
"optionId": "abc123",
"name": "Todo"
},
"title": "Some Project"
}
]
}
`),
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
@ -213,38 +181,6 @@ func TestPullRequest_ExportData(t *testing.T) {
}
`),
},
{
name: "project items",
fields: []string{"projectItems"},
inputJSON: heredoc.Doc(`
{ "projectItems": { "nodes": [
{
"id": "PVTPR_id",
"project": {
"id": "PVT_id",
"title": "Some Project"
},
"status": {
"name": "Todo",
"optionId": "abc123"
}
}
] } }
`),
outputJSON: heredoc.Doc(`
{
"projectItems": [
{
"status": {
"optionId": "abc123",
"name": "Todo"
},
"title": "Some Project"
}
]
}
`),
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
@ -269,3 +205,108 @@ func TestPullRequest_ExportData(t *testing.T) {
})
}
}
// The following tests exist separately from the table driven tests
// above because in the implementation code, the GraphQL request is
// performed by shurcool, and it handles the JSON decoding into the
// response struct, which is slightly different than the stdlib JSON
// decoder used by the rest of the requests when Finding an Issue or PR.
func TestIssueExportProjectItems(t *testing.T) {
issue := Issue{
ProjectItems: ProjectItems{
Nodes: []*ProjectV2Item{
{
ID: "PVTI_lADOB-vozM4AVk16zgK6U50",
Project: struct {
ID string `json:"id"`
Title string `json:"title"`
}{
ID: "PVT_kwDOB-vozM4AVk16",
Title: "Test Project",
},
Status: Status{
StatusFragment: struct {
OptionID string `json:"optionId"`
Name string `json:"name"`
}{
OptionID: "47fc9ee4",
Name: "In Progress",
},
},
},
},
},
}
expectedExportedJSON := heredoc.Doc(`
{
"projectItems": [
{
"status": {
"optionId": "47fc9ee4",
"name": "In Progress"
},
"title": "Test Project"
}
]
}
`)
exported := issue.ExportData([]string{"projectItems"})
buf := bytes.Buffer{}
enc := json.NewEncoder(&buf)
enc.SetIndent("", "\t")
require.NoError(t, enc.Encode(exported))
require.Equal(t, expectedExportedJSON, buf.String())
}
func TestPRExportProjectItems(t *testing.T) {
pr := PullRequest{
ProjectItems: ProjectItems{
Nodes: []*ProjectV2Item{
{
ID: "PVTI_lADOB-vozM4AVk16zgK6U50",
Project: struct {
ID string `json:"id"`
Title string `json:"title"`
}{
ID: "PVT_kwDOB-vozM4AVk16",
Title: "Test Project",
},
Status: Status{
StatusFragment: struct {
OptionID string `json:"optionId"`
Name string `json:"name"`
}{
OptionID: "47fc9ee4",
Name: "In Progress",
},
},
},
},
},
}
expectedExportedJSON := heredoc.Doc(`
{
"projectItems": [
{
"status": {
"optionId": "47fc9ee4",
"name": "In Progress"
},
"title": "Test Project"
}
]
}
`)
exported := pr.ExportData([]string{"projectItems"})
buf := bytes.Buffer{}
enc := json.NewEncoder(&buf)
enc.SetIndent("", "\t")
require.NoError(t, enc.Encode(exported))
require.Equal(t, expectedExportedJSON, buf.String())
}

12
api/queries_issue.go
View file

@ -106,10 +106,14 @@ type ProjectV2Item struct {
ID string `json:"id"`
Title string `json:"title"`
}
Status struct {
OptionID string `json:"optionId" graphql:"... on ProjectV2ItemFieldSingleSelectValue{optionId}"`
Name string `json:"name" graphql:"... on ProjectV2ItemFieldSingleSelectValue{name}"`
} `graphql:"status:fieldValueByName(name: \"Status\")"`
Status Status `graphql:"status:fieldValueByName(name: \"Status\")"`
}
type Status struct {
StatusFragment struct {
OptionID string `json:"optionId"`
Name string `json:"name"`
} `graphql:"... on ProjectV2ItemFieldSingleSelectValue"`
}
func (p ProjectCards) ProjectNames() []string {

14
api/queries_projects_v2_test.go
View file

@ -236,12 +236,14 @@ func TestProjectsV2ItemsForPullRequest(t *testing.T) {
ID: "PVT_kwDOB-vozM4AVk16",
Title: "Test Project",
},
Status: struct {
OptionID string `json:"optionId" graphql:"... on ProjectV2ItemFieldSingleSelectValue{optionId}"`
Name string `json:"name" graphql:"... on ProjectV2ItemFieldSingleSelectValue{name}"`
}{
OptionID: "47fc9ee4",
Name: "In Progress",
Status: Status{
StatusFragment: struct {
OptionID string `json:"optionId"`
Name string `json:"name"`
}{
OptionID: "47fc9ee4",
Name: "In Progress",
},
},
},
},