N’envoie plus de notification en cas d’ajout automatique

betagouv · Sep 17, 2024 · 04113f3 · 04113f3
1 parent c04490d
commit 04113f3
Showing 1 changed file with 48 additions and 45 deletions.
diff --git a/app/services/NotificationService.scala b/app/services/NotificationService.scala
@@ -81,55 +81,58 @@ class NotificationService @Inject() (
 
   // Note: application does not contain answer at this point
   def newAnswer(application: Application, answer: Answer): Unit = {
-    // Retrieve data
-    val userIds = (application.invitedUsers ++ answer.invitedUsers).keys
-    val users = userService.byIds(userIds.toList)
-    val (allGroups, alreadyPresentGroupIds): (List[UserGroup], Set[UUID]) = {
-      val allGroupIds = application.invitedGroups.union(answer.invitedGroupIds.toSet)
-      (
-        groupService
-          .byIds(allGroupIds.toList)
-          .filter(_.email.nonEmpty),
-        application.invitedGroups
-      )
-    }
-
-    // Send emails to users
-    users
-      .flatMap { user =>
-        if (user.id === answer.creatorUserID) {
-          None
-        } else if (
-          !Authorization.canSeeAnswer(answer, application)(Authorization.readUserRights(user))
-        ) {
-          None
-        } else if (answer.invitedUsers.contains(user.id)) {
-          Some(generateInvitationEmail(application, Some(answer))(user))
-        } else {
-          Some(generateAnswerEmail(application, answer)(user))
-        }
+    val shouldNotify = answer.answerType =!= Answer.AnswerType.InviteThroughGroupPermission
+    if shouldNotify then {
+      // Retrieve data
+      val userIds = (application.invitedUsers ++ answer.invitedUsers).keys
+      val users = userService.byIds(userIds.toList)
+      val (allGroups, alreadyPresentGroupIds): (List[UserGroup], Set[UUID]) = {
+        val allGroupIds = application.invitedGroups.union(answer.invitedGroupIds.toSet)
+        (
+          groupService
+            .byIds(allGroupIds.toList)
+            .filter(_.email.nonEmpty),
+          application.invitedGroups
+        )
       }
-      .foreach(email => emailsService.sendBlocking(email, EmailPriority.Normal))
 
-    val usersEmails: Set[String] = users.map(_.email).toSet
-
-    // Send emails to groups
-    allGroups
-      .collect {
-        case group @ UserGroup(id, _, _, _, _, _, _, Some(email), _, _)
-            if !usersEmails.contains(email) =>
-          if (alreadyPresentGroupIds.contains(id))
-            generateNotificationBALEmail(application, answer.some, users)(group)
-          else
-            generateNotificationBALEmail(application, Option.empty[Answer], users)(group)
-      }
-      .foreach(email => emailsService.sendBlocking(email, EmailPriority.Normal))
+      // Send emails to users
+      users
+        .flatMap { user =>
+          if (user.id === answer.creatorUserID) {
+            None
+          } else if (
+            !Authorization.canSeeAnswer(answer, application)(Authorization.readUserRights(user))
+          ) {
+            None
+          } else if (answer.invitedUsers.contains(user.id)) {
+            Some(generateInvitationEmail(application, Some(answer))(user))
+          } else {
+            Some(generateAnswerEmail(application, answer)(user))
+          }
+        }
+        .foreach(email => emailsService.sendBlocking(email, EmailPriority.Normal))
 
-    if (answer.visibleByHelpers && answer.creatorUserID =!= application.creatorUserId) {
-      userService
-        .byId(application.creatorUserId)
-        .map(generateAnswerEmail(application, answer))
+      val usersEmails: Set[String] = users.map(_.email).toSet
+
+      // Send emails to groups
+      allGroups
+        .collect {
+          case group @ UserGroup(id, _, _, _, _, _, _, Some(email), _, _)
+              if !usersEmails.contains(email) =>
+            if (alreadyPresentGroupIds.contains(id))
+              generateNotificationBALEmail(application, answer.some, users)(group)
+            else
+              generateNotificationBALEmail(application, Option.empty[Answer], users)(group)
+        }
         .foreach(email => emailsService.sendBlocking(email, EmailPriority.Normal))
+
+      if (answer.visibleByHelpers && answer.creatorUserID =!= application.creatorUserId) {
+        userService
+          .byId(application.creatorUserId)
+          .map(generateAnswerEmail(application, answer))
+          .foreach(email => emailsService.sendBlocking(email, EmailPriority.Normal))
+      }
     }
   }