New variables

 * ${PULL_REQUEST_REVIEWERS_APPROVED_COUNT} Number of reviewers that approved the PR.
 * ${PULL_REQUEST_PARTICIPANTS_APPROVED_COUNT} Number of participants that approved the PR.
 * These can be used to, for example, show a trigger button only if there are non-zero number of approvals.

Author: tomasbjerre

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 Changelog of Pull Request Notifier for Stash.
 
+## 1.32
+* New variables
+ * ${PULL_REQUEST_REVIEWERS_APPROVED_COUNT} Number of reviewers that approved the PR.
+ * ${PULL_REQUEST_PARTICIPANTS_APPROVED_COUNT} Number of participants that approved the PR.
+These can be used to, for example, show a trigger button only if there are non-zero number of approvals.
+
 ## 1.31
 * Bugfix: Saving with checked checkboxes RESCOPED_FROM/TO and BUTTON_TRIGGER was not reflected in GUI.
 * Bugfix: Avoiding admin page to crash if entering quote as value of a field.

README.md

@@ -58,6 +58,8 @@ The filter text as well as the URL support variables. These are:
 * ${PULL_REQUEST_AUTHOR_ID} Example: 1
 * ${PULL_REQUEST_AUTHOR_NAME} Example: admin
 * ${PULL_REQUEST_AUTHOR_SLUG} Example: admin
+* ${PULL_REQUEST_REVIEWERS_APPROVED_COUNT} Number of reviewers that approved the PR.
+* ${PULL_REQUEST_PARTICIPANTS_APPROVED_COUNT} Number of participants that approved the PR.
 * ${PULL_REQUEST_FROM_SSH_CLONE_URL} Example: ssh://git@localhost:7999/project_1/rep_1
 * ${PULL_REQUEST_FROM_HTTP_CLONE_URL} Example: http://admin@localhost:7990/stash/scm/project_1/rep_1.git
 * ${PULL_REQUEST_FROM_HASH} Example: 6053a1eaa1c009dd11092d09a72f3c41af1b59ad

src/main/java/se/bjurr/prnfs/listener/PrnfsRenderer.java

@@ -1,5 +1,7 @@
 package se.bjurr.prnfs.listener;
 
+import static com.google.common.collect.Iterables.filter;
+import static com.google.common.collect.Lists.newArrayList;
 import static java.util.logging.Logger.getLogger;
 import static java.util.regex.Pattern.compile;
 import static se.bjurr.prnfs.listener.PrnfsRenderer.REPO_PROTOCOL.http;
@@ -15,13 +17,15 @@
 import se.bjurr.prnfs.settings.PrnfsNotification;
 
 import com.atlassian.stash.pull.PullRequest;
+import com.atlassian.stash.pull.PullRequestParticipant;
 import com.atlassian.stash.repository.Repository;
 import com.atlassian.stash.repository.RepositoryCloneLinksRequest;
 import com.atlassian.stash.repository.RepositoryService;
 import com.atlassian.stash.server.ApplicationPropertiesService;
 import com.atlassian.stash.user.StashUser;
 import com.atlassian.stash.util.NamedLink;
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Predicate;
 import com.google.common.base.Supplier;
 
 public class PrnfsRenderer {
@@ -331,7 +335,28 @@ public String resolve(PullRequest pullRequest, PrnfsPullRequestAction pullReques
      PrnfsNotification prnfsNotification, Map<PrnfsVariable, Supplier<String>> variables) {
     return pullRequest.getTitle();
    }
+  }), PULL_REQUEST_REVIEWERS_APPROVED_COUNT(new Resolver() {
+   @Override
+   public String resolve(PullRequest pullRequest, PrnfsPullRequestAction pullRequestAction, StashUser ApplicationUser,
+     RepositoryService repositoryService, ApplicationPropertiesService propertiesService,
+     PrnfsNotification prnfbNotification, Map<PrnfsVariable, Supplier<String>> variables) {
+    return Integer.toString(newArrayList(filter(pullRequest.getReviewers(), isApproved)).size());
+   }
+  }), PULL_REQUEST_PARTICIPANTS_APPROVED_COUNT(new Resolver() {
+   @Override
+   public String resolve(PullRequest pullRequest, PrnfsPullRequestAction pullRequestAction, StashUser ApplicationUser,
+     RepositoryService repositoryService, ApplicationPropertiesService propertiesService,
+     PrnfsNotification prnfbNotification, Map<PrnfsVariable, Supplier<String>> variables) {
+    return Integer.toString(newArrayList(filter(pullRequest.getParticipants(), isApproved)).size());
+   }
   });
