Merge pull request jenkins-x#107 from abayer/more-pr-list-options

feat: Add labels and update/create times to GitLab PR listing

scm/const.go

@@ -237,3 +237,7 @@ func (d Driver) String() (s string) {
 		return "unknown"
 	}
 }
+
+// SearchTimeFormat is a time.Time format string for ISO8601 which is the
+// format that GitHub requires for times specified as part of a search query.
+const SearchTimeFormat = "2006-01-02T15:04:05Z"

scm/driver/gitlab/integration/pr_test.go

@@ -7,6 +7,7 @@ package integration
 import (
 	"context"
 	"testing"
+	"time"
 
 	"github.com/jenkins-x/go-scm/scm"
 )
@@ -28,9 +29,11 @@ func testPullRequests(client *scm.Client) func(t *testing.T) {
 func testPullRequestList(client *scm.Client) func(t *testing.T) {
 	return func(t *testing.T) {
 		t.Parallel()
+		updatedAfter, _ := time.Parse(scm.SearchTimeFormat, "2015-12-18T17:30:22.522Z")
 		opts := scm.PullRequestListOptions{
-			Open:   true,
-			Closed: true,
+			Open:         true,
+			Closed:       true,
+			UpdatedAfter: &updatedAfter,
 		}
 		result, _, err := client.PullRequests.List(context.Background(), "gitlab-org/testme", opts)
 		if err != nil {

scm/driver/gitlab/pr_test.go

@@ -9,6 +9,7 @@ import (
 	"encoding/json"
 	"io/ioutil"
 	"testing"
+	"time"
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/h2non/gock"
@@ -53,19 +54,29 @@ func TestPullFind(t *testing.T) {
 func TestPullList(t *testing.T) {
 	defer gock.Off()
 
+	updatedAfter, _ := time.Parse(scm.SearchTimeFormat, "2015-12-18T17:30:22.522Z")
 	gock.New("https://gitlab.com").
 		Get("/api/v4/projects/diaspora/diaspora/merge_requests").
+		MatchParam("labels", "Community contribution,Manage").
 		MatchParam("page", "1").
 		MatchParam("per_page", "30").
 		MatchParam("state", "all").
+		MatchParam("updated_after", "2015-12-18T17:30:22Z").
 		Reply(200).
 		Type("application/json").
 		SetHeaders(mockHeaders).
 		SetHeaders(mockPageHeaders).
 		File("testdata/merges.json")
 
 	client := NewDefault()
-	got, res, err := client.PullRequests.List(context.Background(), "diaspora/diaspora", scm.PullRequestListOptions{Page: 1, Size: 30, Open: true, Closed: true})
+	got, res, err := client.PullRequests.List(context.Background(), "diaspora/diaspora", scm.PullRequestListOptions{
+		Page:         1,
+		Size:         30,
+		Open:         true,
+		Closed:       true,
+		Labels:       []string{"Community contribution", "Manage"},
+		UpdatedAfter: &updatedAfter,
+	})
 	if err != nil {
 		t.Error(err)
 		return

scm/driver/gitlab/testdata/merges.json

@@ -23,7 +23,10 @@
         "assignee": null,
         "source_project_id": 32732,
         "target_project_id": 32732,
-        "labels": [],
+        "labels": [
+            "Community contribution",
+            "Manage"
+        ],
         "work_in_progress": false,
         "milestone": null,
         "merge_when_pipeline_succeeds": false,

scm/driver/gitlab/testdata/merges.json.golden

@@ -7,6 +7,7 @@
         "Ref": "refs/merge-requests/1/head",
         "Source": "fix",
         "Target": "master",
+        "Labels": [{"Name":"Community contribution"},{"Name":"Manage"}],
         "Link": "https://gitlab.com/gitlab-org/testme/merge_requests/1",
         "Closed": true,
         "Merged": false,

scm/driver/gitlab/util.go

@@ -86,5 +86,20 @@ func encodePullRequestListOptions(opts scm.PullRequestListOptions) string {
 	} else if opts.Open {
 		params.Set("state", "opened")
 	}
+	if len(opts.Labels) > 0 {
+		params.Set("labels", strings.Join(opts.Labels, ","))
+	}
+	if opts.CreatedAfter != nil {
+		params.Set("created_after", opts.CreatedAfter.Format(scm.SearchTimeFormat))
+	}
+	if opts.CreatedBefore != nil {
+		params.Set("created_before", opts.CreatedBefore.Format(scm.SearchTimeFormat))
+	}
+	if opts.UpdatedAfter != nil {
+		params.Set("updated_after", opts.UpdatedAfter.Format(scm.SearchTimeFormat))
+	}
+	if opts.UpdatedBefore != nil {
+		params.Set("updated_before", opts.UpdatedBefore.Format(scm.SearchTimeFormat))
+	}
 	return params.Encode()
 }

scm/pr.go

@@ -62,10 +62,15 @@ type (
 	// PullRequestListOptions provides options for querying
 	// a list of repository merge requests.
 	PullRequestListOptions struct {
-		Page   int
-		Size   int
-		Open   bool
-		Closed bool
+		Page          int
+		Size          int
+		Open          bool
+		Closed        bool
+		Labels        []string
+		UpdatedAfter  *time.Time
+		UpdatedBefore *time.Time
+		CreatedAfter  *time.Time
+		CreatedBefore *time.Time
 	}
 
 	// PullRequestBranch contains information about a particular branch in a PR.