Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Close #26: Filter PRs by updated date instead of commit date #1

Merged
merged 1 commit into from
Dec 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions check.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ func Check(request CheckRequest, manager Github) (CheckResponse, error) {
filterStates = request.Source.States
}

pulls, err := manager.ListPullRequests(filterStates)
pulls, err := manager.ListPullRequests(filterStates, request.Version.CommittedDate)
if err != nil {
return nil, fmt.Errorf("failed to get last commits: %s", err)
}
Expand All @@ -44,11 +44,6 @@ Loop:
continue
}

// Filter out commits that are too old.
if !p.UpdatedDate().Time.After(request.Version.CommittedDate) {
continue
}

// Filter out pull request if it does not contain at least one of the desired labels
if len(request.Source.Labels) > 0 {
labelFound := false
Expand Down
53 changes: 38 additions & 15 deletions check_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func TestCheck(t *testing.T) {
},

{
description: "check returns the previous version when its still latest",
description: "check returns all open PRs if there is a previous",
source: resource.Source{
Repository: "itsdalmo/test-repository",
AccessToken: "oauthtoken",
Expand All @@ -59,20 +59,13 @@ func TestCheck(t *testing.T) {
pullRequests: testPullRequests,
files: [][]string{},
expected: resource.CheckResponse{
resource.NewVersion(testPullRequests[1]),
},
},

{
description: "check returns all new versions since the last",
source: resource.Source{
Repository: "itsdalmo/test-repository",
AccessToken: "oauthtoken",
},
version: resource.NewVersion(testPullRequests[3]),
pullRequests: testPullRequests,
files: [][]string{},
expected: resource.CheckResponse{
resource.NewVersion(testPullRequests[11]),
resource.NewVersion(testPullRequests[8]),
resource.NewVersion(testPullRequests[7]),
resource.NewVersion(testPullRequests[6]),
resource.NewVersion(testPullRequests[5]),
resource.NewVersion(testPullRequests[4]),
resource.NewVersion(testPullRequests[3]),
resource.NewVersion(testPullRequests[2]),
resource.NewVersion(testPullRequests[1]),
},
Expand All @@ -93,6 +86,7 @@ func TestCheck(t *testing.T) {
{"terraform/modules/variables.tf", "travis.yml"},
},
expected: resource.CheckResponse{
resource.NewVersion(testPullRequests[3]),
resource.NewVersion(testPullRequests[2]),
},
},
Expand All @@ -112,6 +106,7 @@ func TestCheck(t *testing.T) {
{"terraform/modules/variables.tf", "travis.yml"},
},
expected: resource.CheckResponse{
resource.NewVersion(testPullRequests[3]),
resource.NewVersion(testPullRequests[2]),
},
},
Expand All @@ -126,6 +121,15 @@ func TestCheck(t *testing.T) {
version: resource.NewVersion(testPullRequests[1]),
pullRequests: testPullRequests,
expected: resource.CheckResponse{
resource.NewVersion(testPullRequests[11]),
resource.NewVersion(testPullRequests[8]),
resource.NewVersion(testPullRequests[7]),
resource.NewVersion(testPullRequests[6]),
resource.NewVersion(testPullRequests[5]),
resource.NewVersion(testPullRequests[4]),
resource.NewVersion(testPullRequests[3]),
resource.NewVersion(testPullRequests[2]),
resource.NewVersion(testPullRequests[1]),
resource.NewVersion(testPullRequests[0]),
},
},
Expand All @@ -140,6 +144,13 @@ func TestCheck(t *testing.T) {
version: resource.NewVersion(testPullRequests[3]),
pullRequests: testPullRequests,
expected: resource.CheckResponse{
resource.NewVersion(testPullRequests[11]),
resource.NewVersion(testPullRequests[8]),
resource.NewVersion(testPullRequests[7]),
resource.NewVersion(testPullRequests[6]),
resource.NewVersion(testPullRequests[5]),
resource.NewVersion(testPullRequests[4]),
resource.NewVersion(testPullRequests[3]),
resource.NewVersion(testPullRequests[1]),
},
},
Expand All @@ -154,6 +165,13 @@ func TestCheck(t *testing.T) {
version: resource.NewVersion(testPullRequests[3]),
pullRequests: testPullRequests,
expected: resource.CheckResponse{
resource.NewVersion(testPullRequests[11]),
resource.NewVersion(testPullRequests[8]),
resource.NewVersion(testPullRequests[7]),
resource.NewVersion(testPullRequests[6]),
resource.NewVersion(testPullRequests[5]),
resource.NewVersion(testPullRequests[4]),
resource.NewVersion(testPullRequests[3]),
resource.NewVersion(testPullRequests[2]),
resource.NewVersion(testPullRequests[1]),
},
Expand All @@ -169,6 +187,11 @@ func TestCheck(t *testing.T) {
version: resource.NewVersion(testPullRequests[5]),
pullRequests: testPullRequests,
expected: resource.CheckResponse{
resource.NewVersion(testPullRequests[11]),
resource.NewVersion(testPullRequests[8]),
resource.NewVersion(testPullRequests[7]),
resource.NewVersion(testPullRequests[6]),
resource.NewVersion(testPullRequests[5]),
resource.NewVersion(testPullRequests[3]),
resource.NewVersion(testPullRequests[2]),
resource.NewVersion(testPullRequests[1]),
Expand Down
Loading