The Unified and Autonomous Development Platform
Continue to improve pull request and issue notification
Robin Shen5344a5ce43d5
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.javaindex 0d640a2597..f66af3a034 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java@@ -55,6 +55,7 @@ import io.onedev.server.model.support.LastUpdate;import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.model.support.issue.NamedIssueQuery;import io.onedev.server.model.support.issue.changedata.IssueChangeData;+import io.onedev.server.model.support.issue.changedata.IssueCommittedData;import io.onedev.server.model.support.issue.changedata.IssueReferencedFromCodeCommentData;import io.onedev.server.model.support.issue.changedata.IssueReferencedFromIssueData;import io.onedev.server.model.support.issue.changedata.IssueReferencedFromPullRequestData;@@ -265,16 +266,27 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements@Listenpublic void on(IssueEvent event) {boolean minorChange = false;+ LastUpdate lastUpdate = null;if (event instanceof IssueChangeEvent) {IssueChangeData changeData = ((IssueChangeEvent)event).getChange().getData();- if (changeData instanceof IssueReferencedFromCodeCommentData+ if (changeData instanceof IssueCommittedData) {+ User committer = ((IssueCommittedData) changeData).getCommitter(event.getIssue());+ if (committer != null) {+ lastUpdate = new LastUpdate();+ lastUpdate.setUser(committer);+ lastUpdate.setDate(event.getDate());+ lastUpdate.setActivity("committed code");+ }+ } else if (changeData instanceof IssueReferencedFromCodeCommentData|| changeData instanceof IssueReferencedFromIssueData|| changeData instanceof IssueReferencedFromPullRequestData) {minorChange = true;}}-- if (!(event instanceof IssueOpened || minorChange))++ if (lastUpdate != null)+ event.getIssue().setLastUpdate(lastUpdate);+ else if (!(event instanceof IssueOpened || minorChange))event.getIssue().setLastUpdate(event.getLastUpdate());}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.javaindex 01d7abe058..a7ba76d6ea 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java@@ -84,6 +84,7 @@ import io.onedev.server.event.pullrequest.PullRequestCodeCommentEvent;import io.onedev.server.event.pullrequest.PullRequestEvent;import io.onedev.server.event.pullrequest.PullRequestMergePreviewCalculated;import io.onedev.server.event.pullrequest.PullRequestOpened;+import io.onedev.server.event.pullrequest.PullRequestUpdated;import io.onedev.server.git.GitUtils;import io.onedev.server.infomanager.CommitInfoManager;import io.onedev.server.model.Build;@@ -669,24 +670,41 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest@Transactional@Listenpublic void on(PullRequestEvent event) {- boolean minorChange = false;- if (event instanceof PullRequestChangeEvent) {- PullRequestChangeData changeData = ((PullRequestChangeEvent)event).getChange().getData();- if (changeData instanceof PullRequestReviewerAddData- || changeData instanceof PullRequestReviewerRemoveData- || changeData instanceof PullRequestSourceBranchDeleteData- || changeData instanceof PullRequestSourceBranchRestoreData- || changeData instanceof PullRequestReferencedFromCodeCommentData- || changeData instanceof PullRequestReferencedFromIssueData- || changeData instanceof PullRequestReferencedFromPullRequestData) {- minorChange = true;+ if (event instanceof PullRequestUpdated) {+ Collection<User> committers = ((PullRequestUpdated) event).getCommitters();+ if (committers.size() == 1) {+ LastUpdate lastUpdate = new LastUpdate();+ lastUpdate.setUser(committers.iterator().next());+ lastUpdate.setActivity("added commits");+ lastUpdate.setDate(event.getDate());+ event.getRequest().setLastUpdate(lastUpdate);+ } else {+ LastUpdate lastUpdate = new LastUpdate();+ lastUpdate.setUser(committers.iterator().next());+ lastUpdate.setActivity("Commits added");+ lastUpdate.setDate(event.getDate());+ event.getRequest().setLastUpdate(lastUpdate);+ }+ } else {+ boolean minorChange = false;+ if (event instanceof PullRequestChangeEvent) {+ PullRequestChangeData changeData = ((PullRequestChangeEvent)event).getChange().getData();+ if (changeData instanceof PullRequestReviewerAddData+ || changeData instanceof PullRequestReviewerRemoveData+ || changeData instanceof PullRequestSourceBranchDeleteData+ || changeData instanceof PullRequestSourceBranchRestoreData+ || changeData instanceof PullRequestReferencedFromCodeCommentData+ || changeData instanceof PullRequestReferencedFromIssueData+ || changeData instanceof PullRequestReferencedFromPullRequestData) {+ minorChange = true;+ }+ }+ if (!(event instanceof PullRequestOpened+ || event instanceof PullRequestMergePreviewCalculated+ || event instanceof PullRequestBuildEvent+ || minorChange)) {+ event.getRequest().setLastUpdate(event.getLastUpdate());}- }- if (!(event instanceof PullRequestOpened- || event instanceof PullRequestMergePreviewCalculated- || event instanceof PullRequestBuildEvent- || minorChange)) {- event.getRequest().setLastUpdate(event.getLastUpdate());}}diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestUpdated.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestUpdated.javaindex ec395de0ce..7125a1455a 100644--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestUpdated.java+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestUpdated.java@@ -1,11 +1,19 @@package io.onedev.server.event.pullrequest;+import java.util.Collection;+import java.util.stream.Collectors;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.PullRequestUpdate;+import io.onedev.server.model.User;public class PullRequestUpdated extends PullRequestEvent {private final PullRequestUpdate update;+ private transient Collection<User> committers;+public PullRequestUpdated(PullRequestUpdate update) {super(null, update.getDate(), update.getRequest());this.update = update;@@ -23,4 +31,14 @@ public class PullRequestUpdated extends PullRequestEvent {return activity;}+ public Collection<User> getCommitters() {+ if (committers == null) {+ committers = getUpdate().getCommits()+ .stream()+ .map(it->OneDev.getInstance(UserManager.class).find(it.getCommitterIdent()))+ .filter(it->it!=null)+ .collect(Collectors.toSet());+ }+ return committers;+ }}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueCommittedData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueCommittedData.javaindex b83f9550f8..f77aecfa1c 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueCommittedData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueCommittedData.java@@ -3,9 +3,15 @@ package io.onedev.server.model.support.issue.changedata;import java.util.Collection;import java.util.HashMap;import java.util.Map;+import java.util.Optional;++import javax.annotation.Nullable;import org.apache.wicket.Component;+import org.eclipse.jgit.revwalk.RevCommit;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Group;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueChange;@@ -19,6 +25,8 @@ public class IssueCommittedData implements IssueChangeData {private final String commitHash;+ private transient Optional<User> committer;+public IssueCommittedData(String commitHash) {this.commitHash = commitHash;}@@ -43,9 +51,9 @@ public class IssueCommittedData implements IssueChangeData {@Overridepublic String getActivity(Issue withIssue) {if (withIssue != null)- return "Code committed to fix issue " + withIssue.describe();+ return "Code committed for issue " + withIssue.describe();else- return "Code committed to fix issue";+ return "Code committed";}@Override@@ -63,6 +71,18 @@ public class IssueCommittedData implements IssueChangeData {return new HashMap<>();}+ @Nullable+ public User getCommitter(Issue issue) {+ if (committer == null) {+ RevCommit commit = issue.getProject().getRevCommit(getCommitHash(), false);+ if (commit != null)+ committer = Optional.ofNullable(OneDev.getInstance(UserManager.class).find(commit.getCommitterIdent()));+ else+ committer = Optional.empty();+ }+ return committer.orElse(null);+ }+@Overridepublic boolean affectsBoards() {return false;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 183eb2f61d..d384be2481 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@@ -10,8 +10,6 @@ import java.util.stream.Collectors;import javax.inject.Inject;import javax.inject.Singleton;-import org.eclipse.jgit.revwalk.RevCommit;-import com.google.common.collect.Sets;import io.onedev.commons.launcher.loader.Listen;@@ -137,18 +135,17 @@ public class IssueNotificationManager {if (!user.isSystem())issueWatchManager.watch(issue, user, true);}++ User committer = null;if (event instanceof IssueChangeEvent) {IssueChangeData changeData = ((IssueChangeEvent) event).getChange().getData();if (changeData instanceof IssueCommittedData) {IssueCommittedData committedData = (IssueCommittedData) changeData;- RevCommit commit = issue.getProject().getRevCommit(committedData.getCommitHash(), false);- if (commit != null) {- User committer = userManager.find(commit.getCommitterIdent());- if (committer != null) {- notifiedUsers.add(committer);- if (!committer.isSystem())- issueWatchManager.watch(issue, committer, true);- }+ committer = committedData.getCommitter(issue);+ if (committer != null) {+ notifiedUsers.add(committer);+ if (!committer.isSystem())+ issueWatchManager.watch(issue, committer, true);}}}@@ -251,6 +248,8 @@ public class IssueNotificationManager {String subject;if (user != null)subject = String.format("%s %s", user.getDisplayName(), event.getActivity(true));+ else if (committer != null)+ subject = String.format("%s committed code for issue %s", committer.getDisplayName(), issue.describe());elsesubject = event.getActivity(true);String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);diff --git a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.javaindex adf6f81f97..6579fd98b9 100644--- a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java@@ -4,7 +4,6 @@ import java.util.Collection;import java.util.Date;import java.util.HashSet;import java.util.Map;-import java.util.Set;import java.util.stream.Collectors;import javax.inject.Inject;@@ -145,18 +144,18 @@ public class PullRequestNotificationManager {if (!user.isSystem())pullRequestWatchManager.watch(request, user, true);}++ User committer = null;if (event instanceof PullRequestUpdated) {PullRequestUpdated pullRequestUpdated = (PullRequestUpdated) event;- Set<User> committers = pullRequestUpdated.getUpdate().getCommits()- .stream()- .map(it->userManager.find(it.getCommitterIdent()))- .filter(it->it!=null)- .collect(Collectors.toSet());- if (committers.size() == 1)- notifiedUsers.add(committers.iterator().next());- for (User committer: committers) {- if (!committer.isSystem())- pullRequestWatchManager.watch(request, committer, true);+ Collection<User> committers = pullRequestUpdated.getCommitters();+ if (committers.size() == 1) {+ committer = committers.iterator().next();+ notifiedUsers.add(committer);+ }+ for (User each: committers) {+ if (!each.isSystem())+ pullRequestWatchManager.watch(request, each, true);}}@@ -258,7 +257,9 @@ public class PullRequestNotificationManager {String subject;if (user != null)subject = String.format("%s %s", user.getDisplayName(), event.getActivity(true));- else+ else if (committer != null)+ subject = String.format("%s added commits to pull request %s", committer.getDisplayName(), request.describe());+ elsesubject = event.getActivity(true);String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);mailManager.sendMailAsync(usersToNotify.stream().map(User::getEmail).collect(Collectors.toList()), subject, body);