The Unified and Autonomous Development Platform
feat: Send notifications to watches when issues are moved to other projects (OD-1910)
Robin Shen70cfcd593348
diff --git a/server-core/src/main/java/io/onedev/server/event/project/issue/IssuesCopied.java b/server-core/src/main/java/io/onedev/server/event/project/issue/IssuesCopied.javaindex 5b5a9265de..2203113d2b 100644--- a/server-core/src/main/java/io/onedev/server/event/project/issue/IssuesCopied.java+++ b/server-core/src/main/java/io/onedev/server/event/project/issue/IssuesCopied.java@@ -41,7 +41,7 @@ public class IssuesCopied extends ProjectEvent {@Overridepublic String getActivity() {- return "issues copied";+ return "copied";}}diff --git a/server-core/src/main/java/io/onedev/server/event/project/issue/IssuesDeleted.java b/server-core/src/main/java/io/onedev/server/event/project/issue/IssuesDeleted.javaindex ea52dc8527..dc65b933a8 100644--- a/server-core/src/main/java/io/onedev/server/event/project/issue/IssuesDeleted.java+++ b/server-core/src/main/java/io/onedev/server/event/project/issue/IssuesDeleted.java@@ -26,7 +26,7 @@ public class IssuesDeleted extends ProjectEvent {@Overridepublic String getActivity() {- return "issues deleted";+ return "deleted";}}diff --git a/server-core/src/main/java/io/onedev/server/event/project/issue/IssuesImported.java b/server-core/src/main/java/io/onedev/server/event/project/issue/IssuesImported.javaindex a0094410f5..1f6c425ea6 100644--- a/server-core/src/main/java/io/onedev/server/event/project/issue/IssuesImported.java+++ b/server-core/src/main/java/io/onedev/server/event/project/issue/IssuesImported.java@@ -26,7 +26,7 @@ public class IssuesImported extends ProjectEvent {@Overridepublic String getActivity() {- return "issues imported";+ return "imported";}}diff --git a/server-core/src/main/java/io/onedev/server/event/project/issue/IssuesMoved.java b/server-core/src/main/java/io/onedev/server/event/project/issue/IssuesMoved.javaindex 8dd012f7cc..a145d131ae 100644--- a/server-core/src/main/java/io/onedev/server/event/project/issue/IssuesMoved.java+++ b/server-core/src/main/java/io/onedev/server/event/project/issue/IssuesMoved.java@@ -39,7 +39,7 @@ public class IssuesMoved extends ProjectEvent {@Overridepublic String getActivity() {- return "issues moved";+ return "moved";}}diff --git a/server-core/src/main/java/io/onedev/server/event/project/issue/IssuesTouched.java b/server-core/src/main/java/io/onedev/server/event/project/issue/IssuesTouched.javaindex 8b64ab8b86..846d7cc615 100644--- a/server-core/src/main/java/io/onedev/server/event/project/issue/IssuesTouched.java+++ b/server-core/src/main/java/io/onedev/server/event/project/issue/IssuesTouched.java@@ -24,7 +24,7 @@ public class IssuesTouched extends ProjectEvent {@Overridepublic String getActivity() {- return "issues touched";+ return "touched";}}diff --git a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.javaindex 1a658e3859..07c9dde02b 100644--- a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java@@ -13,6 +13,7 @@ import javax.inject.Singleton;import io.onedev.server.entitymanager.*;import io.onedev.server.event.project.issue.*;import io.onedev.server.util.ProjectScope;+import io.onedev.server.web.UrlManager;import io.onedev.server.web.asset.emoji.Emojis;import org.apache.commons.lang3.StringUtils;@@ -38,6 +39,9 @@ import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.search.entity.issue.IssueQueryParseOption;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.commenttext.MarkdownText;+import org.unbescape.html.HtmlEscape;++import static org.unbescape.html.HtmlEscape.escapeHtml5;@Singletonpublic class IssueNotificationManager extends AbstractNotificationManager {@@ -56,12 +60,17 @@ public class IssueNotificationManager extends AbstractNotificationManager {private final IssueQueryPersonalizationManager queryPersonalizationManager;+ private final IssueManager issueManager;++ private final UrlManager urlManager;+@Injectpublic IssueNotificationManager(MarkdownManager markdownManager, MailManager mailManager,IssueWatchManager watchManager, VisitInfoManager userInfoManager,UserManager userManager, SettingManager settingManager,IssueAuthorizationManager authorizationManager, IssueMentionManager mentionManager,- IssueQueryPersonalizationManager queryPersonalizationManager) {+ IssueQueryPersonalizationManager queryPersonalizationManager,+ IssueManager issueManager, UrlManager urlManager) {super(markdownManager, settingManager);this.mailManager = mailManager;@@ -71,30 +80,12 @@ public class IssueNotificationManager extends AbstractNotificationManager {this.authorizationManager = authorizationManager;this.mentionManager = mentionManager;this.queryPersonalizationManager = queryPersonalizationManager;+ this.issueManager = issueManager;+ this.urlManager = urlManager;}- @Transactional- @Listen- public void on(IssueEvent event) {- if (event.isMinor())- return;-- Issue issue = event.getIssue();- User user = event.getUser();-- String url = event.getUrl();-- String senderName;- String summary;- if (user != null) {- senderName = user.getDisplayName();- summary = user.getDisplayName() + " " + event.getActivity();- } else {- senderName = null;- summary = StringUtils.capitalize(event.getActivity());- }-- for (Map.Entry<User, Boolean> entry: new QueryWatchBuilder<Issue>() {+ private void setupWatches(Issue issue) {+ for (Map.Entry<User, Boolean> entry : new QueryWatchBuilder<Issue>() {@Overrideprotected Issue getEntity() {@@ -116,13 +107,13 @@ public class IssueNotificationManager extends AbstractNotificationManager {protected Collection<? extends NamedQuery> getNamedQueries() {return issue.getProject().getNamedIssueQueries();}-+}.getWatches().entrySet()) {if (SecurityUtils.canAccessIssue(entry.getKey().asSubject(), issue))watchManager.watch(issue, entry.getKey(), entry.getValue());}-- for (Map.Entry<User, Boolean> entry: new QueryWatchBuilder<Issue>() {++ for (Map.Entry<User, Boolean> entry : new QueryWatchBuilder<Issue>() {@Overrideprotected Issue getEntity() {@@ -131,7 +122,7 @@ public class IssueNotificationManager extends AbstractNotificationManager {@Overrideprotected Collection<? extends QueryPersonalization<?>> getQueryPersonalizations() {- return userManager.query().stream().map(it->it.getIssueQueryPersonalization()).collect(Collectors.toList());+ return userManager.query().stream().map(it -> it.getIssueQueryPersonalization()).collect(Collectors.toList());}@Override@@ -144,11 +135,35 @@ public class IssueNotificationManager extends AbstractNotificationManager {protected Collection<? extends NamedQuery> getNamedQueries() {return settingManager.getIssueSetting().getNamedQueries();}-+}.getWatches().entrySet()) {if (SecurityUtils.canAccessIssue(entry.getKey().asSubject(), issue))watchManager.watch(issue, entry.getKey(), entry.getValue());}+ }++ @Transactional+ @Listen+ public void on(IssueEvent event) {+ if (event.isMinor())+ return;++ Issue issue = event.getIssue();+ User user = event.getUser();++ String url = event.getUrl();++ String senderName;+ String summary;+ if (user != null) {+ senderName = user.getDisplayName();+ summary = user.getDisplayName() + " " + event.getActivity();+ } else {+ senderName = null;+ summary = StringUtils.capitalize(event.getActivity());+ }++ setupWatches(issue);Collection<User> notifiedUsers = Sets.newHashSet();if (user != null) {@@ -285,5 +300,71 @@ public class IssueNotificationManager extends AbstractNotificationManager {replyAddress, senderName, threadingReferences);}}++ @Transactional+ @Listen+ public void on(IssuesMoved event) {+ User user = event.getUser();+ for (var issueId: event.getIssueIds()) {+ var issue = issueManager.load(issueId);++ String senderName;+ String summary;+ if (user != null) {+ senderName = user.getDisplayName();+ summary = user.getDisplayName() + " " + event.getActivity();+ } else {+ senderName = null;+ summary = StringUtils.capitalize(event.getActivity());+ }++ setupWatches(issue);++ var emojis = Emojis.getInstance();+ String replyAddress = mailManager.getReplyAddress(issue);+ boolean replyable = replyAddress != null;++ Collection<String> bccEmailAddresses = new HashSet<>();+ for (IssueWatch watch : issue.getWatches()) {+ Date visitDate = userInfoManager.getIssueVisitDate(watch.getUser(), issue);+ if (watch.isWatching()+ && (visitDate == null || visitDate.before(event.getDate()))+ && !watch.getUser().equals(user)+ && SecurityUtils.canAccessIssue(watch.getUser().asSubject(), issue)) {+ EmailAddress emailAddress = watch.getUser().getPrimaryEmailAddress();+ if (emailAddress != null && emailAddress.isVerified())+ bccEmailAddresses.add(emailAddress.getValue());+ }+ }++ if (!bccEmailAddresses.isEmpty()) {+ String subject = String.format(+ "[Issue %s] (%s) %s",+ issue.getReference(),+ "Moved",+ emojis.apply(issue.getTitle()));++ var url = urlManager.urlFor(issue);+ String textDetail = "" ++ "Previous project: " + event.getSourceProject().getPath() ++ "\n" ++ "Current project: " + event.getTargetProject().getPath() ++ "\n";+ String htmlDetail = "" ++ "Previous project: " + escapeHtml5(event.getSourceProject().getPath()) ++ "<br>" ++ "Current project: " + escapeHtml5(event.getTargetProject().getPath()) ++ "<br>";+ Unsubscribable unsubscribable = new Unsubscribable(mailManager.getUnsubscribeAddress(issue));+ String htmlBody = getEmailBody(true, event, summary, htmlDetail, url, replyable, unsubscribable);+ String textBody = getEmailBody(false, event, summary, textDetail, url, replyable, unsubscribable);++ String threadingReferences = issue.getThreadingReferences();+ mailManager.sendMailAsync(Sets.newHashSet(), Sets.newHashSet(),+ bccEmailAddresses, subject, htmlBody, textBody,+ replyAddress, senderName, threadingReferences);+ }+ }+ }}