Commit @033bbd48516253afec671807b4e55505af27c88d

Mijeong Park 2018-03-06

Merge branch 'next' before release v1.9.0

Reviewed-by: Suwon Chae
Reviewed-by: Mijeong Park

@033bbd48516253afec671807b4e55505af27c88d

2c5883e

033bbd4

AUTHORS

--- AUTHORS

+++ AUTHORS

...	...	@@ -48,3 +48,4 @@
48	48	rimi <rimi@userinsight.co.kr>
49	49	kenu <kenu.heo@gmail.com>
50	50	DongHo Byun <cpascal@nextfloor.com>
	51	+Mijeong Park <p.mj@naverlabs.com>

2c5883e

033bbd4

app/Global.java

--- app/Global.java

+++ app/Global.java


         isSecretInvalid = equalsDefaultSecret();
         insertInitialData();
 
+        Timestamp timestamp = new Timestamp("=== Yona server starting initialization ===");
         Config.onStart();
+        timestamp.logElapsedTime("--- Config reading: ok!");
         Property.onStart();
+        timestamp.logElapsedTime("--- Property reading: ok!");
         PullRequest.onStart();
+        timestamp.logElapsedTime("--- Pull request checking: ok!");
         NotificationMail.onStart();
+        timestamp.logElapsedTime("--- Notification mail scheduler: ok!");
         NotificationEvent.onStart();
+        timestamp.logElapsedTime("--- Notification event cleanup scheduler: ok!");
         Attachment.onStart();
+        timestamp.logElapsedTime("--- Temporary files cleanup scheduler: ok!");
         AccessControl.onStart();
+        timestamp.logElapsedTime("--- Basic access controller config reading: ok!");
 
         if (!isSecretInvalid) {
             YobiUpdate.onStart();
+            timestamp.logElapsedTime("--- Update checker run: ok! ");
             mailboxService.start();
+            timestamp.logElapsedTime("--- MailboxService checker run: ok!");
         }
 
         PlayAuthenticate.setResolver(new PlayAuthenticate.Resolver() {

2c5883e

033bbd4

app/actors/CommitsNotificationActor.java

--- app/actors/CommitsNotificationActor.java

+++ app/actors/CommitsNotificationActor.java


 /**
- * Yobi, Project Hosting SW
- *
- * Copyright 2013 NAVER Corp.
- * http://yobi.io
- *
- * @author Keesun Baik
- *
- * 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 actors;
 
 import models.*;

 
 /**
  * Creates new commit notifications.
- *
- * @author Keesun Baik
  */
 public class CommitsNotificationActor extends PostReceiveActor {
 

             title = Messages.get("notification.pushed.commits", project.name, commits.size());
         }
 
-        Set<User> watchers = Watch.findWatchers(project.asResource());
-        watchers.remove(sender);
-
-        NotificationEvent.afterNewCommits(commits, refNames, project, sender, title, watchers);
+        NotificationEvent.afterNewCommits(commits, refNames, project, sender, title);
     }
 
 }

2c5883e

033bbd4

app/assets/stylesheets/less/_common.less

--- app/assets/stylesheets/less/_common.less

+++ app/assets/stylesheets/less/_common.less

...	...	@@ -219,6 +219,7 @@
219	219	.mt4 { margin-top:4px; }
220	220	.mr3 { margin-right:3px; }
221	221	.pb4 { padding-bottom: 4px}
	222	+.pl0 { padding-left: 0}
