Commit @b67ab0d775911aaceec70a154decd46cc32054ac

Hyeonjae Park 2019-01-10

issue: Fix moved issues's mail bugs

@b67ab0d775911aaceec70a154decd46cc32054ac

4e6f200

b67ab0d

app/controllers/IssueApp.java

--- app/controllers/IssueApp.java

+++ app/controllers/IssueApp.java


         }
     }
 
-    private static void addIssueMovedNotification(Project previous, Issue originalIssue, Issue issue) {
+    private static void addIssueMovedNotification(Project previous, Issue originalIssue, Issue issue, Set<User> fromWatchers) {
         if (isRequestedToOtherProject(previous, originalIssue.project)) {
-            NotificationEvent notiEvent = NotificationEvent.afterIssueMoved(previous, originalIssue);
+            NotificationEvent notiEvent = NotificationEvent.afterIssueMoved(previous, originalIssue, () -> fromWatchers);
             IssueEvent.addFromNotificationEvent(notiEvent, originalIssue, UserApp.currentUser().loginId);
 
             play.Logger.debug("addIssueMovedNotification - afterIssueMoved receivers: " + notiEvent.receivers);

         setMilestone(issueForm, issue);
         issue.dueDate = JodaDateUtil.lastSecondOfDay(issue.dueDate);
 
+
+
         Issue originalIssue = Issue.findByNumber(project, number);
+        Set<User> fromWatchers = originalIssue.getWatchers();
+
         if(hasTargetProject(issue)) {
             Project toOtherProject = Project.find.byId(Long.valueOf(issue.targetProjectId));
             if (toOtherProject == null) {

                     if(isFromMyOwnPrivateProject(previous)){
                         issue.history = "";
                     } else {
-                        addIssueMovedNotification(previous, originalIssue, issue);
+                        addIssueMovedNotification(previous, originalIssue, issue, fromWatchers);
                     }
                 } else {
                     addLabels(issue, request());

4e6f200

b67ab0d

app/models/NotificationEvent.java

--- app/models/NotificationEvent.java

+++ app/models/NotificationEvent.java


 import java.net.URLEncoder;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 

         return notiEvent;
     }
 
+    public static NotificationEvent afterIssueMoved(Project previous, Issue issue, Supplier<Set<User>> getReceivers) {
+        webhookRequest(ISSUE_MOVED, issue, previous, false);
+
+        NotificationEvent notiEvent = createFromCurrentUser(issue);
+        notiEvent.title = formatReplyTitle(issue);
+        notiEvent.receivers = getReceivers.get();
+        notiEvent.eventType = ISSUE_MOVED;
+        notiEvent.oldValue = previous != null ? previous.owner + "/" + previous.name : null;
+        notiEvent.newValue = issue.project.owner + "/" + issue.project.name;
+
+        NotificationEvent.add(notiEvent);
+
+        return notiEvent;
+    }
+
     public static NotificationEvent afterIssueMoved(Project previous, Issue issue) {
         webhookRequest(ISSUE_MOVED, issue, previous, false);
 

Add a comment

Open 0
Closed 0

List

...	...	@@ -665,9 +665,9 @@
665	665	}
666	666	}
667	667
668		- private static void addIssueMovedNotification(Project previous, Issue originalIssue, Issue issue) {
	668	+ private static void addIssueMovedNotification(Project previous, Issue originalIssue, Issue issue, Set<User> fromWatchers) {
669	669	if (isRequestedToOtherProject(previous, originalIssue.project)) {
670		- NotificationEvent notiEvent = NotificationEvent.afterIssueMoved(previous, originalIssue);
	670	+ NotificationEvent notiEvent = NotificationEvent.afterIssueMoved(previous, originalIssue, () -> fromWatchers);
671	671	IssueEvent.addFromNotificationEvent(notiEvent, originalIssue, UserApp.currentUser().loginId);
672	672
673	673	play.Logger.debug("addIssueMovedNotification - afterIssueMoved receivers: " + notiEvent.receivers);
...	...	@@ -703,7 +703,11 @@
703	703	setMilestone(issueForm, issue);
704	704	issue.dueDate = JodaDateUtil.lastSecondOfDay(issue.dueDate);
705	705
	706	+
	707	+
706	708	Issue originalIssue = Issue.findByNumber(project, number);
	709	+ Set<User> fromWatchers = originalIssue.getWatchers();
	710	+
707	711	if(hasTargetProject(issue)) {
708	712	Project toOtherProject = Project.find.byId(Long.valueOf(issue.targetProjectId));
709	713	if (toOtherProject == null) {
...	...	@@ -744,7 +748,7 @@
744	748	if(isFromMyOwnPrivateProject(previous)){
745	749	issue.history = "";
746	750	} else {
747		- addIssueMovedNotification(previous, originalIssue, issue);
	751	+ addIssueMovedNotification(previous, originalIssue, issue, fromWatchers);
748	752	}
749	753	} else {
750	754	addLabels(issue, request());

...	...	@@ -41,6 +41,7 @@
41	41	import java.net.URLEncoder;
42	42	import java.util.*;
43	43	import java.util.concurrent.TimeUnit;
	44	+import java.util.function.Supplier;
44	45	import java.util.regex.Matcher;
45	46	import java.util.regex.Pattern;
46	47
...	...	@@ -922,6 +923,21 @@
922	923	return notiEvent;
923	924	}
924	925
	926	+ public static NotificationEvent afterIssueMoved(Project previous, Issue issue, Supplier<Set<User>> getReceivers) {
	927	+ webhookRequest(ISSUE_MOVED, issue, previous, false);
	928	+
	929	+ NotificationEvent notiEvent = createFromCurrentUser(issue);
	930	+ notiEvent.title = formatReplyTitle(issue);
	931	+ notiEvent.receivers = getReceivers.get();
	932	+ notiEvent.eventType = ISSUE_MOVED;
	933	+ notiEvent.oldValue = previous != null ? previous.owner + "/" + previous.name : null;
	934	+ notiEvent.newValue = issue.project.owner + "/" + issue.project.name;
	935	+
	936	+ NotificationEvent.add(notiEvent);
	937	+
	938	+ return notiEvent;
	939	+ }
	940	+
925	941	public static NotificationEvent afterIssueMoved(Project previous, Issue issue) {
926	942	webhookRequest(ISSUE_MOVED, issue, previous, false);
927	943

Delete comment