Skip to content

The Unified and Autonomous Development Platform

fix issue #60: Avoid some unnecessary issue and pull request notifiations

Robin Shen147bca8a0467
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/UserManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/UserManager.java
index 9ec8de8d4d..88e8762a6a 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/UserManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/UserManager.java
@@ -51,7 +51,8 @@ public interface UserManager extends EntityManager<User> {
* @return
* matching user, or <tt>null</tt> if not found
*/
- @Nullable User findByName(String userName);
+ @Nullable
+ User findByName(String userName);
/**
* Find user of specified name.
@@ -61,7 +62,8 @@ public interface UserManager extends EntityManager<User> {
* @return
* matching user, or <tt>null</tt> if not found
*/
- @Nullable User findByEmail(String email);
+ @Nullable
+ User findByEmail(String email);
/**
* Find user by person
@@ -71,7 +73,8 @@ public interface UserManager extends EntityManager<User> {
* @return
* matching user, or <tt>null</tt> if not found
*/
- @Nullable User find(PersonIdent person);
+ @Nullable
+ User find(PersonIdent person);
List<User> queryAndSort(Collection<User> topUsers);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java
index 724bceb8ca..1499defefb 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java
@@ -7,6 +7,7 @@ import java.util.List;
import javax.inject.Inject;
import javax.inject.Singleton;
+import org.apache.commons.lang3.StringUtils;
import org.eclipse.jgit.lib.PersonIdent;
import org.hibernate.ReplicationMode;
import org.hibernate.criterion.Restrictions;
@@ -238,7 +239,10 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements U
@Sessional
@Override
public User find(PersonIdent person) {
- return findByEmail(person.getEmailAddress());
+ if (StringUtils.isNotBlank(person.getEmailAddress()))
+ return findByEmail(person.getEmailAddress());
+ else
+ return null;
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
index 257ef3561e..77d42ff65f 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
@@ -161,9 +161,7 @@ public class GlobalIssueSetting implements Serializable {
failedBuild.setShowCondition(showCondition);
BuildChoiceField affectedBuilds = new BuildChoiceField();
- affectedBuilds.setName("Affected Builds");
- affectedBuilds.setAllowEmpty(true);
- affectedBuilds.setNameOfEmptyValue("Not specified");
+ affectedBuilds.setName("Seen Builds");
affectedBuilds.setAllowMultiple(true);
showCondition = new ShowCondition();
@@ -261,7 +259,7 @@ public class GlobalIssueSetting implements Serializable {
defaultPromptFieldsUponIssueOpen.add("Priority");
defaultPromptFieldsUponIssueOpen.add("Assignees");
defaultPromptFieldsUponIssueOpen.add("Failed Build");
- defaultPromptFieldsUponIssueOpen.add("Affected Builds");
+ defaultPromptFieldsUponIssueOpen.add("Seen Builds");
BoardSpec board = new BoardSpec();
board.setName(Issue.FIELD_STATE);
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.java
index 0200665b87..183eb2f61d 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,6 +10,8 @@ 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;
@@ -30,6 +32,7 @@ import io.onedev.server.model.User;
import io.onedev.server.model.support.NamedQuery;
import io.onedev.server.model.support.QuerySetting;
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;
@@ -134,6 +137,21 @@ public class IssueNotificationManager {
if (!user.isSystem())
issueWatchManager.watch(issue, user, true);
}
+ 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);
+ }
+ }
+ }
+ }
Map<String, Group> newGroups = event.getNewGroups();
Map<String, Collection<User>> newUsers = event.getNewUsers();
@@ -144,6 +162,7 @@ public class IssueNotificationManager {
String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);
Set<String> emails = entry.getValue().getMembers()
.stream()
+ .filter(it->!it.equals(user))
.map(it->it.getEmail())
.collect(Collectors.toSet());
mailManager.sendMailAsync(emails, subject, body.toString());
@@ -159,6 +178,7 @@ public class IssueNotificationManager {
String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);
Set<String> emails = entry.getValue()
.stream()
+ .filter(it->!it.equals(user))
.map(it->it.getEmail())
.collect(Collectors.toSet());
mailManager.sendMailAsync(emails, subject, body.toString());
@@ -178,7 +198,7 @@ public class IssueNotificationManager {
for (String userName: new MentionParser().parseMentions(rendered)) {
User mentionedUser = userManager.findByName(userName);
- if (mentionedUser != null && !notifiedUsers.contains(mentionedUser)) {
+ if (mentionedUser != null) {
if (event instanceof IssueOpened)
url = urlManager.urlFor(((IssueOpened)event).getIssue());
else if (event instanceof IssueCommented)
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.java
index 3a000af2c6..adf6f81f97 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,6 +4,7 @@ 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;
@@ -46,6 +47,7 @@ import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.QueryWatchBuilder;
import io.onedev.server.search.entity.pullrequest.PullRequestQuery;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.markdown.MarkdownManager;
import io.onedev.server.util.markdown.MentionParser;
@@ -143,6 +145,20 @@ public class PullRequestNotificationManager {
if (!user.isSystem())
pullRequestWatchManager.watch(request, user, true);
}
+ 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);
+ }
+ }
if (event instanceof PullRequestOpened) {
for (PullRequestReview review: request.getReviews()) {
@@ -156,14 +172,14 @@ public class PullRequestNotificationManager {
if (event instanceof PullRequestChangeEvent
&& request.getSubmitter() != null
&& !notifiedUsers.contains(request.getSubmitter())) {
- PullRequestChangeEvent actionEvent = (PullRequestChangeEvent) event;
- PullRequestChangeData actionData = actionEvent.getChange().getData();
+ PullRequestChangeEvent changeEvent = (PullRequestChangeEvent) event;
+ PullRequestChangeData changeData = changeEvent.getChange().getData();
String subject = null;
- if (actionData instanceof PullRequestApproveData)
+ if (changeData instanceof PullRequestApproveData)
subject = String.format(user.getDisplayName() + " approved pull request %s", request.describe());
- else if (actionData instanceof PullRequestRequestedForChangesData)
+ else if (changeData instanceof PullRequestRequestedForChangesData)
subject = String.format(user.getDisplayName() + " requested changes for pull request %s", request.describe());
- else if (actionData instanceof PullRequestDiscardData)
+ else if (changeData instanceof PullRequestDiscardData)
subject = String.format(user.getDisplayName() + " discarded pull request %s", request.describe());
if (subject != null) {
String url = urlManager.urlFor(request);
@@ -182,7 +198,7 @@ public class PullRequestNotificationManager {
for (String userName: new MentionParser().parseMentions(rendered)) {
User mentionedUser = userManager.findByName(userName);
- if (mentionedUser != null && !notifiedUsers.contains(mentionedUser)) {
+ if (mentionedUser != null) {
pullRequestWatchManager.watch(request, mentionedUser, true);
String url;
if (event instanceof PullRequestCommentCreated)
@@ -267,7 +283,7 @@ public class PullRequestNotificationManager {
PullRequest request = review.getRequest();
if (review.getExcludeDate() == null
&& review.getResult() == null
- && (request.getSubmitter() == null || !request.getSubmitter().equals(review.getUser()))) {
+ && !review.getUser().equals(SecurityUtils.getUser())) {
pullRequestWatchManager.watch(request, review.getUser(), true);
inviteToReview(review);
}