Merge branch 'next' into internal

doortts · doortts · commit 3624944821f3 · 2018-08-01T13:29:43.000+09:00
diff --git a/app/assets/stylesheets/less/_common.less b/app/assets/stylesheets/less/_common.less
@@ -305,4 +305,9 @@ input.white:-ms-input-placeholder        { color:#fff; opacity:0.8; }
     line-height: 36px;
 }
 
-.dimgray { color:dimgray; }
+.dimgray { color:dimgray; }
+
+.vertical-align {
+    display: flex;
+    align-items: center;
+}
diff --git a/app/controllers/ProjectApp.java b/app/controllers/ProjectApp.java
@@ -18,7 +18,6 @@
 import models.enumeration.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.exception.ExceptionUtils;
-import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.mail.HtmlEmail;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -49,7 +48,6 @@
 import views.html.project.transfer;
 import views.html.project.change_vcs;
 
-import javax.annotation.Nonnull;
 import javax.servlet.ServletException;
 import java.io.IOException;
 import java.security.NoSuchAlgorithmException;
@@ -1291,22 +1289,27 @@ public static Result newWebhook(String ownerId, String projectName) {
             return notFound(ErrorViews.NotFound.render("error.notfound"));
         }
 
-        Form<Webhook> addWebhookForm = form(Webhook.class).bindFromRequest();
-        if (addWebhookForm == null) {
+        Form<Webhook> addNewWebhookForm = form(Webhook.class).bindFromRequest();
+        if (addNewWebhookForm == null) {
             Logger.warn("Failed creating webhook: got null form from newWebhook request");
-            return badRequest();
-        } else if (addWebhookForm.hasErrors()) {
-            return badRequest(ErrorViews.BadRequest.render());
+            return badRequest("Failed creating webhook: got null form from newWebhook request");
+        } else if (addNewWebhookForm.hasErrors()) {
+            return badRequest(ErrorViews.BadRequest.render(addNewWebhookForm.errorsAsJson().toString()));
         }
 
-        Webhook webhook = addWebhookForm.get();
-
-        Webhook.create(project.id, webhook.payloadUrl.trim(), webhook.secret,
-                BooleanUtils.toBooleanDefaultIfNull(webhook.gitPushOnly, false));
+        createWebhook(project, addNewWebhookForm);
 
         return redirect(routes.ProjectApp.webhooks(project.owner, project.name));
     }
 
