Factorize members mails into a new Emails::Members module

Signed-off-by: Rémy Coutable <remy@rymai.me>

1 files changed, 16 insertions, 14 deletions

diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb
index cd11feb9d7a..259199f6e2b 100644
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -175,23 +175,24 @@ class NotificationService
 
   # Project access request
   def new_project_access_request(project_member)
-    mailer.project_access_requested_email(project_member.id).deliver_later
+    mailer.member_access_requested_email('project', project_member.id).deliver_later
   end
 
   def decline_project_access_request(project, user)
-    mailer.project_access_denied_email(project.id, user.id).deliver_later
+    mailer.member_access_denied_email('project', project.id, user.id).deliver_later
   end
 
   def invite_project_member(project_member, token)
-    mailer.project_member_invited_email(project_member.id, token).deliver_later
+    mailer.member_invited_email('project', project_member.id, token).deliver_later
   end
 
   def accept_project_invite(project_member)
-    mailer.project_invite_accepted_email(project_member.id).deliver_later
+    mailer.member_invite_accepted_email('project', project_member.id).deliver_later
   end
 
   def decline_project_invite(project_member)
-    mailer.project_invite_declined_email(
+    mailer.member_invite_declined_email(
+      'project',
       project_member.project.id,
       project_member.invite_email,
       project_member.access_level,
@@ -200,32 +201,33 @@ class NotificationService
   end
 
   def new_project_member(project_member)
-    mailer.project_access_granted_email(project_member.id).deliver_later
+    mailer.member_access_granted_email('project', project_member.id).deliver_later
   end
 
   def update_project_member(project_member)
-    mailer.project_access_granted_email(project_member.id).deliver_later
+    mailer.member_access_granted_email('project', project_member.id).deliver_later
   end
 
   # Group access request
   def new_group_access_request(group_member)
-    mailer.group_access_requested_email(group_member.id).deliver_later
+    mailer.member_access_requested_email('group', group_member.id).deliver_later
   end
 
   def decline_group_access_request(group, user)
-    mailer.group_access_denied_email(group.id, user.id).deliver_later
+    mailer.member_access_denied_email('group', group.id, user.id).deliver_later
   end
 
   def invite_group_member(group_member, token)
-    mailer.group_member_invited_email(group_member.id, token).deliver_later
+    mailer.member_invited_email('group', group_member.id, token).deliver_later
   end
 
   def accept_group_invite(group_member)
-    mailer.group_invite_accepted_email(group_member.id).deliver_later
+    mailer.member_invite_accepted_email(group_member.id).deliver_later
   end
 
   def decline_group_invite(group_member)
-    mailer.group_invite_declined_email(
+    mailer.member_invite_declined_email(
+      'group',
       group_member.group.id,
       group_member.invite_email,
       group_member.access_level,
@@ -234,11 +236,11 @@ class NotificationService
   end
 
   def new_group_member(group_member)
-    mailer.group_access_granted_email(group_member.id).deliver_later
+    mailer.member_access_granted_email('group', group_member.id).deliver_later
   end
 
   def update_group_member(group_member)
-    mailer.group_access_granted_email(group_member.id).deliver_later
+    mailer.member_access_granted_email('group', group_member.id).deliver_later
   end
 
   def project_was_moved(project, old_path_with_namespace)