opendev/gerrit
Code Issues Proposed changes

Write a change message when approvals are removed

Browse Source 
If the approvals of a reviewer are removed (e.g. by the project owner)
this is now recorded as a change message so that it later can be seen
who removed the approvals.

This change only affects removing reviewers on ChangeScreen2. If a
reviewer is removed on the old change screen there is still no
message.

Bug: issue 1300
Change-Id: Ibe95d1835e065d6c142edbf53e2ce483c4dc4889
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
This commit is contained in:
Edwin Kempin
2013-12-04 11:39:36 +01:00
parent b8dff0376a
commit d709df68f7
1 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteReviewer.java
View File

@@ -23,17 +23,21 @@ import com.google.gerrit.extensions.restapi.Response;
import com.google.gerrit.extensions.restapi.RestModifyView;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.ChangeMessage;
import com.google.gerrit.reviewdb.client.PatchSetApproval;
import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.ChangeUtil;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.change.DeleteReviewer.Input;
import com.google.gerrit.server.index.ChangeIndexer;
import com.google.gerrit.server.project.ChangeControl;
import com.google.gerrit.server.util.TimeUtil;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import com.google.inject.Provider;
import java.io.IOException;
import java.util.Collections;
import java.util.List;
public class DeleteReviewer implements RestModifyView<ReviewerResource, Input> {
@@ -42,11 +46,14 @@ public class DeleteReviewer implements RestModifyView<ReviewerResource, Input> {
private final Provider<ReviewDb> dbProvider;
private final ChangeIndexer indexer;
private final IdentifiedUser.GenericFactory userFactory;
@Inject
DeleteReviewer(Provider<ReviewDb> dbProvider, ChangeIndexer indexer) {
DeleteReviewer(Provider<ReviewDb> dbProvider, ChangeIndexer indexer,
IdentifiedUser.GenericFactory userFactory) {
this.dbProvider = dbProvider;
this.indexer = indexer;
this.userFactory = userFactory;
}
@Override
@@ -56,12 +63,22 @@ public class DeleteReviewer implements RestModifyView<ReviewerResource, Input> {
ChangeControl control = rsrc.getControl();
Change.Id changeId = rsrc.getChange().getId();
ReviewDb db = dbProvider.get();
StringBuilder msg = new StringBuilder();
db.changes().beginTransaction(changeId);
try {
List<PatchSetApproval> del = Lists.newArrayList();
for (PatchSetApproval a : approvals(db, rsrc)) {
if (control.canRemoveReviewer(a)) {
del.add(a);
if (a.getValue() != 0) {
if (msg.length() == 0) {
msg.append("Removed the following approvals:\n\n");
}
msg.append("* ")
.append(a.getLabel()).append(formatLabelValue(a.getValue()))
.append(" by ").append(userFactory.create(a.getAccountId()).getNameEmail())
.append("\n");
}
} else {
throw new AuthException("delete not permitted");
}
@@ -71,6 +88,17 @@ public class DeleteReviewer implements RestModifyView<ReviewerResource, Input> {
}
ChangeUtil.bumpRowVersionNotLastUpdatedOn(rsrc.getChange().getId(), db);
db.patchSetApprovals().delete(del);
if (msg.length() > 0) {
ChangeMessage changeMessage =
new ChangeMessage(new ChangeMessage.Key(rsrc.getChange().getId(),
ChangeUtil.messageUUID(db)),
((IdentifiedUser) control.getCurrentUser()).getAccountId(),
TimeUtil.nowTs(), rsrc.getChange().currentPatchSetId());
changeMessage.setMessage(msg.toString());
db.changeMessages().insert(Collections.singleton(changeMessage));
}
db.commit();
} finally {
db.rollback();
@@ -79,6 +107,14 @@ public class DeleteReviewer implements RestModifyView<ReviewerResource, Input> {
return Response.none();
}
private static String formatLabelValue(short value) {
if (value > 0) {
return "+" + value;
} else {
return Short.toString(value);
}
}
private Iterable<PatchSetApproval> approvals(ReviewDb db,
ReviewerResource rsrc) throws OrmException {
final Account.Id user = rsrc.getUser().getAccountId();