+  ;
+  private static final Predicate<PullRequestParticipant> isApproved = new Predicate<PullRequestParticipant>() {
+   @Override
+   public boolean apply(PullRequestParticipant input) {
+    return input.isApproved();
+   }
+  };
 
   private Resolver resolver;
 

src/main/resources/admin.vm

@@ -56,6 +56,8 @@
         <li><b>${PULL_REQUEST_AUTHOR_ID}</b> Example: 1</li>
         <li><b>${PULL_REQUEST_AUTHOR_NAME}</b> Example: admin</li>
         <li><b>${PULL_REQUEST_AUTHOR_SLUG}</b> Example: admin</li>
+        <li><b>${PULL_REQUEST_REVIEWERS_APPROVED_COUNT}</b> Number of reviewers that approved the PR.</li>
+        <li><b>${PULL_REQUEST_PARTICIPANTS_APPROVED_COUNT}</b> Number of participants that approved the PR.</li>
         <li><b>${PULL_REQUEST_FROM_SSH_CLONE_URL}</b> Example: ssh://git@localhost:7999/project_1/rep_1</li>
         <li><b>${PULL_REQUEST_FROM_HTTP_CLONE_URL}</b> Example: http://admin@localhost:7990/stash/scm/project_1/rep_1.git</li>
         <li><b>${PULL_REQUEST_FROM_HASH}</b> Example: 6053a1eaa1c009dd11092d09a72f3c41af1b59ad</li>

src/main/resources/pr-triggerbutton.js

