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

nkrrkn · Dec 8, 2022 · 463ed9a · 463ed9a
1 parent 4e6d302
commit 463ed9a
Show file tree

Hide file tree

Showing 5 changed files with 89 additions and 127 deletions.
diff --git a/check.go b/check.go
@@ -20,7 +20,7 @@ func Check(request CheckRequest, manager Github) (CheckResponse, error) {
 		filterStates = request.Source.States
 	}
 
-	pulls, err := manager.ListPullRequests(filterStates, request.Version.CommittedDate)
+	pulls, err := manager.ListPullRequests(filterStates)
 	if err != nil {
 		return nil, fmt.Errorf("failed to get last commits: %s", err)
 	}
@@ -44,6 +44,11 @@ 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

diff --git a/check_test.go b/check_test.go
@@ -50,7 +50,7 @@ func TestCheck(t *testing.T) {
 		},
 
 		{
-			description: "check returns all open PRs if there is a previous",
+			description: "check returns the previous version when its still latest",
 			source: resource.Source{
 				Repository:  "itsdalmo/test-repository",
 				AccessToken: "oauthtoken",
@@ -59,13 +59,20 @@ func TestCheck(t *testing.T) {
 			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[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[2]),
 				resource.NewVersion(testPullRequests[1]),
 			},
@@ -86,7 +93,6 @@ func TestCheck(t *testing.T) {
 				{"terraform/modules/variables.tf", "travis.yml"},
 			},
 			expected: resource.CheckResponse{
-				resource.NewVersion(testPullRequests[3]),
 				resource.NewVersion(testPullRequests[2]),
 			},
 		},
@@ -106,7 +112,6 @@ func TestCheck(t *testing.T) {
 				{"terraform/modules/variables.tf", "travis.yml"},
 			},
 			expected: resource.CheckResponse{
-				resource.NewVersion(testPullRequests[3]),
 				resource.NewVersion(testPullRequests[2]),
 			},
 		},
@@ -121,15 +126,6 @@ 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]),
 			},
 		},
@@ -144,13 +140,6 @@ 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]),
 			},
 		},
@@ -165,13 +154,6 @@ 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]),
 			},
@@ -187,11 +169,6 @@ 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]),