Skip to content

Commit 13d3225

Browse files
katbytekatbyte
committed
add support to sync based on assignee
2 parents 8d82058 + 2d3f193 commit 13d3225

File tree

3 files changed

+76
-35
lines changed

3 files changed

+76
-35
lines changed

‎cli/cmds.go

+4
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,15 @@ func Make(cmdName string) (*cobra.Command, error) {
4242
fmt.Println(cmdName + " v" + version.Version + "-" + version.GitCommit)
4343
},
4444
})
45+
4546
root.AddCommand(&cobra.Command{
4647
Use: "issues",
4748
Args: cobra.NoArgs,
4849
SilenceErrors: true,
4950
PreRunE: ValidateParams([]string{"token", "repo", "project-owner", "project-number"}),
5051
RunE: CmdIssues,
5152
})
53+
5254
root.AddCommand(&cobra.Command{
5355
Use: "prs",
5456
Args: cobra.NoArgs,
@@ -57,6 +59,8 @@ func Make(cmdName string) (*cobra.Command, error) {
5759
RunE: CmdPRs,
5860
})
5961

62+
// TODO add CLEAR command to reset a project?
63+
6064
if err := configureFlags(root); err != nil {
6165
return nil, fmt.Errorf("unable to configure flags: %w", err)
6266
}

‎cli/cmds_prs.go

+60-34
Original file line numberDiff line numberDiff line change
@@ -61,35 +61,8 @@ func CmdPRs(_ *cobra.Command, _ []string) error {
6161
}
6262
c.Printf(" found <yellow>%d</>\n", len(*prs))
6363

64-
// todo copy over logic from "filters" used by issues command to replace the below logic
65-
if len(f.Filters.Authors) > 0 {
66-
c.Printf(" filtering on: <yellow>%s:</>\n", f.Filters.Authors)
67-
68-
// map of users
69-
msUserMap := map[string]bool{}
70-
for _, u := range f.Filters.Authors {
71-
msUserMap[u] = true
72-
}
73-
74-
var filteredPRs []github.PullRequest
75-
for _, pr := range *prs {
76-
if msUserMap[pr.User.GetLogin()] {
77-
filteredPRs = append(filteredPRs, pr)
78-
}
79-
}
80-
81-
sort.Slice(filteredPRs, func(i, j int) bool {
82-
return filteredPRs[i].GetNumber() < filteredPRs[j].GetNumber()
83-
})
84-
85-
c.Printf(" Found <lightBlue>%d</> filtered PRs: ", len(filteredPRs))
86-
for _, pr := range filteredPRs {
87-
c.Printf("<white>%d</>,", pr.GetNumber())
88-
}
89-
c.Printf("\n\n")
90-
91-
prs = &filteredPRs
92-
}
64+
//filter them
65+
prs = FilterByFlags(f, prs)
9366

9467
byStatus := map[string][]int{}
9568

@@ -278,10 +251,12 @@ func CmdPRs(_ *cobra.Command, _ []string) error {
278251
{"-F", fmt.Sprintf("daysWait_value=%d", daysWaiting)},
279252
}
280253

281-
out, err := r.GraphQLQuery(q, p)
282-
if err != nil {
283-
c.Printf("\n\n <red>ERROR!!</> %s\n%s", err, *out)
284-
return nil
254+
if !f.DryRun {
255+
out, err := r.GraphQLQuery(q, p)
256+
if err != nil {
257+
c.Printf("\n\n <red>ERROR!!</> %s\n%s", err, *out)
258+
return nil
259+
}
285260
}
286261

287262
c.Printf("\n")
@@ -295,8 +270,59 @@ func CmdPRs(_ *cobra.Command, _ []string) error {
295270
}
296271
c.Printf("\n")
297272

298-
c.Printf("Total of %d waiting for on average %d days\n", totalWaiting, totalDaysWaiting/totalWaiting)
299273
}
300274

301275
return nil
302276
}
277+
278+
func FilterByFlags(f FlagData, prs *[]github.PullRequest) *[]github.PullRequest {
279+
if len(f.Filters.Authors) == 0 && len(f.Filters.Assignees) == 0 {
280+
return prs
281+
}
282+
283+
c.Printf(" filtering by authors: <yellow>%s:</>\n", f.Filters.Authors)
284+
c.Printf(" filtering by assignees: <yellow>%s:</>\n", f.Filters.Assignees)
285+
286+
// map of users
287+
authorMap := map[string]bool{}
288+
for _, u := range f.Filters.Authors {
289+
authorMap[u] = true
290+
}
291+
292+
assigneeUserMap := map[string]bool{}
293+
for _, u := range f.Filters.Assignees {
294+
assigneeUserMap[u] = true
295+
}
296+
297+
var filteredPRs []github.PullRequest
298+
for _, pr := range *prs {
299+
add := false
300+
301+
if authorMap[pr.User.GetLogin()] {
302+
add = true
303+
}
304+
305+
for _, a := range pr.Assignees {
306+
if assigneeUserMap[a.GetLogin()] {
307+
filteredPRs = append(filteredPRs, pr)
308+
break
309+
}
310+
}
311+
312+
if add {
313+
filteredPRs = append(filteredPRs, pr)
314+
}
315+
}
316+
317+
sort.Slice(filteredPRs, func(i, j int) bool {
318+
return filteredPRs[i].GetNumber() < filteredPRs[j].GetNumber()
319+
})
320+
321+
c.Printf(" Found <lightBlue>%d</> filtered PRs: ", len(filteredPRs))
322+
for _, pr := range filteredPRs {
323+
c.Printf("<white>%d</>,", pr.GetNumber())
324+
}
325+
c.Printf("\n\n")
326+
327+
return &filteredPRs
328+
}

