Merge pull request #4 from impossiblecloud/some-improvements

Add PR review checks

Author: adidenko

README.md

@@ -16,3 +16,35 @@ Github app:
 - `GITHUB_APP_ID` - Github app ID
 - `GITHUB_INSTALLATION_ID` - installation ID (see URL when managing installation)
 - `GITHUB_APP_PRIVATE_KEY` - Github app private key PEM (sensitive)
+
+## Config
+
+Config example:
+
+```yaml
+github_pr_notifications:
+
+  - gh_owner: my-org
+    gh_repo: my-repo-1
+    gh_pr_labels:
+      - enhancement
+    gh_pr_include_drafts: true
+    gh_pr_ignore_approved: true
+    gh_pr_ignore_changes_requested: true
+    # Mon-Fri every 2 hours during business hours
+    schedule: "CRON_TZ=Europe/Berlin 00 10-18/2 * * 1-5"
+    notify:
+      slack:
+        channel_id: "ABC123000"
+        message_header: ":warning: Please review at your earliest convenience @some-group-handle"
+
+  - gh_owner: my-org
+    gh_repo: my-repo-2
+    gh_pr_labels: []
+    # Mon-Fri every 30 hours during business hours
+    schedule: "CRON_TZ=Europe/Berlin */30 10-18 * * 1-5"
+    notify:
+      slack:
+        channel_id: "DEF456000"
+        message_header: ":warning: Please review at your earliest convenience @some-group-handle"
+```

fixtures/config.yaml

@@ -5,8 +5,10 @@ github_pr_notifications:
     gh_pr_labels:
       - enhancement
     gh_pr_include_drafts: true
+    gh_pr_ignore_approved: true
+    gh_pr_ignore_changes_requested: true
     # Mon-Fri every 2 hours during business hours
-    schedule: "00 10,12,14,16,18 * * 1-5"
+    schedule: "CRON_TZ=Europe/Berlin 00 10-18/2 * * 1-5"
     notify:
       slack:
         channel_id: "ABC123000"
@@ -15,9 +17,8 @@ github_pr_notifications:
   - gh_owner: my-org
     gh_repo: my-repo-2
     gh_pr_labels: []
-    gh_pr_include_drafts: false
     # Mon-Fri every 30 hours during business hours
-    schedule: "*/30 10-18 * * 1-5"
+    schedule: "CRON_TZ=Europe/Berlin */30 10-18 * * 1-5"
     notify:
       slack:
         channel_id: "DEF456000"

internal/cfg/cfg.go

@@ -31,12 +31,14 @@ type Notification struct {
 
 // PrNotification is a struct for a single GH repo PRs notifications
 type PrNotification struct {
-	Owner         string       `yaml:"gh_owner"`
-	Labels        []string     `yaml:"gh_pr_labels"`
-	Repo          string       `yaml:"gh_repo"`
-	Schedule      string       `yaml:"schedule"`
-	IncludeDrafts bool         `yaml:"gh_pr_include_drafts"`
-	Notifications Notification `yaml:"notify"`
+	Owner                  string       `yaml:"gh_owner"`
+	Labels                 []string     `yaml:"gh_pr_labels"`
+	Repo                   string       `yaml:"gh_repo"`
+	Schedule               string       `yaml:"schedule"`
+	IncludeDrafts          bool         `yaml:"gh_pr_include_drafts"`
+	IgnoreApproved         bool         `yaml:"gh_pr_ignore_approved"`
+	IgnoreChangesRequested bool         `yaml:"gh_pr_ignore_changes_requested"`
+	Notifications          Notification `yaml:"notify"`
 }
 
 // LoadConfig loads config file

internal/gh/gh.go

@@ -77,9 +77,36 @@ func (g *Github) GetPullRequests(prn cfg.PrNotification) ([]*github.PullRequest,
 		if !prn.IncludeDrafts && *pr.Draft {
 			continue
 		}
-		//glog.V(8).Infof("Got PR-%d %s: %s", *pr.Number, *pr.Title, *pr.State)
+		glog.V(8).Infof("Checking PR-%d %q: %s", *pr.Number, *pr.Title, *pr.State)
+
 		if labelsMatched(pr.Labels, prn.Labels) {
-			result = append(result, pr)
+			addPR := true
+
+			// Ignore PRs that have APPROVED or CHANGES_REQUESTED reviews, if it's configured
+			if prn.IgnoreApproved || prn.IgnoreChangesRequested {
+				reviews, _, err := g.Client.PullRequests.ListReviews(context.Background(), prn.Owner, prn.Repo, *pr.Number, &github.ListOptions{})
+				if err != nil {
+					return result, err
+				}
+				for _, review := range reviews {
+					glog.V(10).Infof("Review %s: %s", *review.HTMLURL, *review.State)
+					if prn.IgnoreApproved && *review.State == "APPROVED" {
+						glog.V(8).Infof("Skipping PR-%d: %q, because it's APPROVED", *pr.Number, *pr.Title)
+						addPR = false
+						break
+					}
+					if prn.IgnoreChangesRequested && *review.State == "CHANGES_REQUESTED" {
+						glog.V(8).Infof("Skipping PR-%d: %q, because it's CHANGES_REQUESTED", *pr.Number, *pr.Title)
+						addPR = false
+						break
+					}
+				}
+			}
+
+			if addPR {
+				glog.V(8).Infof("Adding to notifications PR-%d: %q", *pr.Number, *pr.Title)
+				result = append(result, pr)
+			}
 		}
 	}