Determining conflicing state correctly #228

 * PR has to be open in order to check if it can be merged. Any closed PR is now considered not conflicting.

Author: tomasbjerre

CHANGELOG.md

@@ -3,10 +3,24 @@
 Changelog of Pull Request Notifier for Bitbucket.
 
 ## Unreleased
+### GitHub [#226](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/issues/226) REST API POST ISSUES
+  Correcting markdown in REST-API
+  
+  [5f555e903069e04](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/5f555e903069e04) Tomas Bjerre *2017-06-23 09:37:28*
+
+### GitHub [#231](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/issues/231) Typo "Optinoal" in admin.vm
+  Typo "Optinoal" in admin.vm
+  
+  [53b27e36155c764](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/53b27e36155c764) Tomas Bjerre *2017-07-12 05:25:41*
+
 ### No issue
+  Fixing compile error in Travis
+  
+  [338ae4477962919](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/338ae4477962919) Tomas Bjerre *2017-06-02 08:38:13*
+
   doc
 
-  [ddbf3b6a86162a9](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/ddbf3b6a86162a9) Tomas Bjerre *2017-06-02 07:56:38*
+  [305d0711327e562](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/305d0711327e562) Tomas Bjerre *2017-06-02 08:07:02*
 
 ## 3.1
 ### GitHub [#220](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/issues/220) Feature: add PREVIOUS_FROM_HASH and PREVIOUS_TO_HASH to variables

docker-bash.sh

@@ -190,22 +190,10 @@ public boolean isNotificationTriggeredByAction(
       return FALSE;
     }
 
-    if (notification.getTriggerIfCanMerge() != ALWAYS && pullRequest.isOpen()) {
+    if (notification.getTriggerIfCanMerge() != ALWAYS) {
       // Cannot perform canMerge unless PR is open
-      boolean isConflicted =
-          securityService //
-              .withPermission(ADMIN, "Can merge") //
-              .call(
-                  new Operation<Boolean, RuntimeException>() {
-                    @Override
-                    public Boolean perform() throws RuntimeException {
-                      return pullRequestService //
-                          .canMerge(
-                              pullRequest.getToRef().getRepository().getId(),
-                              pullRequest.getId()) //
-                          .isConflicted();
-                    }
-                  });
+      boolean notYetMerged = pullRequest.isOpen();
+      boolean isConflicted = notYetMerged && hasConflicts(pullRequest);
       if (ignoreBecauseOfConflicting(notification.getTriggerIfCanMerge(), isConflicted)) {
         return FALSE;
       }
@@ -214,6 +202,21 @@ public Boolean perform() throws RuntimeException {
     return TRUE;
   }
 
+  private boolean hasConflicts(PullRequest pullRequest) {
+    return securityService //
+        .withPermission(ADMIN, "Can merge") //
+        .call(
+            new Operation<Boolean, RuntimeException>() {
+              @Override
+              public Boolean perform() throws RuntimeException {
+                return pullRequestService //
+                    .canMerge(
+                        pullRequest.getToRef().getRepository().getId(), pullRequest.getId()) //
+                    .isConflicted();
+              }
+            });
+  }
+
   public NotificationResponse notify(
       final PrnfbNotification notification,
       PrnfbPullRequestAction pullRequestAction,