222	223
223	224	.margin-top-20 { margin-top:20px; }
224	225	.margin-left-20 { margin-left: 20px; }
...	...	@@ -277,3 +278,31 @@
277	278	input.white:-moz-placeholder { color:#fff; opacity:0.8; } /* Firefox 18- */
278	279	input.white::-moz-placeholder { color:#fff; opacity:0.8; } /* Firefox 19+ */
279	280	input.white:-ms-input-placeholder { color:#fff; opacity:0.8; }
	281	+
	282	+.va-text-top {
	283	+ vertical-align: text-top !important;
	284	+}
	285	+
	286	+.width100p {
	287	+ width: 100%
	288	+}
	289	+
	290	+.text-ellipsis {
	291	+ white-space: nowrap;
	292	+ overflow: hidden;
	293	+ text-overflow: ellipsis;
	294	+}
	295	+
	296	+.z-index-1 {
	297	+ z-index: 1 !important;
	298	+}
	299	+
	300	+.hideFromDisplayOnly {
	301	+ display: none;
	302	+}
	303	+
	304	+.fixed-height-my-issues-list {
	305	+ line-height: 36px;
	306	+}
	307	+
	308	+.dimgray { color:dimgray; } (No newline at end of file)

2c5883e

033bbd4

app/assets/stylesheets/less/_override.less

--- app/assets/stylesheets/less/_override.less

+++ app/assets/stylesheets/less/_override.less


     .box-shadow(none);
 }
 
+.sharer-list {
+    .select2-container{
+        border: none;
+        box-shadow: none;
+        border-radius: 0 !important;
+        border-bottom: 1px solid rgba(0, 0, 0, 0.15);
+    }
+    .select2-container-multi {
+        .select2-choices {
+            .select2-search-choice {
+                background-color: #ececec;
+                border: 1px solid #dfdfdf;
+            }
+        }
+    }
+}
+
 .select2-dropdown-open {
     .select2-choice {
         border-bottom-color: transparent;

2c5883e

033bbd4

app/assets/stylesheets/less/_page.less

--- app/assets/stylesheets/less/_page.less

+++ app/assets/stylesheets/less/_page.less


                         font-size: 14px;
                         margin-left:5px;
                     }
+
+                    .user-project-list {
+                        .star {
+                            color: rgba(255, 255, 255, 0.22);
+                            &:hover {
+                                color: #e91e63;
+                                cursor: pointer;
+                            }
+                        }
+                        .starred {
+                            color: #e91e63 !important;
+                        }
+                    }
                 }
 
                 .project-origin {

 
                             &.nowrap {
                                 min-height:20px;
-                                height:20px;
-                                .message {
-                                    text-overflow: ellipsis;
-                                    white-space: nowrap;
-                                    overflow: hidden;
-                                }
+                                max-height:200px;
                             }
                         }
                     }

         }
 
         .event {
-            padding: 10px 0 10px 55px;
+            padding: 2px 0 2px 55px;
             font-size: 1em;
             line-height: 30px;
 

                 &.rejected {background: #F39C12;}
                 &.conflict {background: #C0392B;}
                 &.resolved {background: #468847;}
+                &.sharer-added {
+                    background-color: #B2EBF2;
+                    color: #0097A7;
+                }
+                &.sharer-deleted {
+                    background-color: #FFCCBC;
+                    color: #F4511E;
+                }
+                &.label-added {
+                    background-color: #B2EBF2;
+                    color: #0097A7;
+                }
+                &.label-deleted {
+                    background-color: #FFCCBC;
+                    color: #F4511E;
+                }
+                &.milestone-changed {
+                    background-color: #0088cc;
+                }
              }
 
              em { font-size:12px; color:#7F8C8D; margin-right:5px;}

         line-height: 20px;
         font-size:12px;
         color:#999;
+        overflow: hidden;
 
         .infos-item {
             margin-right:6px;

     .comments-count-color {
         color: @darkmagenta;
     }
+    .sharer-color {
+        color: @green;
+    }
 
     a:nth-child(2) {
+        margin-left: -5px;
+    }
+
+    a:nth-child(3) {
         margin-left: -5px;
     }
 

 .mileston-tag {
     max-width: 135px;
     text-overflow: ellipsis;
-    white-space: nowrap;
     overflow: hidden;
     color: #2196f3;
     font-size:11px;

     -moz-shadow: inset 0 0 5px 5px #222;
     //box-shadow: inset 0 0 5px 5px #222;
     box-shadow: 2px 2px 8px #000;
-    background: #FFF url('/assets/images/loading-gif-2.gif') no-repeat center;
+    background: #FFF url('@{base-image-path}/loading-gif-2.gif') no-repeat center;
 }
 
 .myissues-search-input {

     font-size: 15px;
     color: rgba(0, 0, 0, 0.7);
     padding: 0 2px;
+    vertical-align: top;
 }
 
 .no-margin {

 
 .my-issues {
     .post-item {
-        padding: 6px 10px;
+        padding: 2px 10px;
+        color: #999999;
       
         .title-wrap {
             margin-top: 2px;
+            white-space: normal;
+            overflow: auto;
+            display:table;
+
+            .title-cell {
+                display:table-cell;
+                vertical-align:middle;
+            }
+
+            .item-count-groups {
+                font-size: 10px;
+            }
+            .title {
+                font-size: 14px;
+                font-weight: 400;
+            }
         }
+
+        .author {
+            display:table;
+
+            .author-cell {
+                display:table-cell;
+                vertical-align:middle;
+                text-overflow: ellipsis;
+                overflow: hidden;
+                white-space: nowrap;
+            }
+        }
+        .meta {
+            display:table;
+
+            .meta-cell {
+                display:table-cell;
+                vertical-align:middle;
+            }
+        }
+
+        .post-id {
+            color:#999;
+            margin-right:5px;
+            font-size: 12px;
+            font-weight: normal;
+        }
+
         .infos {
             margin-top: 4px;
         }

         border-radius: 4px;
     }
 }
+
+.sharer-list {
+    margin-top: 40px;
+    padding: 10px;
+
+    .issue-share-title {
+        font-size: 16px;
+    }
+    .sharer-item{
+        display: inline-block;
+        background-color: #ececec;
+        border: 1px solid #dfdfdf;
+        border-radius: 3px;
+        padding: 1px 8px;
+    }
+}
+
+.project-name-in-my-issues {
+    display: flex !important;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    flex-grow: 1;
+    justify-content: space-between;
+    align-items: center;
+
+    .project-name {
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
+    }
+}

2c5883e

033bbd4

app/assets/stylesheets/less/_yobiUI.less

--- app/assets/stylesheets/less/_yobiUI.less

+++ app/assets/stylesheets/less/_yobiUI.less


 .yobiToasts {
     position: fixed;
     overflow: hidden;
-    left: 20px !important;
-    top: 25px !important;
+    right: 20px !important;
+    bottom: 25px !important;
     margin: 10px;
     z-index:9999;
 

2c5883e

033bbd4

app/controllers/Application.java

--- app/controllers/Application.java

+++ app/controllers/Application.java


     public static String LOGIN_PAGE_LOGINID_PLACEHOLDER  = play.Configuration.root().getString("application.login.page.loginId.placeholder", "");
     public static String LOGIN_PAGE_PASSWORD_PLACEHOLDER  = play.Configuration.root().getString("application.login.page.password.placeholder", "");
     public static boolean SHOW_USER_EMAIL = play.Configuration.root().getBoolean("application.show.user.email", true);
+    public static String NAVBAR_CUSTOM_LINK_NAME  = play.Configuration.root().getString("application.navbar.custom.link.name", "");
+    public static String NAVBAR_CUSTOM_LINK_URL  = play.Configuration.root().getString("application.navbar.custom.link.url", "");
 
     @AnonymousCheck
     public static Result index() {

2c5883e

033bbd4

app/controllers/AttachmentApp.java

--- app/controllers/AttachmentApp.java

+++ app/controllers/AttachmentApp.java


 /**
- * Yona, Project Hosting SW
- *
- * Copyright 2016 the original author or authors.
- */
+ * Yona, 21st Century Project Hosting SW
+ * <p>
+ * Copyright Yona & Yobi Authors & NAVER Corp. & NAVER LABS Corp.
+ * https://yona.io
+ **/
 package controllers;
 
 import com.fasterxml.jackson.databind.JsonNode;

 
         User uploader = findUploader(request().body().asMultipartFormData().asFormUrlEncoded());
         if (uploader.isAnonymous()) {
-            uploader = User.findByUserToken(request().getHeader("Yona-Token"));
+            uploader = User.findByUserToken(User.extractUserTokenFromRequestHeader(request()));
         }
 
         // Anonymous cannot upload a file.

2c5883e

033bbd4

app/controllers/BoardApp.java

--- app/controllers/BoardApp.java

+++ app/controllers/BoardApp.java


 /**
- * Yona, Project Hosting SW
- *
- * Copyright 2016 the original author or authors.
- */
+ * Yona, 21st Century Project Hosting SW
+ * <p>
+ * Copyright Yona & Yobi Authors & NAVER Corp. & NAVER LABS Corp.
+ * https://yona.io
+ **/
 package controllers;
 
 import actions.NullProjectCheckAction;

             public void run() {
                 post.comments = original.comments;
                 if(isSelectedToSendNotificationMail() || !original.isAuthoredBy(UserApp.currentUser())){
-                    NotificationEvent.afterNewPost(post);
+                    NotificationEvent.afterUpdatePosting(original.body, post);
                 }
             }
         };

         Posting posting = Posting.findByNumber(project, number);
         Call redirectTo = routes.BoardApp.posts(project.owner, project.name, 1);
 
+        NotificationEvent.afterResourceDeleted(posting, UserApp.currentUser());
         return delete(posting, posting.asResource(), redirectTo);
     }
 

         return new Runnable() {
             @Override
             public void run() {
+                posting.updatedDate = JodaDateUtil.now();
                 comment.posting = posting;
             }
         };

2c5883e

033bbd4

app/controllers/IssueApp.java

--- app/controllers/IssueApp.java

+++ app/controllers/IssueApp.java


 /**
  * Yona, 21st Century Project Hosting SW
  * <p>
- * Copyright Yona & Yobi Authors & NAVER Corp.
+ * Copyright Yona & Yobi Authors & NAVER Corp. & NAVER LABS Corp.
  * https://yona.io
  **/
 package controllers;

 
     @AnonymousCheck(requiresLogin = false, displaysFlashMessage = true)
     public static Result organizationIssues(@Nonnull String organizationName, @Nonnull String state, @Nonnull String format, int pageNum) throws WriteException, IOException {
+
         // SearchCondition from param
         Form<models.support.SearchCondition> issueParamForm = new Form<>(models.support.SearchCondition.class);
         models.support.SearchCondition searchCondition = issueParamForm.bindFromRequest().get();

 
     private static boolean hasNotConditions(models.support.SearchCondition searchCondition) {
         return searchCondition.assigneeId == null && searchCondition.authorId == null && searchCondition.mentionId == null
-                && searchCondition.commenterId == null;
+                && searchCondition.commenterId == null && searchCondition.sharerId == null;
     }
 
     @Transactional

                 continue;
             }
 
-            boolean assigneeChanged = false;
-            User oldAssignee = null;
-            if (issueMassUpdate.assignee != null) {
-                if(hasAssignee(issue)) {
-                    oldAssignee = issue.assignee.user;
-                }
-                Assignee newAssignee;
-                if (issueMassUpdate.assignee.isAnonymous()) {
-                    newAssignee = null;
-                } else {
-                    newAssignee = Assignee.add(issueMassUpdate.assignee.id, project.id);
-                }
-                assigneeChanged = !issue.assignedUserEquals(newAssignee);
-                issue.assignee = newAssignee;
-            }
-
-            boolean stateChanged = false;
-            State oldState = null;
-            if ((issueMassUpdate.state != null) && (issue.state != issueMassUpdate.state)) {
-                stateChanged = true;
-                oldState = issue.state;
-                issue.state = issueMassUpdate.state;
-            }
-
-            if (issueMassUpdate.milestone != null) {
-                if(issueMassUpdate.milestone.isNullMilestone()) {
-                    issue.milestone = null;
-                } else {
-                    issue.milestone = issueMassUpdate.milestone;
-                }
-            }
-
-            if (issueMassUpdate.attachingLabelIds != null) {
-                for (Long labelId : issueMassUpdate.attachingLabelIds) {
-                    issue.labels.add(IssueLabel.finder.byId(labelId));
-                }
-            }
-
-            if (issueMassUpdate.detachingLabelIds != null) {
-                for (Long labelId : issueMassUpdate.detachingLabelIds) {
-                    issue.labels.remove(IssueLabel.finder.byId(labelId));
-                }
-            }
+            updateAssigneeIfChanged(issueMassUpdate.assignee, project, issue);
+            updateStateIfChanged(issueMassUpdate.state, issue);
+            updateMilestoneIfChanged(issueMassUpdate.milestone, issue);
+            updateLabelIfChanged(issueMassUpdate.attachingLabelIds,
+                    issueMassUpdate.detachingLabelIds, issue);
 
             if (issueMassUpdate.isDueDateChanged) {
                 issue.dueDate = JodaDateUtil.lastSecondOfDay(issueMassUpdate.dueDate);

             issue.updatedDate = JodaDateUtil.now();
             issue.update();
             updatedItems++;
-
-            if(assigneeChanged) {
-                NotificationEvent notiEvent = NotificationEvent.afterAssigneeChanged(oldAssignee, issue);
-                IssueEvent.addFromNotificationEvent(notiEvent, issue, UserApp.currentUser().loginId);
-            }
-            if(stateChanged) {
-                NotificationEvent notiEvent = NotificationEvent.afterStateChanged(oldState, issue);
-                IssueEvent.addFromNotificationEvent(notiEvent, issue, UserApp.currentUser().loginId);
-            }
         }
 
         if (updatedItems == 0 && rejectedByPermission > 0) {

             }
         } else {
             return redirect(request().getHeader("Referer"));
+        }
+    }
+
+    private static void updateLabelIfChanged(List<Long> attachingLabelIds, List<Long> detachingLabelIds,
+                                             Issue issue) {
+        boolean isLabelChanged = false;
+        StringBuilder addedLabels = new StringBuilder();
+        StringBuilder deletedLabels = new StringBuilder();
+
+        if (attachingLabelIds != null) {
+            for (Long labelId : attachingLabelIds) {
+                IssueLabel label = IssueLabel.finder.byId(labelId);
+                issue.labels.add(label);
+                isLabelChanged = true;
+                addedLabels.append(label.category.name).append(" - ").append(label.name);
+            }
+        }
+
+        if (detachingLabelIds != null) {
+            for (Long labelId : detachingLabelIds) {
+                IssueLabel label = IssueLabel.finder.byId(labelId);
+                issue.labels.remove(label);
+                isLabelChanged = true;
+                deletedLabels.append(label.category.name).append(" - ").append(label.name);
+            }
+        }
+
+        if(isLabelChanged) {
+            NotificationEvent notiEvent = NotificationEvent.afterIssueLabelChanged(
+                    addedLabels.toString(),
+                    deletedLabels.toString(),
+                    issue);
+            IssueEvent.addFromNotificationEventWithoutSkipEvent(notiEvent, issue, UserApp.currentUser().loginId);
+        }
+    }
+
+    private static void updateMilestoneIfChanged(Milestone newMilestone, Issue issue) {
+
+        Long oldMilestoneId = issue.milestoneId();
+
+        if (!isMilestoneChanged(newMilestone, issue.milestone)) {
+            return;
+        }
+
+        if(newMilestone.isNullMilestone()) {
+            issue.milestone = null;
+        } else {
+            issue.milestone = newMilestone;
+        }
+        NotificationEvent notiEvent = NotificationEvent.afterMilestoneChanged(oldMilestoneId, issue);
+        IssueEvent.addFromNotificationEvent(notiEvent, issue, UserApp.currentUser().loginId);
+    }
+
+    private static boolean isMilestoneChanged(Milestone newMilestone, Milestone oldMilestone) {
+        if (newMilestone == null) {
+            return false;
+        }
+
+        if (oldMilestone != null && oldMilestone.id.equals(newMilestone.id)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    private static void updateStateIfChanged(State newState, Issue issue) {
+        boolean stateChanged = false;
+        State oldState = null;
+        if ((newState != null) && (issue.state != newState)) {
+            stateChanged = true;
+            oldState = issue.state;
+            issue.state = newState;
+        }
+        if(stateChanged) {
+            NotificationEvent notiEvent = NotificationEvent.afterStateChanged(oldState, issue);
+            IssueEvent.addFromNotificationEvent(notiEvent, issue, UserApp.currentUser().loginId);
+        }
+    }
+
+    private static void updateAssigneeIfChanged(User assignee, Project project, Issue issue) {
+        boolean assigneeChanged = false;
+        User oldAssignee = null;
+
+        if (assignee != null) {
+            if(hasAssignee(issue)) {
+                oldAssignee = issue.assignee.user;
+            }
+            Assignee newAssignee;
+            if (assignee.isAnonymous()) {
+                newAssignee = null;
+            } else {
+                newAssignee = Assignee.add(assignee.id, project.id);
+            }
+            assigneeChanged = !issue.assignedUserEquals(newAssignee);
+            issue.assignee = newAssignee;
+        }
+
+        if(assigneeChanged) {
+            NotificationEvent notiEvent = NotificationEvent.afterAssigneeChanged(oldAssignee, issue);
+            IssueEvent.addFromNotificationEvent(notiEvent, issue, UserApp.currentUser().loginId);
         }
     }
 

         Call redirectTo =
             routes.IssueApp.issues(project.owner, project.name, State.OPEN.state(), "html", 1);
 
+        NotificationEvent.afterResourceDeleted(issue, UserApp.currentUser());
         return delete(issue, issue.asResource(), redirectTo);
     }
 

     private static Comment saveComment(Project project, Issue issue, IssueComment comment) {
         Comment savedComment;
         IssueComment existingComment = IssueComment.find.where().eq("id", comment.id).findUnique();
-        if (existingComment != null) {
+        if (existingComment == null) {
+            comment.projectId = project.id;
+            savedComment = saveComment(comment, getContainerUpdater(issue, comment));
+            NotificationEvent.afterNewComment(savedComment);
+        } else {
             existingComment.contents = comment.contents;
             savedComment = saveComment(existingComment, getContainerUpdater(issue, comment));
             if(isSelectedToSendNotificationMail() || !existingComment.isAuthoredBy(UserApp.currentUser())){
                 NotificationEvent.afterCommentUpdated(savedComment);
             }
-        } else {
-            comment.projectId = project.id;
-            savedComment = saveComment(comment, getContainerUpdater(issue, comment));
-            NotificationEvent.afterNewComment(savedComment);
         }
         return savedComment;
     }

2c5883e

033bbd4

app/controllers/LabelApp.java

--- app/controllers/LabelApp.java

+++ app/controllers/LabelApp.java


             return status(Http.Status.NOT_ACCEPTABLE);
         }
 
+        if (limit == null) {
+            return badRequest("No limit");
+        }
+
         ExpressionList<Label> el =
                 Label.find.where().and(icontains("category", category), icontains("name", query));
 

             return status(Http.Status.NOT_ACCEPTABLE);
         }
 
+        if (limit == null) {
+            return badRequest("No limit");
+        }
+
         SqlQuery sqlQuery;
         SqlQuery sqlCountQuery;
 

2c5883e

033bbd4

app/controllers/OrganizationApp.java

--- app/controllers/OrganizationApp.java

+++ app/controllers/OrganizationApp.java


 /**
- * Yona, Project Hosting SW
- *
- * Copyright 2017 the original author or authors.
- */
+ * Yona, 21st Century Project Hosting SW
+ * <p>
+ * Copyright Yona & Yobi Authors & NAVER Corp. & NAVER LABS Corp.
+ * https://yona.io
+ **/
 package controllers;
 
 import com.avaje.ebean.ExpressionList;
 import com.avaje.ebean.Page;
 import controllers.annotation.AnonymousCheck;
 import controllers.annotation.GuestProhibit;
+import controllers.PullRequestApp.SearchCondition;
+import controllers.PullRequestApp.Category;
 import models.*;
 import models.enumeration.Operation;
 import models.enumeration.RequestState;

 import views.html.organization.members;
 import views.html.organization.setting;
 import views.html.organization.view;
+import views.html.organization.group_pullrequest_list;
 
 import javax.servlet.ServletException;
 import javax.validation.ConstraintViolation;

  */
 @AnonymousCheck
 public class OrganizationApp extends Controller {
+
+    @AnonymousCheck(requiresLogin = false, displaysFlashMessage = true)
+    public static Result organizationPullRequests(String organizationName, String category) {
+
+        Organization organization = Organization.findByName(organizationName);
+        if (organization == null) {
+            return notFound(ErrorViews.NotFound.render("error.notfound.organization"));
+        }
+
+        SearchCondition condition = Form.form(SearchCondition.class).bindFromRequest().get();
+        if (category.equals("open")) {
+            condition.setOrganization(organization).setCategory(Category.OPEN);
+        } else {
+            condition.setOrganization(organization).setCategory(Category.CLOSED);
+        }
+        Page<PullRequest> page = PullRequest.findPagingList(condition);
+
+        return ok(group_pullrequest_list.render("title.pullrequest",  organization, page, condition, category));
+    }
+
+    @AnonymousCheck(requiresLogin = false, displaysFlashMessage = true)
+    public static Result organizationClosedPullRequests(String organizationName) {
+        return organizationPullRequests(organizationName, "closed");
+    }
+
     /**
      * show New Group page
      * @return {@link Result}

2c5883e

033bbd4

app/controllers/ProjectApp.java

--- app/controllers/ProjectApp.java

+++ app/controllers/ProjectApp.java


 /**
  * Yona, 21st Century Project Hosting SW
  * <p>
- * Copyright Yona & Yobi Authors & NAVER Corp.
+ * Copyright Yona & Yobi Authors & NAVER Corp. & NAVER LABS Corp.
  * https://yona.io
  **/
 package controllers;

         return redirect(url);
     }
 
-    @Transactional
     @AnonymousCheck(requiresLogin = true, displaysFlashMessage = true)
     public static synchronized Result acceptTransfer(Long id, String confirmKey) throws IOException, ServletException {
         ProjectTransfer pt = ProjectTransfer.findValidOne(id);

 
         // Change the project's name and move the repository.
         String newProjectName = Project.newProjectName(pt.destination, project.name);
-        PlayRepository repository = RepositoryService.getRepository(project);
-        repository.move(project.owner, project.name, pt.destination, newProjectName);
 
-        User newOwnerUser = User.findByLoginId(pt.destination);
-        Organization newOwnerOrg = Organization.findByName(pt.destination);
+        // Following three local variables are used for bottom of this method
+        String originalProjectOwner = project.owner;
+        String originalProjectName = project.name;
+        String destinationOwner = pt.destination;
+        Long senderId = pt.sender.id;
+
+        disableProjectTransferLink(pt, project, newProjectName);
+        PlayRepository repository = RepositoryService.getRepository(project);
+
+        // intentionally placed to the last of method
+        repository.move(originalProjectOwner, originalProjectName, destinationOwner, newProjectName);
+
+        User newOwnerUser = User.findByLoginId(destinationOwner);
+        Organization newOwnerOrg = Organization.findByName(destinationOwner);
 
         // Change the project's information.
         project.recordRenameOrTransferHistoryIfLastChangePassed24HoursFrom(project);
-        project.owner = pt.destination;
+        project.owner = destinationOwner;
         project.name = newProjectName;
         if (newOwnerOrg != null) {
             project.organization = newOwnerOrg;

         project.update();
 
         // Change roles.
-        if (ProjectUser.isManager(pt.sender.id, project.id)) {
-            ProjectUser.assignRole(pt.sender.id, project.id, RoleType.MEMBER);
+        if (ProjectUser.isManager(senderId, project.id)) {
+            ProjectUser.assignRole(senderId, project.id, RoleType.MEMBER);
         }
         if (!newOwnerUser.isAnonymous()) {
             ProjectUser.assignRole(newOwnerUser.id, project.id, RoleType.MANAGER);
         }
 
-        // Change the tranfer's status to be accepted.
-        pt.newProjectName = newProjectName;
-        pt.accepted = true;
-        pt.update();
-
-        // If the opposite request is exists, delete it.
-        ProjectTransfer.deleteExisting(project, pt.sender, pt.destination);
         CacheStore.refreshProjectMap();
 
         return redirect(routes.ProjectApp.project(project.owner, project.name));
     }
 
+    private static void disableProjectTransferLink(ProjectTransfer pt, Project project, String newProjectName) {
+        // Change the tranfer's status to be accepted.
+        pt.newProjectName = newProjectName;
+        pt.accepted = true;
+
+        // If the opposite request is exists, delete it.
+        ProjectTransfer.deleteExisting(project, pt.sender, pt.destination);
+    }
+
     @IsAllowed(Operation.UPDATE)
     public static Result changeVCSForm(String ownerId, String projectName) {
         Project project = Project.findByOwnerAndProjectName(ownerId, projectName);

2c5883e

033bbd4

app/controllers/PullRequestApp.java

--- app/controllers/PullRequestApp.java

+++ app/controllers/PullRequestApp.java


 
         // Only members can access code?
         if(project.isCodeAccessibleMemberOnly && !project.hasMember(UserApp.currentUser())) {
-                return forbidden(ErrorViews.Forbidden.render("error.forbidden", project));
+            return forbidden(ErrorViews.Forbidden.render("error.forbidden", project));
         }
 
         SearchCondition condition = Form.form(SearchCondition.class).bindFromRequest().get();

         public Long contributorId;
         public int pageNum = Constants.DEFAULT_PAGE;
         public Category category;
+        public Organization organization;
+
+        public SearchCondition setOrganization(Organization organization) {
+            this.organization = organization;
+            return this;
+        }
 
         public SearchCondition setProject(Project project) {
             this.project = project;

             clone.contributorId = this.contributorId;
             clone.pageNum = this.pageNum;
             clone.category = this.category;
+            clone.organization = this.organization;
             return clone;
         }
 

2c5883e

033bbd4

app/controllers/UserApp.java

--- app/controllers/UserApp.java

+++ app/controllers/UserApp.java


         } catch (CommunicationException e) {
             play.Logger.error("Cannot connect to ldap server \n" + e.getMessage());
             e.printStackTrace();
+            if(FALLBACK_TO_LOCAL_LOGIN){
+                play.Logger.warn("fallback to local login: " + loginIdOrEmail);
+                return authenticateWithPlainPassword(loginIdOrEmail, password);
+            }
             return User.anonymous;
         } catch (AuthenticationException e) {
             flash(Constants.WARNING, Messages.get("user.login.invalid"));

2c5883e

033bbd4

app/controllers/WatchProjectApp.java

--- app/controllers/WatchProjectApp.java

+++ app/controllers/WatchProjectApp.java


 /**
  * Yona, 21st Century Project Hosting SW
  * <p>
- * Copyright Yona & Yobi Authors & NAVER Corp.
+ * Copyright Yona & Yobi Authors & NAVER Corp. & NAVER LABS Corp.
  * https://yona.io
  **/
 package controllers;

 import play.mvc.Result;
 import utils.AccessControl;
 import utils.ErrorViews;
+
+import static models.UserProjectNotification.*;
 
 @AnonymousCheck(requiresLogin = true, displaysFlashMessage = true)
 public class WatchProjectApp extends Controller {

             return badRequest(Messages.get("error.notfound.watch"));
         }
 
-        UserProjectNotification upn = UserProjectNotification.findOne(user, project, notiType);
-        if(upn == null) { // make the EventType OFF, because default is ON.
-            UserProjectNotification.unwatchExplictly(user, project, notiType);
+        UserProjectNotification userProjectNotification = findOne(user, project, notiType);
+        if(userProjectNotification == null) { // not specified yet
+            if (isNotifiedByDefault(notiType)) {
+                unwatchExplictly(user, project, notiType);
+            } else {
+                watchExplictly(user, project, notiType);
+            }
         } else {
-            upn.toggle();
+            userProjectNotification.toggle(notiType);
         }
 
         return ok();

2c5883e

033bbd4

app/controllers/api/IssueApi.java

--- app/controllers/api/IssueApi.java

+++ app/controllers/api/IssueApi.java


 import java.util.*;
 
 import static controllers.UserApp.MAX_FETCH_USERS;
+import static controllers.UserApp.currentUser;
 import static controllers.api.UserApi.createUserNode;
 import static play.libs.Json.toJson;
 

         }
     }
 
-    private static void addUserToUsers(User user, List<ObjectNode> users) {
+    static void addUserToUsers(User user, List<ObjectNode> users) {
         ObjectNode userNode = Json.newObject();
         userNode.put("loginId", user.loginId);
         userNode.put("name", user.getDisplayName());

                     return ok(node);
                 });
     }
+
+    @AnonymousCheck
+    public static Result findSharerByloginIds(String ownerName, String projectName, Long number,
+                                              String commaSeperatedIds) {
+        if (!request().accepts("application/json")) {
+            return status(Http.Status.NOT_ACCEPTABLE);
+        }
+        Project project = Project.findByOwnerAndProjectName(ownerName, projectName);
+        Issue issue = Issue.findByNumber(project, number);
+
+        List<IssueSharer> list = getExpressionListByExtractingLoginIds(issue, commaSeperatedIds).findList();
+        sortListByAddedDate(list);
+
+        List<ObjectNode> users = new ArrayList<>();
+        for (IssueSharer sharer :list) {
+            addUserToUsers(sharer.user, users);
+        }
+        return ok(toJson(users));
+    }
+
+    private static void sortListByAddedDate(List<IssueSharer> list) {
+        list.sort(new Comparator<IssueSharer>() {
+            @Override
+            public int compare(IssueSharer o1, IssueSharer o2) {
+                return o1.created.compareTo(o2.created);
+            }
+        });
+    }
+
+    private static ExpressionList<IssueSharer> getExpressionListByExtractingLoginIds(Issue issue, String query) {
+        String[] queryItems = query.split(",");
+        ExpressionList<IssueSharer> el = IssueSharer.find
+                .where()
+                .in("loginId", Arrays.asList(queryItems))
+                .eq("issue.id", issue.id);
+        return el;
+    }
+
+    @IsAllowed(Operation.READ)
+    public static Result findSharableUsers(String ownerName, String projectName, Long number, String query) {
+        if (!request().accepts("application/json")) {
+            return status(Http.Status.NOT_ACCEPTABLE);
+        }
+
+        List<ObjectNode> users = new ArrayList<>();
+
+        ExpressionList<User> el = getUserExpressionList(query, request().getQueryString("type"));
+
+        int total = el.findRowCount();
+        if (total > MAX_FETCH_USERS) {
+            el.setMaxRows(MAX_FETCH_USERS);
+            response().setHeader("Content-Range", "items " + MAX_FETCH_USERS + "/" + total);
+        }
+
+        for (User user :el.findList()) {
+            addUserToUsers(user, users);
+        }
+
+        return ok(toJson(users));
+    }
+
+    public static Result updateSharer(String owner, String projectName, Long number){
+        JsonNode json = request().body().asJson();
+        if (json == null) {
+            return badRequest(Json.newObject().put("message", "Expecting Json data"));
+        }
+
+        Project project = Project.findByOwnerAndProjectName(owner, projectName);
+        Issue issue = Issue.findByNumber(project, number);
+        if (!AccessControl.isAllowed(UserApp.currentUser(), issue.asResource(),
+                Operation.UPDATE)) {
+            return forbidden(Json.newObject().put("message", "Permission denied"));
+        }
+
+        JsonNode sharer = json.findValue("sharer");
+        if(noSharer(sharer)){
+            return badRequest(Json.newObject().put("message", "No sharer"));
+        }
+
+        final String action = json.findValue("action").asText();
+
+        ObjectNode result = changeSharer(sharer, issue, action);
+        sendNotification(sharer, issue, action);
+
+        return ok(result);
+    }
+
+    private static ObjectNode changeSharer(JsonNode sharer, Issue issue, String action) {
+        ObjectNode result = Json.newObject();
+        for (JsonNode sharerLoginId : sharer) {
+            if ("add".equalsIgnoreCase(action)) {
+                addSharer(issue, sharerLoginId.asText());
+                result.put("action", "added");
+            } else if ("delete".equalsIgnoreCase(action)) {
+                result.put("action", "deleted");
+                removeSharer(issue, sharerLoginId.asText());
+            } else {
+                play.Logger.error("Unknown issue sharing action: " + issue + ":" + action + " by " + currentUser());
+                result.put("action", "Do nothing. Unsupported action: " + action);
+            }
+            result.put("sharer", User.findByLoginId(sharerLoginId.asText()).getDisplayName());
+        }
+        return result;
+    }
+
+    private static void sendNotification(JsonNode sharer, Issue issue, String action) {
+        Runnable preUpdateHook = new Runnable() {
+            @Override
+            public void run() {
+                for(JsonNode sharerLoginId: sharer){
+                    addSharerChangedNotification(issue, sharerLoginId.asText(), action);
+                }
+            }
+        };
+        preUpdateHook.run();
+    }
+
+
+    private static void addSharerChangedNotification(Issue issue, String sharerLoginId, String action) {
+        NotificationEvent notiEvent = NotificationEvent.afterIssueSharerChanged(issue, sharerLoginId, action);
+        IssueEvent.addFromNotificationEventWithoutSkipEvent(notiEvent, issue, UserApp.currentUser().loginId);
+    }
+
+    private static boolean noSharer(JsonNode sharers) {
+        return sharers == null || sharers.size() == 0;
+    }
+
+    private static void addSharer(Issue issue, String loginId) {
+        IssueSharer issueSharer = IssueSharer.find.where()
+                .eq("loginId", loginId)
+                .eq("issue.id", issue.id).findUnique();
+        if(issueSharer == null) {
+            issueSharer = IssueSharer.createSharer(loginId, issue);
+            issueSharer.save();
+        }
+        issue.sharers.add(issueSharer);
+    }
+
+    private static void removeSharer(Issue issue, String loginId) {
+        IssueSharer issueSharer =
+                IssueSharer.find.where()
+                        .eq("loginId", loginId)
+                        .eq("issue.id", issue.id)
+                        .findUnique();
+        issueSharer.delete();
+        issue.sharers.remove(issueSharer);
+    }
 }

2c5883e

033bbd4

app/mailbox/MailboxService.java

--- app/mailbox/MailboxService.java

+++ app/mailbox/MailboxService.java


 /**
- * Yobi, Project Hosting SW
- *
- * Copyright 2014 NAVER Corp.
- * http://yobi.io
- *
- * @Author Yi EungJun
- *
- * 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 mailbox;
 
 import akka.actor.Cancellable;

 import play.Configuration;
 import play.Logger;
 import play.libs.Akka;
+import play.libs.F;
 import scala.concurrent.duration.Duration;
 import utils.Diagnostic;
 import utils.SimpleDiagnostic;

             return;
         }
 
-        try {
-            EmailHandler.handleNewMessages(folder);
-        } catch (MessagingException e) {
-            play.Logger.error("Failed to handle new messages");
-        }
-
-        try {
-            startEmailListener();
-        } catch (Exception e) {
-            startEmailPolling();
-        }
+        handleNewMessagesAndStartListener();
 
         Diagnostic.register(new SimpleDiagnostic() {
             @Override

         });
     }
 
+    private void handleNewMessagesAndStartListener() {
+        F.Promise<Void> promise = F.Promise.promise(
+                new F.Function0<Void>() {
+                    public Void apply() {
+                        try {
+                            EmailHandler.handleNewMessages(folder);
+                        } catch (MessagingException e) {
+                            Logger.error("Failed to handle new messages");
+                        }
+
+                        try {
+                            startEmailListener();
+                        } catch (Exception e) {
+                            startEmailPolling();
+                        }
+                        return null;
+                    }
+                }
+        );
+    }
+
     /**
      * Reopen the IMAP folder which is used by MailboxService.
      *

2c5883e

033bbd4

app/models/AbstractPosting.java

--- app/models/AbstractPosting.java

+++ app/models/AbstractPosting.java


         actualWatchers.addAll(baseWatchers);
 
         actualWatchers.add(getAuthor());
-        for (Comment c : getComments()) {
-            User user = User.find.byId(c.authorId);
-            if (user != null) {
-                actualWatchers.add(user);
-            }
-        }
 
         return Watch.findActualWatchers(actualWatchers, asResource(), allowedWatchersOnly);
     }

2c5883e

033bbd4

app/models/FavoriteProject.java

--- app/models/FavoriteProject.java

+++ app/models/FavoriteProject.java

...	...	@@ -49,4 +49,11 @@
49	49	favoriteProject.update();
50	50	}
51	51	}
	52	+
	53	+ public static FavoriteProject findByProjectId(Long userId, Long projectId){
	54	+ return finder.where()
	55	+ .eq("user.id", userId)
	56	+ .eq("project.id", projectId)
	57	+ .findUnique();
	58	+ }
52	59	}

2c5883e

033bbd4

app/models/Issue.java

--- app/models/Issue.java

+++ app/models/Issue.java


     @OneToMany(cascade = CascadeType.ALL, mappedBy="issue")
     public List<IssueEvent> events;
 
+    @OneToMany(cascade = CascadeType.ALL, mappedBy = "issue")
+    public Set<IssueSharer> sharers = new LinkedHashSet<>();
+
     @ManyToMany(cascade = CascadeType.ALL)
     @JoinTable(
             name = "issue_voter",

 
     public String assigneeName() {
         return ((assignee != null && assignee.user != null) ? assignee.user.name : null);
+    }
+
+    public Long milestoneId() {
+        if (milestone == null) {
+            return Milestone.NULL_MILESTONE_ID;
+        }
+        return milestone.id;
     }
 
     public boolean hasAssignee() {

                 Messages.get("issue.label"),
                 Messages.get("issue.createdDate"),
                 Messages.get("issue.dueDate"),
+                Messages.get("milestone"),
                 "URL",
                 Messages.get("common.comment"),
                 Messages.get("common.comment.author"),

 
             lineNumber++;
             int columnPos = 0;
+            String milestoneName = issue.milestone != null ? issue.milestone.title : "";
             sheet.addCell(new jxl.write.Label(columnPos++, lineNumber, issue.getNumber().toString(), bodyCellFormat));
             sheet.addCell(new jxl.write.Label(columnPos++, lineNumber, issue.state.toString(), bodyCellFormat));
             sheet.addCell(new jxl.write.Label(columnPos++, lineNumber, issue.title, bodyCellFormat));

             sheet.addCell(new jxl.write.Label(columnPos++, lineNumber, getIssueLabels(issue), bodyCellFormat));
             sheet.addCell(new jxl.write.DateTime(columnPos++, lineNumber, issue.createdDate, dateCellFormat));
             sheet.addCell(new jxl.write.Label(columnPos++, lineNumber, JodaDateUtil.geYMDDate(issue.dueDate), bodyCellFormat));
+            sheet.addCell(new jxl.write.Label(columnPos++, lineNumber, milestoneName, bodyCellFormat));
             sheet.addCell(new jxl.write.Label(columnPos++, lineNumber, controllers.routes.IssueApp.issue(issue.project.owner, issue.project.name, issue.number).toString(), bodyCellFormat));
             if (comments.size() > 0) {
                 for (int j = 0; j < comments.size(); j++) {

                 .eq("state", State.OPEN)
                 .findRowCount();
     }
+
+    public IssueSharer findSharerByUserId(Long id){
+        for (IssueSharer sharer : sharers) {
+            if (sharer.user.id.equals(id)) {
+                return sharer;
+            }
+        }
+        return null;
+    }
+
+    public List<IssueSharer> getSortedSharer() {
+        return new ArrayList<>(sharers);
+    }
+
+    public static int getCountOfMentionedOpenIssues(Long userId) {
+        return finder.where()
+                .in("id", Mention.getMentioningIssueIds(userId))
+                .eq("state", State.OPEN)
+                .findRowCount();
+    }
 }

2c5883e

033bbd4

app/models/IssueEvent.java

--- app/models/IssueEvent.java

+++ app/models/IssueEvent.java


 /**
- * Yobi, Project Hosting SW
- *
- * Copyright 2013 NAVER Corp.
- * http://yobi.io
- *
- * @author Yi EungJun
- *
- * 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 models.enumeration.EventType;

                 .orderBy("id desc").setMaxRows(1).findUnique();
 
         if (lastEvent != null) {
-            if (lastEvent.eventType == event.eventType &&
-                    StringUtils.equals(event.senderLoginId, lastEvent.senderLoginId)) {
+            if (isSameUserEventAsPrevious(event, lastEvent)) {
                 // A -> B, B -> C ==> A -> C
                 event.oldValue = lastEvent.oldValue;
                 lastEvent.delete();

         }
 
         event.save();
+    }
+
+
+    /**
+     * It is nearly same as {@link #add(IssueEvent)} except that it doesn't skip waypoint events.
+     *
+     * For example, if events of an issue are occurred continuously
+     * A -> B -> C, then {@link #add(IssueEvent)} method skip B.
+     *
+     * This method doesn't skip B and leave it.
+     *
+     * @param event
+     */
+    public static void addWithoutSkipEvent(IssueEvent event) {
+        Date draftDate = DateTime.now().minusMillis(DRAFT_TIME_IN_MILLIS).toDate();
+
+        IssueEvent lastEvent = IssueEvent.find.where()
+                .eq("issue.id", event.issue.id)
+                .gt("created", draftDate)
+                .orderBy("id desc").setMaxRows(1).findUnique();
+
+        if (lastEvent != null) {
+            if (isSameUserEventAsPrevious(event, lastEvent) &&
+                    isRevertingTheValue(event, lastEvent)) {
+                lastEvent.delete();
+                return;
+            }
+        }
+        event.save();
+    }
+
+    private static boolean isRevertingTheValue(IssueEvent event, IssueEvent lastEvent) {
+        return StringUtils.equals(event.oldValue, lastEvent.newValue) &&
+                StringUtils.equals(event.newValue, lastEvent.oldValue);
+    }
+
+    private static boolean isSameUserEventAsPrevious(IssueEvent event, IssueEvent lastEvent) {
+        return lastEvent.eventType == event.eventType &&
+                StringUtils.equals(event.senderLoginId, lastEvent.senderLoginId);
     }
 
     /**

         add(event);
     }
 
+    public static void addFromNotificationEventWithoutSkipEvent(NotificationEvent notiEvent, Issue updatedIssue,
+                                                String senderLoginId) {
+        IssueEvent event = new IssueEvent();
+        event.created = notiEvent.created;
+        event.senderLoginId = senderLoginId;
+        event.issue = updatedIssue;
+        event.eventType = notiEvent.eventType;
+        event.oldValue = notiEvent.oldValue;
+        event.newValue = notiEvent.newValue;
+        addWithoutSkipEvent(event);
+    }
+
     @Override
     public Date getDate() {
         return created;

033bbd4

app/models/IssueSharer.java (added)

+++ app/models/IssueSharer.java

...	...	@@ -0,0 +1,60 @@
	1	+/**
	2	+ * Yona, 21st Century Project Hosting SW
	3	+ * <p>
	4	+ * Copyright Yona & Yobi Authors & NAVER Corp. & NAVER LABS Corp.
	5	+ * https://yona.io
	6	+ **/
	7	+
	8	+package models;
	9	+
	10	+import models.enumeration.State;
	11	+import play.db.ebean.Model;
	12	+
	13	+import javax.persistence.*;
	14	+import java.util.Date;
	15	+
	16	+@Entity
	17	+public class IssueSharer extends Model {
	18	+ private static final long serialVersionUID = 6199025373911652405L;
	19	+
	20	+ @Id
	21	+ public Long id;
	22	+
	23	+ public Date created;
	24	+
	25	+ public String loginId;
	26	+
	27	+ @OneToOne
	28	+ public User user;
	29	+
	30	+ @OneToOne
	31	+ public Issue issue;
	32	+
	33	+ public static final String ADD = "add";
	34	+ public static final String DELETE = "delete";
	35	+
	36	+ public static final Finder<Long, IssueSharer> find = new Finder<>(Long.class,
	37	+ IssueSharer.class);
	38	+
	39	+ public static IssueSharer createSharer(String loginId, Issue issue) {
	40	+ IssueSharer issueSharer = new IssueSharer();
	41	+ issueSharer.loginId = loginId;
	42	+ issueSharer.created = new Date();
	43	+ issueSharer.issue = issue;
	44	+ issueSharer.user = User.findByLoginId(loginId);
	45	+
	46	+ if (issueSharer.user == null) {
	47	+ String errorMsg = "Wrong loginId for issue sharing: " + loginId;
	48	+ play.Logger.error(errorMsg);
	49	+ throw new IllegalArgumentException(errorMsg);
	50	+ }
	51	+ return issueSharer;
	52	+ }
	53	+
	54	+ public static int getNumberOfIssuesSharedWithUser(Long userId){
	55	+ return find.where()
	56	+ .eq("user.id", userId)
	57	+ .eq("issue.state", State.OPEN)
	58	+ .findRowCount();
	59	+ }
	60	+}

2c5883e

033bbd4

app/models/Mention.java

--- app/models/Mention.java

+++ app/models/Mention.java


 /**
- * Yobi, Project Hosting SW
- *
- * Copyright 2014 NAVER Corp.
- * http://yobi.io
- *
- * @author Yi EungJun
- *
- * 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 models.enumeration.ResourceType;

 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
+
+import static models.enumeration.ResourceType.ISSUE_COMMENT;
+import static models.enumeration.ResourceType.ISSUE_POST;
 
 @Entity
 public class Mention extends Model {

             mention.save();
         }
     }
+
+    public static List<Long> getMentioningIssueIds(Long mentionUserId) {
+        Set<Long> ids = new HashSet<>();
+        Set<Long> commentIds = new HashSet<>();
+
+        for (Mention mention : Mention.find.where()
+                .eq("user.id", mentionUserId)
+                .in("resourceType", ISSUE_POST, ISSUE_COMMENT)
+                .findList()) {
+
+            switch (mention.resourceType) {
+                case ISSUE_POST:
+                    ids.add(Long.valueOf(mention.resourceId));
+                    break;
+                case ISSUE_COMMENT:
+                    commentIds.add(Long.valueOf(mention.resourceId));
+                    break;
+                default:
+                    play.Logger.warn("'" + mention.resourceType + "' is not supported.");
+                    break;
+            }
+        }
+
+        if (!commentIds.isEmpty()) {
+            for (IssueComment comment : IssueComment.find.where()
+                    .idIn(new ArrayList<>(commentIds))
+                    .findList()) {
+                ids.add(comment.issue.id);
+            }
+        }
+
+        return new ArrayList<>(ids);
+    }
 }

2c5883e

033bbd4

app/models/NotificationEvent.java

--- app/models/NotificationEvent.java

+++ app/models/NotificationEvent.java


 /**
  * Yona, 21st Century Project Hosting SW
  * <p>
- * Copyright Yona & Yobi Authors & NAVER Corp.
+ * Copyright Yona & Yobi Authors & NAVER Corp. & NAVER LABS Corp.
  * https://yona.io
  **/
 package models;

 import models.resource.GlobalResource;
 import models.resource.Resource;
 import models.resource.ResourceConvertible;
-import models.Webhook;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.Predicate;
 import org.apache.commons.lang3.StringUtils;

 import playRepository.*;
 import scala.concurrent.duration.Duration;
 import utils.AccessControl;
+import utils.DiffUtil;
 import utils.EventConstants;
 import utils.RouteUtil;
 
 import javax.naming.LimitExceededException;
 import javax.persistence.*;
 import javax.servlet.ServletException;
+import java.beans.Transient;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import static models.UserProjectNotification.findEventUnwatchersByEventType;
+import static models.UserProjectNotification.findEventWatchersByEventType;
+import static models.Watch.findUnwatchers;
+import static models.Watch.findWatchers;
 import static models.enumeration.EventType.*;
 
 @Entity

         return oldValue;
     }
 
+    public String getNewValue() {
+        return newValue;
+    }
+
     @Transient
     public String getMessage() {
         return getMessage(Lang.defaultLang());

                 } else {
                     return Messages.get(lang, "notification.issue.assigned", newValue);
                 }
+            case ISSUE_MILESTONE_CHANGED:
+                return Messages.get(lang, "notification.milestone.changed", newValue);
             case NEW_ISSUE:
             case NEW_POSTING:
             case NEW_COMMENT:
             case NEW_PULL_REQUEST:
             case NEW_COMMIT:
-            case ISSUE_BODY_CHANGED:
             case COMMENT_UPDATED:
                 return newValue;
+            case ISSUE_BODY_CHANGED:
+            case POSTING_BODY_CHANGED:
+                return DiffUtil.getDiffText(oldValue, newValue);
             case NEW_REVIEW_COMMENT:
                 try {
                     ReviewComment reviewComment = ReviewComment.find.byId(Long.valueOf(this.resourceId));

                 }
             case ISSUE_MOVED:
                     return Messages.get(lang, "notification.type.issue.moved", oldValue, newValue);
+            case ISSUE_SHARER_CHANGED:
+                if (StringUtils.isNotBlank(newValue)) {
+                    User user = User.findByLoginId(newValue);
+                    return Messages.get(lang, "notification.issue.sharer.added", user.getDisplayName(user));
+                } else if (StringUtils.isNotBlank(oldValue)) {
+                    return Messages.get(lang, "notification.issue.sharer.deleted");
+                }
+            case ISSUE_LABEL_CHANGED:
+                if (StringUtils.isNotBlank(newValue)) {
+                    User user = User.findByLoginId(newValue);
+                    return Messages.get(lang, "notification.issue.label.added", user.getDisplayName(user));
+                } else if (StringUtils.isNotBlank(oldValue)) {
+                    return Messages.get(lang, "notification.issue.label.deleted");
+                }
+            case RESOURCE_DELETED:
+                User user = User.findByLoginId(newValue);
+                return Messages.get(lang, "notification.resource.deleted", user.getDisplayName(user));
             default:
-                return null;
+                play.Logger.warn("Unknown event message: " + this);
+                play.Logger.warn("Event Type: " + eventType);
+                play.Logger.warn("See: NotificationEvent.getMessage");
+                return eventType.getDescr();
+        }
+    }
+
+    @Transient
+    public String getPlainMessage() {
+        return getPlainMessage(Lang.defaultLang());
+    }
+
+    @Transient
+    public String getPlainMessage(Lang lang) {
+        switch(eventType) {
+            case ISSUE_BODY_CHANGED:
+            case POSTING_BODY_CHANGED:
+                return DiffUtil.getDiffPlainText(oldValue, newValue);
+            default:
+                return getMessage(lang);
         }
     }
 

                 .orderBy("id desc").setMaxRows(1).findUnique();
 
         if (lastEvent != null) {
-            if (lastEvent.eventType == event.eventType &&
-                    event.senderId.equals(lastEvent.senderId)) {
+            if (isSameUserEventAsPrevious(event, lastEvent)) {
                 // If the last event is A -> B and the current event is B -> C,
                 // they are merged into the new event A -> C.
                 event.oldValue = lastEvent.getOldValue();

         }
         event.save();
         event.saveManyToManyAssociations("receivers");
+    }
+
+    public static void addWithoutSkipEvent(NotificationEvent event) {
+        if (event.notificationMail == null) {
+            event.notificationMail = new NotificationMail();
+            event.notificationMail.notificationEvent = event;
+        }
+
+        Date draftDate = DateTime.now().minusMillis(EventConstants.DRAFT_TIME_IN_MILLIS).toDate();
+
+        NotificationEvent lastEvent = NotificationEvent.find.where()
+                .eq("resourceId", event.resourceId)
+                .eq("resourceType", event.resourceType)
+                .gt("created", draftDate)
+                .orderBy("id desc").setMaxRows(1).findUnique();
+
+        if (lastEvent != null) {
+            if (isSameUserEventAsPrevious(event, lastEvent) &&
+                    isRevertingTheValue(event, lastEvent)) {
+                lastEvent.delete();
+                return;
+            }
+        }
+
+        if(isAddingSharerEvent(event)){
+            filterReceivers(event);
+        }
+
+        if (event.receivers.isEmpty()) {
+            return;
+        }
+        event.save();
+        event.saveManyToManyAssociations("receivers");
+    }
+
+    private static boolean isSameUserEventAsPrevious(NotificationEvent event, NotificationEvent lastEvent) {
+        return lastEvent.eventType == event.eventType &&
+                event.senderId.equals(lastEvent.senderId);
+    }
+
+    private static boolean isRevertingTheValue(NotificationEvent event, NotificationEvent lastEvent) {
+        return StringUtils.equals(event.oldValue, lastEvent.newValue) &&
+                StringUtils.equals(event.newValue, lastEvent.oldValue);
+    }
+
+    private static boolean isAddingSharerEvent(NotificationEvent event) {
+        return event.eventType.equals(EventType.ISSUE_SHARER_CHANGED)
+            && StringUtils.isBlank(event.oldValue)
+            && StringUtils.isNotBlank(event.newValue);
     }
 
     private static void filterReceivers(final NotificationEvent event) {

         NotificationEvent notiEvent = createFrom(author, comment);
         notiEvent.title = formatReplyTitle(post);
         notiEvent.eventType = eventType;
-        Set<User> receivers = getReceivers(post, author);
-        receivers.addAll(getMentionedUsers(comment.contents));
-        receivers.remove(author);
-        notiEvent.receivers = receivers;
+        notiEvent.receivers = getMandatoryReceivers(comment, eventType);
         notiEvent.oldValue = null;
         notiEvent.newValue = comment.contents;
         notiEvent.resourceType = comment.asResource().getType();

 
         NotificationEvent notiEvent = createFromCurrentUser(issue);
         notiEvent.title = formatReplyTitle(issue);
-        notiEvent.receivers = getReceivers(issue);
+        notiEvent.receivers = getMandatoryReceivers(issue, EventType.ISSUE_STATE_CHANGED);
         notiEvent.eventType = ISSUE_STATE_CHANGED;
         notiEvent.oldValue = oldState != null ? oldState.state() : null;
         notiEvent.newValue = issue.state.state();

 
         NotificationEvent notiEvent = createFromCurrentUser(issue);
 
-        Set<User> receivers = getReceivers(issue);
+        Set<User> receivers = getReceiversWhenAssigneeChanged(oldAssignee, issue);
         if(oldAssignee != null) {
             notiEvent.oldValue = oldAssignee.loginId;
-            if(!oldAssignee.loginId.equals(UserApp.currentUser().loginId)) {
-                receivers.add(oldAssignee);
-            }
         }
 
         if (issue.assignee != null) {

         return notiEvent;
     }
 
+    private static Set<User> getReceiversWhenAssigneeChanged(User oldAssignee, Issue issue) {
+        Set<User> receivers = getMandatoryReceivers(issue, ISSUE_ASSIGNEE_CHANGED);
+
+        if (oldAssignee != null && !oldAssignee.isAnonymous()
+                && !oldAssignee.loginId.equals(UserApp.currentUser().loginId)) {
+            receivers.add(oldAssignee);
+        }
+
+        return receivers;
+    }
+
     public static void afterNewIssue(Issue issue) {
         NotificationEvent.add(forNewIssue(issue, UserApp.currentUser()));
         webhookRequest(NEW_ISSUE, issue, false);

         notiEvent.eventType = NEW_ISSUE;
         notiEvent.oldValue = null;
         notiEvent.newValue = issue.body;
+        return notiEvent;
+    }
+
+    public static NotificationEvent afterResourceDeleted(AbstractPosting item, User reuqestedUser) {
+        NotificationEvent notiEvent = createFrom(reuqestedUser, item.project);
+        notiEvent.title = formatNewTitle(item);
+        notiEvent.receivers = getReceivers(item, reuqestedUser);
+        notiEvent.eventType = RESOURCE_DELETED;
+        notiEvent.oldValue = item.body;
+        notiEvent.newValue = reuqestedUser.loginId;
+
+        NotificationEvent.add(notiEvent);
+        if (item instanceof Issue) {
+            webhookRequest(RESOURCE_DELETED, (Issue)item, false);
+        }
         return notiEvent;
     }
 

         return notiEvent;
     }
 
+    public static NotificationEvent afterIssueSharerChanged(Issue issue, String sharerLoginId, String action) {
+        NotificationEvent notiEvent = createFromCurrentUser(issue);
+        notiEvent.title = formatReplyTitle(issue);
+        notiEvent.receivers = findSharer(sharerLoginId);
+        notiEvent.eventType = ISSUE_SHARER_CHANGED;
+        if (IssueSharer.ADD.equalsIgnoreCase(action)) {
+            notiEvent.oldValue = "";
+            notiEvent.newValue = sharerLoginId;
+        } else if (IssueSharer.DELETE.equalsIgnoreCase(action)) {
+            notiEvent.oldValue = sharerLoginId;
+            notiEvent.newValue = "";
+        }
+
+        NotificationEvent.addWithoutSkipEvent(notiEvent);
+
+        return notiEvent;
+    }
+
+    private static Set<User> findSharer(String sharerLoginId) {
+        Set<User> receivers = new HashSet<>();
+        receivers.add(User.findByLoginId(sharerLoginId));
+        return receivers;
+    }
+
+    public static NotificationEvent afterIssueLabelChanged(String addedLabels, String deletedLabels, Issue issue) {
+        NotificationEvent notiEvent = createFromCurrentUser(issue);
+        notiEvent.title = formatReplyTitle(issue);
+        notiEvent.receivers = null; // no receivers
+        notiEvent.eventType = ISSUE_LABEL_CHANGED;
+        notiEvent.oldValue = deletedLabels;
+        notiEvent.newValue = addedLabels;
+
+        NotificationEvent.addWithoutSkipEvent(notiEvent);
+        return notiEvent;
+    }
+
+    public static NotificationEvent afterMilestoneChanged(Long oldMilestoneId, Issue issue) {
+        webhookRequest(ISSUE_MILESTONE_CHANGED, issue, false);
+
+        NotificationEvent notiEvent = createFromCurrentUser(issue);
+
+        Set<User> receivers = getMandatoryReceivers(issue, ISSUE_MILESTONE_CHANGED);
+
+        notiEvent.title = formatReplyTitle(issue);
+        notiEvent.receivers = receivers;
+        notiEvent.eventType = ISSUE_MILESTONE_CHANGED;
+        notiEvent.oldValue = oldMilestoneId.toString();
+        notiEvent.newValue = issue.milestoneId().toString();
+
+        NotificationEvent.add(notiEvent);
+
+        return notiEvent;
+    }
+
+    private static Set<User> getMandatoryReceivers(Issue issue, EventType eventType) {
+        Set<User> receivers = findWatchers(issue.asResource());
+        receivers.add(issue.getAuthor());
+
+        for (IssueSharer issueSharer : issue.sharers) {
+            receivers.add(User.findByLoginId(issueSharer.loginId));
+        }
+
+        if (issue.assignee != null) {
+            receivers.add(issue.assignee.user);
+        }
+
+        receivers.addAll(findWatchers(issue.asResource()));
+        receivers.addAll(findEventWatchersByEventType(issue.project.id, eventType));
+
+        receivers.removeAll(findUnwatchers(issue.asResource()));
+        receivers.removeAll(findEventUnwatchersByEventType(issue.project.id, eventType));
+        receivers.remove(UserApp.currentUser());
+
+        return receivers;
+    }
+
+    private static Set<User> getMandatoryReceivers(Posting posting, EventType eventType) {
+        Set<User> receivers = findWatchers(posting.asResource());
+        receivers.add(posting.getAuthor());
+        receivers.addAll(findWatchers(posting.asResource()));
+        receivers.addAll(findEventWatchersByEventType(posting.project.id, eventType));
+
+        receivers.removeAll(findUnwatchers(posting.asResource()));
+        receivers.removeAll(findEventUnwatchersByEventType(posting.project.id, eventType));
+        receivers.remove(UserApp.currentUser());
+
+        return receivers;
+    }
+
+    private static Set<User> getMandatoryReceivers(Comment comment, EventType eventType) {
+        AbstractPosting parent = comment.getParent();
+        Set<User> receivers = findWatchers(parent.asResource());
+        receivers.add(parent.getAuthor());
+        receivers.addAll(findEventWatchersByEventType(comment.projectId, eventType));
+        receivers.addAll(getMentionedUsers(comment.contents));
+        includeAssigneeIfExist(comment, receivers);
+
+        receivers.removeAll(findUnwatchers(parent.asResource()));
+        receivers.removeAll(findEventUnwatchersByEventType(comment.projectId, eventType));
+        receivers.remove(UserApp.currentUser());
+
+        return receivers;
+    }
+
+    private static Set<User> getProjectCommitReceivers(Project project, EventType eventType) {
+        Set<User> receivers = findMembersOnlyFromWatchers(project);
+        receivers.removeAll(findUnwatchers(project.asResource()));
+        receivers.removeAll(findEventUnwatchersByEventType(project.id, eventType));
+        receivers.remove(UserApp.currentUser());
+
+        return receivers;
+    }
+
+    private static Set<User> findMembersOnlyFromWatchers(Project project) {
+        Set<User> receivers = new HashSet<>();
+        Set<User> projectMembers = extractMembers(project);
+        for (User watcher : findWatchers(project.asResource())) {
+            if (projectMembers.contains(watcher)) {
+                receivers.add(watcher);
+            }
+        }
+        return receivers;
+    }
+
+    private static Set<User> extractMembers(Project project) {
+        Set<User> projectMembers = new HashSet<>();
+        for (ProjectUser projectUser : project.members()) {
+            projectMembers.add(projectUser.user);
+        }
+        return projectMembers;
+    }
+
     private static Set<User> getReceiversForIssueBodyChanged(String oldBody, Issue issue) {
-        Set<User> receivers = issue.getWatchers();
+        Set<User> receivers = getMandatoryReceivers(issue, ISSUE_BODY_CHANGED);
         receivers.addAll(getNewMentionedUsers(oldBody, issue.body));
         receivers.remove(UserApp.currentUser());
         return receivers;

         NotificationEvent.add(forNewPosting(post, UserApp.currentUser()));
     }
 
+    public static void afterUpdatePosting(String oldValue, Posting post) {
+        NotificationEvent.add(forUpdatePosting(oldValue, post, UserApp.currentUser()));
+    }
+
     public static NotificationEvent forNewPosting(Posting post, User author) {
         NotificationEvent notiEvent = createFrom(author, post);
         notiEvent.title = formatNewTitle(post);
         notiEvent.receivers = getReceivers(post);
         notiEvent.eventType = NEW_POSTING;
         notiEvent.oldValue = null;
+        notiEvent.newValue = post.body;
+        return notiEvent;
+    }
+
+    public static NotificationEvent forUpdatePosting(String oldValue, Posting post, User author) {
+        NotificationEvent notiEvent = createFrom(author, post);
+        notiEvent.title = formatNewTitle(post);
+        notiEvent.receivers = getMandatoryReceivers(post, EventType.POSTING_BODY_CHANGED);
+        notiEvent.eventType = POSTING_BODY_CHANGED;
+        notiEvent.oldValue = oldValue;
         notiEvent.newValue = post.body;
         return notiEvent;
     }

         NotificationEvent.add(notiEvent);
     }
 
-    public static void afterNewCommits(List<RevCommit> commits, List<String> refNames, Project project, User sender, String title, Set<User> watchers) {
+    public static void afterNewCommits(List<RevCommit> commits, List<String> refNames, Project project, User sender, String title) {
         NotificationEvent notiEvent = createFrom(sender, project);
         notiEvent.title = title;
-        notiEvent.receivers = watchers;
+        notiEvent.receivers = getProjectCommitReceivers(project, NEW_COMMIT);
         notiEvent.eventType = NEW_COMMIT;
         notiEvent.oldValue = null;
         notiEvent.newValue = newCommitsMessage(commits, refNames, project);

         receivers.addAll(getMentionedUsers(abstractPosting.body));
         receivers.remove(except);
         return receivers;
+    }
+
+    private static void includeAssigneeIfExist(Comment comment, Set<User> receivers) {
+        if (comment instanceof IssueComment) {
+            Assignee assignee = ((Issue) comment.getParent()).assignee;
+            if (assignee != null) {
+                receivers.add(assignee.user);
+            }
+        }
     }
 
     private static String getPrefixedNumber(AbstractPosting posting) {

         webhookRequest(COMMENT_UPDATED, comment, false);
         NotificationEvent.add(forUpdatedComment(comment, UserApp.currentUser()));
     }
+
+    @Override
+    public String toString() {
+        return "NotificationEvent{" +
+                "id=" + id +
+                ", title='" + title + '\'' +
+                ", senderId=" + senderId +
+                ", receivers=" + receivers +
+                ", created=" + created +
+                ", resourceType=" + resourceType +
+                ", resourceId='" + resourceId + '\'' +
+                ", eventType=" + eventType +
+                ", oldValue='" + oldValue + '\'' +
+                ", newValue='" + newValue + '\'' +
+                ", notificationMail=" + notificationMail +
+                '}';
+    }
 }

2c5883e

033bbd4

app/models/NotificationMail.java

--- app/models/NotificationMail.java

+++ app/models/NotificationMail.java


 /**
  * Yona, 21st Century Project Hosting SW
  * <p>
- * Copyright Yona & Yobi Authors & NAVER Corp.
+ * Copyright Yona & Yobi Authors & NAVER Corp. & NAVER LABS Corp.
  * https://yona.io
  **/
 package models;

             Lang lang = Lang.apply(langCode);
 
             String message = event.getMessage(lang);
+            String plainMessage = event.getPlainMessage(lang);
 


...	...	@@ -158,17 +158,27 @@
158	158	isSecretInvalid = equalsDefaultSecret();
159	159	insertInitialData();
160	160
	161	+ Timestamp timestamp = new Timestamp("=== Yona server starting initialization ===");
161	162	Config.onStart();
	163	+ timestamp.logElapsedTime("--- Config reading: ok!");
162	164	Property.onStart();
	165	+ timestamp.logElapsedTime("--- Property reading: ok!");
163	166	PullRequest.onStart();
	167	+ timestamp.logElapsedTime("--- Pull request checking: ok!");
164	168	NotificationMail.onStart();
	169	+ timestamp.logElapsedTime("--- Notification mail scheduler: ok!");
165	170	NotificationEvent.onStart();
	171	+ timestamp.logElapsedTime("--- Notification event cleanup scheduler: ok!");
166	172	Attachment.onStart();
	173	+ timestamp.logElapsedTime("--- Temporary files cleanup scheduler: ok!");
167	174	AccessControl.onStart();
	175	+ timestamp.logElapsedTime("--- Basic access controller config reading: ok!");
168	176
169	177	if (!isSecretInvalid) {
170	178	YobiUpdate.onStart();
	179	+ timestamp.logElapsedTime("--- Update checker run: ok! ");
171	180	mailboxService.start();
	181	+ timestamp.logElapsedTime("--- MailboxService checker run: ok!");
172	182	}
173	183
174	184	PlayAuthenticate.setResolver(new PlayAuthenticate.Resolver() {

...	...	@@ -581,8 +581,8 @@
581	581	.yobiToasts {
582	582	position: fixed;
583	583	overflow: hidden;
584		- left: 20px !important;
585		- top: 25px !important;
	584	+ right: 20px !important;
	585	+ bottom: 25px !important;
586	586	margin: 10px;
587	587	z-index:9999;
588	588

...	...	@@ -1,8 +1,9 @@
1	1	/**
2		- * Yona, Project Hosting SW
3		- *
4		- * Copyright 2016 the original author or authors.
5		- */
	2	+ * Yona, 21st Century Project Hosting SW
	3	+ * <p>
	4	+ * Copyright Yona & Yobi Authors & NAVER Corp. & NAVER LABS Corp.
	5	+ * https://yona.io
	6	+ **/
6	7	package controllers;
7	8
8	9	import actions.NullProjectCheckAction;
...	...	@@ -353,7 +354,7 @@
353	354	public void run() {
354	355	post.comments = original.comments;
355	356	if(isSelectedToSendNotificationMail() \|\| !original.isAuthoredBy(UserApp.currentUser())){
356		- NotificationEvent.afterNewPost(post);
	357	+ NotificationEvent.afterUpdatePosting(original.body, post);
357	358	}
358	359	}
359	360	};
...	...	@@ -379,6 +380,7 @@
379	380	Posting posting = Posting.findByNumber(project, number);
380	381	Call redirectTo = routes.BoardApp.posts(project.owner, project.name, 1);
381	382
	383	+ NotificationEvent.afterResourceDeleted(posting, UserApp.currentUser());
382	384	return delete(posting, posting.asResource(), redirectTo);
383	385	}
384	386
...	...	@@ -436,6 +438,7 @@
436	438	return new Runnable() {
437	439	@Override
438	440	public void run() {
	441	+ posting.updatedDate = JodaDateUtil.now();
439	442	comment.posting = posting;
440	443	}
441	444	};

...	...	@@ -1,7 +1,7 @@
1	1	/**
2	2	* Yona, 21st Century Project Hosting SW
3	3	* <p>
4		- * Copyright Yona & Yobi Authors & NAVER Corp.
	4	+ * Copyright Yona & Yobi Authors & NAVER Corp. & NAVER LABS Corp.
5	5	* https://yona.io
6	6	**/
7	7	package controllers;
...	...	@@ -634,7 +634,6 @@
634	634	return redirect(url);
635	635	}
636	636
637		- @Transactional
638	637	@AnonymousCheck(requiresLogin = true, displaysFlashMessage = true)
639	638	public static synchronized Result acceptTransfer(Long id, String confirmKey) throws IOException, ServletException {
640	639	ProjectTransfer pt = ProjectTransfer.findValidOne(id);
...	...	@@ -653,15 +652,25 @@
653	652
654	653	// Change the project's name and move the repository.
655	654	String newProjectName = Project.newProjectName(pt.destination, project.name);
656		- PlayRepository repository = RepositoryService.getRepository(project);
657		- repository.move(project.owner, project.name, pt.destination, newProjectName);
658	655
659		- User newOwnerUser = User.findByLoginId(pt.destination);
660		- Organization newOwnerOrg = Organization.findByName(pt.destination);
	656	+ // Following three local variables are used for bottom of this method
	657	+ String originalProjectOwner = project.owner;
	658	+ String originalProjectName = project.name;
	659	+ String destinationOwner = pt.destination;
	660	+ Long senderId = pt.sender.id;
	661	+
	662	+ disableProjectTransferLink(pt, project, newProjectName);
	663	+ PlayRepository repository = RepositoryService.getRepository(project);
	664	+
	665	+ // intentionally placed to the last of method
	666	+ repository.move(originalProjectOwner, originalProjectName, destinationOwner, newProjectName);
	667	+
	668	+ User newOwnerUser = User.findByLoginId(destinationOwner);
	669	+ Organization newOwnerOrg = Organization.findByName(destinationOwner);
661	670
662	671	// Change the project's information.
663	672	project.recordRenameOrTransferHistoryIfLastChangePassed24HoursFrom(project);
664		- project.owner = pt.destination;
	673	+ project.owner = destinationOwner;
665	674	project.name = newProjectName;
666	675	if (newOwnerOrg != null) {
667	676	project.organization = newOwnerOrg;
...	...	@@ -671,25 +680,27 @@
671	680	project.update();
672	681
673	682	// Change roles.
674		- if (ProjectUser.isManager(pt.sender.id, project.id)) {
675		- ProjectUser.assignRole(pt.sender.id, project.id, RoleType.MEMBER);
	683	+ if (ProjectUser.isManager(senderId, project.id)) {
	684	+ ProjectUser.assignRole(senderId, project.id, RoleType.MEMBER);
676	685	}
677	686	if (!newOwnerUser.isAnonymous()) {
678	687	ProjectUser.assignRole(newOwnerUser.id, project.id, RoleType.MANAGER);
679	688	}
680	689
681		- // Change the tranfer's status to be accepted.
682		- pt.newProjectName = newProjectName;
683		- pt.accepted = true;
684		- pt.update();
685		-
686		- // If the opposite request is exists, delete it.
687		- ProjectTransfer.deleteExisting(project, pt.sender, pt.destination);
688	690	CacheStore.refreshProjectMap();
689	691
690	692	return redirect(routes.ProjectApp.project(project.owner, project.name));
691	693	}
692	694
	695	+ private static void disableProjectTransferLink(ProjectTransfer pt, Project project, String newProjectName) {
	696	+ // Change the tranfer's status to be accepted.
	697	+ pt.newProjectName = newProjectName;
	698	+ pt.accepted = true;
	699	+
	700	+ // If the opposite request is exists, delete it.
	701	+ ProjectTransfer.deleteExisting(project, pt.sender, pt.destination);
	702	+ }
	703	+
693	704	@IsAllowed(Operation.UPDATE)
694	705	public static Result changeVCSForm(String ownerId, String projectName) {
695	706	Project project = Project.findByOwnerAndProjectName(ownerId, projectName);

...	...	@@ -343,7 +343,7 @@
343	343
344	344	// Only members can access code?
345	345	if(project.isCodeAccessibleMemberOnly && !project.hasMember(UserApp.currentUser())) {
346		- return forbidden(ErrorViews.Forbidden.render("error.forbidden", project));
	346	+ return forbidden(ErrorViews.Forbidden.render("error.forbidden", project));
347	347	}
348	348
349	349	SearchCondition condition = Form.form(SearchCondition.class).bindFromRequest().get();
...	...	@@ -697,6 +697,12 @@
697	697	public Long contributorId;
698	698	public int pageNum = Constants.DEFAULT_PAGE;
699	699	public Category category;
	700	+ public Organization organization;
	701	+
	702	+ public SearchCondition setOrganization(Organization organization) {
	703	+ this.organization = organization;
	704	+ return this;
	705	+ }
700	706
701	707	public SearchCondition setProject(Project project) {
702	708	this.project = project;
...	...	@@ -731,6 +737,7 @@
731	737	clone.contributorId = this.contributorId;
732	738	clone.pageNum = this.pageNum;
733	739	clone.category = this.category;
	740	+ clone.organization = this.organization;
734	741	return clone;
735	742	}
736	743

...	...	@@ -1,23 +1,10 @@
1	1	/**
2		- * Yobi, Project Hosting SW
3		- *
4		- * Copyright 2013 NAVER Corp.
5		- * http://yobi.io
6		- *
7		- * @author Keesun Baik
8		- *
9		- * Licensed under the Apache License, Version 2.0 (the "License");
10		- * you may not use this file except in compliance with the License.
11		- * You may obtain a copy of the License at
12		- *
13		- * http://www.apache.org/licenses/LICENSE-2.0
14		- *
15		- * Unless required by applicable law or agreed to in writing, software
16		- * distributed under the License is distributed on an "AS IS" BASIS,
17		- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18		- * See the License for the specific language governing permissions and
19		- * limitations under the License.
20		- */
	2	+ * Yona, 21st Century Project Hosting SW
	3	+ * <p>
	4	+ * Copyright Yona & Yobi Authors & NAVER Corp. & NAVER LABS Corp.
	5	+ * https://yona.io
	6	+ **/
	7	+
21	8	package actors;
22	9
23	10	import models.*;
...	...	@@ -29,8 +16,6 @@
29	16
30	17	/**
31	18	* Creates new commit notifications.
32		- *
33		- * @author Keesun Baik
34	19	*/
35	20	public class CommitsNotificationActor extends PostReceiveActor {
36	21
...	...	@@ -50,10 +35,7 @@
50	35	title = Messages.get("notification.pushed.commits", project.name, commits.size());
51	36	}
52	37
53		- Set<User> watchers = Watch.findWatchers(project.asResource());
54		- watchers.remove(sender);
55		-
56		- NotificationEvent.afterNewCommits(commits, refNames, project, sender, title, watchers);
	38	+ NotificationEvent.afterNewCommits(commits, refNames, project, sender, title);
57	39	}
58	40
59	41	}

...	...	@@ -182,6 +182,23 @@
182	182	.box-shadow(none);
183	183	}
184	184
	185	+.sharer-list {
	186	+ .select2-container{
	187	+ border: none;
	188	+ box-shadow: none;
	189	+ border-radius: 0 !important;
	190	+ border-bottom: 1px solid rgba(0, 0, 0, 0.15);
	191	+ }
	192	+ .select2-container-multi {
	193	+ .select2-choices {
	194	+ .select2-search-choice {
	195	+ background-color: #ececec;
	196	+ border: 1px solid #dfdfdf;
	197	+ }
	198	+ }
	199	+ }
	200	+}
	201	+
185	202	.select2-dropdown-open {
186	203	.select2-choice {
187	204	border-bottom-color: transparent;

...	...	@@ -419,6 +419,19 @@
419	419	font-size: 14px;
420	420	margin-left:5px;
421	421	}
	422	+
	423	+ .user-project-list {
	424	+ .star {
	425	+ color: rgba(255, 255, 255, 0.22);
	426	+ &:hover {
	427	+ color: #e91e63;
	428	+ cursor: pointer;
	429	+ }
	430	+ }
	431	+ .starred {
	432	+ color: #e91e63 !important;
	433	+ }
	434	+ }
422	435	}
423	436
424	437	.project-origin {
...	...	@@ -1159,12 +1172,7 @@
1159	1172
1160	1173	&.nowrap {
1161	1174	min-height:20px;
1162		- height:20px;
1163		- .message {
1164		- text-overflow: ellipsis;
1165		- white-space: nowrap;
1166		- overflow: hidden;
1167		- }
	1175	+ max-height:200px;
1168	1176	}
1169	1177	}
1170	1178	}
...	...	@@ -3029,7 +3037,7 @@
3029	3037	}
3030	3038
3031	3039	.event {
3032		- padding: 10px 0 10px 55px;
	3040	+ padding: 2px 0 2px 55px;
3033	3041	font-size: 1em;
3034	3042	line-height: 30px;
3035	3043
...	...	@@ -3053,6 +3061,25 @@
3053	3061	&.rejected {background: #F39C12;}
3054	3062	&.conflict {background: #C0392B;}
3055	3063	&.resolved {background: #468847;}
	3064	+ &.sharer-added {
	3065	+ background-color: #B2EBF2;
	3066	+ color: #0097A7;
	3067	+ }
	3068	+ &.sharer-deleted {
	3069	+ background-color: #FFCCBC;
	3070	+ color: #F4511E;
	3071	+ }
	3072	+ &.label-added {
	3073	+ background-color: #B2EBF2;
	3074	+ color: #0097A7;
	3075	+ }
	3076	+ &.label-deleted {
	3077	+ background-color: #FFCCBC;
	3078	+ color: #F4511E;
	3079	+ }
	3080	+ &.milestone-changed {
	3081	+ background-color: #0088cc;
	3082	+ }
3056	3083	}
3057	3084
3058	3085	em { font-size:12px; color:#7F8C8D; margin-right:5px;}
...	...	@@ -3652,6 +3679,7 @@
3652	3679	line-height: 20px;
3653	3680	font-size:12px;
3654	3681	color:#999;
	3682	+ overflow: hidden;
3655	3683
3656	3684	.infos-item {
3657	3685	margin-right:6px;
...	...	@@ -3732,8 +3760,15 @@
3732	3760	.comments-count-color {
3733	3761	color: @darkmagenta;
3734	3762	}
	3763	+ .sharer-color {
	3764	+ color: @green;
	3765	+ }
3735	3766
3736	3767	a:nth-child(2) {
	3768	+ margin-left: -5px;
	3769	+ }
	3770	+
	3771	+ a:nth-child(3) {
3737	3772	margin-left: -5px;
3738	3773	}
3739	3774
...	...	@@ -3783,7 +3818,6 @@
3783	3818	.mileston-tag {
3784	3819	max-width: 135px;
3785	3820	text-overflow: ellipsis;
3786		- white-space: nowrap;
3787	3821	overflow: hidden;
3788	3822	color: #2196f3;
3789	3823	font-size:11px;
...	...	@@ -6984,7 +7018,7 @@
6984	7018	-moz-shadow: inset 0 0 5px 5px #222;
6985	7019	//box-shadow: inset 0 0 5px 5px #222;
6986	7020	box-shadow: 2px 2px 8px #000;
6987		- background: #FFF url('/assets/images/loading-gif-2.gif') no-repeat center;
	7021	+ background: #FFF url('@{base-image-path}/loading-gif-2.gif') no-repeat center;
6988	7022	}
6989	7023
6990	7024	.myissues-search-input {
...	...	@@ -6997,6 +7031,7 @@
6997	7031	font-size: 15px;
6998	7032	color: rgba(0, 0, 0, 0.7);
6999	7033	padding: 0 2px;
	7034	+ vertical-align: top;
7000	7035	}
7001	7036
7002	7037	.no-margin {
...	...	@@ -7005,11 +7040,56 @@
7005	7040
7006	7041	.my-issues {
7007	7042	.post-item {
7008		- padding: 6px 10px;
	7043	+ padding: 2px 10px;
	7044	+ color: #999999;
7009	7045
7010	7046	.title-wrap {
7011	7047	margin-top: 2px;
	7048	+ white-space: normal;
	7049	+ overflow: auto;
	7050	+ display:table;
	7051	+
	7052	+ .title-cell {
	7053	+ display:table-cell;
	7054	+ vertical-align:middle;
	7055	+ }
	7056	+
	7057	+ .item-count-groups {
	7058	+ font-size: 10px;
	7059	+ }
	7060	+ .title {
	7061	+ font-size: 14px;
	7062	+ font-weight: 400;
	7063	+ }
7012	7064	}
	7065	+
	7066	+ .author {
	7067	+ display:table;
	7068	+
	7069	+ .author-cell {
	7070	+ display:table-cell;
	7071	+ vertical-align:middle;
	7072	+ text-overflow: ellipsis;
	7073	+ overflow: hidden;
	7074	+ white-space: nowrap;
	7075	+ }
	7076	+ }
	7077	+ .meta {
	7078	+ display:table;
	7079	+
	7080	+ .meta-cell {
	7081	+ display:table-cell;
	7082	+ vertical-align:middle;
	7083	+ }
	7084	+ }
	7085	+
	7086	+ .post-id {
	7087	+ color:#999;
	7088	+ margin-right:5px;
	7089	+ font-size: 12px;
	7090	+ font-weight: normal;
	7091	+ }
	7092	+
7013	7093	.infos {
7014	7094	margin-top: 4px;
7015	7095	}
...	...	@@ -7056,3 +7136,34 @@
7056	7136	border-radius: 4px;
7057	7137	}
7058	7138	}
	7139	+
	7140	+.sharer-list {
	7141	+ margin-top: 40px;
	7142	+ padding: 10px;
	7143	+
	7144	+ .issue-share-title {
	7145	+ font-size: 16px;
	7146	+ }
	7147	+ .sharer-item{
	7148	+ display: inline-block;
	7149	+ background-color: #ececec;
	7150	+ border: 1px solid #dfdfdf;
	7151	+ border-radius: 3px;
	7152	+ padding: 1px 8px;
	7153	+ }
	7154	+}
	7155	+
	7156	+.project-name-in-my-issues {
	7157	+ display: flex !important;
	7158	+ flex-direction: row;
	7159	+ flex-wrap: nowrap;
	7160	+ flex-grow: 1;
	7161	+ justify-content: space-between;
	7162	+ align-items: center;
	7163	+
	7164	+ .project-name {
	7165	+ text-overflow: ellipsis;
	7166	+ overflow: hidden;
	7167	+ white-space: nowrap;
	7168	+ }
	7169	+}

...	...	@@ -38,6 +38,8 @@
38	38	public static String LOGIN_PAGE_LOGINID_PLACEHOLDER = play.Configuration.root().getString("application.login.page.loginId.placeholder", "");
39	39	public static String LOGIN_PAGE_PASSWORD_PLACEHOLDER = play.Configuration.root().getString("application.login.page.password.placeholder", "");
40	40	public static boolean SHOW_USER_EMAIL = play.Configuration.root().getBoolean("application.show.user.email", true);
	41	+ public static String NAVBAR_CUSTOM_LINK_NAME = play.Configuration.root().getString("application.navbar.custom.link.name", "");
	42	+ public static String NAVBAR_CUSTOM_LINK_URL = play.Configuration.root().getString("application.navbar.custom.link.url", "");
41	43
42	44	@AnonymousCheck
43	45	public static Result index() {

...	...	@@ -53,6 +53,10 @@
53	53	return status(Http.Status.NOT_ACCEPTABLE);
54	54	}
55	55
	56	+ if (limit == null) {
	57	+ return badRequest("No limit");
	58	+ }
	59	+
56	60	ExpressionList<Label> el =
57	61	Label.find.where().and(icontains("category", category), icontains("name", query));
58	62
...	...	@@ -77,6 +81,10 @@
77	81	return status(Http.Status.NOT_ACCEPTABLE);
78	82	}
79	83
	84	+ if (limit == null) {
	85	+ return badRequest("No limit");
	86	+ }
	87	+
80	88	SqlQuery sqlQuery;
81	89	SqlQuery sqlCountQuery;
82	90

...	...	@@ -1,14 +1,17 @@
1	1	/**
2		- * Yona, Project Hosting SW
3		- *
4		- * Copyright 2017 the original author or authors.
5		- */
	2	+ * Yona, 21st Century Project Hosting SW
	3	+ * <p>
	4	+ * Copyright Yona & Yobi Authors & NAVER Corp. & NAVER LABS Corp.
	5	+ * https://yona.io
	6	+ **/
6	7	package controllers;
7	8
8	9	import com.avaje.ebean.ExpressionList;
9	10	import com.avaje.ebean.Page;
10	11	import controllers.annotation.AnonymousCheck;
11	12	import controllers.annotation.GuestProhibit;
	13	+import controllers.PullRequestApp.SearchCondition;
	14	+import controllers.PullRequestApp.Category;
12	15	import models.*;
13	16	import models.enumeration.Operation;
14	17	import models.enumeration.RequestState;
...	...	@@ -30,6 +33,7 @@
30	33	import views.html.organization.members;
31	34	import views.html.organization.setting;
32	35	import views.html.organization.view;
	36	+import views.html.organization.group_pullrequest_list;
33	37
34	38	import javax.servlet.ServletException;
35	39	import javax.validation.ConstraintViolation;
...	...	@@ -45,6 +49,31 @@
45	49	*/
46	50	@AnonymousCheck
47	51	public class OrganizationApp extends Controller {
	52	+
	53	+ @AnonymousCheck(requiresLogin = false, displaysFlashMessage = true)
	54	+ public static Result organizationPullRequests(String organizationName, String category) {
	55	+
	56	+ Organization organization = Organization.findByName(organizationName);
	57	+ if (organization == null) {
	58	+ return notFound(ErrorViews.NotFound.render("error.notfound.organization"));
	59	+ }
	60	+
	61	+ SearchCondition condition = Form.form(SearchCondition.class).bindFromRequest().get();
	62	+ if (category.equals("open")) {
	63	+ condition.setOrganization(organization).setCategory(Category.OPEN);
	64	+ } else {
	65	+ condition.setOrganization(organization).setCategory(Category.CLOSED);
	66	+ }
	67	+ Page<PullRequest> page = PullRequest.findPagingList(condition);
	68	+
	69	+ return ok(group_pullrequest_list.render("title.pullrequest", organization, page, condition, category));
	70	+ }
	71	+
	72	+ @AnonymousCheck(requiresLogin = false, displaysFlashMessage = true)
	73	+ public static Result organizationClosedPullRequests(String organizationName) {
	74	+ return organizationPullRequests(organizationName, "closed");
	75	+ }
	76	+
48	77	/**
49	78	* show New Group page
50	79	* @return {@link Result}

...	...	@@ -1177,6 +1177,10 @@
1177	1177	} catch (CommunicationException e) {
1178	1178	play.Logger.error("Cannot connect to ldap server \n" + e.getMessage());
1179	1179	e.printStackTrace();
	1180	+ if(FALLBACK_TO_LOCAL_LOGIN){
	1181	+ play.Logger.warn("fallback to local login: " + loginIdOrEmail);
	1182	+ return authenticateWithPlainPassword(loginIdOrEmail, password);
	1183	+ }
1180	1184	return User.anonymous;
1181	1185	} catch (AuthenticationException e) {
1182	1186	flash(Constants.WARNING, Messages.get("user.login.invalid"));

...	...	@@ -39,6 +39,7 @@
39	39	import java.util.*;
40	40
41	41	import static controllers.UserApp.MAX_FETCH_USERS;
	42	+import static controllers.UserApp.currentUser;
42	43	import static controllers.api.UserApi.createUserNode;
43	44	import static play.libs.Json.toJson;
44	45
...	...	@@ -385,7 +386,7 @@
385	386	}
386	387	}
387	388
388		- private static void addUserToUsers(User user, List<ObjectNode> users) {
	389	+ static void addUserToUsers(User user, List<ObjectNode> users) {
389	390	ObjectNode userNode = Json.newObject();
390	391	userNode.put("loginId", user.loginId);
391	392	userNode.put("name", user.getDisplayName());
...	...	@@ -535,4 +536,151 @@
535	536	return ok(node);
536	537	});
537	538	}
	539	+
	540	+ @AnonymousCheck
	541	+ public static Result findSharerByloginIds(String ownerName, String projectName, Long number,
	542	+ String commaSeperatedIds) {
	543	+ if (!request().accepts("application/json")) {
	544	+ return status(Http.Status.NOT_ACCEPTABLE);
	545	+ }
	546	+ Project project = Project.findByOwnerAndProjectName(ownerName, projectName);
	547	+ Issue issue = Issue.findByNumber(project, number);
	548	+
	549	+ List<IssueSharer> list = getExpressionListByExtractingLoginIds(issue, commaSeperatedIds).findList();
	550	+ sortListByAddedDate(list);
	551	+
	552	+ List<ObjectNode> users = new ArrayList<>();
	553	+ for (IssueSharer sharer :list) {
	554	+ addUserToUsers(sharer.user, users);
	555	+ }
	556	+ return ok(toJson(users));
	557	+ }
	558	+
	559	+ private static void sortListByAddedDate(List<IssueSharer> list) {
	560	+ list.sort(new Comparator<IssueSharer>() {
	561	+ @Override
	562	+ public int compare(IssueSharer o1, IssueSharer o2) {
	563	+ return o1.created.compareTo(o2.created);
	564	+ }
	565	+ });
	566	+ }
	567	+
	568	+ private static ExpressionList<IssueSharer> getExpressionListByExtractingLoginIds(Issue issue, String query) {
	569	+ String[] queryItems = query.split(",");
	570	+ ExpressionList<IssueSharer> el = IssueSharer.find
	571	+ .where()
	572	+ .in("loginId", Arrays.asList(queryItems))
	573	+ .eq("issue.id", issue.id);
	574	+ return el;
	575	+ }
	576	+
	577	+ @IsAllowed(Operation.READ)
	578	+ public static Result findSharableUsers(String ownerName, String projectName, Long number, String query) {
	579	+ if (!request().accepts("application/json")) {
	580	+ return status(Http.Status.NOT_ACCEPTABLE);
	581	+ }
	582	+
	583	+ List<ObjectNode> users = new ArrayList<>();
	584	+
	585	+ ExpressionList<User> el = getUserExpressionList(query, request().getQueryString("type"));
	586	+
	587	+ int total = el.findRowCount();
	588	+ if (total > MAX_FETCH_USERS) {
	589	+ el.setMaxRows(MAX_FETCH_USERS);
	590	+ response().setHeader("Content-Range", "items " + MAX_FETCH_USERS + "/" + total);
	591	+ }
	592	+
	593	+ for (User user :el.findList()) {
	594	+ addUserToUsers(user, users);
	595	+ }
	596	+
	597	+ return ok(toJson(users));
	598	+ }
	599	+
	600	+ public static Result updateSharer(String owner, String projectName, Long number){
	601	+ JsonNode json = request().body().asJson();
	602	+ if (json == null) {
	603	+ return badRequest(Json.newObject().put("message", "Expecting Json data"));
	604	+ }
	605	+
	606	+ Project project = Project.findByOwnerAndProjectName(owner, projectName);
	607	+ Issue issue = Issue.findByNumber(project, number);
	608	+ if (!AccessControl.isAllowed(UserApp.currentUser(), issue.asResource(),
	609	+ Operation.UPDATE)) {
	610	+ return forbidden(Json.newObject().put("message", "Permission denied"));
	611	+ }
	612	+
	613	+ JsonNode sharer = json.findValue("sharer");
	614	+ if(noSharer(sharer)){
	615	+ return badRequest(Json.newObject().put("message", "No sharer"));
	616	+ }
	617	+
	618	+ final String action = json.findValue("action").asText();
	619	+
	620	+ ObjectNode result = changeSharer(sharer, issue, action);
	621	+ sendNotification(sharer, issue, action);
	622	+
	623	+ return ok(result);
	624	+ }
	625	+
	626	+ private static ObjectNode changeSharer(JsonNode sharer, Issue issue, String action) {
	627	+ ObjectNode result = Json.newObject();
	628	+ for (JsonNode sharerLoginId : sharer) {
	629	+ if ("add".equalsIgnoreCase(action)) {
	630	+ addSharer(issue, sharerLoginId.asText());
	631	+ result.put("action", "added");
	632	+ } else if ("delete".equalsIgnoreCase(action)) {
	633	+ result.put("action", "deleted");
	634	+ removeSharer(issue, sharerLoginId.asText());
	635	+ } else {
	636	+ play.Logger.error("Unknown issue sharing action: " + issue + ":" + action + " by " + currentUser());
	637	+ result.put("action", "Do nothing. Unsupported action: " + action);
	638	+ }
	639	+ result.put("sharer", User.findByLoginId(sharerLoginId.asText()).getDisplayName());
	640	+ }
	641	+ return result;
	642	+ }
	643	+
	644	+ private static void sendNotification(JsonNode sharer, Issue issue, String action) {
	645	+ Runnable preUpdateHook = new Runnable() {
	646	+ @Override
	647	+ public void run() {
	648	+ for(JsonNode sharerLoginId: sharer){
	649	+ addSharerChangedNotification(issue, sharerLoginId.asText(), action);
	650	+ }
	651	+ }
	652	+ };
	653	+ preUpdateHook.run();
	654	+ }
	655	+
	656	+
	657	+ private static void addSharerChangedNotification(Issue issue, String sharerLoginId, String action) {
	658	+ NotificationEvent notiEvent = NotificationEvent.afterIssueSharerChanged(issue, sharerLoginId, action);
	659	+ IssueEvent.addFromNotificationEventWithoutSkipEvent(notiEvent, issue, UserApp.currentUser().loginId);
	660	+ }
	661	+
	662	+ private static boolean noSharer(JsonNode sharers) {
	663	+ return sharers == null \|\| sharers.size() == 0;
	664	+ }
	665	+
	666	+ private static void addSharer(Issue issue, String loginId) {
	667	+ IssueSharer issueSharer = IssueSharer.find.where()
	668	+ .eq("loginId", loginId)
	669	+ .eq("issue.id", issue.id).findUnique();
	670	+ if(issueSharer == null) {
	671	+ issueSharer = IssueSharer.createSharer(loginId, issue);
	672	+ issueSharer.save();
	673	+ }
	674	+ issue.sharers.add(issueSharer);
	675	+ }
	676	+
	677	+ private static void removeSharer(Issue issue, String loginId) {
	678	+ IssueSharer issueSharer =
	679	+ IssueSharer.find.where()
	680	+ .eq("loginId", loginId)
	681	+ .eq("issue.id", issue.id)
	682	+ .findUnique();
	683	+ issueSharer.delete();
	684	+ issue.sharers.remove(issueSharer);
	685	+ }
538	686	}

...	...	@@ -1,23 +1,10 @@
1	1	/**
2		- * Yobi, Project Hosting SW
3		- *
4		- * Copyright 2014 NAVER Corp.
5		- * http://yobi.io
6		- *
7		- * @Author Yi EungJun
8		- *
9		- * Licensed under the Apache License, Version 2.0 (the "License");
10		- * you may not use this file except in compliance with the License.
11		- * You may obtain a copy of the License at
12		- *
13		- * http://www.apache.org/licenses/LICENSE-2.0
14		- *
15		- * Unless required by applicable law or agreed to in writing, software
16		- * distributed under the License is distributed on an "AS IS" BASIS,
17		- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18		- * See the License for the specific language governing permissions and
19		- * limitations under the License.
20		- */
	2	+ * Yona, 21st Century Project Hosting SW
	3	+ * <p>
	4	+ * Copyright Yona & Yobi Authors & NAVER Corp. & NAVER LABS Corp.
	5	+ * https://yona.io
	6	+ **/
	7	+
21	8	package mailbox;
22	9
23	10	import akka.actor.Cancellable;
...	...	@@ -29,6 +16,7 @@
29	16	import play.Configuration;
30	17	import play.Logger;
31	18	import play.libs.Akka;
	19	+import play.libs.F;
32	20	import scala.concurrent.duration.Duration;
33	21	import utils.Diagnostic;
34	22	import utils.SimpleDiagnostic;
...	...	@@ -184,17 +172,7 @@
184	172	return;
185	173	}
186	174
187		- try {
188		- EmailHandler.handleNewMessages(folder);
189		- } catch (MessagingException e) {
190		- play.Logger.error("Failed to handle new messages");
191		- }
192		-
193		- try {
194		- startEmailListener();
195		- } catch (Exception e) {
196		- startEmailPolling();
197		- }
	175	+ handleNewMessagesAndStartListener();
198	176
199	177	Diagnostic.register(new SimpleDiagnostic() {
200	178	@Override
...	...	@@ -210,6 +188,27 @@
210	188	});
211	189	}
212	190
	191	+ private void handleNewMessagesAndStartListener() {
	192	+ F.Promise<Void> promise = F.Promise.promise(
	193	+ new F.Function0<Void>() {
	194	+ public Void apply() {
	195	+ try {
	196	+ EmailHandler.handleNewMessages(folder);
	197	+ } catch (MessagingException e) {
	198	+ Logger.error("Failed to handle new messages");
	199	+ }
	200	+
	201	+ try {
	202	+ startEmailListener();
	203	+ } catch (Exception e) {
	204	+ startEmailPolling();
	205	+ }
	206	+ return null;
	207	+ }
	208	+ }
	209	+ );
	210	+ }
	211	+
213	212	/**
214	213	* Reopen the IMAP folder which is used by MailboxService.
215	214	*

...	...	@@ -254,12 +254,6 @@
254	254	actualWatchers.addAll(baseWatchers);
255	255
256	256	actualWatchers.add(getAuthor());
257		- for (Comment c : getComments()) {
258		- User user = User.find.byId(c.authorId);
259		- if (user != null) {
260		- actualWatchers.add(user);
261		- }
262		- }
263	257
264	258	return Watch.findActualWatchers(actualWatchers, asResource(), allowedWatchersOnly);
265	259	}

...	...	@@ -75,6 +75,9 @@
75	75	@OneToMany(cascade = CascadeType.ALL, mappedBy="issue")
76	76	public List<IssueEvent> events;
77	77
	78	+ @OneToMany(cascade = CascadeType.ALL, mappedBy = "issue")
	79	+ public Set<IssueSharer> sharers = new LinkedHashSet<>();
	80	+
78	81	@ManyToMany(cascade = CascadeType.ALL)
79	82	@JoinTable(
80	83	name = "issue_voter",
...	...	@@ -130,6 +133,13 @@
130	133
131	134	public String assigneeName() {
132	135	return ((assignee != null && assignee.user != null) ? assignee.user.name : null);
	136	+ }
	137	+
	138	+ public Long milestoneId() {
	139	+ if (milestone == null) {
	140	+ return Milestone.NULL_MILESTONE_ID;
	141	+ }
	142	+ return milestone.id;
133	143	}
134	144
135	145	public boolean hasAssignee() {
...	...	@@ -245,6 +255,7 @@
245	255	Messages.get("issue.label"),
246	256	Messages.get("issue.createdDate"),
247	257	Messages.get("issue.dueDate"),
	258	+ Messages.get("milestone"),
248	259	"URL",
249	260	Messages.get("common.comment"),
250	261	Messages.get("common.comment.author"),
...	...	@@ -261,6 +272,7 @@
261	272
262	273	lineNumber++;
263	274	int columnPos = 0;
	275	+ String milestoneName = issue.milestone != null ? issue.milestone.title : "";
264	276	sheet.addCell(new jxl.write.Label(columnPos++, lineNumber, issue.getNumber().toString(), bodyCellFormat));
265	277	sheet.addCell(new jxl.write.Label(columnPos++, lineNumber, issue.state.toString(), bodyCellFormat));
266	278	sheet.addCell(new jxl.write.Label(columnPos++, lineNumber, issue.title, bodyCellFormat));
...	...	@@ -269,6 +281,7 @@
269	281	sheet.addCell(new jxl.write.Label(columnPos++, lineNumber, getIssueLabels(issue), bodyCellFormat));
270	282	sheet.addCell(new jxl.write.DateTime(columnPos++, lineNumber, issue.createdDate, dateCellFormat));
271	283	sheet.addCell(new jxl.write.Label(columnPos++, lineNumber, JodaDateUtil.geYMDDate(issue.dueDate), bodyCellFormat));
	284	+ sheet.addCell(new jxl.write.Label(columnPos++, lineNumber, milestoneName, bodyCellFormat));
272	285	sheet.addCell(new jxl.write.Label(columnPos++, lineNumber, controllers.routes.IssueApp.issue(issue.project.owner, issue.project.name, issue.number).toString(), bodyCellFormat));
273	286	if (comments.size() > 0) {
274	287	for (int j = 0; j < comments.size(); j++) {
...	...	@@ -675,4 +688,24 @@
675	688	.eq("state", State.OPEN)
676	689	.findRowCount();
677	690	}
	691	+
	692	+ public IssueSharer findSharerByUserId(Long id){
	693	+ for (IssueSharer sharer : sharers) {
	694	+ if (sharer.user.id.equals(id)) {
	695	+ return sharer;
	696	+ }
	697	+ }
	698	+ return null;
	699	+ }
	700	+
	701	+ public List<IssueSharer> getSortedSharer() {
	702	+ return new ArrayList<>(sharers);
	703	+ }
	704	+
	705	+ public static int getCountOfMentionedOpenIssues(Long userId) {
	706	+ return finder.where()
	707	+ .in("id", Mention.getMentioningIssueIds(userId))
	708	+ .eq("state", State.OPEN)
	709	+ .findRowCount();
	710	+ }
678	711	}