The Unified and Autonomous Development Platform
Refactored pull request notification
robin shenbfbda3ef180d
diff --git a/core/src/main/java/com/gitplex/server/CoreModule.java b/core/src/main/java/com/gitplex/server/CoreModule.javaindex 10f1fd5eb2..60e7a8308c 100644--- a/core/src/main/java/com/gitplex/server/CoreModule.java+++ b/core/src/main/java/com/gitplex/server/CoreModule.java@@ -98,6 +98,7 @@ import com.gitplex.server.manager.impl.DefaultDataManager;import com.gitplex.server.manager.impl.DefaultDepotManager;import com.gitplex.server.manager.impl.DefaultMailManager;import com.gitplex.server.manager.impl.DefaultMarkdownManager;+import com.gitplex.server.manager.impl.DefaultNotificationManager;import com.gitplex.server.manager.impl.DefaultOrganizationMembershipManager;import com.gitplex.server.manager.impl.DefaultPullRequestCommentManager;import com.gitplex.server.manager.impl.DefaultPullRequestInfoManager;@@ -116,6 +117,7 @@ import com.gitplex.server.manager.impl.DefaultTeamMembershipManager;import com.gitplex.server.manager.impl.DefaultUserAuthorizationManager;import com.gitplex.server.manager.impl.DefaultVisitInfoManager;import com.gitplex.server.manager.impl.DefaultWorkExecutor;+import com.gitplex.server.manager.impl.NotificationManager;import com.gitplex.server.migration.JpaConverter;import com.gitplex.server.migration.PersistentBagConverter;import com.gitplex.server.persistence.DefaultIdManager;@@ -274,6 +276,7 @@ public class CoreModule extends AbstractPluginModule {bind(CodeCommentStatusChangeManager.class).to(DefaultCodeCommentStatusChangeManager.class);bind(PullRequestReferenceManager.class).to(DefaultPullRequestReferenceManager.class);bind(WorkExecutor.class).to(DefaultWorkExecutor.class);+ bind(NotificationManager.class).to(DefaultNotificationManager.class);contribute(ObjectMapperConfigurator.class, GitObjectMapperConfigurator.class);contribute(ObjectMapperConfigurator.class, HibernateObjectMapperConfigurator.class);diff --git a/core/src/main/java/com/gitplex/server/event/ReviewInvitationChanged.java b/core/src/main/java/com/gitplex/server/event/ReviewInvitationChanged.javadeleted file mode 100644index 42db8f6630..0000000000--- a/core/src/main/java/com/gitplex/server/event/ReviewInvitationChanged.java+++ /dev/null@@ -1,17 +0,0 @@-package com.gitplex.server.event;--import com.gitplex.server.model.ReviewInvitation;--public class ReviewInvitationChanged {-- private final ReviewInvitation invitation;-- public ReviewInvitationChanged(ReviewInvitation invitation) {- this.invitation = invitation;- }-- public ReviewInvitation getInvitation() {- return invitation;- }--}diff --git a/core/src/main/java/com/gitplex/server/event/TaskChanged.java b/core/src/main/java/com/gitplex/server/event/TaskChanged.javadeleted file mode 100644index c183cc10bd..0000000000--- a/core/src/main/java/com/gitplex/server/event/TaskChanged.java+++ /dev/null@@ -1,17 +0,0 @@-package com.gitplex.server.event;--import com.gitplex.server.model.Account;--public class TaskChanged {-- private Long userId;-- public TaskChanged(Account user) {- userId = user.getId();- }-- public Long getUserId() {- return userId;- }--}diff --git a/core/src/main/java/com/gitplex/server/event/pullrequest/MergePreviewCalculated.java b/core/src/main/java/com/gitplex/server/event/pullrequest/MergePreviewCalculated.javaindex 53ad0a1930..5bd9675d64 100644--- a/core/src/main/java/com/gitplex/server/event/pullrequest/MergePreviewCalculated.java+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/MergePreviewCalculated.java@@ -4,7 +4,9 @@ import java.util.Date;import com.gitplex.server.model.Account;import com.gitplex.server.model.PullRequest;+import com.gitplex.server.util.editable.annotation.Editable;+@Editable(name="merge preview calculated")public class MergePreviewCalculated extends PullRequestEvent {private Date date;diff --git a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestUpdated.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestUpdated.javaindex ba171bbe1e..66a5ccd5c4 100644--- a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestUpdated.java+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestUpdated.java@@ -6,7 +6,7 @@ import com.gitplex.server.model.Account;import com.gitplex.server.model.PullRequestUpdate;import com.gitplex.server.util.editable.annotation.Editable;-@Editable(name="has new commits")+@Editable(name="there are new commits")public class PullRequestUpdated extends PullRequestEvent {private final PullRequestUpdate update;diff --git a/core/src/main/java/com/gitplex/server/manager/CodeCommentManager.java b/core/src/main/java/com/gitplex/server/manager/CodeCommentManager.javaindex eaf954cdfc..607ef22901 100644--- a/core/src/main/java/com/gitplex/server/manager/CodeCommentManager.java+++ b/core/src/main/java/com/gitplex/server/manager/CodeCommentManager.java@@ -7,7 +7,6 @@ import javax.annotation.Nullable;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.server.event.codecomment.CodeCommentEvent;import com.gitplex.server.model.CodeComment;import com.gitplex.server.model.CodeCommentStatusChange;import com.gitplex.server.model.Depot;@@ -28,6 +27,4 @@ public interface CodeCommentManager extends EntityManager<CodeComment> {void save(CodeComment comment);- void sendNotifications(CodeCommentEvent event);-}\ No newline at end of filediff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentManager.javaindex eb63f09706..0ef2498372 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentManager.java@@ -2,20 +2,16 @@ package com.gitplex.server.manager.impl;import java.util.ArrayList;import java.util.Collection;-import java.util.HashSet;import java.util.List;-import java.util.stream.Collectors;import javax.inject.Inject;import javax.inject.Singleton;import org.eclipse.jgit.lib.ObjectId;-import org.eclipse.jgit.revwalk.RevCommit;import org.hibernate.criterion.Criterion;import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;-import com.google.common.base.Preconditions;import com.gitplex.launcher.loader.Listen;import com.gitplex.launcher.loader.ListenerRegistry;import com.gitplex.server.event.codecomment.CodeCommentActivityEvent;@@ -24,14 +20,9 @@ import com.gitplex.server.event.codecomment.CodeCommentEvent;import com.gitplex.server.event.codecomment.CodeCommentResolved;import com.gitplex.server.event.codecomment.CodeCommentUnresolved;import com.gitplex.server.event.pullrequest.PullRequestCodeCommentActivityEvent;-import com.gitplex.server.manager.AccountManager;import com.gitplex.server.manager.CodeCommentManager;import com.gitplex.server.manager.CodeCommentStatusChangeManager;-import com.gitplex.server.manager.MailManager;-import com.gitplex.server.manager.MarkdownManager;import com.gitplex.server.manager.PullRequestManager;-import com.gitplex.server.manager.UrlManager;-import com.gitplex.server.model.Account;import com.gitplex.server.model.CodeComment;import com.gitplex.server.model.CodeCommentRelation;import com.gitplex.server.model.CodeCommentStatusChange;@@ -43,7 +34,7 @@ import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.persistence.dao.AbstractEntityManager;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.persistence.dao.EntityCriteria;-import com.gitplex.server.util.markdown.MentionParser;+import com.google.common.base.Preconditions;@Singletonpublic class DefaultCodeCommentManager extends AbstractEntityManager<CodeComment> implements CodeCommentManager {@@ -54,26 +45,17 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeCommentprivate final PullRequestManager pullRequestManager;- private final MailManager mailManager;-- private final UrlManager urlManager;-- private final MarkdownManager markdownManager;-- private final AccountManager accountManager;+ private final NotificationManager notificationManager;@Inject- public DefaultCodeCommentManager(Dao dao, ListenerRegistry listenerRegistry, MailManager mailManager,- CodeCommentStatusChangeManager codeCommentStatusChangeManager, UrlManager urlManager,- PullRequestManager pullRequestManager, MarkdownManager markdownManager, AccountManager accountManager) {+ public DefaultCodeCommentManager(Dao dao, ListenerRegistry listenerRegistry,+ CodeCommentStatusChangeManager codeCommentStatusChangeManager,+ PullRequestManager pullRequestManager, NotificationManager notificationManager) {super(dao);this.listenerRegistry = listenerRegistry;- this.markdownManager = markdownManager;- this.urlManager = urlManager;- this.mailManager = mailManager;this.codeCommentStatusChangeManager = codeCommentStatusChangeManager;this.pullRequestManager = pullRequestManager;- this.accountManager = accountManager;+ this.notificationManager = notificationManager;}@Sessional@@ -179,56 +161,7 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeComment}if (activity.getComment().getRelations().isEmpty())- sendNotifications(event);+ notificationManager.sendNotifications(event);}- @Override- public void sendNotifications(CodeCommentEvent event) {- if (event.getMarkdown() != null) {- CodeComment comment = event.getComment();- Collection<Account> mentionedUsers = new HashSet<>();- for (Account user: new MentionParser().parseMentions(markdownManager.render(event.getMarkdown(), null, false))) {- mentionedUsers.add(user);- }- String subject = "You are mentioned in a code comment on file " + comment.getCommentPos().getPath();- String url;- if (event instanceof CodeCommentCreated)- url = urlManager.urlFor(((CodeCommentCreated)event).getComment(), null);- else- url = urlManager.urlFor(((CodeCommentActivityEvent)event).getActivity(), null);-- String content = String.format(""- + "<p style='margin: 16px 0; padding-left: 16px; border-left: 4px solid #CCC;'>%s"- + "<p style='margin: 16px 0;'>"- + "For details, please visit <a href='%s'>%s</a>",- markdownManager.escape(event.getMarkdown()), url, url);-- mailManager.sendMailAsync(mentionedUsers.stream().map(Account::getEmail).collect(Collectors.toList()),- subject, decorateBody(subject + "." + content));-- Collection<Account> involvedUsers = new HashSet<>();- RevCommit commit = comment.getDepot().getRevCommit(ObjectId.fromString(comment.getCommentPos().getCommit()));-- Account author = accountManager.find(commit.getAuthorIdent());- if (author != null)- involvedUsers.add(author);- involvedUsers.add(comment.getUser());- involvedUsers.addAll(comment.getActivities().stream().map(CodeCommentActivity::getUser).collect(Collectors.toList()));- involvedUsers.removeAll(mentionedUsers);- involvedUsers.remove(event.getUser());-- subject = "You are involved in a code comment on file " + comment.getCommentPos().getPath();- mailManager.sendMailAsync(involvedUsers.stream().map(Account::getEmail).collect(Collectors.toList()),- subject, decorateBody(subject + "." + content));- }- }-- private String decorateBody(String body) {- return String.format(""- + "%s"- + "<p style='margin: 16px 0;'>"- + "-- Sent by GitPlex",- body);- }-}diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentRelationManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentRelationManager.javaindex 7365ead726..e3f90c26a9 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentRelationManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentRelationManager.java@@ -49,11 +49,13 @@ public class DefaultCodeCommentRelationManager extends AbstractEntityManager<Codprivate final ListenerRegistry listenerRegistry;+ private final NotificationManager notificationManager;+@Injectpublic DefaultCodeCommentRelationManager(Dao dao, PullRequestInfoManager pullRequestInfoManager,CodeCommentInfoManager codeCommentInfoManager, CodeCommentManager codeCommentManager,PullRequestManager pullRequestManager, VisitInfoManager visitInfoManager,- ListenerRegistry listenerRegistry) {+ ListenerRegistry listenerRegistry, NotificationManager notificationManager) {super(dao);this.pullRequestInfoManager = pullRequestInfoManager;this.codeCommentInfoManager = codeCommentInfoManager;@@ -61,6 +63,7 @@ public class DefaultCodeCommentRelationManager extends AbstractEntityManager<Codthis.pullRequestManager = pullRequestManager;this.visitInfoManager = visitInfoManager;this.listenerRegistry = listenerRegistry;+ this.notificationManager = notificationManager;}/*@@ -169,7 +172,7 @@ public class DefaultCodeCommentRelationManager extends AbstractEntityManager<Cod}if (!found) {- codeCommentManager.sendNotifications(event);+ notificationManager.sendNotifications(event);}}diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultNotificationManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultNotificationManager.javanew file mode 100644index 0000000000..6bc283f3e1--- /dev/null+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultNotificationManager.java@@ -0,0 +1,449 @@+package com.gitplex.server.manager.impl;++import static com.gitplex.server.model.PullRequestTask.Type.RESOLVE_CONFLICT;+import static com.gitplex.server.model.PullRequestTask.Type.REVIEW;+import static com.gitplex.server.model.PullRequestTask.Type.UPDATE;++import java.util.Collection;+import java.util.Date;+import java.util.HashSet;+import java.util.Set;+import java.util.stream.Collectors;++import javax.inject.Inject;+import javax.inject.Singleton;++import org.eclipse.jgit.lib.ObjectId;+import org.eclipse.jgit.revwalk.RevCommit;+import org.eclipse.jgit.util.StringUtils;+import org.hibernate.criterion.Restrictions;++import com.gitplex.launcher.loader.Listen;+import com.gitplex.server.event.MarkdownAware;+import com.gitplex.server.event.codecomment.CodeCommentActivityEvent;+import com.gitplex.server.event.codecomment.CodeCommentCreated;+import com.gitplex.server.event.codecomment.CodeCommentEvent;+import com.gitplex.server.event.pullrequest.MergePreviewCalculated;+import com.gitplex.server.event.pullrequest.PullRequestCodeCommentActivityEvent;+import com.gitplex.server.event.pullrequest.PullRequestCodeCommentCreated;+import com.gitplex.server.event.pullrequest.PullRequestCommentCreated;+import com.gitplex.server.event.pullrequest.PullRequestEvent;+import com.gitplex.server.event.pullrequest.PullRequestOpened;+import com.gitplex.server.event.pullrequest.PullRequestStatusChangeEvent;+import com.gitplex.server.event.pullrequest.PullRequestUpdated;+import com.gitplex.server.manager.AccountManager;+import com.gitplex.server.manager.BranchWatchManager;+import com.gitplex.server.manager.MailManager;+import com.gitplex.server.manager.MarkdownManager;+import com.gitplex.server.manager.PullRequestTaskManager;+import com.gitplex.server.manager.PullRequestWatchManager;+import com.gitplex.server.manager.UrlManager;+import com.gitplex.server.manager.VisitInfoManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.BranchWatch;+import com.gitplex.server.model.CodeComment;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestStatusChange;+import com.gitplex.server.model.PullRequestStatusChange.Type;+import com.gitplex.server.model.support.CodeCommentActivity;+import com.gitplex.server.model.PullRequestTask;+import com.gitplex.server.model.PullRequestWatch;+import com.gitplex.server.model.ReviewInvitation;+import com.gitplex.server.persistence.annotation.Transactional;+import com.gitplex.server.persistence.dao.EntityCriteria;+import com.gitplex.server.persistence.dao.EntityPersisted;+import com.gitplex.server.util.editable.EditableUtils;+import com.gitplex.server.util.markdown.MentionParser;+import com.google.common.collect.Sets;++@Singleton+public class DefaultNotificationManager implements NotificationManager {++ private final BranchWatchManager branchWatchManager;++ private final MailManager mailManager;++ private final UrlManager urlManager;++ private final VisitInfoManager visitInfoManager;++ private final MarkdownManager markdownManager;++ private final PullRequestTaskManager pullRequestTaskManager;++ private final PullRequestWatchManager pullRequestWatchManager;++ private final AccountManager accountManager;++ @Inject+ public DefaultNotificationManager(MarkdownManager markdownManager, BranchWatchManager branchWatchManager,+ MailManager mailManager, UrlManager urlManager, VisitInfoManager visitInfoManager,+ PullRequestWatchManager pullRequestWatchManager, PullRequestTaskManager pullRequestTaskManager,+ AccountManager accountManager) {+ this.branchWatchManager = branchWatchManager;+ this.mailManager = mailManager;+ this.urlManager = urlManager;+ this.visitInfoManager = visitInfoManager;+ this.markdownManager = markdownManager;+ this.pullRequestTaskManager = pullRequestTaskManager;+ this.pullRequestWatchManager = pullRequestWatchManager;+ this.accountManager = accountManager;+ }++ @Transactional+ @Listen+ public void on(PullRequestEvent event) {+ PullRequest request = event.getRequest();++ Set<Account> notifiedUsers = new HashSet<>();++ // Update pull request tasks+ if (event instanceof PullRequestOpened) {+ for (ReviewInvitation invitation: request.getReviewInvitations()) {+ if (invitation.getType() != ReviewInvitation.Type.EXCLUDE) {+ requestReview(invitation);+ notifiedUsers.add(invitation.getUser());+ }+ }+ } else if (event instanceof PullRequestUpdated) {+ EntityCriteria<PullRequestTask> criteria = EntityCriteria.of(PullRequestTask.class);+ criteria.add(Restrictions.eq("request", request)).add(Restrictions.eq("type", UPDATE));+ for (PullRequestTask task: pullRequestTaskManager.findAll(criteria)) {+ pullRequestTaskManager.delete(task);+ }+ } else if (event instanceof MergePreviewCalculated) {+ if (request.getSubmitter() != null && request.getMergePreview() != null) {+ if (request.getMergePreview().getMerged() != null) {+ EntityCriteria<PullRequestTask> criteria = EntityCriteria.of(PullRequestTask.class);+ criteria.add(Restrictions.eq("user", request.getSubmitter()))+ .add(Restrictions.eq("type", RESOLVE_CONFLICT));+ for (PullRequestTask task: pullRequestTaskManager.findAll(criteria)) {+ pullRequestTaskManager.delete(task);+ }+ } else {+ PullRequestTask task = new PullRequestTask();+ task.setRequest(request);+ task.setUser(request.getSubmitter());+ task.setType(RESOLVE_CONFLICT);+ EntityCriteria<PullRequestTask> criteria = EntityCriteria.of(PullRequestTask.class);+ criteria.add(Restrictions.eq("request", task.getRequest()))+ .add(Restrictions.eq("user", request.getSubmitter()))+ .add(Restrictions.eq("type", task.getType()));+ if (pullRequestTaskManager.find(criteria) == null) {+ pullRequestTaskManager.save(task);+ String subject = String.format("Please resolve conflicts in pull request #%d - %s",+ request.getNumber(), request.getTitle());+ String url = urlManager.urlFor(request);+ String body = String.format(""+ + "Dear %s,"+ + "<p style='margin: 16px 0;'>"+ + "There are merge conficts in pull request #%d - %s."+ + "<p style='margin: 16px 0;'>"+ + "Visit <a href='%s'>%s</a> for details."+ + "<p style='margin: 16px 0;'>"+ + "-- Sent by GitPlex",+ request.getSubmitter().getDisplayName(), request.getNumber(), request.getTitle(),+ url, url);++ mailManager.sendMailAsync(Sets.newHashSet(request.getSubmitter().getEmail()), subject, body);++ notifiedUsers.add(request.getSubmitter());+ }+ }+ }+ } else if (event instanceof PullRequestStatusChangeEvent) {+ PullRequestStatusChange statusChange = ((PullRequestStatusChangeEvent)event).getStatusChange();+ PullRequestStatusChange.Type type = statusChange.getType();+ EntityCriteria<PullRequestTask> criteria = EntityCriteria.of(PullRequestTask.class);+ criteria.add(Restrictions.eq("request", request));+ if (type == PullRequestStatusChange.Type.APPROVED || type == PullRequestStatusChange.Type.DISAPPROVED) {+ criteria.add(Restrictions.eq("user", statusChange.getUser())).add(Restrictions.eq("type", REVIEW));+ for (PullRequestTask task: pullRequestTaskManager.findAll(criteria)) {+ pullRequestTaskManager.delete(task);+ }+ if (type == PullRequestStatusChange.Type.DISAPPROVED && request.getSubmitter() != null) {+ PullRequestTask task = new PullRequestTask();+ task.setRequest(request);+ task.setUser(request.getSubmitter());+ task.setType(UPDATE);+ criteria = EntityCriteria.of(PullRequestTask.class);+ criteria.add(Restrictions.eq("request", task.getRequest()))+ .add(Restrictions.eq("user", task.getUser()))+ .add(Restrictions.eq("type", task.getType()));+ if (pullRequestTaskManager.find(criteria) == null) {+ pullRequestTaskManager.save(task);+ String subject = String.format("%s disapproved pull request #%d - %s",+ event.getUser().getDisplayName(), request.getNumber(), request.getTitle());+ String url = urlManager.urlFor(request);+ String body = String.format(""+ + "Dear %s,"+ + "<p style='margin: 16px 0;'>"+ + "%s disapproved pull request #%d - %s."+ + "<p style='margin: 16px 0;'>"+ + "Visit <a href='%s'>%s</a> for details."+ + "<p style='margin: 16px 0;'>"+ + "-- Sent by GitPlex",+ request.getSubmitter().getDisplayName(), event.getUser().getDisplayName(),+ request.getNumber(), request.getTitle(), url, url);+ mailManager.sendMailAsync(Sets.newHashSet(request.getSubmitter().getEmail()), subject, body);+ notifiedUsers.add(request.getSubmitter());+ }+ }+ } else if (type == PullRequestStatusChange.Type.MERGED || type == PullRequestStatusChange.Type.DISCARDED) {+ for (PullRequestTask task: pullRequestTaskManager.findAll(criteria)) {+ pullRequestTaskManager.delete(task);+ }+ }+ }++ // handle mentions+ Set<Account> mentionUsers = new HashSet<>();+ if (event instanceof MarkdownAware) {+ MarkdownAware markdownAware = (MarkdownAware) event;+ String markdown = markdownAware.getMarkdown();+ if (markdown != null) {+ String html = markdownManager.render(markdown, null, false);+ mentionUsers.addAll(new MentionParser().parseMentions(html));+ if (!mentionUsers.isEmpty()) {+ String url;+ if (event instanceof PullRequestCommentCreated)+ url = urlManager.urlFor(((PullRequestCommentCreated)event).getComment());+ else if (event instanceof PullRequestStatusChangeEvent)+ url = urlManager.urlFor(((PullRequestStatusChangeEvent)event).getStatusChange());+ else if (event instanceof PullRequestCodeCommentCreated)+ url = urlManager.urlFor(((PullRequestCodeCommentCreated)event).getComment(), event.getRequest());+ else if (event instanceof PullRequestCodeCommentActivityEvent)+ url = urlManager.urlFor(((PullRequestCodeCommentActivityEvent)event).getActivity(), event.getRequest());+ else+ url = urlManager.urlFor(event.getRequest());++ String subject = String.format("You are mentioned in pull request #%d - %s",+ request.getNumber(), request.getTitle());+ String body = String.format(""+ + "Dear Users,"+ + "<p style='margin: 16px 0;'>"+ + "%s."+ + "<p style='margin: 16px 0;'>"+ + "<div style='padding-left: 16px; border-left: 4px solid #CCC;'>%s</div>"+ + "<p style='margin: 16px 0;'>"+ + "Visit <a href='%s'>%s</a> for details."+ + "<p style='margin: 16px 0;'>"+ + "-- Sent by GitPlex",+ subject, markdownManager.escape(markdown), url, url);++ mailManager.sendMailAsync(mentionUsers.stream().map(Account::getEmail).collect(Collectors.toList()),+ subject, body);+ }+ }+ }++ notifiedUsers.addAll(mentionUsers);++ // Update watch list+ String eventType;+ if (event instanceof PullRequestStatusChangeEvent)+ eventType = ((PullRequestStatusChangeEvent) event).getStatusChange().getType().getName();+ else+ eventType = EditableUtils.getName(event.getClass());++ String activity = eventType;+ if (activity.contains(" "))+ activity += " in";++ if (event.getUser() != null)+ watch(request, event.getUser(), "You've set to watch this pull request as you've " + activity + " it");++ if (event instanceof PullRequestOpened) {+ for (BranchWatch branchWatch:+ branchWatchManager.find(request.getTargetDepot(), request.getTargetBranch())) {+ watch(request, branchWatch.getUser(),+ "You are set to watch this pull request as you are watching the target branch.");+ }+ }++ for (Account mention: mentionUsers) {+ watch(request, mention,+ "You are set to watch this pull request as you are mentioned in code comment.");+ }++ // notify watchers+ boolean notifyWatchers = false;+ if (event instanceof PullRequestStatusChangeEvent) {+ PullRequestStatusChange.Type type = ((PullRequestStatusChangeEvent) event).getStatusChange().getType();+ if (type == Type.APPROVED || type == Type.DISAPPROVED || type == Type.MERGED || type == Type.REOPENED+ || type == Type.DISCARDED || type == Type.WITHDRAWED_REVIEW) {+ notifyWatchers = true;+ }+ } else if (!(event instanceof MergePreviewCalculated)) {+ notifyWatchers = true;+ }++ if (notifyWatchers) {+ Collection<Account> usersToNotify = new HashSet<>();++ for (PullRequestWatch watch: request.getWatches()) {+ if (!watch.isIgnore() && !watch.getUser().equals(event.getUser())+ && (!(event instanceof PullRequestUpdated)+ || !watch.getUser().equals(request.getSubmitter()))) {+ if (request.getLastEvent() == null) {+ usersToNotify.add(watch.getUser());+ } else {+ Date visitDate = visitInfoManager.getVisitDate(watch.getUser(), request);+ if (visitDate == null || visitDate.getTime()<request.getLastEvent().getDate().getTime()) {+ if (!request.getLastEvent().getType().equals(eventType)) {+ usersToNotify.add(watch.getUser());+ }+ } else {+ usersToNotify.add(watch.getUser());+ }+ }+ }+ }++ usersToNotify.removeAll(notifiedUsers);++ if (!usersToNotify.isEmpty()) {+ String subject, body;+ String url = urlManager.urlFor(request);+ if (event instanceof PullRequestOpened) {+ subject = String.format("%s opened pull request #%d - %s",+ request.getSubmitter().getDisplayName(), request.getNumber(), request.getTitle());+ body = String.format("Dear Users,"+ + "<p style='margin: 16px 0;'>%s opened pull request #%d - %s"+ + "<p style='margin: 16px 0;'>Visit <a href='%s'>%s</a> for details."+ + "<p style='margin: 16px 0;'>-- Sent by GitPlex"+ + "<p style='margin: 16px 0; font-size: 12px; color: #888;'>"+ + "You receive this email as you are watching target branch.",+ request.getSubmitter().getDisplayName(), request.getNumber(), request.getTitle(), url, url);+ } else {+ if (event.getUser() != null) {+ activity = event.getUser().getDisplayName() + " " + activity;+ } else if (event instanceof PullRequestUpdated || event instanceof MergePreviewCalculated) {+ activity = StringUtils.capitalize(activity);+ } else {+ activity = "GitPlex " + activity;+ }++ subject = String.format("%s pull request #%d - %s", activity, request.getNumber(), request.getTitle());+ body = String.format("Dear Users,"+ + "<p style='margin: 16px 0;'>%s pull request #%d - %s "+ + "<p style='margin: 16px 0;'>Visit <a href='%s'>%s</a> for details."+ + "<p style='margin: 16px 0;'>-- Sent by GitPlex"+ + "<p style='margin: 16px 0; font-size: 12px; color: #888;'>"+ + "You receive this email as you are watching the pull request.",+ activity, request.getNumber(), request.getTitle(), url, url);+ }+ mailManager.sendMailAsync(usersToNotify.stream().map(Account::getEmail).collect(Collectors.toList()), subject, body);+ }+ }+ }++ private void requestReview(ReviewInvitation invitation) {+ PullRequest request = invitation.getRequest();++ PullRequestTask task = new PullRequestTask();+ task.setRequest(request);+ task.setUser(invitation.getUser());+ task.setType(REVIEW);++ pullRequestTaskManager.save(task);++ String subject = String.format("Please review pull request #%d - %s", request.getNumber(), request.getTitle());+ String url = urlManager.urlFor(request);+ String body = String.format(""+ + "Dear %s,"+ + "<p style='margin: 16px 0;'>"+ + "You are selected to review pull request #%d - %s."+ + "<p style='margin: 16px 0;'>"+ + "Visit <a href='%s'>%s</a> for details."+ + "<p style='margin: 16px 0;'>"+ + "-- Sent by GitPlex",+ invitation.getUser().getDisplayName(), request.getNumber(), request.getTitle(), url, url);+ mailManager.sendMailAsync(Sets.newHashSet(task.getUser().getEmail()), subject, body);+ }++ private void watch(PullRequest request, Account user, String reason) {+ PullRequestWatch watch = request.getWatch(user);+ if (watch == null) {+ watch = new PullRequestWatch();+ watch.setRequest(request);+ watch.setUser(user);+ watch.setReason(reason);+ request.getWatches().add(watch);+ pullRequestWatchManager.save(watch);+ }+ }++ @Transactional+ @Listen+ public void on(EntityPersisted event) {+ if (event.getEntity() instanceof ReviewInvitation) {+ ReviewInvitation invitation = (ReviewInvitation) event.getEntity();+ if (!event.isNew()) {+ PullRequest request = invitation.getRequest();+ Account user = invitation.getUser();+ if (invitation.getType() == ReviewInvitation.Type.EXCLUDE) {+ EntityCriteria<PullRequestTask> criteria = EntityCriteria.of(PullRequestTask.class);+ criteria.add(Restrictions.eq("request", request)).add(Restrictions.eq("user", user)).add(Restrictions.eq("type", REVIEW));+ for (PullRequestTask task: pullRequestTaskManager.findAll(criteria)) {+ pullRequestTaskManager.delete(task);+ }+ } else {+ EntityCriteria<PullRequestTask> criteria = EntityCriteria.of(PullRequestTask.class);+ criteria.add(Restrictions.eq("request", request))+ .add(Restrictions.eq("user", user))+ .add(Restrictions.eq("type", PullRequestTask.Type.REVIEW));+ if (pullRequestTaskManager.find(criteria) == null)+ requestReview(invitation);+ watch(invitation.getRequest(), invitation.getUser(),+ "You are set to watch this pull request as you are reviewer.");+ }+ }+ }+ }++ @Override+ public void sendNotifications(CodeCommentEvent event) {+ if (event.getMarkdown() != null) {+ CodeComment comment = event.getComment();+ Collection<Account> mentionedUsers = new HashSet<>();+ for (Account user: new MentionParser().parseMentions(markdownManager.render(event.getMarkdown(), null, false))) {+ mentionedUsers.add(user);+ }+ String subject = "You are mentioned in a code comment on file " + comment.getCommentPos().getPath();+ String url;+ if (event instanceof CodeCommentCreated)+ url = urlManager.urlFor(((CodeCommentCreated)event).getComment(), null);+ else+ url = urlManager.urlFor(((CodeCommentActivityEvent)event).getActivity(), null);++ String content = String.format(""+ + "<p style='margin: 16px 0;'>"+ + "<div style='padding-left: 16px; border-left: 4px solid #CCC;'>%s</div>"+ + "<p style='margin: 16px 0;'>"+ + "Visit <a href='%s'>%s</a> for details."+ + "<p style='margin: 16px 0;'>"+ + "-- Sent by GitPlex",+ markdownManager.escape(event.getMarkdown()), url, url);++ mailManager.sendMailAsync(mentionedUsers.stream().map(Account::getEmail).collect(Collectors.toList()),+ subject, subject + "." + content);++ Collection<Account> involvedUsers = new HashSet<>();+ RevCommit commit = comment.getDepot().getRevCommit(ObjectId.fromString(comment.getCommentPos().getCommit()));++ Account author = accountManager.find(commit.getAuthorIdent());+ if (author != null)+ involvedUsers.add(author);+ involvedUsers.add(comment.getUser());+ involvedUsers.addAll(comment.getActivities().stream().map(CodeCommentActivity::getUser).collect(Collectors.toList()));+ involvedUsers.removeAll(mentionedUsers);+ involvedUsers.remove(event.getUser());++ subject = "You are involved in a code comment on file " + comment.getCommentPos().getPath();+ mailManager.sendMailAsync(involvedUsers.stream().map(Account::getEmail).collect(Collectors.toList()),+ subject, subject + "." + content);+ }+ }++}diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.javaindex facf6594b2..27b40f7213 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java@@ -8,8 +8,8 @@ import static com.gitplex.server.model.PullRequest.CriterionHelper.ofTarget;import static com.gitplex.server.model.PullRequest.CriterionHelper.ofTargetDepot;import static com.gitplex.server.model.support.MergeStrategy.ALWAYS_MERGE;import static com.gitplex.server.model.support.MergeStrategy.MERGE_IF_NECESSARY;-import static com.gitplex.server.model.support.MergeStrategy.SQUASH_MERGE;import static com.gitplex.server.model.support.MergeStrategy.REBASE_MERGE;+import static com.gitplex.server.model.support.MergeStrategy.SQUASH_MERGE;import java.util.Collection;import java.util.Date;@@ -58,10 +58,10 @@ import com.gitplex.server.manager.ReviewInvitationManager;import com.gitplex.server.model.Account;import com.gitplex.server.model.Depot;import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestReview;import com.gitplex.server.model.PullRequestStatusChange;import com.gitplex.server.model.PullRequestStatusChange.Type;import com.gitplex.server.model.PullRequestUpdate;-import com.gitplex.server.model.PullRequestReview;import com.gitplex.server.model.ReviewInvitation;import com.gitplex.server.model.support.CloseInfo;import com.gitplex.server.model.support.DepotAndBranch;diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestTaskManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestTaskManager.javaindex ec123500f5..166019fa91 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestTaskManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestTaskManager.java@@ -1,198 +1,20 @@package com.gitplex.server.manager.impl;-import static com.gitplex.server.model.PullRequestTask.Type.RESOLVE_CONFLICT;-import static com.gitplex.server.model.PullRequestTask.Type.REVIEW;-import static com.gitplex.server.model.PullRequestTask.Type.UPDATE;-import javax.inject.Inject;import javax.inject.Singleton;-import org.hibernate.criterion.Restrictions;--import com.gitplex.launcher.loader.Listen;-import com.gitplex.launcher.loader.ListenerRegistry;-import com.gitplex.server.event.ReviewInvitationChanged;-import com.gitplex.server.event.TaskChanged;-import com.gitplex.server.event.pullrequest.MergePreviewCalculated;-import com.gitplex.server.event.pullrequest.PullRequestStatusChangeEvent;-import com.gitplex.server.event.pullrequest.PullRequestUpdated;-import com.gitplex.server.manager.MailManager;import com.gitplex.server.manager.PullRequestTaskManager;-import com.gitplex.server.manager.UrlManager;-import com.gitplex.server.model.Account;-import com.gitplex.server.model.PullRequest;-import com.gitplex.server.model.PullRequestStatusChange;import com.gitplex.server.model.PullRequestTask;-import com.gitplex.server.model.ReviewInvitation;-import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.persistence.dao.AbstractEntityManager;import com.gitplex.server.persistence.dao.Dao;-import com.gitplex.server.persistence.dao.EntityCriteria;-import com.google.common.collect.Sets;-/**- * This class manages pull request tasks and send task notifications if necessary.- * Unlike watch based notifications, task notifications can not be suppressed.- *- * @author robin- *- */@Singletonpublic class DefaultPullRequestTaskManager extends AbstractEntityManager<PullRequestTask> implements PullRequestTaskManager {- private final MailManager mailManager;-- private final UrlManager urlManager;-- private final ListenerRegistry listenerRegistry;-@Inject- public DefaultPullRequestTaskManager(Dao dao, MailManager mailManager, UrlManager urlManager, ListenerRegistry listenerRegistry) {+ public DefaultPullRequestTaskManager(Dao dao) {super(dao);-- this.mailManager = mailManager;- this.urlManager = urlManager;- this.listenerRegistry = listenerRegistry;- }-- @Transactional- @Listen- public void on(PullRequestUpdated event) {- EntityCriteria<PullRequestTask> criteria = newCriteria();- criteria.add(Restrictions.eq("request", event.getRequest())).add(Restrictions.eq("type", UPDATE));- for (PullRequestTask task: findAll(criteria)) {- listenerRegistry.post(new TaskChanged(task.getUser()));- delete(task);- }}- @Transactional- @Listen- public void on(ReviewInvitationChanged event) {- ReviewInvitation invitation = event.getInvitation();- PullRequest request = invitation.getRequest();- Account user = invitation.getUser();- if (invitation.getType() == ReviewInvitation.Type.EXCLUDE) {- EntityCriteria<PullRequestTask> criteria = newCriteria();- criteria.add(Restrictions.eq("request", request)).add(Restrictions.eq("user", user)).add(Restrictions.eq("type", REVIEW));- for (PullRequestTask task: findAll(criteria)) {- listenerRegistry.post(new TaskChanged(task.getUser()));- delete(task);- }- } else {- PullRequestTask task = new PullRequestTask();- task.setRequest(request);- task.setUser(user);- task.setType(REVIEW);- EntityCriteria<PullRequestTask> criteria = EntityCriteria.of(PullRequestTask.class);- criteria.add(Restrictions.eq("request", request))- .add(Restrictions.eq("user", user))- .add(Restrictions.eq("type", task.getType()));- if (find(criteria) == null) {- save(task);-- String subject = String.format("Please review pull request #%d (%s)",- request.getNumber(), request.getTitle());- String url = urlManager.urlFor(request);- String body = String.format("You are selected to review pull request #%d (%s).<br>"- + "Please visit <a href='%s'>%s</a> to do the review.",- request.getNumber(), request.getTitle(), url, url);- mailManager.sendMailAsync(Sets.newHashSet(task.getUser().getEmail()), subject, decorate(user, body));-- listenerRegistry.post(new TaskChanged(user));- }- }- }-- private String decorate(Account user, String body) {- return String.format("Dear %s, "- + "<p style='margin: 16px 0;'>"- + "%s"- + "<p style='margin: 16px 0;'>"- + "-- Sent by GitPlex",- user.getDisplayName(), body);- }- @Transactional- @Listen- public void on(MergePreviewCalculated event) {- PullRequest request = event.getRequest();- Account user = request.getSubmitter();- if (user != null && request.getMergePreview() != null) {- if (request.getMergePreview().getMerged() != null) {- EntityCriteria<PullRequestTask> criteria = newCriteria();- criteria.add(Restrictions.eq("user", user)).add(Restrictions.eq("type", RESOLVE_CONFLICT));- for (PullRequestTask task: findAll(criteria)) {- listenerRegistry.post(new TaskChanged(task.getUser()));- delete(task);- }- } else {- PullRequestTask task = new PullRequestTask();- task.setRequest(request);- task.setUser(user);- task.setType(RESOLVE_CONFLICT);- EntityCriteria<PullRequestTask> criteria = EntityCriteria.of(PullRequestTask.class);- criteria.add(Restrictions.eq("request", task.getRequest()))- .add(Restrictions.eq("user", user))- .add(Restrictions.eq("type", task.getType()));- if (find(criteria) == null) {- save(task);- String subject = String.format("Please resolve conflicts in pull request #%d (%s)",- request.getNumber(), request.getTitle());- String url = urlManager.urlFor(request);- String body = String.format("Pull request #%d (%s) has merge conflicts<br>"- + "Please visit <a href='%s'>%s</a> for details.",- request.getNumber(), request.getTitle(), url, url);-- mailManager.sendMailAsync(Sets.newHashSet(task.getUser().getEmail()), subject, decorate(user, body));- listenerRegistry.post(new TaskChanged(user));- }- }- }- }-- @Transactional- @Listen- public void on(PullRequestStatusChangeEvent event) {- PullRequest request = event.getRequest();- PullRequestStatusChange statusChange = event.getStatusChange();- PullRequestStatusChange.Type type = statusChange.getType();- EntityCriteria<PullRequestTask> criteria = newCriteria();- criteria.add(Restrictions.eq("request", request));- if (type == PullRequestStatusChange.Type.APPROVED || type == PullRequestStatusChange.Type.DISAPPROVED) {- criteria.add(Restrictions.eq("user", statusChange.getUser())).add(Restrictions.eq("type", REVIEW));- for (PullRequestTask task: findAll(criteria)) {- listenerRegistry.post(new TaskChanged(task.getUser()));- delete(task);- }- if (type == PullRequestStatusChange.Type.DISAPPROVED && request.getSubmitter() != null) {- PullRequestTask task = new PullRequestTask();- task.setRequest(request);- task.setUser(request.getSubmitter());- task.setType(UPDATE);- criteria = EntityCriteria.of(PullRequestTask.class);- criteria.add(Restrictions.eq("request", task.getRequest()))- .add(Restrictions.eq("user", task.getUser()))- .add(Restrictions.eq("type", task.getType()));- if (find(criteria) == null) {- save(task);- String subject = String.format("Someone raised concerns in pull request #%d (%s)",- request.getNumber(), request.getTitle());- String url = urlManager.urlFor(request);- String body = String.format("Someone raised concerns in pull request #%d (%s).<br>"- + "Please visit <a href='%s'>%s</a> for details",- request.getNumber(), request.getTitle(), url, url);- mailManager.sendMailAsync(Sets.newHashSet(request.getSubmitter().getEmail()), subject,- decorate(request.getSubmitter(), body));- listenerRegistry.post(new TaskChanged(request.getSubmitter()));- }- }- } else if (type == PullRequestStatusChange.Type.MERGED || type == PullRequestStatusChange.Type.DISCARDED) {- for (PullRequestTask task: findAll(criteria)) {- listenerRegistry.post(new TaskChanged(task.getUser()));- delete(task);- }- }- }-}\ No newline at end of filediff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestWatchManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestWatchManager.javaindex d174202b92..e6615a7118 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestWatchManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestWatchManager.java@@ -1,244 +1,19 @@package com.gitplex.server.manager.impl;-import java.util.Collection;-import java.util.Date;-import java.util.HashSet;-import java.util.Set;-import java.util.stream.Collectors;-import javax.inject.Inject;import javax.inject.Singleton;-import org.eclipse.jgit.lib.PersonIdent;-import org.eclipse.jgit.revwalk.RevCommit;--import com.gitplex.launcher.loader.Listen;-import com.gitplex.server.event.MarkdownAware;-import com.gitplex.server.event.ReviewInvitationChanged;-import com.gitplex.server.event.pullrequest.MergePreviewCalculated;-import com.gitplex.server.event.pullrequest.PullRequestCodeCommentActivityEvent;-import com.gitplex.server.event.pullrequest.PullRequestCodeCommentCreated;-import com.gitplex.server.event.pullrequest.PullRequestCommentCreated;-import com.gitplex.server.event.pullrequest.PullRequestEvent;-import com.gitplex.server.event.pullrequest.PullRequestOpened;-import com.gitplex.server.event.pullrequest.PullRequestStatusChangeEvent;-import com.gitplex.server.event.pullrequest.PullRequestUpdated;-import com.gitplex.server.git.NameAndEmail;-import com.gitplex.server.manager.AccountManager;-import com.gitplex.server.manager.BranchWatchManager;-import com.gitplex.server.manager.MailManager;-import com.gitplex.server.manager.MarkdownManager;import com.gitplex.server.manager.PullRequestWatchManager;-import com.gitplex.server.manager.UrlManager;-import com.gitplex.server.manager.VisitInfoManager;-import com.gitplex.server.model.Account;-import com.gitplex.server.model.BranchWatch;-import com.gitplex.server.model.PullRequest;-import com.gitplex.server.model.PullRequestStatusChange.Type;-import com.gitplex.server.model.PullRequestUpdate;import com.gitplex.server.model.PullRequestWatch;-import com.gitplex.server.model.ReviewInvitation;-import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.persistence.dao.AbstractEntityManager;import com.gitplex.server.persistence.dao.Dao;-import com.gitplex.server.util.editable.EditableUtils;-import com.gitplex.server.util.markdown.MentionParser;@Singletonpublic class DefaultPullRequestWatchManager extends AbstractEntityManager<PullRequestWatch>implements PullRequestWatchManager {- private final AccountManager userManager;-- private final BranchWatchManager branchWatchManager;-- private final MailManager mailManager;-- private final UrlManager urlManager;-- private final VisitInfoManager visitInfoManager;-- private final MarkdownManager markdownManager;-@Inject- public DefaultPullRequestWatchManager(Dao dao, AccountManager userManager, MarkdownManager markdownManager,- BranchWatchManager branchWatchManager, MailManager mailManager, UrlManager urlManager,- VisitInfoManager visitInfoManager) {+ public DefaultPullRequestWatchManager(Dao dao) {super(dao);- this.userManager = userManager;- this.branchWatchManager = branchWatchManager;- this.mailManager = mailManager;- this.urlManager = urlManager;- this.visitInfoManager = visitInfoManager;- this.markdownManager = markdownManager;- }-- @Transactional- @Listen- public void on(PullRequestEvent event) {- if (event instanceof MergePreviewCalculated) {- return;- }- String eventType;- Type statusChangeType = null;- if (event instanceof PullRequestStatusChangeEvent) {- statusChangeType = ((PullRequestStatusChangeEvent) event).getStatusChange().getType();- eventType = statusChangeType.getName();- if (statusChangeType == Type.DELETED_SOURCE_BRANCH || statusChangeType == Type.RESTORED_SOURCE_BRANCH) {- return;- }- } else {- eventType = EditableUtils.getName(event.getClass());- }-- PullRequest request = event.getRequest();- Account user = event.getUser();-- if (user != null && user.getEmail() != null) {- watch(request, user,- "You've set to watch this pull request as you've " + eventType);- }- if (event instanceof PullRequestOpened) {- for (BranchWatch branchWatch: branchWatchManager.find(request.getTargetDepot(), request.getTargetBranch())) {- watch(request, branchWatch.getUser(),- "You are set to watch this pull request as you are watching the target branch.");- }- makeContributorsWatching(request.getLatestUpdate());- } else if (event instanceof PullRequestUpdated) {- PullRequestUpdated updated = (PullRequestUpdated) event;- makeContributorsWatching(updated.getUpdate());- }-- Collection<Account> mentionUsers = new HashSet<>();- if (event instanceof MarkdownAware) {- MarkdownAware markdownAware = (MarkdownAware) event;- String markdown = markdownAware.getMarkdown();- if (markdown != null) {- String html = markdownManager.render(markdown, null, false);- mentionUsers.addAll(new MentionParser().parseMentions(html));- for (Account mention: mentionUsers) {- watch(request, mention, "You are set to watch this pull request as you are mentioned in code comment.");- }-- String url;- if (event instanceof PullRequestCommentCreated)- url = urlManager.urlFor(((PullRequestCommentCreated)event).getComment());- else if (event instanceof PullRequestStatusChangeEvent)- url = urlManager.urlFor(((PullRequestStatusChangeEvent)event).getStatusChange());- else if (event instanceof PullRequestCodeCommentCreated)- url = urlManager.urlFor(((PullRequestCodeCommentCreated)event).getComment(), event.getRequest());- else if (event instanceof PullRequestCodeCommentActivityEvent)- url = urlManager.urlFor(((PullRequestCodeCommentActivityEvent)event).getActivity(), event.getRequest());- else- url = urlManager.urlFor(event.getRequest());-- String subject = String.format("You are mentioned in pull request #%d (%s)",- request.getNumber(), request.getTitle());- String body = String.format("%s."- + "<p style='margin: 16px 0; padding-left: 16px; border-left: 4px solid #CCC;'>%s"- + "<p style='margin: 16px 0;'>"- + "For details, please visit <a href='%s'>%s</a>",- subject, markdownManager.escape(markdown), url, url);-- mailManager.sendMailAsync(mentionUsers.stream().map(Account::getEmail).collect(Collectors.toList()),- subject, decorateBody(body));- }- }-- Collection<Account> watchUsers = new HashSet<>();-- for (PullRequestWatch watch: request.getWatches()) {- if (!watch.isIgnore() && !watch.getUser().equals(event.getUser())) {- if (request.getLastEvent() == null) {- watchUsers.add(watch.getUser());- } else {- Date visitDate = visitInfoManager.getVisitDate(watch.getUser(), request);- if (visitDate == null || visitDate.getTime()<request.getLastEvent().getDate().getTime()) {- if (!request.getLastEvent().getType().equals(eventType)) {- watchUsers.add(watch.getUser());- }- } else {- watchUsers.add(watch.getUser());- }- }- }- }-- watchUsers.removeAll(mentionUsers);-- if (!watchUsers.isEmpty()) {- String subject, body;- String url = urlManager.urlFor(request);- if (event instanceof PullRequestOpened) {- subject = String.format("Newly opened pull request - #%d (%s)",- request.getNumber(), request.getTitle());- body = String.format("Dear Users,"- + "<p style='margin: 16px 0;'>A new pull request is opened - #%d (%s)"- + "<p style='margin: 16px 0;'>Visit <a href='%s'>%s</a> for details."- + "<p style='margin: 16px 0;'>-- Sent by GitPlex"- + "<p style='margin: 16px 0; font-size: 12px; color: #888;'>"- + "You receive this email as you are watching target branch.",- request.getNumber(), request.getTitle(), url, url);- } else {- subject = String.format("New activity in pull request #%d (%s) - %s",- request.getNumber(), request.getTitle(), eventType);- body = String.format("Dear Users,"- + "<p style='margin: 16px 0;'>There is new activity in pull request #%d (%s) - %s "- + "<p style='margin: 16px 0;'>Visit <a href='%s'>%s</a> for details."- + "<p style='margin: 16px 0;'>-- Sent by GitPlex"- + "<p style='margin: 16px 0; font-size: 12px; color: #888;'>"- + "You receive this email as you are watching the pull request.",- request.getNumber(), request.getTitle(), eventType, url, url);- }- mailManager.sendMailAsync(watchUsers.stream().map(Account::getEmail).collect(Collectors.toList()), subject, body);- }-}-- private String decorateBody(String body) {- return String.format(""- + "%s"- + "<p style='margin: 16px 0;'>"- + "-- Sent by GitPlex",- body);- }-- private void makeContributorsWatching(PullRequestUpdate update) {- // we use a name-email pair to filter off duplicate person as equals method of PersonIdent also takes- // "when" field into account- Set<NameAndEmail> nameAndEmails = new HashSet<>();- for (RevCommit commit: update.getCommits()) {- nameAndEmails.add(new NameAndEmail(commit.getCommitterIdent()));- nameAndEmails.add(new NameAndEmail(commit.getAuthorIdent()));- }- for (NameAndEmail nameAndEmail: nameAndEmails) {- PersonIdent person = new PersonIdent(nameAndEmail.getName(), nameAndEmail.getEmailAddress());- Account user = userManager.find(person);- if (user != null)- watch(update.getRequest(), user, "You are set to watch this pull request as it contains your commits.");- }- }-- @Transactional- @Listen- public void on(ReviewInvitationChanged event) {- ReviewInvitation invitation = event.getInvitation();- if (invitation.getType() != ReviewInvitation.Type.EXCLUDE) {- watch(invitation.getRequest(), invitation.getUser(),- "You are set to watch this pull request as you are invited to review it.");- }- }-- private void watch(PullRequest request, Account user, String reason) {- PullRequestWatch watch = request.getWatch(user);- if (watch == null) {- watch = new PullRequestWatch();- watch.setRequest(request);- watch.setUser(user);- watch.setReason(reason);- request.getWatches().add(watch);- save(watch);- }- }-}diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultReviewInvitationManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultReviewInvitationManager.javaindex 554c1c9406..c8eac0241b 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultReviewInvitationManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultReviewInvitationManager.java@@ -5,8 +5,6 @@ import java.util.Date;import javax.inject.Inject;import javax.inject.Singleton;-import com.gitplex.launcher.loader.ListenerRegistry;-import com.gitplex.server.event.ReviewInvitationChanged;import com.gitplex.server.manager.PullRequestManager;import com.gitplex.server.manager.PullRequestStatusChangeManager;import com.gitplex.server.manager.ReviewInvitationManager;@@ -23,30 +21,19 @@ import com.gitplex.server.security.SecurityUtils;public class DefaultReviewInvitationManager extends AbstractEntityManager<ReviewInvitation>implements ReviewInvitationManager {- private final ListenerRegistry listenerRegistry;-private final PullRequestManager pullRequestManager;private final PullRequestStatusChangeManager pullRequestStatusChangeManager;@Inject- public DefaultReviewInvitationManager(Dao dao, ListenerRegistry listenerRegistry,- PullRequestManager pullRequestManager, PullRequestStatusChangeManager pullRequestStatusChangeManger) {+ public DefaultReviewInvitationManager(Dao dao, PullRequestManager pullRequestManager,+ PullRequestStatusChangeManager pullRequestStatusChangeManger) {super(dao);- this.listenerRegistry = listenerRegistry;this.pullRequestManager = pullRequestManager;this.pullRequestStatusChangeManager = pullRequestStatusChangeManger;}- @Transactional- @Override- public void save(ReviewInvitation invitation) {- dao.persist(invitation);-- listenerRegistry.post(new ReviewInvitationChanged(invitation));- }-@Transactional@Overridepublic boolean exclude(ReviewInvitation invitation) {diff --git a/core/src/main/java/com/gitplex/server/manager/impl/NotificationManager.java b/core/src/main/java/com/gitplex/server/manager/impl/NotificationManager.javanew file mode 100644index 0000000000..e50ff5480c--- /dev/null+++ b/core/src/main/java/com/gitplex/server/manager/impl/NotificationManager.java@@ -0,0 +1,9 @@+package com.gitplex.server.manager.impl;++import com.gitplex.server.event.codecomment.CodeCommentEvent;++public interface NotificationManager {++ void sendNotifications(CodeCommentEvent event);++}diff --git a/web/src/main/java/com/gitplex/server/web/websocket/TaskChangeBroadcaster.java b/web/src/main/java/com/gitplex/server/web/websocket/TaskChangeBroadcaster.javaindex 890c1f1a0e..755926c84f 100644--- a/web/src/main/java/com/gitplex/server/web/websocket/TaskChangeBroadcaster.java+++ b/web/src/main/java/com/gitplex/server/web/websocket/TaskChangeBroadcaster.java@@ -4,7 +4,9 @@ import javax.inject.Inject;import javax.inject.Singleton;import com.gitplex.launcher.loader.Listen;-import com.gitplex.server.event.TaskChanged;+import com.gitplex.server.model.PullRequestTask;+import com.gitplex.server.persistence.dao.EntityPersisted;+import com.gitplex.server.persistence.dao.EntityRemoved;import com.gitplex.server.web.websocket.WebSocketManager;@Singleton@@ -18,9 +20,21 @@ public class TaskChangeBroadcaster {}@Listen- public void on(TaskChanged event) {- TaskChangedRegion region = new TaskChangedRegion(event.getUserId());- webSocketManager.render(region, null);+ public void on(EntityPersisted event) {+ if (event.getEntity() instanceof PullRequestTask) {+ PullRequestTask task = (PullRequestTask) event.getEntity();+ TaskChangedRegion region = new TaskChangedRegion(task.getUser().getId());+ webSocketManager.render(region, null);+ }}+ @Listen+ public void on(EntityRemoved event) {+ if (event.getEntity() instanceof PullRequestTask) {+ PullRequestTask task = (PullRequestTask) event.getEntity();+ TaskChangedRegion region = new TaskChangedRegion(task.getUser().getId());+ webSocketManager.render(region, null);+ }+ }+}\ No newline at end of file