Skip to content

fix: Improves some filtering logic #271

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.

Sign up for GitHub

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

Open
isaacsanders wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: Improves some filtering logic #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 5 additions & 2 deletions check.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"path/filepath"
"regexp"
"sort"
"strconv"
"strings"

"github.com/shurcooL/githubv4"
Expand Down Expand Up @@ -44,8 +45,10 @@ Loop:
continue
}

// Filter out commits that are too old.
if !p.UpdatedDate().Time.After(request.Version.CommittedDate) {
// Filter out commits that are too old and don't have more approvals.
approvedReviewCount, err := strconv.Atoi(request.Version.ApprovedReviewCount)
if !(p.UpdatedDate().Time.After(request.Version.CommittedDate) ||
(err != nil && p.ApprovedReviewCount > approvedReviewCount)) {
continue
}

Expand Down
19 changes: 19 additions & 0 deletions check_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ var (
createTestPR(11, "master", false, false, 0, nil, false, githubv4.PullRequestStateMerged),
createTestPR(12, "master", false, false, 0, nil, false, githubv4.PullRequestStateOpen),
}

testApprovalPullRequests = []*resource.PullRequest{
createTestPR(1, "master", false, false, 0, nil, false, githubv4.PullRequestStateOpen),
createTestPR(1, "master", false, false, 1, nil, false, githubv4.PullRequestStateOpen),
}
)

func TestCheck(t *testing.T) {
Expand Down Expand Up @@ -262,6 +267,20 @@ func TestCheck(t *testing.T) {
resource.NewVersion(testPullRequests[10]),
},
},

{
description: "check returns versions with more approvals, even if time is the same",
source: resource.Source{
Repository: "itsdalmo/test-repository",
AccessToken: "oauthtoken",
},
version: resource.NewVersion(testApprovalPullRequests[0]),
pullRequests: testApprovalPullRequests,
files: [][]string{},
expected: resource.CheckResponse{
resource.NewVersion(testApprovalPullRequests[1]),
},
},
}

for _, tc := range tests {
Expand Down