Skip to content

Commit 7d41c15

Browse files
katbytekatbyte
committed
switch to new project functions
1 parent 9e0f62a commit 7d41c15

File tree

3 files changed

+22
-93
lines changed

3 files changed

+22
-93
lines changed

‎cli/cmds_issues.go

+10-14
Original file line numberDiff line numberDiff line change
@@ -18,29 +18,25 @@ func CmdIssues(_ *cobra.Command, _ []string) error {
1818
p := gh.NewProject(f.ProjectOwner, f.ProjectNumber, f.Token)
1919

2020
c.Printf("Looking up project details for <green>%s</>/<lightGreen>%d</>...\n", f.ProjectOwner, f.ProjectNumber)
21-
project, err := p.GetProjectDetailsOld()
21+
err := p.LoadDetails()
2222
if err != nil {
2323
c.Printf("\n\n <red>ERROR!!</> %s", err)
2424
return nil
2525
}
26-
pid := project.Data.Organization.ProjectV2.ID
27-
c.Printf(" ID: <magenta>%s</>\n", pid)
26+
c.Printf(" ID: <magenta>%s</>\n", p.ID)
2827

29-
statuses := map[string]string{}
30-
fields := map[string]string{}
31-
32-
for _, f := range project.Data.Organization.ProjectV2.Fields.Nodes {
33-
fields[f.Name] = f.ID
28+
// todo we can probably remove this? its just for printing the fields
29+
for _, f := range p.Fields {
3430
c.Printf(" <lightBlue>%s</> <> <lightCyan>%s</>\n", f.Name, f.ID)
3531

3632
if f.Name == "Status" {
3733
for _, s := range f.Options {
38-
statuses[s.Name] = s.ID
3934
c.Printf(" <blue>%s</> <> <cyan>%s</>\n", s.Name, s.ID)
4035
}
4136
}
4237
}
4338
fmt.Println()
39+
4440
for _, repo := range f.Repos {
4541
r, err := gh.NewRepo(repo, f.Token)
4642
if err != nil {
@@ -107,7 +103,7 @@ func CmdIssues(_ *cobra.Command, _ []string) error {
107103
c.Printf(" open %d days\n", daysSinceCreation)
108104

109105
c.Printf(" syncing (<cyan>%s</>) to project.. ", issueNode)
110-
iid, err := p.AddItemOld(pid, issueNode)
106+
iid, err := p.AddItem(issueNode)
111107
if err != nil {
112108
c.Printf("\n\n <red>ERROR!!</> %s", err)
113109
continue
@@ -161,13 +157,13 @@ func CmdIssues(_ *cobra.Command, _ []string) error {
161157
`
162158

163159
p := [][]string{
164-
{"-f", "project=" + pid},
160+
{"-f", "project=" + p.ID},
165161
{"-f", "item=" + *iid},
166-
{"-f", "user_field=" + fields["User"]},
162+
{"-f", "user_field=" + p.FieldIDs["User"]},
167163
{"-f", fmt.Sprintf("user_value=%s", issue.User.GetLogin())},
168-
{"-f", "issue_field=" + fields["Issue#"]},
164+
{"-f", "issue_field=" + p.FieldIDs["Issue#"]},
169165
{"-f", fmt.Sprintf("issue_value=%d", *issue.Number)},
170-
{"-f", "daysSinceCreation_field=" + fields["Age"]},
166+
{"-f", "daysSinceCreation_field=" + p.FieldIDs["Age"]},
171167
{"-F", fmt.Sprintf("daysSinceCreation_value=%d", daysSinceCreation)},
172168
}
173169

‎cli/cmds_prs.go

+12-18
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,19 @@ func CmdPRs(_ *cobra.Command, _ []string) error {
1919
p := gh.NewProject(f.ProjectOwner, f.ProjectNumber, f.Token)
2020

2121
c.Printf("Looking up project details for <green>%s</>/<lightGreen>%d</>...\n", f.ProjectOwner, f.ProjectNumber)
22-
project, err := p.GetProjectDetailsOld()
22+
err := p.LoadDetails()
2323
if err != nil {
2424
c.Printf("\n\n <red>ERROR!!</> %s", err)
2525
return nil
2626
}
27-
pid := project.Data.Organization.ProjectV2.ID
28-
c.Printf(" ID: <magenta>%s</>\n", pid)
27+
c.Printf(" ID: <magenta>%s</>\n", p.ID)
2928

30-
statuses := map[string]string{}
31-
fields := map[string]string{}
32-
33-
// TODO write GetProjectFields
34-
for _, f := range project.Data.Organization.ProjectV2.Fields.Nodes {
35-
fields[f.Name] = f.ID
29+
// todo we can probably remove this? its just for printing the fields (we do this multiple times so maybe just a helper)
30+
for _, f := range p.Fields {
3631
c.Printf(" <lightBlue>%s</> <> <lightCyan>%s</>\n", f.Name, f.ID)
3732

3833
if f.Name == "Status" {
3934
for _, s := range f.Options {
40-
statuses[s.Name] = s.ID
4135
c.Printf(" <blue>%s</> <> <cyan>%s</>\n", s.Name, s.ID)
4236
}
4337
}
@@ -74,7 +68,7 @@ func CmdPRs(_ *cobra.Command, _ []string) error {
7468

7569
// flat := strings.Replace(strings.Replace(q, "\n", " ", -1), "\t", "", -1)
7670
c.Printf("Syncing pr <lightCyan>%d</> (<cyan>%s</>) to project.. ", pr.GetNumber(), prNode)
77-
iid, err := p.AddItemOld(pid, prNode)
71+
iid, err := p.AddItem(prNode)
7872
if err != nil {
7973
c.Printf("\n\n <red>ERROR!!</> %s", err)
8074
continue
@@ -159,7 +153,7 @@ func CmdPRs(_ *cobra.Command, _ []string) error {
159153
}
160154
}
161155

162-
status = statuses[statusText]
156+
status = p.StatusIDs[statusText]
163157
byStatus[statusText] = append(byStatus[statusText], pr.GetNumber())
164158

165159
c.Printf(" open %d days, waiting %d days\n", daysOpen, daysWaiting)
@@ -237,17 +231,17 @@ func CmdPRs(_ *cobra.Command, _ []string) error {
237231
`
238232

239233
p := [][]string{
240-
{"-f", "project=" + pid},
234+
{"-f", "project=" + p.ID},
241235
{"-f", "item=" + *iid},
242-
{"-f", "status_field=" + fields["Status"]},
236+
{"-f", "status_field=" + p.FieldIDs["Status"]},
243237
{"-f", "status_value=" + status},
244-
{"-f", "pr_field=" + fields["PR#"]},
238+
{"-f", "pr_field=" + p.FieldIDs["PR#"]},
245239
{"-f", fmt.Sprintf("pr_value=%d", *pr.Number)}, // todo string + value
246-
{"-f", "user_field=" + fields["User"]},
240+
{"-f", "user_field=" + p.FieldIDs["User"]},
247241
{"-f", fmt.Sprintf("user_value=%s", pr.User.GetLogin())},
248-
{"-f", "daysOpen_field=" + fields["Open Days"]},
242+
{"-f", "daysOpen_field=" + p.FieldIDs["Open Days"]},
249243
{"-F", fmt.Sprintf("daysOpen_value=%d", daysOpen)},
250-
{"-f", "daysWait_field=" + fields["Waiting Days"]},
244+
{"-f", "daysWait_field=" + p.FieldIDs["Waiting Days"]},
251245
{"-F", fmt.Sprintf("daysWait_value=%d", daysWaiting)},
252246
}
253247

‎lib/gh/project.go

-61
Original file line numberDiff line numberDiff line change
@@ -69,47 +69,6 @@ type ProjectDetailsResult struct {
6969
} `json:"data"`
7070
}
7171

72-
func (p *Project) GetProjectDetailsOld() (*ProjectDetailsResult, error) {
73-
// nolint: misspell
74-
q := `query=
75-
query($org: String!, $number: Int!) {
76-
organization(login: $org){
77-
projectV2(number: $number) {
78-
id
79-
fields(first:40) {
80-
nodes {
81-
... on ProjectV2Field {
82-
id
83-
name
84-
}
85-
... on ProjectV2SingleSelectField {
86-
id
87-
name
88-
options {
89-
id
90-
name
91-
}
92-
}
93-
}
94-
}
95-
}
96-
}
97-
}
98-
`
99-
100-
params := [][]string{
101-
{"-f", "org=" + p.Owner},
102-
{"-F", "number=" + strconv.Itoa(p.Number)},
103-
}
104-
105-
var project ProjectDetailsResult
106-
if err := p.GraphQLQueryUnmarshal(q, params, &project); err != nil {
107-
return nil, err
108-
}
109-
110-
return &project, nil
111-
}
112-
11372
func (p *Project) LoadDetails() error {
11473
// nolint: misspell
11574
q := `query=
@@ -298,26 +257,6 @@ func (p *Project) SetItemStatus(itemId, status string) error {
298257
return err
299258
}
300259

301-
func (t Token) AddItemOld(projectID, nodeID string) (*string, error) {
302-
q := `query=
303-
mutation($project:ID!, $pr:ID!) {
304-
addProjectV2ItemById(input: {projectId: $project, contentId: $pr}) {
305-
item {
306-
id
307-
}
308-
}
309-
}
310-
`
311-
312-
p := [][]string{
313-
{"-f", "project=" + projectID},
314-
{"-f", "pr=" + nodeID},
315-
{"--jq", ".data.addProjectV2ItemById.item.id"},
316-
}
317-
318-
return t.GraphQLQuery(q, p)
319-
}
320-
321260
// for not we hard code the project fields we want (dueDate and type)
322261
// TODO in the future we can make this configurable / get all of them
323262
type ProjectItemsResult struct {

0 commit comments

Comments
 (0)