From 106e1d996ce3c68ad3144b7604a01681a6a661d7 Mon Sep 17 00:00:00 2001
From: Thomas Kranitsas <thomas.kranitsas@topcoder.com>
Date: Wed, 26 Jan 2022 17:11:28 +0200
Subject: [PATCH 1/2] Fix submitted email

---
 src/services/ChallengeService.js | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/services/ChallengeService.js b/src/services/ChallengeService.js
index 796116ad..c5b2bf6d 100644
--- a/src/services/ChallengeService.js
+++ b/src/services/ChallengeService.js
@@ -1096,16 +1096,6 @@ async function createChallenge (currentUser, challenge, userToken) {
 
   // post bus event
   await helper.postBusEvent(constants.Topics.ChallengeCreated, ret)
-  // send email notification
-  if (challenge.legacy.selfService && currentUser.handle) {
-    await helper.sendSelfServiceNotification(
-      constants.SelfServiceNotificationTypes.WORK_REQUEST_SUBMITTED,
-      [{ userId: currentUser.userId }],
-      {
-        handle: currentUser.handle,
-        workItemName: ret.name
-      })
-  }
   return ret
 }
 
@@ -1391,6 +1381,7 @@ async function validateWinners (winners, challengeId) {
  */
 async function update (currentUser, challengeId, data, isFull) {
   const cancelReason = _.cloneDeep(data.cancelReason)
+  let sendActivationEmail = false
   delete data.cancelReason
   if (!_.isUndefined(_.get(data, 'legacy.reviewType'))) {
     _.set(data, 'legacy.reviewType', _.toUpper(_.get(data, 'legacy.reviewType')))
@@ -1417,6 +1408,7 @@ async function update (currentUser, challengeId, data, isFull) {
     try {
       const selfServiceProjectName = `Self service - ${currentUser.createdBy} - ${challenge.name}`
       await helper.activateProject(challenge.projectId, currentUser, selfServiceProjectName, challenge.description)
+      sendActivationEmail = true
     } catch (e) {
       await update(
         currentUser,
@@ -1901,6 +1893,15 @@ async function update (currentUser, challengeId, data, isFull) {
       doc: challenge
     }
   })
+  if (challenge.legacy.selfService && currentUser.handle) {
+    await helper.sendSelfServiceNotification(
+      constants.SelfServiceNotificationTypes.WORK_REQUEST_SUBMITTED,
+      [{ email: currentUser.email }],
+      {
+        handle: currentUser.handle,
+        workItemName: challenge.name
+      })
+  }
   return challenge
 }
 

From 7e14aa045dcfdd7c2b21896b2282f240f7a7aba9 Mon Sep 17 00:00:00 2001
From: Thomas Kranitsas <thomas.kranitsas@topcoder.com>
Date: Wed, 26 Jan 2022 17:12:13 +0200
Subject: [PATCH 2/2] only send email on activation

---
 src/services/ChallengeService.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/services/ChallengeService.js b/src/services/ChallengeService.js
index c5b2bf6d..c40ddcec 100644
--- a/src/services/ChallengeService.js
+++ b/src/services/ChallengeService.js
@@ -1893,7 +1893,7 @@ async function update (currentUser, challengeId, data, isFull) {
       doc: challenge
     }
   })
-  if (challenge.legacy.selfService && currentUser.handle) {
+  if (sendActivationEmail && challenge.legacy.selfService && currentUser.handle) {
     await helper.sendSelfServiceNotification(
       constants.SelfServiceNotificationTypes.WORK_REQUEST_SUBMITTED,
       [{ email: currentUser.email }],