@@ -14,7 +14,8 @@ define('plugin/prnfs/pr-triggerbutton', [
   var $buttonTemplate = $(".triggerManualNotification");
   $buttonTemplate.empty().remove();
 
-  $.get(getResourceUrl(), function(settings) {
+  function loadSettingsAndShowButtons() {
+   $.get(getResourceUrl(), function(settings) {
   	settings.forEach(function(item) {
   	  var $button = $buttonTemplate.clone();
   	  $button.html(item.title);
@@ -35,8 +36,18 @@ define('plugin/prnfs/pr-triggerbutton', [
 
       $buttonArea.append($button);
   	});
+   });
+  }
+  
+  loadSettingsAndShowButtons();
+  
+  //If a reviewer approves the PR, then a button may become visible
+  $('.aui-button.approve').click(function () {
+   setTimeout(function(){
+    $(".triggerManualNotification").remove();
+    loadSettingsAndShowButtons();
+   }, 1000);
   });
-
 });
 
 AJS.$(document).ready(function() {

src/test/java/se/bjurr/prnfs/admin/PrnfsPullRequestEventListenerTest.java

@@ -4,11 +4,15 @@
 import static com.atlassian.stash.pull.PullRequestAction.MERGED;
 import static com.atlassian.stash.pull.PullRequestAction.OPENED;
 import static com.atlassian.stash.pull.PullRequestAction.RESCOPED;
+import static com.atlassian.stash.pull.PullRequestRole.AUTHOR;
+import static com.atlassian.stash.pull.PullRequestRole.PARTICIPANT;
 import static com.atlassian.stash.pull.PullRequestState.DECLINED;
 import static com.google.common.base.Charsets.UTF_8;
 import static com.google.common.base.Joiner.on;
 import static com.google.common.collect.Lists.newArrayList;
 import static com.google.common.io.Resources.getResource;
+import static java.lang.Boolean.FALSE;
+import static java.lang.Boolean.TRUE;
 import static java.util.Collections.sort;
 import static javax.ws.rs.core.HttpHeaders.AUTHORIZATION;
 import static org.junit.Assert.assertEquals;
@@ -108,7 +112,7 @@ public void testThatAUrlCanHaveSeveralVariables() throws Exception {
       notificationBuilder() //
         .withFieldValue(
           url,
-          "http://bjurr.se/?PULL_REQUEST_FROM_HASH=${PULL_REQUEST_FROM_HASH}&PULL_REQUEST_TO_HASH=${PULL_REQUEST_TO_HASH}&PULL_REQUEST_FROM_REPO_SLUG=${PULL_REQUEST_FROM_REPO_SLUG}&PULL_REQUEST_TO_REPO_SLUG=${PULL_REQUEST_TO_REPO_SLUG}") //
+          "http://bjurr.se/?PULL_REQUEST_FROM_HASH=${PULL_REQUEST_FROM_HASH}&PULL_REQUEST_TO_HASH=${PULL_REQUEST_TO_HASH}&PULL_REQUEST_FROM_REPO_SLUG=${PULL_REQUEST_FROM_REPO_SLUG}&PULL_REQUEST_TO_REPO_SLUG=${PULL_REQUEST_TO_REPO_SLUG}&revapp=${PULL_REQUEST_REVIEWERS_APPROVED_COUNT}&partapp=${PULL_REQUEST_PARTICIPANTS_APPROVED_COUNT}") //
         .withFieldValue(events, OPENED.name()) //
         .build() //
     ) //
@@ -127,11 +131,18 @@ public void testThatAUrlCanHaveSeveralVariables() throws Exception {
         ) //
         .withPullRequestId(10L) //
         .withPullRequestAction(OPENED) //
+        .withParticipant(PARTICIPANT, TRUE) //
+        .withParticipant(PARTICIPANT, TRUE) //
+        .withParticipant(PARTICIPANT, TRUE) //
+        .withParticipant(PARTICIPANT, FALSE) //
+        .withParticipant(AUTHOR, TRUE) //
+        .withParticipant(AUTHOR, TRUE) //
+        .withParticipant(AUTHOR, FALSE) //
         .build() //
     ) //
     .invokedUrl(
       0,
-      "http://bjurr.se/?PULL_REQUEST_FROM_HASH=cde456&PULL_REQUEST_TO_HASH=asd123&PULL_REQUEST_FROM_REPO_SLUG=fromslug&PULL_REQUEST_TO_REPO_SLUG=toslug") //
+      "http://bjurr.se/?PULL_REQUEST_FROM_HASH=cde456&PULL_REQUEST_TO_HASH=asd123&PULL_REQUEST_FROM_REPO_SLUG=fromslug&PULL_REQUEST_TO_REPO_SLUG=toslug&revapp=2&partapp=3") //
     .invokedMethod(GET);
  }
 

src/test/java/se/bjurr/prnfs/admin/utils/PullRequestEventBuilder.java

@@ -2,18 +2,23 @@
 
 import static com.atlassian.stash.pull.PullRequestAction.COMMENTED;
 import static com.atlassian.stash.pull.PullRequestAction.RESCOPED;
+import static com.atlassian.stash.pull.PullRequestRole.PARTICIPANT;
+import static com.google.common.collect.Sets.newHashSet;
 import static java.lang.Boolean.TRUE;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static se.bjurr.prnfs.admin.utils.PullRequestRefBuilder.pullRequestRefBuilder;
 
+import java.util.Set;
+
 import com.atlassian.stash.comment.Comment;
 import com.atlassian.stash.event.pull.PullRequestCommentAddedEvent;
 import com.atlassian.stash.event.pull.PullRequestEvent;
 import com.atlassian.stash.event.pull.PullRequestRescopedEvent;
 import com.atlassian.stash.pull.PullRequest;
 import com.atlassian.stash.pull.PullRequestAction;
 import com.atlassian.stash.pull.PullRequestParticipant;
+import com.atlassian.stash.pull.PullRequestRole;
 import com.atlassian.stash.pull.PullRequestState;
 
 public class PullRequestEventBuilder {
@@ -28,12 +33,25 @@ public class PullRequestEventBuilder {
  private boolean beingClosed;
  private final boolean beingOpen = TRUE;
  private Long pullRequestId = 0L;
+ private final Set<PullRequestParticipant> participants = newHashSet();
+ private final Set<PullRequestParticipant> reviewers = newHashSet();
  private PullRequestState pullRequestState;
 
  private PullRequestEventBuilder(PrnfsTestBuilder prnfsTestBuilder) {
   this.prnfsTestBuilder = prnfsTestBuilder;
  }
 
+ public PullRequestEventBuilder withParticipant(PullRequestRole role, Boolean isApproved) {
+  PullRequestParticipant participant = mock(PullRequestParticipant.class);
+  when(participant.isApproved()).thenReturn(isApproved);
+  if (role == PARTICIPANT) {
+   participants.add(participant);
+  } else {
+   reviewers.add(participant);
+  }
+  return this;
+ }
+
  public PullRequestEventBuilder withFromRef(PullRequestRefBuilder fromRef) {
   this.fromRef = fromRef;
   return this;
@@ -104,6 +122,8 @@ public PullRequestEvent build() {
   when(pullRequest.getState()).thenReturn(pullRequestState);
   when(pullRequestEvent.getAction()).thenReturn(pullRequestAction);
   when(pullRequestEvent.getPullRequest()).thenReturn(pullRequest);
+  when(pullRequestEvent.getPullRequest().getReviewers()).thenReturn(reviewers);
+  when(pullRequestEvent.getPullRequest().getParticipants()).thenReturn(participants);
   when(pullRequestEvent.getPullRequest().getAuthor()).thenReturn(author);
   when(pullRequestEvent.getPullRequest().getFromRef()).thenReturn(fromRef);
   when(pullRequestEvent.getPullRequest().getToRef()).thenReturn(toRef);