create branch before compare 为 null 的bug

Author: yunheli

platform-api/src/main/java/com/flow/platform/api/git/GitEventEnvConverter.java

@@ -104,9 +104,7 @@ public static Map<String, String> convert(GitEvent event) {
             // TODO: multi change log
             if (pt.getCommits().size() > 0) {
                 info.put(GitEnvs.FLOW_GIT_CHANGELOG.name(), pt.getCommits().get(0).getMessage());
-            }
-
-            if (Objects.equals(pt.getType(), GitEventType.TAG)) {
+            } else if (Objects.equals(pt.getType(), GitEventType.TAG)) {
                 info.put(GitEnvs.FLOW_GIT_CHANGELOG.name(), pt.getMessage());
             }
 

platform-util-git/src/main/java/com/flow/platform/util/git/hooks/BitbucketEvents.java

@@ -207,18 +207,25 @@ public GitEvent convert(String json) throws GitException {
 
         private GitEvent convertBranch(ChangeHelper changeHelper, GitPushTagEvent event) {
             event.setRef("refs/heads/" + changeHelper.afterPush.branchName);
-            event.setBefore(changeHelper.beforePush.target.hash);
+
+
+            // set commit message
             event.setMessage(changeHelper.afterPush.target.message);
 
             // set compare value
             event.setCompareUrl(changeHelper.diff.html.value);
 
-            // set compare id
-            final String compareId = GitPushTagEvent.buildCompareId(event);
-            event.setCompareId(compareId);
 
-            event.setCommits(new ArrayList<>(changeHelper.commits.size()));
+            // create branch before_push is null
+            if (changeHelper.beforePush != null) {
+                event.setBefore(changeHelper.beforePush.target.hash);
 
+                // set compare id
+                final String compareId = GitPushTagEvent.buildCompareId(event);
+                event.setCompareId(compareId);
+            }
+
+            event.setCommits(new ArrayList<>(changeHelper.commits.size()));
             for (CommitHelper commit : changeHelper.commits) {
                 GitEventCommit eventCommit = new GitEventCommit();
                 eventCommit.setId(commit.hash);

platform-util-git/src/main/java/com/flow/platform/util/git/hooks/CodingEvents.java

@@ -115,6 +115,7 @@ public GitEvent convert(String json) throws GitException {
             // for create tag event
             if (event.getRef().startsWith("refs/tags")) {
                 event.setType(GitEventType.TAG);
+                event.setUserEmail(helper.user.name);
             }
 
             // for branch push event

platform-util-git/src/main/java/com/flow/platform/util/git/hooks/GitHookEventFactory.java

@@ -69,6 +69,7 @@ public class GitHookEventFactory {
         bitbucketAdaptors.put(Hooks.EVENT_TYPE_PUSH, new PushAndTagAdapter(BITBUCKET, PUSH));
         bitbucketAdaptors.put(Hooks.EVENT_TYPE_PR_MERGERED, new BitbucketEvents.PullRequestAdapter(BITBUCKET, PR));
         bitbucketAdaptors.put(Hooks.EVENT_TYPE_PR_CREATED, new BitbucketEvents.PullRequestAdapter(BITBUCKET, PR));
+        bitbucketAdaptors.put(Hooks.EVENT_TYPE_PR_UPDATED, new BitbucketEvents.PullRequestAdapter(BITBUCKET, PR));
         adaptors.put(Hooks.HEADER, bitbucketAdaptors);
     }
 

platform-util-git/src/test/java/com/flow/platform/util/git/test/CodingWebHooksEventTest.java

@@ -93,7 +93,7 @@ public void should_convert_to_tag_event_obj() throws Throwable {
 
         Assert.assertEquals("benqyang2006", tagEvent.getUserId());
         Assert.assertEquals("benqyang2006", tagEvent.getUsername());
-        Assert.assertEquals(null, tagEvent.getUserEmail());
+        Assert.assertEquals("benqyang2006", tagEvent.getUserEmail());
 
         Assert.assertEquals("b972e2edd91e...v1.0", tagEvent.getCompareId());
         Assert.assertEquals("https://coding.net/u/benqyang2006/p/flowclibasic/git/compare/b972e2edd91e...v1.0",