+    private static void createWebhook(Project project, Form<Webhook> forms) {
+        Webhook webhook = forms.get();
+        webhook.project = project;
+        if(webhook.gitPushOnly == null) webhook.gitPushOnly = false;
+        webhook.createdAt = new Date();
+        webhook.save();
+    }
+
     @Transactional
     @IsAllowed(Operation.UPDATE)
     public static Result deleteWebhook(String ownerId, String projectName, Long id) {
diff --git a/app/models/Webhook.java b/app/models/Webhook.java
@@ -1,23 +1,10 @@
 /**
- * Yobi, Project Hosting SW
- *
- * Copyright 2015 NAVER Corp.
- * http://yobi.io
- *
- * @author Jihwan Chun
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+ * Yona, 21st Century Project Hosting SW
+ * <p>
+ * Copyright Yona & Yobi Authors & NAVER Corp. & NAVER LABS Corp.
+ * https://yona.io
+ **/
+
 package models;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -26,6 +13,7 @@
 import models.enumeration.EventType;
 import models.enumeration.PullRequestReviewAction;
 import models.enumeration.ResourceType;
+import models.enumeration.WebhookType;
 import models.resource.GlobalResource;
 import models.resource.Resource;
 import models.resource.ResourceConvertible;
@@ -86,10 +74,12 @@ public class Webhook extends Model implements ResourceConvertible {
     public String secret;
 
     /**
-     * Type of webhook (true = git only push, false = all cases)
+     * Condition of sending webhook (true: git only push, false: all cases)
      */
     public Boolean gitPushOnly;
 
+    public WebhookType webhookType = WebhookType.SIMPLE;
+
     /**
      * Payload URL of webhook.
      */
@@ -260,11 +250,18 @@ private String buildRequestBody(EventType eventType, User sender, PullRequest ev
         }
         requestMessage += " <" + utils.Config.getScheme() + "://" + utils.Config.getHostport("localhost:9000") + RouteUtil.getUrl(eventPullRequest) + "|#" + eventPullRequest.number + ": " + eventPullRequest.title + ">";
 
+        if (this.webhookType == WebhookType.DETAIL_SLACK) {
+            return buildJsonWithPullReqtuestDetails(eventPullRequest, detailFields, attachments, requestMessage);
+        } else {
+            return buildTextPropertyOnlyJSON(requestMessage);
+        }
+    }
+
+    private String buildJsonWithPullReqtuestDetails(PullRequest eventPullRequest, ArrayNode detailFields, ArrayNode attachments, String requestMessage) {
         detailFields.add(buildTitleValueJSON(Messages.get(Lang.defaultLang(), "pullRequest.sender"), eventPullRequest.contributor.name, false));
         detailFields.add(buildTitleValueJSON(Messages.get(Lang.defaultLang(), "pullRequest.from"), eventPullRequest.fromBranch, true));
-        detailFields.add(buildTitleValueJSON(Messages.get(Lang.defaultLang(), "pullRequest.to"), eventPullRequest.toBranch,true));
+        detailFields.add(buildTitleValueJSON(Messages.get(Lang.defaultLang(), "pullRequest.to"), eventPullRequest.toBranch, true));
         attachments.add(buildAttachmentJSON(eventPullRequest.body, detailFields));
-
         return Json.stringify(buildRequestJSON(requestMessage, attachments));
     }
 
@@ -285,12 +282,11 @@ private String buildRequestBody(EventType eventType, User sender, PullRequest ev
         }
         requestMessage += " <" + utils.Config.getScheme() + "://" + utils.Config.getHostport("localhost:9000") + RouteUtil.getUrl(eventPullRequest) + "|#" + eventPullRequest.number + ": " + eventPullRequest.title + ">";
 
-        detailFields.add(buildTitleValueJSON(Messages.get(Lang.defaultLang(), "pullRequest.sender"), eventPullRequest.contributor.name, false));
-        detailFields.add(buildTitleValueJSON(Messages.get(Lang.defaultLang(), "pullRequest.from"), eventPullRequest.fromBranch, true));
-        detailFields.add(buildTitleValueJSON(Messages.get(Lang.defaultLang(), "pullRequest.to"), eventPullRequest.toBranch, true));
-        attachments.add(buildAttachmentJSON(eventPullRequest.body, detailFields));
-
-        return Json.stringify(buildRequestJSON(requestMessage, attachments));
+        if (this.webhookType == WebhookType.SIMPLE) {
+            return buildTextPropertyOnlyJSON(requestMessage);
+        } else {
+            return buildJsonWithPullReqtuestDetails(eventPullRequest, detailFields, attachments, requestMessage);
+        }
     }
 
     private String buildRequestBody(EventType eventType, User sender, Issue eventIssue) {
@@ -324,11 +320,18 @@ private String buildRequestBody(EventType eventType, User sender, Issue eventIss
 
         requestMessage += " <" + utils.Config.getScheme() + "://" + utils.Config.getHostport("localhost:9000") + RouteUtil.getUrl(eventIssue) + "|#" + eventIssue.number + ": " + eventIssue.title + ">";
 
+        if (this.webhookType == WebhookType.SIMPLE) {
+            return buildTextPropertyOnlyJSON(requestMessage);
+        } else {
+            return buildJsonWithIssueEventDetails(eventIssue, detailFields, attachments, requestMessage);
+        }
+    }
+
+    private String buildJsonWithIssueEventDetails(Issue eventIssue, ArrayNode detailFields, ArrayNode attachments, String requestMessage) {
         detailFields.add(buildTitleValueJSON(Messages.get(Lang.defaultLang(), "notification.type.milestone.changed"), eventIssue.milestoneId().toString(), true));
         detailFields.add(buildTitleValueJSON(Messages.get(Lang.defaultLang(), ""), eventIssue.assigneeName(), true));
         detailFields.add(buildTitleValueJSON(Messages.get(Lang.defaultLang(), "issue.state"), eventIssue.state.toString(), true));
         attachments.add(buildAttachmentJSON(eventIssue.body, detailFields));
-
         return Json.stringify(buildRequestJSON(requestMessage, attachments));
     }
 
@@ -354,9 +357,12 @@ private String buildRequestBody(EventType eventType, User sender, Comment eventC
                 break;
         }
 
-        attachments.add(buildAttachmentJSON(eventComment.contents, null));
-
-        return Json.stringify(buildRequestJSON(requestMessage, attachments));
+        if (this.webhookType == WebhookType.SIMPLE) {
+            return buildTextPropertyOnlyJSON(requestMessage);
+        } else {
+            attachments.add(buildAttachmentJSON(eventComment.contents, null));
+            return Json.stringify(buildRequestJSON(requestMessage, attachments));
+        }
     }
 
     private ObjectNode buildJSONFromCommit(Project project, RevCommit commit) {
@@ -409,6 +415,12 @@ private ObjectNode buildRequestJSON(String requestMessage, ArrayNode attachments
         return requestBody;
     }
 
+    private String buildTextPropertyOnlyJSON(String requestMessage) {
+        ObjectNode requestBody = Json.newObject();
+        requestBody.put("text", requestMessage);
+        return Json.stringify(requestBody);
+    }
+
     private ObjectNode buildSenderJSON(User sender) {
         ObjectNode senderJSON = Json.newObject();
         senderJSON.put("login", sender.loginId);
@@ -457,6 +469,7 @@ public String toString() {
                 ", payloadUrl='" + payloadUrl + '\'' +
                 ", secret='" + secret + '\'' +
                 ", gitPushOnly=" + gitPushOnly +
+                ", webhookType=" + webhookType +
                 ", createdAt=" + createdAt +
                 '}';
     }
diff --git a/app/models/enumeration/WebhookType.java b/app/models/enumeration/WebhookType.java
@@ -0,0 +1,17 @@
+/**
+ * Yona, 21st Century Project Hosting SW
+ * <p>
+ * Copyright Yona & Yobi Authors & NAVER Corp. & NAVER LABS Corp.
+ * https://yona.io
+ **/
+package models.enumeration;
+
+public enum WebhookType {
+    SIMPLE(0), DETAIL_SLACK(1);
+
+    private int type;
+
+    WebhookType(int type) {
+        this.type = type;
+    }
+}
diff --git a/app/views/project/partial_webhooks_list.scala.html b/app/views/project/partial_webhooks_list.scala.html
@@ -30,41 +30,51 @@
   </div>
 } else {
   <div class="row-fluid list-head">
-    <div class="span8 payload-url">
+    <div class="span5 payload-url">
       <strong>@Messages("project.webhook.payloadUrl")</strong>
     </div>
-    <div class="span4 secret">
-      <strong>@Messages("project.webhook.secret") / Working only when Git push</strong>
+    <div class="span2 secret text-center">
+      <strong>@Messages("project.webhook.secret")</strong>
     </div>
+    <div class="span2 secret text-center">
+      <strong>Type of message</strong>
+    </div>
+    <div class="span2 secret text-center">
+      <strong>Just the push event</strong>
+    </div>
+    <div class="span1 secret text-center"></div>
+
   </div>
 
   @webhooks.map { webhook =>
-    <div class="row-fluid list-item" data-webhook-id="@webhook.id">
-      <div class="span8">
+    <div class="row-fluid list-item vertical-align" data-webhook-id="@webhook.id">
+      <div class="span5">
         <h6 class="mr20 truncate">
           @webhook.payloadUrl
         </h6>
       </div>
-      <div class="span4">
-        <table class="table nm">
-          <tr>
-            <td>
-              <span class="webhook-secret truncate">
-                  @webhook.secret
-              </span>
-            </td>
-            <td>
-              <span class="webhook-secret truncate">
-              <input type="checkbox" @if(webhook.gitPushOnly){checked} onclick="return false;" />
-              </span>
-            </td>
-            <td class="actions">
-              <button type="button" class="ybtn ybtn-danger ybtn-small" data-request-method="delete" data-request-uri="@routes.ProjectApp.deleteWebhook(project.owner, project.name, webhook.id)">
-                @Messages("button.delete")
-              </button>
-            </td>
-          </tr>
-        </table>
+      <div class="span2 text-center">
+        <h6>
+          @if(webhook.secret.isEmpty) {
+              NONE
+          } else {
+            @webhook.secret
+          }
+        </h6>
+      </div>
+      <div class="span2 text-center">
+        <h6>
+          @webhook.webhookType
+        </h6>
+      </div>
+      <div class="span2 text-center">
+          <input type="checkbox" @if(webhook.gitPushOnly){checked} onclick="return false;" />
+
+      </div>
+      <div class="span1 text-center">
+        <button type="button" class="ybtn ybtn-danger ybtn-small" data-request-method="delete" data-request-uri="@routes.ProjectApp.deleteWebhook(project.owner, project.name, webhook.id)">
+          @Messages("button.delete")
+        </button>
       </div>
     </div>
   }
diff --git a/app/views/project/webhooks.scala.html b/app/views/project/webhooks.scala.html
@@ -22,6 +22,10 @@
           <div>
             <input type="text" name="payloadUrl" class="input-webhook-payload" maxlength="2000" autocomplete="off" placeholder="@Messages("project.webhook.payloadUrl")">
             <input type="text" name="secret" class="input-webhook-secret" maxlength="250" autocomplete="off" placeholder="@Messages("project.webhook.secret")">
+            <select class="form-control" title="add details or not" name="webhookType">
+              <option value="SIMPLE">SIMPLE Version (no details)</option>
+              <option value="DETAIL_SLACK">DETAIL Version (for slack) </option>
+            </select>
             <label for="gitPushOnly">@Messages("project.webhook.gitPushOnly")</label>
             <input type="checkbox" id="gitPushOnly" name="gitPushOnly" class="form-check-input">
           </div>
diff --git a/conf/evolutions/default/24.sql b/conf/evolutions/default/24.sql
@@ -0,0 +1,6 @@
+# --- !Ups
+ALTER TABLE webhook ADD COLUMN webhook_type tinyint(1) default 1;
+CREATE INDEX ix_webhook_webhook_type ON webhook (webhook_type);
+
+# --- !Downs
+ALTER TABLE webhook DROP COLUMN webhook_type;
diff --git a/conf/messages b/conf/messages
@@ -717,7 +717,7 @@ project.webhook.payloadUrl.empty = Paylaod URL is required field.
 project.webhook.payloadUrl.tooLong = Given payload URL is too long. (Maximum 2000 Characters)
 project.webhook.secret = Authorization Token
 project.webhook.secret.tooLong = Given secret token is too long. (Maximum 250 Characters)
-project.webhook.gitPushOnly = Git push hook
+project.webhook.gitPushOnly = When to Git push only
 project.you.are.not.watching = You are not watching {0} project.
 project.you.are.watching = You are watching {0} project.
 project.you.may.want.to.be.a.member = You can send a sign-up request for {0} project.
diff --git a/conf/messages.ko-KR b/conf/messages.ko-KR
@@ -716,7 +716,7 @@ project.webhook.new = 새 웹후크 생성
 project.webhook.payloadUrl = 전송할 주소
 project.webhook.payloadUrl.empty = Paylaod URL 은 필수 필드입니다.
 project.webhook.payloadUrl.tooLong = Payload URL 이 너무 깁니다 (최대 2000글자)웹후크 추가
-project.webhook.gitPushOnly = Git push hook
+project.webhook.gitPushOnly = Git push 시에만 동작을 원하면 체크
 project.webhook.secret = Authorization Token
 project.webhook.secret.tooLong = 보안 토큰이 너무 깁니다. (최대 250 글자)
 project.you.are.not.watching = {0} 프로젝트를 지켜보고 있지 않습니다.
