feat: use -approve flag to included approved PRs in output

filter/filter.go

@@ -60,6 +60,7 @@ func WithIsClosed() FilterOpt {
 	}
 }
 
+// WithReviewRequired will add the "review:required" flag to the search string. It logically does the opposite of WithIncludeApproved
 func WithReviewRequired(required bool) FilterOpt {
 	return func() (string, error) {
 		if required {
@@ -70,6 +71,17 @@ func WithReviewRequired(required bool) FilterOpt {
 	}
 }
 
+// WithIncludeApproved will NOT add the "review:required" flag to the search string. It logically does the opposite of WithReviewRequired
+func WithIncludeApproved(approved bool) FilterOpt {
+	return func() (string, error) {
+		if approved {
+			return "", nil
+		} else {
+			return "review:required", nil
+		}
+	}
+}
+
 func WithIsDraft() FilterOpt {
 	return func() (string, error) {
 		return "draft:true", nil

filter/filter_test.go

@@ -24,6 +24,7 @@ func TestOptions(t *testing.T) {
 		{WithIsNotDraft(), "draft:false", ""},
 		{WithIsDraft(), "draft:true", ""},
 		{WithReviewRequired(true), "review:required", ""},
+		{WithIncludeApproved(false), "review:required", ""},
 	}
 
 	for _, tc := range tcs {

main.go

@@ -62,7 +62,8 @@ func main() {
 func run() error {
 	v := flag.Bool("v", false, "prints version")
 	jsonOutput := flag.Bool("json", false, "print output in JSON format")
-	all := flag.Bool("all", false, "include PRs ready to merge")
+	all := flag.Bool("all", false, "include PRs ready to merge. DEPRECATED: use -approved")
+	approved := flag.Bool("approved", false, "include PRs ready to merge")
 	searchWholeTeam := flag.Bool("team", false, "should look up all members of the team. defaults to just calling user")
 
 	flag.Parse()
@@ -93,7 +94,9 @@ func run() error {
 		members = append(members, user)
 	}
 
-	queryString, err := generateQueryString(conf.GithubOrg, members, filter.WithReviewRequired(!*all)) //"view all" is "NOT requiring review", therefore have to negate the "all" flag
+	incApproved := *all || *approved
+
+	queryString, err := generateQueryString(conf.GithubOrg, members, filter.WithIncludeApproved(incApproved))
 	if err != nil {
 		return err
 	}

main_test.go

@@ -11,24 +11,34 @@ import (
 
 func TestGenerateQueryString(t *testing.T) {
 	tcs := []struct {
-		Org      string
-		Users    []string
-		Expected []string
+		Org         string
+		Users       []string
+		Expected    []string
+		incApproved bool
 	}{
 		{
 			"TestOrg",
 			[]string{},
 			[]string{"org:TestOrg", "is:open", "review:required", "draft:false", "type:pr"},
+			false,
 		},
 		{
 			"SecondOrg",
 			[]string{"cuotos"},
 			[]string{"org:SecondOrg", "is:open", "review:required", "draft:false", "author:cuotos", "type:pr"},
+			false,
 		},
 		{
 			"AnotherOrg",
 			[]string{"cuotos", "danyo"},
 			[]string{"org:AnotherOrg", "is:open", "review:required", "draft:false", "type:pr", "author:cuotos", "author:danyo"},
+			false,
+		},
+		{
+			"TestOrg",
+			[]string{},
+			[]string{"org:TestOrg", "is:open", "draft:false", "type:pr"},
+			true,
 		},
 	}
 
@@ -44,7 +54,7 @@ func TestGenerateQueryString(t *testing.T) {
 			members = append(members, &github.User{Login: &userName})
 		}
 
-		actual, _ := generateQueryString(tc.Org, members, filter.WithReviewRequired(true))
+		actual, _ := generateQueryString(tc.Org, members, filter.WithReviewRequired(!tc.incApproved)) //"inc approved" is "NOT requiring review", therefore have to negate the "approved" flag
 		actualFields := strings.Fields(actual)
 		assert.ElementsMatch(t, tc.Expected, actualFields)
 	}