Skip to content

The Unified and Autonomous Development Platform

Fix issue #574 - Refactor pull request notification to send more meaningful messages

Robin Shen7b60fd7e7ab2
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java
index d30925827b..19d49b076b 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java
@@ -35,7 +35,6 @@ import javax.validation.ConstraintViolation;
import javax.validation.Validator;
import org.apache.shiro.subject.Subject;
-import org.apache.shiro.util.ThreadContext;
import org.eclipse.jgit.lib.ObjectId;
import org.quartz.CronScheduleBuilder;
import org.quartz.ScheduleBuilder;
@@ -58,10 +57,10 @@ import io.onedev.commons.utils.TaskLogger;
import io.onedev.k8shelper.Action;
import io.onedev.k8shelper.CacheInstance;
import io.onedev.k8shelper.CompositeFacade;
-import io.onedev.k8shelper.StepFacade;
import io.onedev.k8shelper.LeafFacade;
import io.onedev.k8shelper.LeafVisitor;
import io.onedev.k8shelper.ServerSideFacade;
+import io.onedev.k8shelper.StepFacade;
import io.onedev.server.OneDev;
import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.Service;
@@ -295,7 +294,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
@Override
public void run() {
- ThreadContext.bind(userManager.getSystem().asSubject());
+ SecurityUtils.bindAsSystem();
Project project = projectManager.load(projectId);
PullRequest pullRequest;
if (pullRequestId != null)
@@ -827,8 +826,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
@Override
public void run() {
- ThreadContext.bind(userManager.getSystem().asSubject());
-
+ SecurityUtils.bindAsSystem();
Project project = projectManager.load(projectId);
try {
new MatrixRunner<List<String>>(paramMatrix) {
@@ -1087,8 +1085,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
@Override
public void run() {
- ThreadContext.bind(userManager.getSystem().asSubject());
-
+ SecurityUtils.bindAsSystem();
Project project = projectManager.load(projectId);
String triggerChain = UUID.randomUUID().toString();
new MatrixRunner<List<String>>(ParamUtils.getParamMatrix(null, null, trigger.getParams())) {
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestAssignmentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestAssignmentManager.java
index 5f7fed1689..ac47dd6a1d 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestAssignmentManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestAssignmentManager.java
@@ -5,7 +5,4 @@ import io.onedev.server.persistence.dao.EntityManager;
public interface PullRequestAssignmentManager extends EntityManager<PullRequestAssignment> {
- void addAssignee(PullRequestAssignment assignment);
-
- void removeAssignee(PullRequestAssignment assignment);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestReviewManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestReviewManager.java
index 5b7877a19a..35f27b0b2d 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestReviewManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestReviewManager.java
@@ -1,7 +1,6 @@
package io.onedev.server.entitymanager;
import java.util.Collection;
-import java.util.List;
import javax.annotation.Nullable;
@@ -11,18 +10,10 @@ import io.onedev.server.model.User;
import io.onedev.server.persistence.dao.EntityManager;
public interface PullRequestReviewManager extends EntityManager<PullRequestReview> {
-
- void review(PullRequestReview review);
@Nullable
PullRequestReview find(PullRequest request, User user, String commit);
- void addReviewer(PullRequestReview review);
-
- boolean removeReviewer(PullRequestReview review, List<User> unpreferableReviewers);
-
- void saveReviews(PullRequest request);
-
void populateReviews(Collection<PullRequest> requests);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestAssignmentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestAssignmentManager.java
index 56790b3d4e..0e203a2182 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestAssignmentManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestAssignmentManager.java
@@ -21,45 +21,41 @@ import io.onedev.server.security.SecurityUtils;
public class DefaultPullRequestAssignmentManager extends BaseEntityManager<PullRequestAssignment>
implements PullRequestAssignmentManager {
- private final PullRequestChangeManager pullRequestChangeManager;
+ private final PullRequestChangeManager changeManager;
@Inject
- public DefaultPullRequestAssignmentManager(Dao dao,
- PullRequestChangeManager pullRequestChangeManager) {
+ public DefaultPullRequestAssignmentManager(Dao dao, PullRequestChangeManager changeManager) {
super(dao);
- this.pullRequestChangeManager = pullRequestChangeManager;
+ this.changeManager = changeManager;
}
@Transactional
@Override
- public void addAssignee(PullRequestAssignment assignment) {
- save(assignment);
-
- PullRequest request = assignment.getRequest();
- request.getAssignments().add(assignment);
+ public void save(PullRequestAssignment assignment) {
+ super.save(assignment);
+ PullRequest request = assignment.getRequest();
PullRequestChange change = new PullRequestChange();
change.setDate(new Date());
change.setRequest(request);
change.setData(new PullRequestAssigneeAddData(assignment.getUser()));
change.setUser(SecurityUtils.getUser());
- pullRequestChangeManager.save(change);
+ changeManager.save(change);
}
@Transactional
@Override
- public void removeAssignee(PullRequestAssignment assignment) {
- delete(assignment);
+ public void delete(PullRequestAssignment assignment) {
+ super.delete(assignment);
PullRequest request = assignment.getRequest();
- request.getAssignments().remove(assignment);
PullRequestChange change = new PullRequestChange();
change.setDate(new Date());
change.setRequest(request);
change.setData(new PullRequestAssigneeRemoveData(assignment.getUser()));
change.setUser(SecurityUtils.getUser());
- pullRequestChangeManager.save(change);
+ changeManager.save(change);
}
}
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.java
index 887edcfb63..7e5d6f5e52 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
@@ -63,7 +63,6 @@ import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.LockUtils;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.entitymanager.PullRequestAssignmentManager;
import io.onedev.server.entitymanager.PullRequestChangeManager;
import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.entitymanager.PullRequestReviewManager;
@@ -142,7 +141,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im
private static final int PREVIEW_CALC_PRIORITY = 50;
- private final PullRequestUpdateManager pullRequestUpdateManager;
+ private final PullRequestUpdateManager updateManager;
private final ProjectManager projectManager;
@@ -150,7 +149,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im
private final ListenerRegistry listenerRegistry;
- private final PullRequestReviewManager pullRequestReviewManager;
+ private final PullRequestReviewManager reviewManager;
private final BuildManager buildManager;
@@ -158,40 +157,36 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im
private final BatchWorkManager batchWorkManager;
- private final PullRequestChangeManager pullRequestChangeManager;
-
- private final PullRequestAssignmentManager pullRequestAssignmentManager;
+ private final PullRequestChangeManager changeManager;
private final TransactionManager transactionManager;
private final ExecutorService executorService;
- private final EntityReferenceManager entityReferenceManager;
+ private final EntityReferenceManager referenceManager;
@Inject
- public DefaultPullRequestManager(Dao dao, PullRequestUpdateManager pullRequestUpdateManager,
- PullRequestReviewManager pullRequestReviewManager, MarkdownManager markdownManager,
+ public DefaultPullRequestManager(Dao dao, PullRequestUpdateManager updateManager,
+ PullRequestReviewManager reviewManager, MarkdownManager markdownManager,
BatchWorkManager batchWorkManager, ListenerRegistry listenerRegistry,
- SessionManager sessionManager, PullRequestChangeManager pullRequestChangeManager,
+ SessionManager sessionManager, PullRequestChangeManager changeManager,
ExecutorService executorService, BuildManager buildManager,
TransactionManager transactionManager, ProjectManager projectManager,
- CommitInfoManager commitInfoManager, PullRequestAssignmentManager pullRequestAssignmentManager,
- EntityReferenceManager entityReferenceManager) {
+ CommitInfoManager commitInfoManager, EntityReferenceManager referenceManager) {
super(dao);
- this.pullRequestUpdateManager = pullRequestUpdateManager;
- this.pullRequestReviewManager = pullRequestReviewManager;
+ this.updateManager = updateManager;
+ this.reviewManager = reviewManager;
this.transactionManager = transactionManager;
this.batchWorkManager = batchWorkManager;
this.sessionManager = sessionManager;
this.listenerRegistry = listenerRegistry;
- this.pullRequestChangeManager = pullRequestChangeManager;
+ this.changeManager = changeManager;
this.buildManager = buildManager;
this.executorService = executorService;
this.projectManager = projectManager;
this.commitInfoManager = commitInfoManager;
- this.pullRequestAssignmentManager = pullRequestAssignmentManager;
- this.entityReferenceManager = entityReferenceManager;
+ this.referenceManager = referenceManager;
}
@Transactional
@@ -236,7 +231,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im
change.setData(new PullRequestSourceBranchRestoreData());
change.setRequest(request);
change.setUser(SecurityUtils.getUser());
- pullRequestChangeManager.save(change);
+ changeManager.save(change);
}
}
@@ -253,7 +248,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im
change.setData(new PullRequestSourceBranchDeleteData());
change.setRequest(request);
change.setUser(SecurityUtils.getUser());
- pullRequestChangeManager.save(change);
+ changeManager.save(change);
}
}
@@ -269,7 +264,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im
change.setData(new PullRequestReopenData());
change.setRequest(request);
change.setUser(user);
- pullRequestChangeManager.save(change);
+ changeManager.save(change);
MergePreview mergePreview = request.getMergePreview();
if (mergePreview != null && mergePreview.getMergeCommitHash() != null)
@@ -295,7 +290,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im
change.setDate(closeInfo.getDate());
change.setRequest(request);
change.setUser(user);
- pullRequestChangeManager.save(change);
+ changeManager.save(change);
}
@Transactional
@@ -420,12 +415,13 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im
request.writeHeadRef();
for (PullRequestUpdate update: request.getUpdates())
- pullRequestUpdateManager.save(update);
-
- pullRequestReviewManager.saveReviews(request);
+ updateManager.save(update);
+
+ for (PullRequestReview review: request.getReviews())
+ dao.persist(review);
for (PullRequestAssignment assignment: request.getAssignments())
- pullRequestAssignmentManager.save(assignment);
+ dao.persist(assignment);
MergePreview mergePreview = request.getMergePreview();
if (mergePreview != null && mergePreview.getMergeCommitHash() != null)
@@ -458,7 +454,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im
change.setDate(date);
change.setData(new PullRequestMergeData(reason));
change.setRequest(request);
- pullRequestChangeManager.save(change);
+ changeManager.save(change);
}
@Transactional
@@ -474,7 +470,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im
} else if (request.getTarget().getObjectId(false) == null) {
discard(request, "Target branch no longer exists");
} else {
- pullRequestUpdateManager.checkUpdate(request);
+ updateManager.checkUpdate(request);
if (request.isMergedIntoTarget()) {
closeAsMerged(request, true);
} else {
@@ -484,7 +480,10 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im
* If the check method runs concurrently, below statements may fail. It will
* not do any harm except that the transaction rolls back
*/
- pullRequestReviewManager.saveReviews(request);
+ for (PullRequestReview review: request.getReviews()) {
+ if (review.isNew() || review.isDirty())
+ reviewManager.save(review);
+ }
Long requestId = request.getId();
transactionManager.runAfterCommit(new Runnable() {
@@ -799,7 +798,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im
review.setRequest(request);
review.setUser(user);
request.getReviews().add(review);
- } else if (review.getUpdate() == null || review.getUpdate().getId()<update.getId()) {
+ } else if (review.getResult() != null && (review.getUpdate() == null || review.getUpdate().getId()<update.getId())) {
review.setResult(null);
}
}
@@ -956,7 +955,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im
List<PullRequest> requests = query.getResultList();
if (!requests.isEmpty()) {
if (loadReviews)
- pullRequestReviewManager.populateReviews(requests);
+ reviewManager.populateReviews(requests);
if (loadBuilds)
buildManager.populateBuilds(requests);
}
@@ -1068,7 +1067,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im
String prevDescription = request.getDescription();
if (!Objects.equal(description, prevDescription)) {
request.setDescription(description);
- entityReferenceManager.addReferenceChange(request, description);
+ referenceManager.addReferenceChange(request, description);
save(request);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReviewManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReviewManager.java
index 4567a24232..de1d3ce3bd 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReviewManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReviewManager.java
@@ -3,21 +3,21 @@ package io.onedev.server.entitymanager.impl;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
import javax.inject.Inject;
import javax.inject.Singleton;
-import javax.persistence.Query;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Root;
import org.hibernate.criterion.Restrictions;
+import com.google.common.collect.Lists;
+
import io.onedev.server.entitymanager.PullRequestChangeManager;
import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.entitymanager.PullRequestReviewManager;
+import io.onedev.server.exception.ReviewerRequiredException;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestChange;
import io.onedev.server.model.PullRequestReview;
@@ -41,35 +41,15 @@ public class DefaultPullRequestReviewManager extends BaseEntityManager<PullReque
private final PullRequestManager pullRequestManager;
- private final PullRequestChangeManager pullRequestChangeManager;
+ private final PullRequestChangeManager changeManager;
@Inject
- public DefaultPullRequestReviewManager(Dao dao,
- PullRequestManager pullRequestManager,
- PullRequestChangeManager pullRequestChangeManager) {
+ public DefaultPullRequestReviewManager(Dao dao, PullRequestManager pullRequestManager,
+ PullRequestChangeManager changeManager) {
super(dao);
this.pullRequestManager = pullRequestManager;
- this.pullRequestChangeManager = pullRequestChangeManager;
- }
-
- @Transactional
- @Override
- public void review(PullRequestReview review) {
- ReviewResult result = review.getResult();
- PullRequestChange change = new PullRequestChange();
- change.setDate(new Date());
- change.setRequest(review.getRequest());
- change.setComment(result.getComment());
- if (Boolean.TRUE.equals(result.getApproved()))
- change.setData(new PullRequestApproveData());
- else if (Boolean.FALSE.equals(result.getApproved()))
- change.setData(new PullRequestRequestedForChangesData());
- else
- change.setData(new PullRequestReviewWithdrawData());
- change.setUser(review.getUser());
- pullRequestChangeManager.save(change);
- save(review);
+ this.changeManager = changeManager;
}
@Override
@@ -81,70 +61,68 @@ public class DefaultPullRequestReviewManager extends BaseEntityManager<PullReque
return find(criteria);
}
- @Transactional
+ @Transactional
@Override
- public boolean removeReviewer(PullRequestReview review, List<User> unpreferableReviewers) {
+ public void delete(PullRequestReview review) {
PullRequest request = review.getRequest();
- User reviewer = review.getUser();
request.getReviews().remove(review);
- request.setReviews(request.getReviews());
-
- pullRequestManager.checkReviews(request, unpreferableReviewers);
-
+ User reviewer = review.getUser();
+ pullRequestManager.checkReviews(request, Lists.newArrayList(reviewer));
if (request.isNew()) {
- return request.getReview(reviewer) == null;
- } else {
- saveReviews(request);
- if (request.getReview(reviewer) == null) {
- PullRequestChange change = new PullRequestChange();
- change.setDate(new Date());
- change.setRequest(request);
- change.setUser(SecurityUtils.getUser());
- change.setData(new PullRequestReviewerRemoveData(reviewer));
- pullRequestChangeManager.save(change);
- return true;
- } else {
- return false;
+ if (request.getReview(reviewer) != null)
+ throw new ReviewerRequiredException(reviewer);
+ } else if (request.getReview(reviewer) == null) {
+ dao.remove(review);
+ PullRequestChange change = new PullRequestChange();
+ change.setDate(new Date());
+ change.setRequest(review.getRequest());
+ change.setData(new PullRequestReviewerRemoveData(reviewer));
+ change.setUser(SecurityUtils.getUser());
+ changeManager.save(change);
+
+ for (PullRequestReview eachReview: request.getReviews()) {
+ if (eachReview.isNew())
+ save(eachReview);
}
+ } else {
+ throw new ReviewerRequiredException(reviewer);
}
}
- @Transactional
+ @Transactional
@Override
- public void addReviewer(PullRequestReview review) {
- save(review);
-
- PullRequest request = review.getRequest();
- request.getReviews().add(review);
- request.setReviews(request.getReviews());
-
- PullRequestChange change = new PullRequestChange();
- change.setDate(new Date());
- change.setRequest(request);
- change.setData(new PullRequestReviewerAddData(review.getUser()));
- change.setUser(SecurityUtils.getUser());
- pullRequestChangeManager.save(change);
- }
+ public void save(PullRequestReview review) {
+ boolean isNew = review.isNew();
+ review.setDirty(false);
+ super.save(review);
- @Transactional
- @Override
- public void saveReviews(PullRequest request) {
- Collection<User> reviewers = request.getReviews().stream()
- .filter(it->!it.isNew()).map(it->it.getUser()).collect(Collectors.toList());
- if (!reviewers.isEmpty()) {
- Query query = getSession().createQuery("delete from PullRequestReview where request=:request and user not in (:reviewers)");
- query.setParameter("request", request);
- query.setParameter("reviewers", reviewers);
- query.executeUpdate();
+ PullRequestChange change = new PullRequestChange();
+ if (isNew) {
+ change.setDate(new Date());
+ change.setRequest(review.getRequest());
+ change.setData(new PullRequestReviewerAddData(review.getUser()));
+ change.setUser(SecurityUtils.getUser());
+ changeManager.save(change);
} else {
- Query query = getSession().createQuery("delete from PullRequestReview where request=:request");
- query.setParameter("request", request);
- query.executeUpdate();
+ ReviewResult result = review.getResult();
+
+ if (result != null) {
+ change.setDate(new Date());
+ change.setRequest(review.getRequest());
+
+ change.setComment(result.getComment());
+ if (Boolean.TRUE.equals(result.getApproved()))
+ change.setData(new PullRequestApproveData());
+ else if (Boolean.FALSE.equals(result.getApproved()))
+ change.setData(new PullRequestRequestedForChangesData());
+ else
+ change.setData(new PullRequestReviewWithdrawData());
+ change.setUser(review.getUser());
+ changeManager.save(change);
+ }
}
- for (PullRequestReview review: request.getReviews())
- save(review);
}
-
+
@Sessional
@Override
public void populateReviews(Collection<PullRequest> requests) {
diff --git a/server-core/src/main/java/io/onedev/server/exception/ReviewerRequiredException.java b/server-core/src/main/java/io/onedev/server/exception/ReviewerRequiredException.java
new file mode 100644
index 0000000000..34d3a7a4a7
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/exception/ReviewerRequiredException.java
@@ -0,0 +1,14 @@
+package io.onedev.server.exception;
+
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.server.model.User;
+
+public class ReviewerRequiredException extends ExplicitException {
+
+ private static final long serialVersionUID = 1L;
+
+ public ReviewerRequiredException(User user) {
+ super("Reviewer '" + user.getDisplayName() + "' is required");
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
index 7149460952..acee85ab72 100644
--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
@@ -327,10 +327,6 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach
private transient Boolean mergedIntoTarget;
- private transient List<PullRequestUpdate> sortedUpdates;
-
- private transient List<PullRequestReview> sortedReviews;
-
private transient Boolean valid;
private transient Collection<Long> fixedIssueNumbers;
@@ -471,7 +467,6 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach
public void setUpdates(Collection<PullRequestUpdate> updates) {
this.updates = updates;
- sortedUpdates = null;
}
public Collection<PullRequestComment> getComments() {
@@ -590,30 +585,25 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach
* list of sorted updates ordered by id
*/
public List<PullRequestUpdate> getSortedUpdates() {
- if (sortedUpdates == null) {
- Preconditions.checkState(updates.size() >= 1);
- sortedUpdates = new ArrayList<PullRequestUpdate>(updates);
- Collections.sort(sortedUpdates);
- }
+ List<PullRequestUpdate> sortedUpdates = new ArrayList<>(updates);
+ Collections.sort(sortedUpdates);
return sortedUpdates;
}
public List<PullRequestReview> getSortedReviews() {
- if (sortedReviews == null) {
- sortedReviews = new ArrayList<>(reviews);
+ List<PullRequestReview> sortedReviews = new ArrayList<>(reviews);
- Collections.sort(sortedReviews, new Comparator<PullRequestReview>() {
-
- @Override
- public int compare(PullRequestReview o1, PullRequestReview o2) {
- if (o1.getId() != null && o2.getId() != null)
- return o1.getId().compareTo(o1.getId());
- else
- return 0;
- }
-
- });
- }
+ Collections.sort(sortedReviews, new Comparator<PullRequestReview>() {
+
+ @Override
+ public int compare(PullRequestReview o1, PullRequestReview o2) {
+ if (o1.getId() != null && o2.getId() != null)
+ return o1.getId().compareTo(o1.getId());
+ else
+ return 0;
+ }
+
+ });
return sortedReviews;
}
@@ -720,7 +710,6 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach
public void setReviews(Collection<PullRequestReview> reviews) {
this.reviews = reviews;
- sortedReviews = null;
}
public Collection<PullRequestAssignment> getAssignments() {
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestReview.java b/server-core/src/main/java/io/onedev/server/model/PullRequestReview.java
index 577e59f64f..7c96bf78e2 100644
--- a/server-core/src/main/java/io/onedev/server/model/PullRequestReview.java
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestReview.java
@@ -40,6 +40,8 @@ public class PullRequestReview extends AbstractEntity {
@Embedded
private ReviewResult result;
+ private transient boolean dirty;
+
private transient Optional<PullRequestUpdate> updateOptional;
public User getUser() {
@@ -65,6 +67,15 @@ public class PullRequestReview extends AbstractEntity {
public void setResult(@Nullable ReviewResult result) {
this.result = result;
+ dirty = true;
+ }
+
+ public boolean isDirty() {
+ return dirty;
+ }
+
+ public void setDirty(boolean dirty) {
+ this.dirty = dirty;
}
@Nullable
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/notificationtemplate/NotificationTemplateSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/notificationtemplate/NotificationTemplateSetting.java
index 6b5c34c877..ecc9ee6799 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/notificationtemplate/NotificationTemplateSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/notificationtemplate/NotificationTemplateSetting.java
@@ -31,7 +31,7 @@ public class NotificationTemplateSetting implements Serializable {
+ "When evaluating this template, below variables will be available:"
+ "<ul class='mb-0'>"
+ "<li><code>event:</code> <a href='https://code.onedev.io/projects/160/blob/main/server-core/src/main/java/io/onedev/server/event/Event.java' target='_blank'>event object</a> triggering the notification"
- + "<li><code>eventSummary:</code> a string representing summary of the event. May be <code>null</code>"
+ + "<li><code>eventSummary:</code> a string representing summary of the event"
+ "<li><code>eventBody:</code> a string representing body of the event. May be <code>null</code>"
+ "<li><code>eventUrl:</code> a string representing event detail url"
+ "<li><code>replyable:</code> a boolean indiciating whether or not topic comment can be created directly by replying the email"
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/notificationtemplate/default-notification-template.html b/server-core/src/main/java/io/onedev/server/model/support/administration/notificationtemplate/default-notification-template.html
index fbbccb4193..b9b3a6c73b 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/notificationtemplate/default-notification-template.html
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/notificationtemplate/default-notification-template.html
@@ -1,8 +1,6 @@
<%
- if (eventSummary != null) {
- print "<b>${eventSummary}</b>"
- print "<br><br>"
- }
+ print "<b>${eventSummary}</b>"
+ print "<br><br>"
if (eventBody != null) {
print eventBody
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromCodeCommentData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromCodeCommentData.java
index c44bb7fe73..d7c0427404 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromCodeCommentData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromCodeCommentData.java
@@ -28,7 +28,7 @@ public class IssueReferencedFromCodeCommentData extends IssueChangeData implemen
@Override
public String getActivity() {
- return "Referenced from code comment";
+ return "referenced from code comment";
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromIssueData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromIssueData.java
index a00b497d95..36a94441ff 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromIssueData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromIssueData.java
@@ -28,7 +28,7 @@ public class IssueReferencedFromIssueData extends IssueChangeData implements Ref
@Override
public String getActivity() {
- return "Referenced from other issue";
+ return "referenced from other issue";
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromPullRequestData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromPullRequestData.java
index b308876c0b..55eda724dd 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromPullRequestData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromPullRequestData.java
@@ -28,7 +28,7 @@ public class IssueReferencedFromPullRequestData extends IssueChangeData implemen
@Override
public String getActivity() {
- return "Referenced from pull request";
+ return "referenced from pull request";
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeAddData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeAddData.java
index e34d6efdfc..390529a059 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeAddData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeAddData.java
@@ -1,5 +1,7 @@
package io.onedev.server.model.support.pullrequest.changedata;
+import javax.annotation.Nullable;
+
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.User;
@@ -16,11 +18,16 @@ public class PullRequestAssigneeAddData extends PullRequestChangeData {
@Override
public String getActivity() {
- User user = OneDev.getInstance(UserManager.class).get(assigneeId);
+ User user = getUser();
if (user != null)
return "added assignee \"" + user.getDisplayName() + "\"";
else
return "added assignee unknown";
}
+ @Nullable
+ public User getUser() {
+ return OneDev.getInstance(UserManager.class).get(assigneeId);
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeRemoveData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeRemoveData.java
index db3962f01c..161c90353e 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeRemoveData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeRemoveData.java
@@ -1,5 +1,7 @@
package io.onedev.server.model.support.pullrequest.changedata;
+import javax.annotation.Nullable;
+
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.User;
@@ -16,11 +18,16 @@ public class PullRequestAssigneeRemoveData extends PullRequestChangeData {
@Override
public String getActivity() {
- User user = OneDev.getInstance(UserManager.class).get(assigneeId);
+ User user = getUser();
if (user != null)
return "added assignee \"" + user.getDisplayName() + "\"";
else
return "added assignee unknown";
}
+
+ @Nullable
+ public User getUser() {
+ return OneDev.getInstance(UserManager.class).get(assigneeId);
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromCodeCommentData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromCodeCommentData.java
index c29c64ec64..5effc5263a 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromCodeCommentData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromCodeCommentData.java
@@ -23,7 +23,7 @@ public class PullRequestReferencedFromCodeCommentData
@Override
public String getActivity() {
- return "Referenced from code comment";
+ return "referenced from code comment";
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromIssueData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromIssueData.java
index 8fa5f7b64e..2fa7137d85 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromIssueData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromIssueData.java
@@ -23,7 +23,7 @@ public class PullRequestReferencedFromIssueData
@Override
public String getActivity() {
- return "Referenced from issue";
+ return "referenced from issue";
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromPullRequestData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromPullRequestData.java
index 264dd719a6..56c0386834 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromPullRequestData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromPullRequestData.java
@@ -23,7 +23,7 @@ public class PullRequestReferencedFromPullRequestData
@Override
public String getActivity() {
- return "Referenced from other pull request";
+ return "referenced from other pull request";
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewerAddData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewerAddData.java
index 1d6d5fe7a4..a81d1f90d1 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewerAddData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewerAddData.java
@@ -1,5 +1,7 @@
package io.onedev.server.model.support.pullrequest.changedata;
+import javax.annotation.Nullable;
+
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.User;
@@ -16,11 +18,16 @@ public class PullRequestReviewerAddData extends PullRequestChangeData {
@Override
public String getActivity() {
- User user = OneDev.getInstance(UserManager.class).get(reviewerId);
+ User user = getUser();
if (user != null)
return "added reviewer \"" + user.getDisplayName() + "\"";
else
return "added reviewer unknown";
}
+ @Nullable
+ public User getUser() {
+ return OneDev.getInstance(UserManager.class).get(reviewerId);
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewerRemoveData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewerRemoveData.java
index 813cbe9a26..d798a2418a 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewerRemoveData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewerRemoveData.java
@@ -1,5 +1,7 @@
package io.onedev.server.model.support.pullrequest.changedata;
+import javax.annotation.Nullable;
+
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.User;
@@ -16,11 +18,16 @@ public class PullRequestReviewerRemoveData extends PullRequestChangeData {
@Override
public String getActivity() {
- User user = OneDev.getInstance(UserManager.class).get(reviewerId);
+ User user = getUser();
if (user != null)
return "removed reviewer \"" + user.getDisplayName() + "\"";
else
return "removed reviewer unknown";
}
+ @Nullable
+ public User getUser() {
+ return OneDev.getInstance(UserManager.class).get(reviewerId);
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/notification/AbstractNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/AbstractNotificationManager.java
index 919281f099..d420a19f47 100644
--- a/server-core/src/main/java/io/onedev/server/notification/AbstractNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/AbstractNotificationManager.java
@@ -33,14 +33,13 @@ public abstract class AbstractNotificationManager {
this.settingManager = settingManager;
}
- protected String getHtmlBody(Event event, @Nullable String eventSummary, @Nullable String eventBody,
+ protected String getHtmlBody(Event event, String eventSummary, @Nullable String eventBody,
String eventUrl, boolean replyable, @Nullable Unsubscribable unsubscribable) {
String template = null;
Map<String, Object> bindings = new HashMap<>();
- if (eventSummary != null)
- eventSummary = HtmlEscape.escapeHtml5(eventSummary);
+ eventSummary = HtmlEscape.escapeHtml5(eventSummary);
eventUrl = HtmlEscape.escapeHtml5(eventUrl);
bindings.put("event", event);
@@ -76,11 +75,10 @@ public abstract class AbstractNotificationManager {
}
}
- protected String getTextBody(Event event, @Nullable String eventSummary, @Nullable String eventBody,
+ protected String getTextBody(Event event, String eventSummary, @Nullable String eventBody,
String eventUrl, boolean replyable, @Nullable Unsubscribable unsubscribable) {
StringBuilder textBody = new StringBuilder();
- if (eventSummary != null)
- textBody.append(eventSummary).append("\n\n");
+ textBody.append(eventSummary).append("\n\n");
if (eventBody != null)
textBody.append(eventBody).append("\n\n");
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 602420c6dd..adf30f636a 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.apache.commons.lang3.StringUtils;
+
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
@@ -81,7 +83,7 @@ public class IssueNotificationManager extends AbstractNotificationManager {
if (user != null)
summary = user.getDisplayName() + " " + event.getActivity();
else
- summary = event.getActivity();
+ summary = StringUtils.capitalize(event.getActivity());
for (Map.Entry<User, Boolean> entry: new QueryWatchBuilder<Issue>() {
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 58b750f03c..ba29e53d79 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
@@ -5,11 +5,13 @@ 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;
import javax.inject.Singleton;
+import org.apache.commons.lang3.StringUtils;
import org.apache.commons.text.WordUtils;
import com.google.common.collect.Lists;
@@ -20,7 +22,6 @@ import io.onedev.server.entitymanager.PullRequestWatchManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UrlManager;
import io.onedev.server.entitymanager.UserManager;
-import io.onedev.server.event.entity.EntityPersisted;
import io.onedev.server.event.pullrequest.PullRequestBuildEvent;
import io.onedev.server.event.pullrequest.PullRequestChanged;
import io.onedev.server.event.pullrequest.PullRequestCodeCommentCreated;
@@ -41,16 +42,17 @@ import io.onedev.server.model.User;
import io.onedev.server.model.support.NamedQuery;
import io.onedev.server.model.support.QueryPersonalization;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestApproveData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestAssigneeAddData;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestChangeData;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestDiscardData;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeData;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestReopenData;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestRequestedForChangesData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestReviewerAddData;
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.security.SecurityUtils;
@Singleton
public class PullRequestNotificationManager extends AbstractNotificationManager {
@@ -174,37 +176,88 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
else if (committer != null)
summary = committer.getDisplayName() + " " + event.getActivity();
else
- summary = event.getActivity();
+ summary = StringUtils.capitalize(event.getActivity());
+
+ String replyAddress = mailManager.getReplyAddress(request);
+ boolean replyable = replyAddress != null;
+ Set<User> reviewers = new HashSet<>();
+ Set<User> assignees = new HashSet<>();
if (event instanceof PullRequestOpened) {
for (PullRequestReview review: request.getReviews()) {
- if (review.getResult() == null) {
- // reviewers will be sent review invitation separately
- notifiedUsers.add(review.getUser());
- }
+ if (review.getResult() == null)
+ reviewers.add(review.getUser());
}
- }
-
- String replyAddress = mailManager.getReplyAddress(request);
- boolean replyable = replyAddress != null;
- if (event instanceof PullRequestChanged
- && request.getSubmitter() != null
- && !notifiedUsers.contains(request.getSubmitter())) {
+ for (PullRequestAssignment assignment: request.getAssignments())
+ assignees.add(assignment.getUser());
+ } else if (event instanceof PullRequestChanged) {
PullRequestChanged changeEvent = (PullRequestChanged) event;
PullRequestChangeData changeData = changeEvent.getChange().getData();
if (changeData instanceof PullRequestApproveData
|| changeData instanceof PullRequestRequestedForChangesData
|| changeData instanceof PullRequestDiscardData) {
- String subject = String.format("[Pull Request %s] (%s) %s", request.getFQN(),
- WordUtils.capitalize(changeData.getActivity()), request.getTitle());
- String threadingReferences = String.format("<%s-%s@onedev>",
- changeData.getActivity().replace(' ', '-'), request.getUUID());
- mailManager.sendMailAsync(Lists.newArrayList(request.getSubmitter().getEmail()),
+ if (request.getSubmitter() != null && !notifiedUsers.contains(request.getSubmitter())) {
+ String subject = String.format("[Pull Request %s] (%s) %s", request.getFQN(),
+ WordUtils.capitalize(changeData.getActivity()), request.getTitle());
+ String threadingReferences = String.format("<%s-%s@onedev>",
+ changeData.getActivity().replace(' ', '-'), request.getUUID());
+ mailManager.sendMailAsync(Lists.newArrayList(request.getSubmitter().getEmail()),
+ Lists.newArrayList(), Lists.newArrayList(), subject,
+ getHtmlBody(event, summary, event.getHtmlBody(), url, replyable, null),
+ getTextBody(event, summary, event.getTextBody(), url, replyable, null),
+ replyAddress, threadingReferences);
+ notifiedUsers.add(request.getSubmitter());
+ }
+ } else if (changeData instanceof PullRequestAssigneeAddData) {
+ PullRequestAssigneeAddData assigneeAddData = (PullRequestAssigneeAddData) changeData;
+ User assignee = assigneeAddData.getUser();
+ if (assignee != null)
+ assignees.add(assignee);
+ } else if (changeData instanceof PullRequestReviewerAddData) {
+ PullRequestReviewerAddData reviewerAddData = (PullRequestReviewerAddData) changeData;
+ User reviewer = reviewerAddData.getUser();
+ if (reviewer != null)
+ reviewers.add(reviewer);
+ }
+ }
+
+ for (User assignee: assignees) {
+ pullRequestWatchManager.watch(request, assignee, true);
+ if (!notifiedUsers.contains(assignee)) {
+ String subject = String.format("[Pull Request %s] (Assigned) %s",
+ request.getFQN(), request.getTitle());
+ String threadingReferences = String.format("<assigned-%s@onedev>", request.getUUID());
+ String assignmentSummary;
+ if (user != null)
+ assignmentSummary = user.getDisplayName() + " assigned to you";
+ else
+ assignmentSummary = "Assigned to you";
+ mailManager.sendMailAsync(Lists.newArrayList(assignee.getEmail()),
+ Lists.newArrayList(), Lists.newArrayList(), subject,
+ getHtmlBody(event, assignmentSummary, event.getHtmlBody(), url, replyable, null),
+ getTextBody(event, assignmentSummary, event.getTextBody(), url, replyable, null),
+ replyAddress, threadingReferences);
+ notifiedUsers.add(assignee);
+ }
+ }
+
+ for (User reviewer: reviewers) {
+ pullRequestWatchManager.watch(request, reviewer, true);
+ if (!notifiedUsers.contains(reviewer)) {
+ String subject = String.format("[Pull Request %s] (Review Invitation) %s",
+ request.getFQN(), request.getTitle());
+ String threadingReferences = String.format("<review-invitation-%s@onedev>", request.getUUID());
+ String reviewInvitationSummary;
+ if (user != null)
+ reviewInvitationSummary = user.getDisplayName() + " invited you to review";
+ else
+ reviewInvitationSummary = "Invited you to review";
+ mailManager.sendMailAsync(Lists.newArrayList(reviewer.getEmail()),
Lists.newArrayList(), Lists.newArrayList(), subject,
- getHtmlBody(event, summary, event.getHtmlBody(), url, replyable, null),
- getTextBody(event, summary, event.getTextBody(), url, replyable, null),
+ getHtmlBody(event, reviewInvitationSummary, event.getHtmlBody(), url, replyable, null),
+ getTextBody(event, reviewInvitationSummary, event.getTextBody(), url, replyable, null),
replyAddress, threadingReferences);
- notifiedUsers.add(request.getSubmitter());
+ notifiedUsers.add(reviewer);
}
}
@@ -277,43 +330,4 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
}
}
- @Transactional
- @Listen
- public void on(EntityPersisted event) {
- if (event.isNew()) {
- if (event.getEntity() instanceof PullRequestReview) {
- PullRequestReview review = (PullRequestReview) event.getEntity();
- PullRequest request = review.getRequest();
- if (review.getResult() == null && !review.getUser().equals(SecurityUtils.getUser())) {
- pullRequestWatchManager.watch(request, review.getUser(), true);
- String url = urlManager.urlFor(request);
- String subject = String.format("[Pull Request %s] (Review Invitation) %s",
- request.getFQN(), request.getTitle());
- String threadingReferences = "<review-invitation-" + request.getUUID() + "@onedev>";
- String replyAddress = mailManager.getReplyAddress(request);
- mailManager.sendMailAsync(Lists.newArrayList(review.getUser().getEmail()),
- Lists.newArrayList(), Lists.newArrayList(), subject,
- getHtmlBody(event, null, null, url, replyAddress != null, null),
- getTextBody(event, null, null, url, replyAddress != null, null),
- replyAddress, threadingReferences);
- }
- } else if (event.getEntity() instanceof PullRequestAssignment) {
- PullRequestAssignment assignment = (PullRequestAssignment) event.getEntity();
- PullRequest request = assignment.getRequest();
- if (!assignment.getUser().equals(SecurityUtils.getUser())) {
- pullRequestWatchManager.watch(request, assignment.getUser(), true);
- String url = urlManager.urlFor(request);
- String subject = String.format("[Pull Request %s] (Assigned) %s", request.getFQN(), request.getTitle());
- String threadingReferences = "<assigned-" + request.getUUID() + "@onedev>";
- String replyAddress = mailManager.getReplyAddress(request);
- mailManager.sendMailAsync(Lists.newArrayList(assignment.getUser().getEmail()),
- Lists.newArrayList(), Lists.newArrayList(), subject,
- getHtmlBody(event, null, null, url, replyAddress != null, null),
- getTextBody(event, null, null, url, replyAddress != null, null),
- replyAddress, threadingReferences);
- }
- }
- }
- }
-
}
diff --git a/server-core/src/main/java/io/onedev/server/persistence/annotation/Transactional.java b/server-core/src/main/java/io/onedev/server/persistence/annotation/Transactional.java
index 34a091723b..c13a6767c5 100644
--- a/server-core/src/main/java/io/onedev/server/persistence/annotation/Transactional.java
+++ b/server-core/src/main/java/io/onedev/server/persistence/annotation/Transactional.java
@@ -1,19 +1,3 @@
-/**
- * Copyright (C) 2010 Google, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
package io.onedev.server.persistence.annotation;
import java.lang.annotation.ElementType;
diff --git a/server-core/src/main/java/io/onedev/server/rest/PullRequestAssignmentResource.java b/server-core/src/main/java/io/onedev/server/rest/PullRequestAssignmentResource.java
index cf61e8b0a6..b090dcfd5c 100644
--- a/server-core/src/main/java/io/onedev/server/rest/PullRequestAssignmentResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/PullRequestAssignmentResource.java
@@ -54,7 +54,7 @@ public class PullRequestAssignmentResource {
if (pullRequest.isMerged())
throw new ExplicitException("Pull request is merged");
- assignmentManager.addAssignee(assignment);
+ assignmentManager.save(assignment);
return assignment.getId();
}
@@ -71,7 +71,8 @@ public class PullRequestAssignmentResource {
if (assignment.getRequest().isMerged())
throw new ExplicitException("Pull request is merged");
- assignmentManager.removeAssignee(assignment);
+ assignmentManager.delete(assignment);
+
return Response.ok().build();
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/PullRequestReviewResource.java b/server-core/src/main/java/io/onedev/server/rest/PullRequestReviewResource.java
index eddcd4ded3..63729da349 100644
--- a/server-core/src/main/java/io/onedev/server/rest/PullRequestReviewResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/PullRequestReviewResource.java
@@ -15,10 +15,9 @@ import javax.ws.rs.core.Response;
import org.apache.shiro.authz.UnauthorizedException;
-import com.google.common.collect.Lists;
-
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.entitymanager.PullRequestReviewManager;
+import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
import io.onedev.server.rest.annotation.Api;
import io.onedev.server.security.SecurityUtils;
@@ -29,7 +28,7 @@ import io.onedev.server.security.SecurityUtils;
@Produces(MediaType.APPLICATION_JSON)
@Singleton
public class PullRequestReviewResource {
-
+
private final PullRequestReviewManager reviewManager;
@Inject
@@ -58,10 +57,7 @@ public class PullRequestReviewResource {
if (review.getRequest().isMerged())
throw new ExplicitException("Pull request is merged");
- if (review.getResult() != null)
- reviewManager.review(review);
- else
- reviewManager.addReviewer(review);
+ reviewManager.save(review);
return review.getId();
}
@@ -70,15 +66,12 @@ public class PullRequestReviewResource {
@DELETE
public Response delete(@PathParam("reviewId") Long reviewId) {
PullRequestReview review = reviewManager.load(reviewId);
- if (!SecurityUtils.canReadCode(review.getRequest().getProject())
- || !SecurityUtils.canModify(review.getRequest())) {
+ PullRequest request = review.getRequest();
+
+ if (!SecurityUtils.canReadCode(request.getProject()) || !SecurityUtils.canModify(request))
throw new UnauthorizedException();
- }
- if (!reviewManager.removeReviewer(review, Lists.newArrayList())) {
- throw new ExplicitException("Reviewer '" + review.getUser().getDisplayName()
- + "' is required and can not be removed");
- }
+ reviewManager.delete(review);
return Response.ok().build();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.java
index 9984bfd698..ba62ce5a56 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.java
@@ -2,6 +2,7 @@ package io.onedev.server.web.component.issue.activities.activity;
import java.util.List;
+import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -39,12 +40,16 @@ class IssueChangePanel extends GenericPanel<IssueChange> {
protected void onInitialize() {
super.onInitialize();
- if (getChange().getUser() != null)
+ String activity = getChange().getData().getActivity();
+ if (getChange().getUser() != null) {
add(new Label("user", getChange().getUser().getDisplayName()));
- else
+ } else {
add(new WebMarkupContainer("user").setVisible(false));
+ activity = StringUtils.capitalize(activity);
+ }
- add(new Label("description", getChange().getData().getActivity()));
+ add(new Label("description", activity));
+
add(new Label("age", DateUtils.formatAge(getChange().getDate()))
.add(new AttributeAppender("title", DateUtils.formatDateTime(getChange().getDate()))));
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssigneeChoice.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssigneeChoice.java
index c3ca359db8..a51b7463b2 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssigneeChoice.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssigneeChoice.java
@@ -52,7 +52,7 @@ public abstract class AssigneeChoice extends SelectToAddChoice<User> {
assignment.setUser(user);
if (!getPullRequest().isNew())
- OneDev.getInstance(PullRequestAssignmentManager.class).addAssignee(assignment);
+ OneDev.getInstance(PullRequestAssignmentManager.class).save(assignment);
else
getPullRequest().getAssignments().add(assignment);
};
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssignmentListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssignmentListPanel.java
index 7db22da396..3043644300 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssignmentListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssignmentListPanel.java
@@ -112,8 +112,7 @@ public abstract class AssignmentListPanel extends Panel {
request.getAssignments().remove(assignment);
target.add(AssignmentListPanel.this);
} else {
- PullRequestAssignmentManager manager = OneDev.getInstance(PullRequestAssignmentManager.class);
- manager.removeAssignee(assignment);
+ OneDev.getInstance(PullRequestAssignmentManager.class).delete(assignment);
}
assignmentsModel.detach();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.java
index 156e80ba91..c2f742e341 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.java
@@ -1,10 +1,8 @@
package io.onedev.server.web.component.pullrequest.review;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.apache.wicket.MetaDataKey;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -21,6 +19,7 @@ import com.google.common.collect.Sets;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.PullRequestReviewManager;
+import io.onedev.server.exception.ReviewerRequiredException;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
import io.onedev.server.model.User;
@@ -34,8 +33,6 @@ import io.onedev.server.web.component.user.ident.UserIdentPanel;
@SuppressWarnings("serial")
public abstract class ReviewListPanel extends Panel {
- private static final MetaDataKey<ArrayList<User>> UNPREFERABLE_REVIEWERS = new MetaDataKey<ArrayList<User>>() {};
-
private final IModel<List<PullRequestReview>> reviewsModel;
public ReviewListPanel(String id) {
@@ -105,19 +102,13 @@ public abstract class ReviewListPanel extends Panel {
PullRequest request = getPullRequest();
PullRequestReview review = item.getModelObject();
- ArrayList<User> unpreferableReviewers = getPage().getMetaData(UNPREFERABLE_REVIEWERS);
- if (unpreferableReviewers == null)
- unpreferableReviewers = new ArrayList<>();
- unpreferableReviewers.remove(review.getUser());
- unpreferableReviewers.add(review.getUser());
- getPage().setMetaData(UNPREFERABLE_REVIEWERS, unpreferableReviewers);
-
- PullRequestReviewManager manager = OneDev.getInstance(PullRequestReviewManager.class);
- if (!manager.removeReviewer(review, unpreferableReviewers)) {
+ try {
+ OneDev.getInstance(PullRequestReviewManager.class).delete(review);
+ if (request.isNew())
+ target.add(ReviewListPanel.this);
+ } catch (ReviewerRequiredException e) {
getSession().warn("Reviewer '" + review.getUser().getDisplayName()
+ "' is required and can not be removed");
- } else if (request.isNew()) {
- target.add(ReviewListPanel.this);
}
reviewsModel.detach();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewerChoice.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewerChoice.java
index 9a7aaada38..a886e1427a 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewerChoice.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewerChoice.java
@@ -53,8 +53,8 @@ public abstract class ReviewerChoice extends SelectToAddChoice<User> {
review.setRequest(getPullRequest());
review.setUser(user);
- if (!getPullRequest().isNew())
- OneDev.getInstance(PullRequestReviewManager.class).addReviewer(review);
+ if (!getPullRequest().isNew())
+ OneDev.getInstance(PullRequestReviewManager.class).save(review);
else
getPullRequest().getReviews().add(review);
};
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
index 7360ec3292..d870968f00 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
@@ -60,7 +60,7 @@
</wicket:enclosure>
</div>
<div wicket:id="requestedForChanges" class="requested-for-changes text-danger">
- <wicket:svg href="times-circle-o" class="icon"></wicket:svg> Pull request can not be merged now as it was <a class="more-info d-inline link-primary">requested for changes</a>
+ <wicket:svg href="times-circle" class="icon"></wicket:svg> Pull request can not be merged now as it was <a class="more-info d-inline link-primary">requested for changes</a>
</div>
<div wicket:id="waitingForReviews" class="waiting-for-reviews text-warning">
<wicket:svg href="clock" class="icon"></wicket:svg> Pull request can not be merged now as it is <a class="more-info d-inline link-primary">pending review</a>
@@ -111,11 +111,11 @@
<td class="value text-right"><span wicket:id="submitter"></span></td>
</tr>
<tr>
- <td class="name">Target Branch</td>
+ <td class="name">Target</td>
<td class="value text-right"><a wicket:id="targetBranch"></a></td>
</tr>
<tr>
- <td class="name">Source Branch</td>
+ <td class="name">Source</td>
<td class="value text-right"><a wicket:id="sourceBranch"></a></td>
</tr>
</table>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
index df11ae7779..2e9eda8bd6 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
@@ -528,7 +528,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
super.onConfigure();
setVisible(getPullRequest().isOpen() && !requestedForChanges()
- && getPullRequest().getReviews().stream().anyMatch(it-> it.getResult()==null));
+ && getPullRequest().getReviews().stream().anyMatch(it-> it.getResult()==null || it.getResult().getApproved()==null));
}
});
@@ -1116,7 +1116,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
PullRequest request = getPullRequest();
if (request.isOpen()) {
PullRequestReview review = request.getReview(SecurityUtils.getUser());
- return review != null && review.getResult() == null;
+ return review != null && (review.getResult() == null || review.getResult().getApproved() == null);
} else {
return false;
}
@@ -1143,7 +1143,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
result.setComment(getComment());
result.setCommit(request.getLatestUpdate().getHeadCommitHash());
review.setResult(result);
- OneDev.getInstance(PullRequestReviewManager.class).review(review);
+ OneDev.getInstance(PullRequestReviewManager.class).save(review);
Session.get().success("Approved");
return true;
} else {
@@ -1171,7 +1171,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
PullRequest request = getPullRequest();
if (request.isOpen()) {
PullRequestReview review = request.getReview(SecurityUtils.getUser());
- return review != null && review.getResult() == null;
+ return review != null && (review.getResult() == null || review.getResult().getApproved() == null);
} else {
return false;
}
@@ -1198,7 +1198,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
result.setComment(getComment());
result.setCommit(request.getLatestUpdate().getHeadCommitHash());
review.setResult(result);
- OneDev.getInstance(PullRequestReviewManager.class).review(review);
+ OneDev.getInstance(PullRequestReviewManager.class).save(review);
Session.get().success("Requested For changes");
return true;
} else {
@@ -1254,7 +1254,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
result.setComment(getComment());
result.setCommit(request.getLatestUpdate().getHeadCommitHash());
review.setResult(result);
- OneDev.getInstance(PullRequestReviewManager.class).review(review);
+ OneDev.getInstance(PullRequestReviewManager.class).save(review);
Session.get().success("Review Withdrawed");
return true;
} else {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java
index 6539778ea1..60ab8a973e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java
@@ -2,6 +2,7 @@ package io.onedev.server.web.page.project.pullrequests.detail.activities.activit
import java.util.List;
+import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -40,12 +41,16 @@ class PullRequestChangePanel extends GenericPanel<PullRequestChange> {
PullRequestChange change = getModelObject();
- if (change.getUser() != null)
+ String activity = change.getData().getActivity();
+ if (change.getUser() != null) {
add(new Label("user", change.getUser().getDisplayName()));
- else
+ } else {
add(new WebMarkupContainer("user").setVisible(false));
+ activity = StringUtils.capitalize(activity);
+ }
+
+ add(new Label("description", activity));
- add(new Label("description", change.getData().getActivity()));
add(new Label("age", DateUtils.formatAge(change.getDate()))
.add(new AttributeAppender("title", DateUtils.formatDateTime(change.getDate()))));
add(new SinceChangesLink("changes", new AbstractReadOnlyModel<PullRequest>() {