opendev/gerrit
Code Issues Proposed changes

Send event to stream and execute hook when reviewer is added

Browse Source 
When a new reviewer is added on a change, the `reviewer-added`
hook is executed, and the `reviewer-added` event is sent to
the event stream.

This will allow users like automated review bots to monitor the
event stream and take action only when they are explicitly added
as reviewer on a change.

Bug: Issue 1200
Change-Id: I26339360d9e1a5eabb8b6938309d5b411d6cd420
This commit is contained in:
David Pursehouse
2012-09-21 12:50:19 +09:00
committed by Gustaf Lundh
parent 320467f829
commit 2336bd8bac
8 changed files with 108 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
gerrit-server/src/main/java/com/google/gerrit/server/patch/AddReviewer.java
View File

@@ -15,6 +15,7 @@
package com.google.gerrit.server.patch;
import com.google.gerrit.common.ChangeHooks;
import com.google.gerrit.common.data.ApprovalType;
import com.google.gerrit.common.data.ApprovalTypes;
import com.google.gerrit.common.data.ReviewerResult;
@@ -26,6 +27,7 @@ import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.reviewdb.client.PatchSetApproval;
import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.account.AccountCache;
import com.google.gerrit.server.account.AccountResolver;
import com.google.gerrit.server.account.GroupCache;
import com.google.gerrit.server.account.GroupMembers;
@@ -64,6 +66,8 @@ public class AddReviewer implements Callable<ReviewerResult> {
private final IdentifiedUser.GenericFactory identifiedUserFactory;
private final ApprovalCategory.Id addReviewerCategoryId;
private final Config cfg;
private final ChangeHooks hooks;
private final AccountCache accountCache;
private final Change.Id changeId;
private final Collection<String> reviewers;
@@ -76,7 +80,9 @@ public class AddReviewer implements Callable<ReviewerResult> {
final ChangeControl.Factory changeControlFactory, final ReviewDb db,
final IdentifiedUser.GenericFactory identifiedUserFactory,
final IdentifiedUser currentUser, final ApprovalTypes approvalTypes,
final @GerritServerConfig Config cfg, @Assisted final Change.Id changeId,
final @GerritServerConfig Config cfg, final ChangeHooks hooks,
final AccountCache accountCache,
@Assisted final Change.Id changeId,
@Assisted final Collection<String> reviewers,
@Assisted final boolean confirmed) {
this.addReviewerSenderFactory = addReviewerSenderFactory;
@@ -88,6 +94,8 @@ public class AddReviewer implements Callable<ReviewerResult> {
this.identifiedUserFactory = identifiedUserFactory;
this.currentUser = currentUser;
this.cfg = cfg;
this.hooks = hooks;
this.accountCache = accountCache;
final List<ApprovalType> allTypes = approvalTypes.getApprovalTypes();
addReviewerCategoryId =
@@ -197,7 +205,8 @@ public class AddReviewer implements Callable<ReviewerResult> {
//
final Set<Account.Id> added = new HashSet<Account.Id>();
final List<PatchSetApproval> toInsert = new ArrayList<PatchSetApproval>();
final PatchSet.Id psid = control.getChange().currentPatchSetId();
final Change change = control.getChange();
final PatchSet.Id psid = change.currentPatchSetId();
for (final Account.Id reviewer : reviewerIds) {
if (!exists(psid, reviewer)) {
// This reviewer has not entered an approval for this change yet.
@@ -210,6 +219,14 @@ public class AddReviewer implements Callable<ReviewerResult> {
}
db.patchSetApprovals().insert(toInsert);
// Execute hook for added reviewers
//
final PatchSet patchSet = db.patchSets().get(psid);
for (final Account.Id id : added) {
final Account account = accountCache.get(id).getAccount();
hooks.doReviewerAddedHook(change, account, patchSet, db);
}
// Email the reviewers
//
// The user knows they added themselves, don't bother emailing them.