Skip to content

The Unified and Autonomous Development Platform

Add pull request review restful endpoint

robin shen6efc1dac0f89
diff --git a/core/src/main/java/com/gitplex/server/CoreModule.java b/core/src/main/java/com/gitplex/server/CoreModule.java
index cf092df268..10f1fd5eb2 100644
--- a/core/src/main/java/com/gitplex/server/CoreModule.java
+++ b/core/src/main/java/com/gitplex/server/CoreModule.java
@@ -71,7 +71,7 @@ import com.gitplex.server.manager.PullRequestInfoManager;
import com.gitplex.server.manager.PullRequestManager;
import com.gitplex.server.manager.PullRequestReferenceManager;
import com.gitplex.server.manager.ReviewInvitationManager;
-import com.gitplex.server.manager.ReviewManager;
+import com.gitplex.server.manager.PullRequestReviewManager;
import com.gitplex.server.manager.PullRequestStatusChangeManager;
import com.gitplex.server.manager.PullRequestTaskManager;
import com.gitplex.server.manager.PullRequestUpdateManager;
@@ -104,7 +104,7 @@ import com.gitplex.server.manager.impl.DefaultPullRequestInfoManager;
import com.gitplex.server.manager.impl.DefaultPullRequestManager;
import com.gitplex.server.manager.impl.DefaultPullRequestReferenceManager;
import com.gitplex.server.manager.impl.DefaultReviewInvitationManager;
-import com.gitplex.server.manager.impl.DefaultReviewManager;
+import com.gitplex.server.manager.impl.DefaultPullRequestReviewManager;
import com.gitplex.server.manager.impl.DefaultPullRequestStatusChangeManager;
import com.gitplex.server.manager.impl.DefaultPullRequestTaskManager;
import com.gitplex.server.manager.impl.DefaultPullRequestUpdateManager;
@@ -252,7 +252,7 @@ public class CoreModule extends AbstractPluginModule {
bind(DepotManager.class).to(DefaultDepotManager.class);
bind(AccountManager.class).to(DefaultAccountManager.class);
bind(ReviewInvitationManager.class).to(DefaultReviewInvitationManager.class);
- bind(ReviewManager.class).to(DefaultReviewManager.class);
+ bind(PullRequestReviewManager.class).to(DefaultPullRequestReviewManager.class);
bind(MailManager.class).to(DefaultMailManager.class);
bind(BranchWatchManager.class).to(DefaultBranchWatchManager.class);
bind(PullRequestTaskManager.class).to(DefaultPullRequestTaskManager.class);
diff --git a/core/src/main/java/com/gitplex/server/git/GitPreReceiveCallback.java b/core/src/main/java/com/gitplex/server/git/GitPreReceiveCallback.java
index 2218621fd2..fd643113a1 100644
--- a/core/src/main/java/com/gitplex/server/git/GitPreReceiveCallback.java
+++ b/core/src/main/java/com/gitplex/server/git/GitPreReceiveCallback.java
@@ -20,7 +20,7 @@ import org.eclipse.jgit.lib.ObjectId;
import com.gitplex.launcher.loader.LoaderUtils;
import com.gitplex.server.manager.AccountManager;
import com.gitplex.server.manager.DepotManager;
-import com.gitplex.server.manager.ReviewManager;
+import com.gitplex.server.manager.PullRequestReviewManager;
import com.gitplex.server.model.Account;
import com.gitplex.server.model.Depot;
import com.gitplex.server.model.PullRequest;
@@ -42,10 +42,10 @@ public class GitPreReceiveCallback extends HttpServlet {
private final AccountManager userManager;
- private final ReviewManager reviewManager;
+ private final PullRequestReviewManager reviewManager;
@Inject
- public GitPreReceiveCallback(DepotManager depotManager, AccountManager userManager, ReviewManager reviewManager) {
+ public GitPreReceiveCallback(DepotManager depotManager, AccountManager userManager, PullRequestReviewManager reviewManager) {
this.depotManager = depotManager;
this.userManager = userManager;
this.reviewManager = reviewManager;
diff --git a/core/src/main/java/com/gitplex/server/manager/ReviewManager.java b/core/src/main/java/com/gitplex/server/manager/PullRequestReviewManager.java
similarity index 73%
rename from core/src/main/java/com/gitplex/server/manager/ReviewManager.java
rename to core/src/main/java/com/gitplex/server/manager/PullRequestReviewManager.java
index 465ea2aabb..dd7c4b0e4a 100644
--- a/core/src/main/java/com/gitplex/server/manager/ReviewManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/PullRequestReviewManager.java
@@ -2,23 +2,19 @@ package com.gitplex.server.manager;
import java.util.List;
-import javax.annotation.Nullable;
-
import org.eclipse.jgit.lib.ObjectId;
import com.gitplex.server.model.Account;
import com.gitplex.server.model.Depot;
import com.gitplex.server.model.PullRequest;
-import com.gitplex.server.model.PullRequestUpdate;
-import com.gitplex.server.model.Review;
+import com.gitplex.server.model.PullRequestReview;
import com.gitplex.server.persistence.dao.EntityManager;
-import com.gitplex.server.util.ReviewCheckStatus;
-
-public interface ReviewManager extends EntityManager<Review> {
+import com.gitplex.server.util.ReviewStatus;
- Review find(Account user, PullRequestUpdate update);
+public interface PullRequestReviewManager extends EntityManager<PullRequestReview> {
- void review(PullRequest request, boolean approved, @Nullable String note);
+ @Override
+ void save(PullRequestReview review);
/**
* Find list of reviews ordered by review date for specified pull request.
@@ -28,11 +24,11 @@ public interface ReviewManager extends EntityManager<Review> {
* @return
* list of reviews ordered by review date
*/
- List<Review> findAll(PullRequest request);
+ List<PullRequestReview> findAll(PullRequest request);
void delete(Account user, PullRequest request);
- ReviewCheckStatus checkRequest(PullRequest request);
+ ReviewStatus checkRequest(PullRequest request);
/**
* Check if specified user can modify specified file in specified branch.
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java
index 91de640aa6..8c3a472389 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java
@@ -61,7 +61,7 @@ import com.gitplex.server.model.PullRequest;
import com.gitplex.server.model.PullRequestStatusChange;
import com.gitplex.server.model.PullRequestStatusChange.Type;
import com.gitplex.server.model.PullRequestUpdate;
-import com.gitplex.server.model.Review;
+import com.gitplex.server.model.PullRequestReview;
import com.gitplex.server.model.ReviewInvitation;
import com.gitplex.server.model.support.CloseInfo;
import com.gitplex.server.model.support.DepotAndBranch;
@@ -75,7 +75,7 @@ import com.gitplex.server.persistence.dao.Dao;
import com.gitplex.server.persistence.dao.EntityCriteria;
import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.util.BatchWorker;
-import com.gitplex.server.util.ReviewCheckStatus;
+import com.gitplex.server.util.ReviewStatus;
import com.gitplex.server.util.concurrent.Prioritized;
import com.google.common.base.Preconditions;
import com.google.common.base.Throwables;
@@ -229,13 +229,8 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
}
private void merge(PullRequest request) {
- MergePreview preview = request.getMergePreview();
- if (preview == null)
- throw new IllegalStateException("Merge preview has not been calculated yet.");
-
- String merged = preview.getMerged();
- if (merged == null)
- throw new IllegalStateException("There are merge conflicts.");
+ MergePreview preview = Preconditions.checkNotNull(request.getMergePreview());
+ String merged = Preconditions.checkNotNull(preview.getMerged());
ObjectId mergedId = ObjectId.fromString(merged);
RevCommit mergedCommit = request.getTargetDepot().getRevCommit(mergedId);
@@ -422,7 +417,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
closeAsMerged(request, true, null);
} else {
MergePreview mergePreview = request.getMergePreview();
- ReviewCheckStatus checkStatus = request.getReviewCheckStatus();
+ ReviewStatus checkStatus = request.getReviewStatus();
for (ReviewInvitation invitation: request.getReviewInvitations()) {
if (checkStatus.getAwaitingReviewers().contains(invitation.getUser()))
@@ -430,7 +425,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
}
boolean hasDisapprovals = false;
- for (Review review: checkStatus.getEffectiveReviews().values()) {
+ for (PullRequestReview review: checkStatus.getEffectiveReviews().values()) {
if (!review.isApproved()) {
hasDisapprovals = true;
break;
@@ -449,7 +444,8 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
public MergePreview previewMerge(PullRequest request) {
if (request.getMergeStrategy() != MergeStrategy.DO_NOT_MERGE) {
MergePreview lastPreview = request.getLastMergePreview();
- if (request.isOpen() && !request.isMergeIntoTarget() && (lastPreview == null || lastPreview.isObsolete(request))) {
+ if (request.isOpen() && !request.isMergeIntoTarget()
+ && (lastPreview == null || lastPreview.isObsolete(request))) {
int priority = RequestCycle.get() != null?UI_PREVIEW_PRIORITY:BACKEND_PREVIEW_PRIORITY;
if (dao.getSession().getTransaction().getStatus() == TransactionStatus.ACTIVE) {
doAfterCommit(new Runnable() {
@@ -526,7 +522,6 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
GitUtils.deleteRef(refUpdate);
}
}
- preview.setDate(new Date());
dao.persist(request);
listenerRegistry.post(new MergePreviewCalculated(request));
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultReviewManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestReviewManager.java
similarity index 74%
rename from core/src/main/java/com/gitplex/server/manager/impl/DefaultReviewManager.java
rename to core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestReviewManager.java
index 730b8736ac..808c0e5da3 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultReviewManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestReviewManager.java
@@ -3,6 +3,7 @@ package com.gitplex.server.manager.impl;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
@@ -21,18 +22,20 @@ import org.eclipse.jgit.treewalk.TreeWalk;
import org.eclipse.jgit.treewalk.filter.TreeFilter;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.gitplex.server.manager.AccountManager;
import com.gitplex.server.manager.PullRequestManager;
+import com.gitplex.server.manager.PullRequestReviewManager;
import com.gitplex.server.manager.PullRequestStatusChangeManager;
-import com.gitplex.server.manager.ReviewManager;
import com.gitplex.server.model.Account;
import com.gitplex.server.model.Depot;
import com.gitplex.server.model.PullRequest;
+import com.gitplex.server.model.PullRequestReview;
import com.gitplex.server.model.PullRequestStatusChange;
import com.gitplex.server.model.PullRequestStatusChange.Type;
import com.gitplex.server.model.PullRequestUpdate;
-import com.gitplex.server.model.Review;
import com.gitplex.server.model.ReviewInvitation;
import com.gitplex.server.model.Team;
import com.gitplex.server.model.support.BranchProtection;
@@ -45,13 +48,16 @@ import com.gitplex.server.persistence.dao.EntityCriteria;
import com.gitplex.server.security.ObjectPermission;
import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.security.privilege.DepotPrivilege;
-import com.gitplex.server.util.ReviewCheckStatus;
+import com.gitplex.server.util.ReviewStatus;
import com.gitplex.server.util.reviewappointment.ReviewAppointment;
import com.google.common.base.Preconditions;
@Singleton
-public class DefaultReviewManager extends AbstractEntityManager<Review> implements ReviewManager {
+public class DefaultPullRequestReviewManager extends AbstractEntityManager<PullRequestReview>
+ implements PullRequestReviewManager {
+ private static final Logger logger = LoggerFactory.getLogger(DefaultPullRequestReviewManager.class);
+
private final AccountManager accountManager;
private final PullRequestManager pullRequestManager;
@@ -59,7 +65,7 @@ public class DefaultReviewManager extends AbstractEntityManager<Review> implemen
private final PullRequestStatusChangeManager pullRequestStatusChangeManager;
@Inject
- public DefaultReviewManager(Dao dao, AccountManager accountManager, PullRequestManager pullRequestManager,
+ public DefaultPullRequestReviewManager(Dao dao, AccountManager accountManager, PullRequestManager pullRequestManager,
PullRequestStatusChangeManager pullRequestStatusChangeManager) {
super(dao);
@@ -70,52 +76,35 @@ public class DefaultReviewManager extends AbstractEntityManager<Review> implemen
@Transactional
@Override
- public ReviewCheckStatus checkRequest(PullRequest request) {
- return new ReviewCheckStatusImpl(request);
- }
-
- @Sessional
- @Override
- public Review find(Account user, PullRequestUpdate update) {
- return find(EntityCriteria.of(Review.class)
- .add(Restrictions.eq("user", user))
- .add(Restrictions.eq("update", update)));
+ public ReviewStatus checkRequest(PullRequest request) {
+ return new ReviewStatusImpl(request);
}
@Transactional
@Override
- public void review(PullRequest request, boolean approved, String note) {
- Account user = accountManager.getCurrent();
- Date date = new Date();
-
- Review review = new Review();
- review.setRequest(request);
- review.setApproved(approved);
- review.setNote(note);
- review.setUser(user);
- review.setDate(date);
- save(review);
+ public void save(PullRequestReview review) {
+ super.save(review);
PullRequestStatusChange statusChange = new PullRequestStatusChange();
- statusChange.setDate(date);
- statusChange.setNote(note);
- statusChange.setRequest(request);
- if (approved) {
+ statusChange.setDate(new Date());
+ statusChange.setNote(review.getNote());
+ statusChange.setRequest(review.getRequest());
+ if (review.isApproved()) {
statusChange.setType(Type.APPROVED);
} else {
statusChange.setType(Type.DISAPPROVED);
}
- statusChange.setUser(user);
+ statusChange.setUser(review.getUser());
pullRequestStatusChangeManager.save(statusChange);
- request.setLastEvent(statusChange);
- pullRequestManager.save(request);
+ review.getRequest().setLastEvent(statusChange);
+ pullRequestManager.save(review.getRequest());
}
@Sessional
@Override
- public List<Review> findAll(PullRequest request) {
- EntityCriteria<Review> criteria = EntityCriteria.of(Review.class);
+ public List<PullRequestReview> findAll(PullRequest request) {
+ EntityCriteria<PullRequestReview> criteria = EntityCriteria.of(PullRequestReview.class);
criteria.createCriteria("update").add(Restrictions.eq("request", request));
criteria.addOrder(Order.asc("date"));
return findAll(criteria);
@@ -124,8 +113,8 @@ public class DefaultReviewManager extends AbstractEntityManager<Review> implemen
@Transactional
@Override
public void delete(Account user, PullRequest request) {
- for (Iterator<Review> it = request.getReviews().iterator(); it.hasNext();) {
- Review review = it.next();
+ for (Iterator<PullRequestReview> it = request.getReviews().iterator(); it.hasNext();) {
+ PullRequestReview review = it.next();
if (review.getUser().equals(user)) {
delete(review);
it.remove();
@@ -195,13 +184,13 @@ public class DefaultReviewManager extends AbstractEntityManager<Review> implemen
return true;
}
- private static class ReviewCheckStatusImpl implements ReviewCheckStatus {
+ private static class ReviewStatusImpl implements ReviewStatus {
private final PullRequest request;
private final List<Account> awaitingReviewers = new ArrayList<>();
- private final Map<Account, Review> effectiveReviews = new HashMap<>();
+ private final Map<Account, PullRequestReview> effectiveReviews = new HashMap<>();
@Override
public List<Account> getAwaitingReviewers() {
@@ -209,7 +198,7 @@ public class DefaultReviewManager extends AbstractEntityManager<Review> implemen
}
@Override
- public Map<Account, Review> getEffectiveReviews() {
+ public Map<Account, PullRequestReview> getEffectiveReviews() {
return effectiveReviews;
}
@@ -222,13 +211,13 @@ public class DefaultReviewManager extends AbstractEntityManager<Review> implemen
return null;
}
- public ReviewCheckStatusImpl(PullRequest request) {
+ public ReviewStatusImpl(PullRequest request) {
this.request = request;
for (ReviewInvitation invitation: request.getReviewInvitations()) {
if (!invitation.getUser().equals(request.getSubmitter())
&& invitation.getType() == ReviewInvitation.Type.MANUAL) {
- Review effectiveReview = invitation.getUser().getReviewAfter(request.getLatestUpdate());
+ PullRequestReview effectiveReview = invitation.getUser().getReviewAfter(request.getLatestUpdate());
if (effectiveReview == null)
awaitingReviewers.add(invitation.getUser());
else
@@ -259,15 +248,16 @@ public class DefaultReviewManager extends AbstractEntityManager<Review> implemen
ObjectPermission writePermission = ObjectPermission.ofDepotWrite(request.getTargetDepot());
if (request.getSubmitter() == null || !request.getSubmitter().asSubject().isPermitted(writePermission)) {
- checkReviews(SecurityUtils.findUsersCan(request.getTargetDepot(), DepotPrivilege.WRITE), 1,
- request.getLatestUpdate());
+ Collection<Account> writers = SecurityUtils.findUsersCan(request.getTargetDepot(),
+ DepotPrivilege.WRITE);
+ checkReviews(writers, 1, request.getLatestUpdate(), true);
}
- for (Iterator<Map.Entry<Account, Review>> it = effectiveReviews.entrySet().iterator(); it.hasNext();) {
- Review review = it.next().getValue();
+ for (Iterator<Map.Entry<Account, PullRequestReview>> it = effectiveReviews.entrySet().iterator(); it.hasNext();) {
+ PullRequestReview review = it.next().getValue();
if (review.isCheckMerged()) {
if (request.getMergePreview() == null
- || request.getMergePreview().getDate().after(review.getDate())) {
+ || !review.getCommit().equals(request.getMergePreview().getMerged())) {
if (!awaitingReviewers.contains(review.getUser()))
awaitingReviewers.add(review.getUser());
it.remove();
@@ -280,7 +270,7 @@ public class DefaultReviewManager extends AbstractEntityManager<Review> implemen
private void checkReviews(ReviewAppointment appointment, PullRequestUpdate update) {
for (Account user: appointment.getUsers()) {
if (!user.equals(request.getSubmitter()) && !awaitingReviewers.contains(user)) {
- Review effectiveReview = user.getReviewAfter(update);
+ PullRequestReview effectiveReview = user.getReviewAfter(update);
if (effectiveReview == null) {
awaitingReviewers.add(user);
recordReviewer(user);
@@ -293,12 +283,13 @@ public class DefaultReviewManager extends AbstractEntityManager<Review> implemen
for (Map.Entry<Team, Integer> entry: appointment.getTeams().entrySet()) {
Team team = entry.getKey();
int requiredCount = entry.getValue();
- checkReviews(team.getMembers(), requiredCount, update);
+ checkReviews(team.getMembers(), requiredCount, update, false);
}
}
- private void checkReviews(Collection<Account> users, int requiredCount, PullRequestUpdate update) {
- if (requiredCount == 0 || requiredCount > users.size())
+ private void checkReviews(Collection<Account> users, int requiredCount, PullRequestUpdate update,
+ boolean excludeAutoReviews) {
+ if (requiredCount == 0)
requiredCount = users.size();
int effectiveCount = 0;
@@ -309,9 +300,14 @@ public class DefaultReviewManager extends AbstractEntityManager<Review> implemen
} else if (awaitingReviewers.contains(user)) {
requiredCount--;
} else {
- Review effectiveReview = user.getReviewAfter(update);
+ PullRequestReview effectiveReview = user.getReviewAfter(update);
if (effectiveReview != null) {
- effectiveCount++;
+ if (!excludeAutoReviews || !effectiveReview.isAutoCheck()) {
+ effectiveCount++;
+ } else {
+ logger.warn("Auto review made by {} is ignored while checking reviews of pull request #{}",
+ user.getDisplayName(), update.getRequest().getNumber());
+ }
} else {
potentialReviewers.add(user);
}
@@ -339,14 +335,26 @@ public class DefaultReviewManager extends AbstractEntityManager<Review> implemen
}
}
if (candidateReviewers.size() < missingCount) {
+ List<ReviewInvitation> excludedInvitations = new ArrayList<>();
for (Account user: potentialReviewers) {
- if (!candidateReviewers.contains(user)) {
- candidateReviewers.add(user);
- if (candidateReviewers.size() == missingCount)
- break;
- }
+ ReviewInvitation invitation = getInvitation(user);
+ if (invitation != null && invitation.getType() == ReviewInvitation.Type.EXCLUDE)
+ excludedInvitations.add(invitation);
+ }
+ excludedInvitations.sort(Comparator.comparing(ReviewInvitation::getDate));
+
+ for (ReviewInvitation invitation: excludedInvitations) {
+ candidateReviewers.add(invitation.getUser());
+ if (candidateReviewers.size() == missingCount)
+ break;
}
}
+ if (candidateReviewers.size() < missingCount) {
+ String errorMessage = String.format("Impossible to provide required number of reviewers "
+ + "(candidates: %s, required number of reviewers: %d, pull request: #%d)",
+ candidateReviewers, missingCount, update.getRequest().getNumber());
+ throw new RuntimeException(errorMessage);
+ }
Set<Account> selectedReviewers = selectReviewers(candidateReviewers, missingCount);
for (Account user: selectedReviewers) {
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultReviewInvitationManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultReviewInvitationManager.java
index 44e6c1dce3..554c1c9406 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultReviewInvitationManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultReviewInvitationManager.java
@@ -56,8 +56,8 @@ public class DefaultReviewInvitationManager extends AbstractEntityManager<Review
save(invitation);
Account reviewer = invitation.getUser();
- if (request.getReviewCheckStatus().getAwaitingReviewers().contains(reviewer)
- || request.getReviewCheckStatus().getEffectiveReviews().containsKey(reviewer)) {
+ if (request.getReviewStatus().getAwaitingReviewers().contains(reviewer)
+ || request.getReviewStatus().getEffectiveReviews().containsKey(reviewer)) {
return false;
} else {
PullRequestStatusChange statusChange = new PullRequestStatusChange();
diff --git a/core/src/main/java/com/gitplex/server/model/Account.java b/core/src/main/java/com/gitplex/server/model/Account.java
index 3736847557..7d4155f1a6 100644
--- a/core/src/main/java/com/gitplex/server/model/Account.java
+++ b/core/src/main/java/com/gitplex/server/model/Account.java
@@ -111,7 +111,7 @@ public class Account extends AbstractEntity implements AuthenticationInfo, Prote
private Collection<Team> definedTeams = new ArrayList<>();
@OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)
- private Collection<Review> reviews = new ArrayList<>();
+ private Collection<PullRequestReview> reviews = new ArrayList<>();
@OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)
private Collection<ReviewInvitation> reviewInvitations = new ArrayList<>();
@@ -304,10 +304,12 @@ public class Account extends AbstractEntity implements AuthenticationInfo, Prote
}
@Nullable
- public Review getReviewAfter(PullRequestUpdate update) {
- for (Review review: update.getRequest().getReviews()) {
- if (review.getUser().equals(this) && review.getDate().after(update.getDate()))
+ public PullRequestReview getReviewAfter(PullRequestUpdate update) {
+ for (PullRequestReview review: update.getRequest().getReviews()) {
+ if (review.getUser().equals(this) && review.getUpdate() != null
+ && review.getUpdate().getId()>=update.getId()) {
return review;
+ }
}
return null;
}
diff --git a/core/src/main/java/com/gitplex/server/model/PullRequest.java b/core/src/main/java/com/gitplex/server/model/PullRequest.java
index 4b5e653d72..da277ecb8a 100644
--- a/core/src/main/java/com/gitplex/server/model/PullRequest.java
+++ b/core/src/main/java/com/gitplex/server/model/PullRequest.java
@@ -43,7 +43,7 @@ import com.gitplex.server.event.pullrequest.PullRequestCodeCommentEvent;
import com.gitplex.server.git.GitUtils;
import com.gitplex.server.manager.CodeCommentRelationManager;
import com.gitplex.server.manager.PullRequestManager;
-import com.gitplex.server.manager.ReviewManager;
+import com.gitplex.server.manager.PullRequestReviewManager;
import com.gitplex.server.manager.VisitInfoManager;
import com.gitplex.server.model.support.CloseInfo;
import com.gitplex.server.model.support.CompareContext;
@@ -53,7 +53,7 @@ import com.gitplex.server.model.support.MergePreview;
import com.gitplex.server.model.support.MergeStrategy;
import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.security.privilege.DepotPrivilege;
-import com.gitplex.server.util.ReviewCheckStatus;
+import com.gitplex.server.util.ReviewStatus;
import com.gitplex.server.util.diff.WhitespaceOption;
import com.gitplex.server.util.editable.EditableUtils;
import com.gitplex.server.util.jackson.ExternalView;
@@ -155,7 +155,7 @@ public class PullRequest extends AbstractEntity {
private Collection<ReviewInvitation> reviewInvitations = new ArrayList<>();
@OneToMany(mappedBy="request", cascade=CascadeType.REMOVE)
- private Collection<Review> reviews = new ArrayList<>();
+ private Collection<PullRequestReview> reviews = new ArrayList<>();
@OneToMany(mappedBy="referenced", cascade=CascadeType.REMOVE)
private Collection<PullRequestReference> referencedBy = new ArrayList<>();
@@ -175,7 +175,7 @@ public class PullRequest extends AbstractEntity {
@OneToMany(mappedBy="request", cascade=CascadeType.REMOVE)
private Collection<PullRequestWatch> watches = new ArrayList<>();
- private transient ReviewCheckStatus reviewCheckStatus;
+ private transient ReviewStatus reviewStatus;
private transient Boolean mergedIntoTarget;
@@ -412,14 +412,14 @@ public class PullRequest extends AbstractEntity {
this.watches = watches;
}
- public ReviewCheckStatus getReviewCheckStatus() {
- if (reviewCheckStatus == null)
- reviewCheckStatus = GitPlex.getInstance(ReviewManager.class).checkRequest(this);
- return reviewCheckStatus;
+ public ReviewStatus getReviewStatus() {
+ if (reviewStatus == null)
+ reviewStatus = GitPlex.getInstance(PullRequestReviewManager.class).checkRequest(this);
+ return reviewStatus;
}
- public void clearReviewCheckStatus() {
- reviewCheckStatus = null;
+ public void clearReviewStatus() {
+ reviewStatus = null;
}
@Nullable
@@ -610,11 +610,11 @@ public class PullRequest extends AbstractEntity {
return mergedCommits;
}
- public Collection<Review> getReviews() {
+ public Collection<PullRequestReview> getReviews() {
return reviews;
}
- public void setReviews(Collection<Review> reviews) {
+ public void setReviews(Collection<PullRequestReview> reviews) {
this.reviews = reviews;
}
@@ -786,10 +786,10 @@ public class PullRequest extends AbstractEntity {
}
public List<Account> getRemainingReviewers() {
- ReviewCheckStatus checkStatus = getReviewCheckStatus();
+ ReviewStatus checkStatus = getReviewStatus();
Collection<Account> users = SecurityUtils.findUsersCan(getTargetDepot(), DepotPrivilege.READ);
users.removeAll(checkStatus.getAwaitingReviewers());
- for (Review review: checkStatus.getEffectiveReviews().values())
+ for (PullRequestReview review: checkStatus.getEffectiveReviews().values())
users.remove(review.getUser());
users.remove(SecurityUtils.getAccount());
List<Account> userList = new ArrayList<>(users);
diff --git a/core/src/main/java/com/gitplex/server/model/Review.java b/core/src/main/java/com/gitplex/server/model/PullRequestReview.java
similarity index 52%
rename from core/src/main/java/com/gitplex/server/model/Review.java
rename to core/src/main/java/com/gitplex/server/model/PullRequestReview.java
index 08c046d389..04cd0ae8a1 100644
--- a/core/src/main/java/com/gitplex/server/model/Review.java
+++ b/core/src/main/java/com/gitplex/server/model/PullRequestReview.java
@@ -1,7 +1,8 @@
package com.gitplex.server.model;
-import java.util.Date;
+import java.util.Optional;
+import javax.annotation.Nullable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
@@ -9,12 +10,16 @@ import javax.persistence.Index;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
+
+import com.gitplex.server.model.support.MergePreview;
@Entity
@Table(
- indexes={@Index(columnList="g_user_id"), @Index(columnList="g_request_id")
-})
-public class Review extends AbstractEntity {
+ indexes={@Index(columnList="g_user_id"), @Index(columnList="g_request_id")},
+ uniqueConstraints={@UniqueConstraint(columnNames={"g_user_id", "g_request_id", "commit"})}
+)
+public class PullRequestReview extends AbstractEntity {
private static final long serialVersionUID = 1L;
@@ -23,7 +28,7 @@ public class Review extends AbstractEntity {
private Account user;
@Column(nullable=false)
- private Date date;
+ private String commit;
@ManyToOne(fetch=FetchType.LAZY)
@JoinColumn(nullable=false)
@@ -31,16 +36,20 @@ public class Review extends AbstractEntity {
private boolean checkMerged;
+ private boolean autoCheck;
+
private boolean approved;
+ private transient Optional<PullRequestUpdate> updateOpt;
+
private String note;
- public Date getDate() {
- return date;
+ public String getCommit() {
+ return commit;
}
- public void setDate(Date date) {
- this.date = date;
+ public void setCommit(String commit) {
+ this.commit = commit;
}
public Account getUser() {
@@ -75,6 +84,14 @@ public class Review extends AbstractEntity {
this.checkMerged = checkMerged;
}
+ public boolean isAutoCheck() {
+ return autoCheck;
+ }
+
+ public void setAutoCheck(boolean autoCheck) {
+ this.autoCheck = autoCheck;
+ }
+
public String getNote() {
return note;
}
@@ -83,4 +100,24 @@ public class Review extends AbstractEntity {
this.note = note;
}
+ @Nullable
+ public PullRequestUpdate getUpdate() {
+ if (updateOpt == null) {
+ PullRequestUpdate update = null;
+ MergePreview preview = request.getMergePreview();
+ if (preview != null && commit.equals(preview.getMerged())) {
+ update = request.getLatestUpdate();
+ } else {
+ for (PullRequestUpdate each: request.getUpdates()) {
+ if (each.getHeadCommitHash().equals(commit)) {
+ update = each;
+ break;
+ }
+ }
+ }
+ updateOpt = Optional.ofNullable(update);
+ }
+ return updateOpt.orElse(null);
+ }
+
}
diff --git a/core/src/main/java/com/gitplex/server/model/ReviewInvitation.java b/core/src/main/java/com/gitplex/server/model/ReviewInvitation.java
index d5080538da..c013f20b64 100644
--- a/core/src/main/java/com/gitplex/server/model/ReviewInvitation.java
+++ b/core/src/main/java/com/gitplex/server/model/ReviewInvitation.java
@@ -1,5 +1,7 @@
package com.gitplex.server.model;
+import java.util.Date;
+
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.Index;
@@ -29,6 +31,8 @@ public class ReviewInvitation extends AbstractEntity {
private Type type;
+ private Date date = new Date();
+
public Account getUser() {
return user;
}
@@ -53,4 +57,12 @@ public class ReviewInvitation extends AbstractEntity {
this.type = type;
}
+ public Date getDate() {
+ return date;
+ }
+
+ public void setDate(Date date) {
+ this.date = date;
+ }
+
}
diff --git a/core/src/main/java/com/gitplex/server/model/support/MergePreview.java b/core/src/main/java/com/gitplex/server/model/support/MergePreview.java
index ceeb770177..7db5179c1c 100644
--- a/core/src/main/java/com/gitplex/server/model/support/MergePreview.java
+++ b/core/src/main/java/com/gitplex/server/model/support/MergePreview.java
@@ -1,7 +1,6 @@
package com.gitplex.server.model.support;
import java.io.Serializable;
-import java.util.Date;
import javax.annotation.Nullable;
import javax.persistence.Column;
@@ -27,8 +26,6 @@ public class MergePreview implements Serializable {
@Column(name="PREVIEW_MERGED")
private String merged;
- private Date date = new Date();
-
@SuppressWarnings("unused")
private MergePreview() {
}
@@ -64,14 +61,6 @@ public class MergePreview implements Serializable {
this.mergeStrategy = mergeStrategy;
}
- public Date getDate() {
- return date;
- }
-
- public void setDate(Date date) {
- this.date = date;
- }
-
/**
* Integrated commit hash
*
diff --git a/core/src/main/java/com/gitplex/server/security/SecurityUtils.java b/core/src/main/java/com/gitplex/server/security/SecurityUtils.java
index 1415e7a14c..dacef95035 100644
--- a/core/src/main/java/com/gitplex/server/security/SecurityUtils.java
+++ b/core/src/main/java/com/gitplex/server/security/SecurityUtils.java
@@ -10,14 +10,14 @@ import org.eclipse.jgit.lib.ObjectId;
import com.gitplex.server.GitPlex;
import com.gitplex.server.manager.AccountManager;
-import com.gitplex.server.manager.ReviewManager;
+import com.gitplex.server.manager.PullRequestReviewManager;
import com.gitplex.server.model.Account;
import com.gitplex.server.model.CodeComment;
import com.gitplex.server.model.Depot;
import com.gitplex.server.model.PullRequest;
import com.gitplex.server.model.PullRequestComment;
import com.gitplex.server.model.PullRequestStatusChange;
-import com.gitplex.server.model.Review;
+import com.gitplex.server.model.PullRequestReview;
import com.gitplex.server.model.support.BranchProtection;
import com.gitplex.server.model.support.CodeCommentActivity;
import com.gitplex.server.model.support.TagProtection;
@@ -50,7 +50,7 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
return GitPlex.getInstance(AccountManager.class).getCurrent();
}
- public static boolean canModify(Review review) {
+ public static boolean canModify(PullRequestReview review) {
Depot depot = review.getRequest().getTargetDepot();
if (canManage(depot)) {
return true;
@@ -134,11 +134,11 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
}
public static boolean canModify(Depot depot, String branch, String file) {
- return canWrite(depot) && GitPlex.getInstance(ReviewManager.class).canModify(getAccount(), depot, branch, file);
+ return canWrite(depot) && GitPlex.getInstance(PullRequestReviewManager.class).canModify(getAccount(), depot, branch, file);
}
public static boolean canPush(Depot depot, String branchName, ObjectId oldObjectId, ObjectId newObjectId) {
- return canWrite(depot) && GitPlex.getInstance(ReviewManager.class).canPush(getAccount(), depot, branchName,
+ return canWrite(depot) && GitPlex.getInstance(PullRequestReviewManager.class).canPush(getAccount(), depot, branchName,
oldObjectId, newObjectId);
}
diff --git a/core/src/main/java/com/gitplex/server/util/ReviewCheckStatus.java b/core/src/main/java/com/gitplex/server/util/ReviewStatus.java
similarity index 54%
rename from core/src/main/java/com/gitplex/server/util/ReviewCheckStatus.java
rename to core/src/main/java/com/gitplex/server/util/ReviewStatus.java
index 6b7499f6b7..370335735b 100644
--- a/core/src/main/java/com/gitplex/server/util/ReviewCheckStatus.java
+++ b/core/src/main/java/com/gitplex/server/util/ReviewStatus.java
@@ -4,12 +4,12 @@ import java.util.List;
import java.util.Map;
import com.gitplex.server.model.Account;
-import com.gitplex.server.model.Review;
+import com.gitplex.server.model.PullRequestReview;
-public interface ReviewCheckStatus {
+public interface ReviewStatus {
List<Account> getAwaitingReviewers();
- Map<Account, Review> getEffectiveReviews();
+ Map<Account, PullRequestReview> getEffectiveReviews();
}
diff --git a/rest/src/main/java/com/gitplex/server/rest/UserResource.java b/rest/src/main/java/com/gitplex/server/rest/AccountResource.java
similarity index 94%
rename from rest/src/main/java/com/gitplex/server/rest/UserResource.java
rename to rest/src/main/java/com/gitplex/server/rest/AccountResource.java
index 3524c5ea1c..4901ee9bb0 100644
--- a/rest/src/main/java/com/gitplex/server/rest/UserResource.java
+++ b/rest/src/main/java/com/gitplex/server/rest/AccountResource.java
@@ -20,16 +20,16 @@ import com.gitplex.server.persistence.dao.Dao;
import com.gitplex.server.persistence.dao.EntityCriteria;
import com.gitplex.server.rest.jersey.ValidQueryParams;
-@Path("/users")
+@Path("/accounts")
@Consumes(MediaType.WILDCARD)
@Produces(MediaType.APPLICATION_JSON)
@Singleton
-public class UserResource {
+public class AccountResource {
private final Dao dao;
@Inject
- public UserResource(Dao dao) {
+ public AccountResource(Dao dao) {
this.dao = dao;
}
diff --git a/rest/src/main/java/com/gitplex/server/rest/RepositoryResource.java b/rest/src/main/java/com/gitplex/server/rest/DepotResource.java
similarity index 95%
rename from rest/src/main/java/com/gitplex/server/rest/RepositoryResource.java
rename to rest/src/main/java/com/gitplex/server/rest/DepotResource.java
index 8041c9a6c0..3f79dac2e3 100644
--- a/rest/src/main/java/com/gitplex/server/rest/RepositoryResource.java
+++ b/rest/src/main/java/com/gitplex/server/rest/DepotResource.java
@@ -30,14 +30,14 @@ import com.gitplex.server.security.ObjectPermission;
@Consumes(MediaType.WILDCARD)
@Produces(MediaType.APPLICATION_JSON)
@Singleton
-public class RepositoryResource {
+public class DepotResource {
private final Dao dao;
private final DepotManager depotManager;
@Inject
- public RepositoryResource(Dao dao, DepotManager depotManager) {
+ public DepotResource(Dao dao, DepotManager depotManager) {
this.dao = dao;
this.depotManager = depotManager;
}
diff --git a/rest/src/main/java/com/gitplex/server/rest/PullRequestResource.java b/rest/src/main/java/com/gitplex/server/rest/PullRequestResource.java
index 304e26fdf1..b3d9bee5a3 100644
--- a/rest/src/main/java/com/gitplex/server/rest/PullRequestResource.java
+++ b/rest/src/main/java/com/gitplex/server/rest/PullRequestResource.java
@@ -23,7 +23,7 @@ import com.gitplex.server.persistence.dao.EntityCriteria;
import com.gitplex.server.rest.jersey.ValidQueryParams;
import com.gitplex.server.security.SecurityUtils;
-@Path("/pull_requests")
+@Path("/pullrequests")
@Consumes(MediaType.WILDCARD)
@Produces(MediaType.APPLICATION_JSON)
@Singleton
diff --git a/rest/src/main/java/com/gitplex/server/rest/PullRequestReviewResource.java b/rest/src/main/java/com/gitplex/server/rest/PullRequestReviewResource.java
new file mode 100644
index 0000000000..44b0c9d655
--- /dev/null
+++ b/rest/src/main/java/com/gitplex/server/rest/PullRequestReviewResource.java
@@ -0,0 +1,72 @@
+package com.gitplex.server.rest;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.apache.shiro.authz.UnauthorizedException;
+
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.manager.PullRequestReviewManager;
+import com.gitplex.server.model.Account;
+import com.gitplex.server.model.PullRequestReview;
+import com.gitplex.server.security.SecurityUtils;
+
+@Path("/pullrequest_reviews")
+@Consumes(MediaType.WILDCARD)
+@Produces(MediaType.APPLICATION_JSON)
+@Singleton
+public class PullRequestReviewResource {
+
+ private final PullRequestReviewManager reviewManager;
+
+ private final AccountManager accountManager;
+
+ @Inject
+ public PullRequestReviewResource(PullRequestReviewManager reviewManager, AccountManager accountManager) {
+ this.reviewManager = reviewManager;
+ this.accountManager = accountManager;
+ }
+
+ @GET
+ @Path("/{id}")
+ public PullRequestReview get(@PathParam("id") Long id) {
+ PullRequestReview review = reviewManager.load(id);
+ if (!SecurityUtils.canRead(review.getRequest().getTargetDepot()))
+ throw new UnauthorizedException();
+ return review;
+ }
+
+ @DELETE
+ @Path("/{id}")
+ public void delete(@PathParam("id") Long id) {
+ PullRequestReview review = reviewManager.load(id);
+ Account currentUser = accountManager.getCurrent();
+ if (review.getUser().equals(currentUser) || SecurityUtils.canManage(review.getRequest().getTargetDepot()))
+ reviewManager.delete(review);
+ else
+ throw new UnauthorizedException();
+ }
+
+ @POST
+ public Long save(@NotNull @Valid PullRequestReview review) {
+ if (!SecurityUtils.canWrite(review.getRequest().getTargetDepot()))
+ throw new UnauthorizedException();
+
+ review.setUser(accountManager.getCurrent());
+
+ reviewManager.save(review);
+
+ return review.getId();
+ }
+
+}
diff --git a/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerChoice.java b/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerChoice.java
index 8f27b2f5ea..7a94ab5bcf 100644
--- a/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerChoice.java
+++ b/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerChoice.java
@@ -1,5 +1,7 @@
package com.gitplex.server.web.component.requestreviewer;
+import java.util.Date;
+
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
@@ -65,8 +67,9 @@ public abstract class ReviewerChoice extends SelectToAddChoice<Account> {
request.getReviewInvitations().add(invitation);
}
invitation.setType(ReviewInvitation.Type.MANUAL);
+ invitation.setDate(new Date());
- request.clearReviewCheckStatus();
+ request.clearReviewStatus();
if (!request.isNew())
GitPlex.getInstance(ReviewInvitationManager.class).invite(invitation);
diff --git a/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerListPanel.html b/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerListPanel.html
index 317740c6d8..d67a54e39e 100644
--- a/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerListPanel.html
+++ b/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerListPanel.html
@@ -8,8 +8,8 @@
<span wicket:id="result"></span>
</td>
<td class="actions">
- <a wicket:id="withdraw" title="Withdraw this review"><i class="fa fa-undo"></i></a>
<a wicket:id="delete" title="Remove this reviewer"><i class="fa fa-trash"></i></a>
+ <a wicket:id="withdraw" title="Withdraw this review"><i class="fa fa-undo"></i></a>
</td>
</tr>
<wicket:container wicket:id="noReviewers">
diff --git a/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerListPanel.java b/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerListPanel.java
index dfc131ca1f..76f3ddddc2 100644
--- a/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerListPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerListPanel.java
@@ -1,7 +1,8 @@
package com.gitplex.server.web.component.requestreviewer;
import java.util.ArrayList;
-import java.util.Comparator;
+import java.util.Collections;
+import java.util.Date;
import java.util.List;
import org.apache.wicket.Component;
@@ -23,14 +24,14 @@ import org.apache.wicket.model.LoadableDetachableModel;
import com.gitplex.server.GitPlex;
import com.gitplex.server.manager.MarkdownManager;
+import com.gitplex.server.manager.PullRequestReviewManager;
import com.gitplex.server.manager.ReviewInvitationManager;
-import com.gitplex.server.manager.ReviewManager;
import com.gitplex.server.model.Account;
import com.gitplex.server.model.PullRequest;
-import com.gitplex.server.model.Review;
+import com.gitplex.server.model.PullRequestReview;
import com.gitplex.server.model.ReviewInvitation;
import com.gitplex.server.security.SecurityUtils;
-import com.gitplex.server.util.ReviewCheckStatus;
+import com.gitplex.server.util.ReviewStatus;
import com.gitplex.server.web.behavior.dropdown.DropdownHover;
import com.gitplex.server.web.component.avatar.AvatarLink;
import com.gitplex.server.web.component.link.AccountLink;
@@ -69,13 +70,13 @@ public class ReviewerListPanel extends GenericPanel<PullRequest> {
PullRequest request = getPullRequest();
List<Account> reviewers = new ArrayList<>();
- List<Review> reviews = new ArrayList<>(request.getReviewCheckStatus().getEffectiveReviews().values());
- reviews.sort(Comparator.comparing(Review::getDate));
+ List<PullRequestReview> reviews = new ArrayList<>(request.getReviewStatus().getEffectiveReviews().values());
+ Collections.sort(reviews);
- for (Review review: reviews)
+ for (PullRequestReview review: reviews)
reviewers.add(review.getUser());
- for (Account awaitingReviewer: request.getReviewCheckStatus().getAwaitingReviewers())
+ for (Account awaitingReviewer: request.getReviewStatus().getAwaitingReviewers())
reviewers.add(awaitingReviewer);
return reviewers;
@@ -90,7 +91,7 @@ public class ReviewerListPanel extends GenericPanel<PullRequest> {
item.add(new AccountLink("name", item.getModelObject()));
PullRequest request = getPullRequest();
- Review review = request.getReviewCheckStatus().getEffectiveReviews().get(item.getModelObject());
+ PullRequestReview review = request.getReviewStatus().getEffectiveReviews().get(item.getModelObject());
WebMarkupContainer result = new WebMarkupContainer("result");
if (review != null) {
@@ -151,17 +152,18 @@ public class ReviewerListPanel extends GenericPanel<PullRequest> {
}
if (invitation != null) {
- request.clearReviewCheckStatus();
+ request.clearReviewStatus();
+ invitation.setDate(new Date());
boolean removed;
if (request.isNew()) {
invitation.setType(ReviewInvitation.Type.EXCLUDE);
- removed = !request.getReviewCheckStatus().getAwaitingReviewers().contains(reviewer);
+ removed = !request.getReviewStatus().getAwaitingReviewers().contains(reviewer);
} else {
removed = GitPlex.getInstance(ReviewInvitationManager.class).exclude(invitation);
}
if (!removed) {
getSession().warn("Reviewer '" + reviewer.getDisplayName()
- + "' is required by branch protection setting and can not be removed");
+ + "' is required and can not be removed");
}
reviewersModel.detach();
@@ -175,9 +177,8 @@ public class ReviewerListPanel extends GenericPanel<PullRequest> {
PullRequest request = getPullRequest();
Account currentUser = SecurityUtils.getAccount();
- setVisible(request.isOpen() &&
- (currentUser != null && currentUser.equals(request.getSubmitter())
- || SecurityUtils.canManage(request.getTargetDepot())));
+ setVisible(currentUser != null && currentUser.equals(request.getSubmitter())
+ || SecurityUtils.canManage(request.getTargetDepot()));
}
});
@@ -196,8 +197,8 @@ public class ReviewerListPanel extends GenericPanel<PullRequest> {
PullRequest request = getPullRequest();
Account reviewer = item.getModelObject();
- Review review = request.getReviewCheckStatus().getEffectiveReviews().get(reviewer);
- setVisible(request.isOpen() && review != null
+ PullRequestReview review = request.getReviewStatus().getEffectiveReviews().get(reviewer);
+ setVisible(review != null
&& (reviewer.equals(SecurityUtils.getAccount())
|| SecurityUtils.canManage(request.getTargetDepot())));
}
@@ -206,8 +207,8 @@ public class ReviewerListPanel extends GenericPanel<PullRequest> {
public void onClick(AjaxRequestTarget target) {
PullRequest request = getPullRequest();
Account reviewer = item.getModelObject();
- request.clearReviewCheckStatus();
- GitPlex.getInstance(ReviewManager.class).delete(reviewer, request);
+ request.clearReviewStatus();
+ GitPlex.getInstance(PullRequestReviewManager.class).delete(reviewer, request);
reviewersModel.detach();
send(getPage(), Broadcast.BREADTH, new PullRequestChanged(target));
}
@@ -222,7 +223,7 @@ public class ReviewerListPanel extends GenericPanel<PullRequest> {
@Override
protected void onConfigure() {
super.onConfigure();
- ReviewCheckStatus reviewCheckStatus = getPullRequest().getReviewCheckStatus();
+ ReviewStatus reviewCheckStatus = getPullRequest().getReviewStatus();
setVisible(reviewCheckStatus.getAwaitingReviewers().isEmpty()
&& reviewCheckStatus.getEffectiveReviews().isEmpty());
}
@@ -236,7 +237,7 @@ public class ReviewerListPanel extends GenericPanel<PullRequest> {
super.onConfigure();
PullRequest request = getPullRequest();
- setVisible(request.isOpen() && SecurityUtils.canModify(request));
+ setVisible(SecurityUtils.canModify(request));
}
@Override
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/BlobUploadPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/BlobUploadPanel.java
index df17fcb260..ec64c14f6a 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/BlobUploadPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/BlobUploadPanel.java
@@ -27,7 +27,7 @@ import com.gitplex.server.git.exception.NotTreeException;
import com.gitplex.server.git.exception.ObjectAlreadyExistsException;
import com.gitplex.server.git.exception.ObsoleteCommitException;
import com.gitplex.server.manager.AccountManager;
-import com.gitplex.server.manager.ReviewManager;
+import com.gitplex.server.manager.PullRequestReviewManager;
import com.gitplex.server.model.Account;
import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.web.component.dropzonefield.DropzoneField;
@@ -85,7 +85,7 @@ abstract class BlobUploadPanel extends Panel {
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
super.onSubmit(target, form);
- ReviewManager reviewManager = GitPlex.getInstance(ReviewManager.class);
+ PullRequestReviewManager reviewManager = GitPlex.getInstance(PullRequestReviewManager.class);
Map<String, BlobContent> newBlobs = new HashMap<>();
for (FileUpload upload: uploads) {
String blobPath = upload.getClientFileName();
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/CommitOptionPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/CommitOptionPanel.java
index ff5b17ff33..b2e2fbe7ee 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/CommitOptionPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/CommitOptionPanel.java
@@ -49,7 +49,7 @@ import com.gitplex.server.git.exception.NotTreeException;
import com.gitplex.server.git.exception.ObjectAlreadyExistsException;
import com.gitplex.server.git.exception.ObsoleteCommitException;
import com.gitplex.server.manager.AccountManager;
-import com.gitplex.server.manager.ReviewManager;
+import com.gitplex.server.manager.PullRequestReviewManager;
import com.gitplex.server.model.Account;
import com.gitplex.server.model.Depot;
import com.gitplex.server.model.PullRequest;
@@ -318,7 +318,7 @@ public class CommitOptionPanel extends Panel {
Map<String, BlobContent> newBlobs = new HashMap<>();
if (newContentProvider != null) {
- if (!GitPlex.getInstance(ReviewManager.class).canModify(SecurityUtils.getAccount(), context.getDepot(),
+ if (!GitPlex.getInstance(PullRequestReviewManager.class).canModify(SecurityUtils.getAccount(), context.getDepot(),
context.getBlobIdent().revision, context.getNewPath())) {
CommitOptionPanel.this.error("Adding of file '" + context.getNewPath() + "' need to be reviewed. "
+ "Please submit pull request instead");
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.java
index 6b723d98b7..73728b98c0 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.java
@@ -560,7 +560,7 @@ public class NewRequestPage extends DepotPage implements CommentSupport {
PullRequest request = getPullRequest();
setVisible(request.getMergeStrategy() != MergeStrategy.DO_NOT_MERGE
- && request.getReviewCheckStatus().getAwaitingReviewers().isEmpty());
+ && request.getReviewStatus().getAwaitingReviewers().isEmpty());
}
}.setOutputMarkupPlaceholderTag(true));
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/PullRequestOperation.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/PullRequestOperation.java
index 1b649ba787..77f1178711 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/PullRequestOperation.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/PullRequestOperation.java
@@ -6,9 +6,10 @@ import com.gitplex.server.GitPlex;
import com.gitplex.server.git.GitUtils;
import com.gitplex.server.manager.AccountManager;
import com.gitplex.server.manager.PullRequestManager;
-import com.gitplex.server.manager.ReviewManager;
+import com.gitplex.server.manager.PullRequestReviewManager;
import com.gitplex.server.model.Account;
import com.gitplex.server.model.PullRequest;
+import com.gitplex.server.model.PullRequestReview;
import com.gitplex.server.model.support.MergePreview;
import com.gitplex.server.security.SecurityUtils;
@@ -35,7 +36,15 @@ public enum PullRequestOperation {
@Override
public void operate(PullRequest request, String comment) {
- GitPlex.getInstance(ReviewManager.class).review(request, true, comment);
+ PullRequestReview review = new PullRequestReview();
+ review.setApproved(true);
+ review.setAutoCheck(false);
+ review.setCheckMerged(false);
+ review.setCommit(request.getHeadCommitHash());
+ review.setNote(comment);
+ review.setRequest(request);
+ review.setUser(SecurityUtils.getAccount());
+ GitPlex.getInstance(PullRequestReviewManager.class).save(review);
}
},
@@ -48,7 +57,15 @@ public enum PullRequestOperation {
@Override
public void operate(PullRequest request, String comment) {
- GitPlex.getInstance(ReviewManager.class).review(request, false, comment);
+ PullRequestReview review = new PullRequestReview();
+ review.setApproved(false);
+ review.setAutoCheck(false);
+ review.setCheckMerged(false);
+ review.setCommit(request.getHeadCommitHash());
+ review.setNote(comment);
+ review.setRequest(request);
+ review.setUser(SecurityUtils.getAccount());
+ GitPlex.getInstance(PullRequestReviewManager.class).save(review);
}
},
@@ -117,7 +134,7 @@ public enum PullRequestOperation {
private static boolean canReview(PullRequest request) {
Account user = GitPlex.getInstance(AccountManager.class).getCurrent();
- return request.getReviewCheckStatus().getAwaitingReviewers().contains(user);
+ return request.getReviewStatus().getAwaitingReviewers().contains(user);
}
public abstract void operate(PullRequest request, @Nullable String comment);