Add milestone filter

eddumelendez · eddumelendez · commit 9aebb66a3c00 · 2020-06-13T20:53:41.000-05:00
diff --git a/api/queries_issue.go b/api/queries_issue.go
@@ -198,7 +198,7 @@ func IssueStatus(client *Client, repo ghrepo.Interface, currentUsername string)
 	return &payload, nil
 }
 
-func IssueList(client *Client, repo ghrepo.Interface, state string, labels []string, assigneeString string, limit int, authorString string, mentionedString string) (*IssuesAndTotalCount, error) {
+func IssueList(client *Client, repo ghrepo.Interface, state string, labels []string, assigneeString string, limit int, authorString string, mentionedString string, milestoneString string) (*IssuesAndTotalCount, error) {
 	var states []string
 	switch state {
 	case "open", "":
@@ -215,7 +215,7 @@ func IssueList(client *Client, repo ghrepo.Interface, state string, labels []str
 	query($owner: String!, $repo: String!, $limit: Int, $endCursor: String, $states: [IssueState!] = OPEN, $labels: [String!], $assignee: String, $author: String) {
 		repository(owner: $owner, name: $repo) {
 			hasIssuesEnabled
-			issues(first: $limit, after: $endCursor, orderBy: {field: CREATED_AT, direction: DESC}, states: $states, labels: $labels, filterBy: {assignee: $assignee, createdBy: $author, mentioned: $mentioned}) {
+			issues(first: $limit, after: $endCursor, orderBy: {field: CREATED_AT, direction: DESC}, states: $states, labels: $labels, filterBy: {assignee: $assignee, createdBy: $author, mentioned: $mentioned, milestone: $milestone}) {
 				totalCount
 				nodes {
 					...issue
@@ -246,6 +246,9 @@ func IssueList(client *Client, repo ghrepo.Interface, state string, labels []str
 	if mentionedString != "" {
 		variables["mentioned"] = mentionedString
 	}
+	if milestoneString != "" {
+		variables["milestone"] = milestoneString
+	}
 
 	var response struct {
 		Repository struct {
diff --git a/api/queries_issue_test.go b/api/queries_issue_test.go
@@ -40,7 +40,7 @@ func TestIssueList(t *testing.T) {
 	`))
 
 	repo, _ := ghrepo.FromFullName("OWNER/REPO")
-	_, err := IssueList(client, repo, "open", []string{}, "", 251, "", "")
+	_, err := IssueList(client, repo, "open", []string{}, "", 251, "", "", "")
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
diff --git a/command/issue.go b/command/issue.go
@@ -42,6 +42,7 @@ func init() {
 	issueListCmd.Flags().IntP("limit", "L", 30, "Maximum number of issues to fetch")
 	issueListCmd.Flags().StringP("author", "A", "", "Filter by author")
 	issueListCmd.Flags().StringP("mentioned", "", "", "Filter by mention")
+	issueListCmd.Flags().StringP("milestone", "", "", "Filter by milestone")
 
 	issueCmd.AddCommand(issueViewCmd)
 	issueViewCmd.Flags().BoolP("web", "w", false, "Open an issue in the browser")
@@ -147,7 +148,12 @@ func issueList(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	listResult, err := api.IssueList(apiClient, baseRepo, state, labels, assignee, limit, author, mentioned)
+	milestone, err := cmd.Flags().GetString("milestone")
+	if err != nil {
+		return err
+	}
+
+	listResult, err := api.IssueList(apiClient, baseRepo, state, labels, assignee, limit, author, mentioned, milestone)
 	if err != nil {
 		return err
 	}
diff --git a/command/issue_test.go b/command/issue_test.go
@@ -153,7 +153,7 @@ func TestIssueList_withFlags(t *testing.T) {
 	} } }
 	`))
 
-	output, err := RunCommand("issue list -a probablyCher -l web,bug -s open -A foo --mentioned me")
+	output, err := RunCommand("issue list -a probablyCher -l web,bug -s open -A foo --mentioned me --milestone 1.x")
 	if err != nil {
 		t.Errorf("error running command `issue list`: %v", err)
 	}
@@ -172,6 +172,7 @@ No issues match your search in OWNER/REPO
 			States     []string
 			Author     string
 			Mentioned  string
+			Milestone  string
 		}
 	}{}
 	_ = json.Unmarshal(bodyBytes, &reqBody)
@@ -181,6 +182,7 @@ No issues match your search in OWNER/REPO
 	eq(t, reqBody.Variables.States, []string{"OPEN"})
 	eq(t, reqBody.Variables.Author, "foo")
 	eq(t, reqBody.Variables.Mentioned, "me")
+	eq(t, reqBody.Variables.Milestone, "1.x")
 }
 
 func TestIssueList_withInvalidLimitFlag(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ func TestIssueList(t *testing.T) {`
`40`	`40`	`))
`41`	`41`
`42`	`42`	`repo, _ := ghrepo.FromFullName("OWNER/REPO")`
`43`		`- _, err := IssueList(client, repo, "open", []string{}, "", 251, "", "")`
	`43`	`+ _, err := IssueList(client, repo, "open", []string{}, "", 251, "", "", "")`
`44`	`44`	`if err != nil {`
`45`	`45`	`t.Fatalf("unexpected error: %v", err)`
`46`	`46`	`}`