Send email when staged changes are restored back to new status

When rebuilding of staging ref fails and already staged changes
are restore back to new status, now also email notification is sent.

Fixes: QTQAINFRA-4329
Change-Id: Ie8a18b9c0a5ea3cc0898013f56861f4c388ef6aa
Reviewed-by: Tor Arne Vestbø <[email protected]>

Author: jujokini

src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandBuildApprove.java

@@ -19,7 +19,6 @@
 import com.google.gerrit.server.extensions.events.GitReferenceUpdated;
 import com.google.gerrit.server.git.CodeReviewCommit;
 import com.google.gerrit.server.git.GitRepositoryManager;
-import com.google.gerrit.server.mail.send.MergedSender;
 import com.google.gerrit.server.notedb.ChangeNotes;
 import com.google.gerrit.server.permissions.PermissionBackend;
 import com.google.gerrit.server.permissions.PermissionBackendException;
@@ -67,10 +66,6 @@ class QtCommandBuildApprove extends SshCommand {
 
   @Inject private GitRepositoryManager gitManager;
 
-  @Inject private MergedSender.Factory mergedSenderFactory;
-
-  @Inject QtBuildFailedSender.Factory qtBuildFailedSenderFactory;
-
   @Inject private BatchUpdate.Factory updateFactory;
 
   @Inject private PatchSetInserter.Factory patchSetInserterFactory;
@@ -81,6 +76,8 @@ class QtCommandBuildApprove extends SshCommand {
 
   @Inject private QtUtil qtUtil;
 
+  @Inject private QtEmailSender qtEmailSender;
+
   @Inject private QtChangeUpdateOp.Factory qtUpdateFactory;
 
   private final ReentrantLock buildApproveLock = new ReentrantLock();
@@ -333,12 +330,12 @@ private void updateChanges(
       if (passed) {
         qtUtil.postChangeIntegrationPassEvent(change);
         sendMergeEvent(cd);
-        sendMergedEmail(change.getId());
+        qtEmailSender.sendMergedEmail(projectKey, change.getId(), user.getAccountId());
         logger.atInfo().log(
             "qtcodereview: staging-approve     change %s merged into %s", change, destBranchKey);
       } else {
         qtUtil.postChangeIntegrationFailEvent(change);
-        sendBuildFailedEmail(change.getId());
+        qtEmailSender.sendBuildFailedEmail(projectKey, change.getId(), user.getAccountId(), message);
         logger.atInfo().log(
             "qtcodereview: staging-approve     change %s rejected for %s", change, destBranchKey);
       }
@@ -389,27 +386,4 @@ private void readMessageParameter() throws UnloggedFailure {
     }
   }
 
-  private void sendMergedEmail(Change.Id changeId) {
-    try {
-      MergedSender mcm = mergedSenderFactory.create(projectKey, changeId);
-      mcm.setFrom(user.getAccountId());
-      mcm.send();
-    } catch (Exception e) {
-      logger.atWarning().log(
-          "qtcodereview: staging-approve Merged notification not sent for %s %s", changeId, e);
-    }
-  }
-
-  private void sendBuildFailedEmail(Change.Id changeId) {
-    try {
-      QtBuildFailedSender cm = qtBuildFailedSenderFactory.create(projectKey, changeId);
-      cm.setFrom(user.getAccountId());
-      cm.setChangeMessage(message, TimeUtil.nowTs());
-      cm.send();
-    } catch (Exception e) {
-      logger.atWarning().log(
-          "qtcodereview: staging-approve Build Failed not sent notification for %s %s",
-          changeId, e);
-    }
-  }
 }

src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtEmailSender.java

@@ -0,0 +1,47 @@
+//
+// Copyright (C) 2021 The Qt Company
+//
+
+package com.googlesource.gerrit.plugins.qtcodereview;
+
+import com.google.common.flogger.FluentLogger;
+import com.google.gerrit.entities.Account;
+import com.google.gerrit.entities.Change;
+import com.google.gerrit.entities.Project;
+import com.google.gerrit.server.mail.send.MergedSender;
+import com.google.gerrit.server.util.time.TimeUtil;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+
+@Singleton
+public class QtEmailSender {
+
+  @Inject private MergedSender.Factory mergedSenderFactory;
+
+  @Inject private QtBuildFailedSender.Factory qtBuildFailedSenderFactory;
+
+  private static final FluentLogger logger = FluentLogger.forEnclosingClass();
+
+  public void sendMergedEmail(Project.NameKey projectKey, Change.Id changeId,
+      Account.Id fromAccount) {
+    try {
+      MergedSender mcm = mergedSenderFactory.create(projectKey, changeId);
+      mcm.setFrom(fromAccount);
+      mcm.send();
+    } catch (Exception e) {
+      logger.atWarning().log("Merged notification not sent for %s %s", changeId, e);
+    }
+  }
+
+  public void sendBuildFailedEmail(Project.NameKey projectKey, Change.Id changeId,
+      Account.Id fromAccount, String message) {
+    try {
+      QtBuildFailedSender cm = qtBuildFailedSenderFactory.create(projectKey, changeId);
+      cm.setFrom(fromAccount);
+      cm.setChangeMessage(message, TimeUtil.nowTs());
+      cm.send();
+    } catch (Exception e) {
+      logger.atWarning().log("Build Failed not sent notification for %s %s", changeId, e);
+    }
+  }
+}

src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtUtil.java

@@ -94,6 +94,7 @@ public class QtUtil {
   private final EventFactory eventFactory;
   private final QtCherryPickPatch qtCherryPickPatch;
   private final QtChangeUpdateOp.Factory qtUpdateFactory;
+  private final QtEmailSender qtEmailSender;
 
   @Inject
   QtUtil(
@@ -104,7 +105,8 @@ public class QtUtil {
       EventFactory eventFactory,
       DynamicItem<EventDispatcher> eventDispatcher,
       QtCherryPickPatch qtCherryPickPatch,
-      QtChangeUpdateOp.Factory qtUpdateFactory) {
+      QtChangeUpdateOp.Factory qtUpdateFactory,
+      QtEmailSender qtEmailSender) {
     this.queryProvider = queryProvider;
     this.referenceUpdated = referenceUpdated;
     this.updateFactory = updateFactory;
@@ -113,6 +115,7 @@ public class QtUtil {
     this.eventFactory = eventFactory;
     this.qtCherryPickPatch = qtCherryPickPatch;
     this.qtUpdateFactory = qtUpdateFactory;
+    this.qtEmailSender = qtEmailSender;
   }
 
   public static class MergeConflictException extends Exception {
@@ -463,6 +466,12 @@ public void rebuildStagingBranch(
         logger.atSevere().log(
             "qtcodereview: staging ref rebuild. Failed to update change status %s", ex);
       }
+
+      for (ChangeData item : changes_staged) {
+        Change change = item.change();
+        qtEmailSender.sendBuildFailedEmail(projectKey, change.getId(), user.getAccountId(),
+            message);
+      }
     }
 
     try {