‎cli/flags.go

+12-1
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,13 @@ type FlagData struct {
1414
ProjectOwner string
1515
ProjectNumber int
1616
IncludeClosed bool
17+
DryRun bool
1718
Filters Filters
1819
}
1920

2021
type Filters struct {
2122
Authors []string
23+
Assignees []string
2224
LabelsOr []string
2325
LabelsAnd []string
2426
}
@@ -33,8 +35,10 @@ func configureFlags(root *cobra.Command) error {
3335
pflags.IntVarP(&flags.ProjectNumber, "project-number", "p", 0, "github project number (GITHUB_PROJECT_NUMBER)")
3436
pflags.BoolVarP(&flags.IncludeClosed, "include-closed", "c", false, "include closed prs/issues")
3537
pflags.StringSliceVarP(&flags.Filters.Authors, "authors", "a", []string{}, "only sync prs by these authors. ie 'katbyte,author2,author3'")
38+
pflags.StringSliceVarP(&flags.Filters.Assignees, "assignees", "", []string{}, "sync prs assigned to these users. ie 'katbyte,assignee2,assignee3'")
3639
pflags.StringSliceVarP(&flags.Filters.LabelsOr, "labels-or", "l", []string{}, "filter that match any label conditions. ie 'label1,label2,-not-this-label'")
3740
pflags.StringSliceVarP(&flags.Filters.LabelsAnd, "labels-and", "", []string{}, "filter that match all label conditions. ie 'label1,label2,-not-this-label'")
41+
pflags.BoolVarP(&flags.DryRun, "dry-run", "d", false, "dry run, don't actually add issues/prs to project")
3842

3943
// binding map for viper/pflag -> env
4044
m := map[string]string{
@@ -44,8 +48,10 @@ func configureFlags(root *cobra.Command) error {
4448
"project-number": "GITHUB_PROJECT_NUMBER",
4549
"include-closed": "GITHUB_INCLUDE_CLOSED",
4650
"authors": "GITHUB_AUTHORS",
51+
"assignees": "GITHUB_ASSIGNEES",
4752
"labels-or": "GITHUB_LABELS_OR",
4853
"labels-and": "GITHUB_LABELS_AND",
54+
"dry-run": "",
4955
}
5056

5157
for name, env := range m {
@@ -74,6 +80,10 @@ func GetFlags() FlagData {
7480
if len(repos) > 0 {
7581
repos = strings.Split(repos[0], ",")
7682
}
83+
assignees := viper.GetStringSlice("assignees")
84+
if len(assignees) > 0 {
85+
assignees = strings.Split(assignees[0], ",")
86+
}
7787

7888
// there has to be an easier way....
7989
return FlagData{
@@ -82,11 +92,12 @@ func GetFlags() FlagData {
8292
ProjectNumber: viper.GetInt("project-number"),
8393
ProjectOwner: viper.GetString("project-owner"),
8494
IncludeClosed: viper.GetBool("include-closed"),
95+
DryRun: viper.GetBool("dry-run"),
8596
Filters: Filters{
8697
Authors: authors,
98+
Assignees: assignees,
8799
LabelsOr: viper.GetStringSlice("labels-or"),
88100
LabelsAnd: viper.GetStringSlice("labels-and"),
89101
},
90102
}
91-
92103
}

0 commit comments

Comments
 (0)