New Members::DestroyService

This is to ensure we don't send unwanted notifications when deleting a
project. In other words, stop abusing AR callbacks and use services.

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

1 files changed, 4 insertions, 2 deletions

diff --git a/app/controllers/concerns/membership_actions.rb b/app/controllers/concerns/membership_actions.rb
index a24273fad0b..b1343576b3c 100644
--- a/app/controllers/concerns/membership_actions.rb
+++ b/app/controllers/concerns/membership_actions.rb
@@ -23,22 +23,24 @@ module MembershipActions
     @member = membershipable.members.find_by(user_id: current_user)
     return render_403 unless @member
 
+    @member = Members::DestroyService.new(@member, current_user).execute
+
     source_type = @member.real_source_type.humanize(capitalize: false)
 
-    if can?(current_user, action_member_permission(:destroy, @member), @member)
+    if @member.destroyed?
       notice =
         if @member.request?
           "Your access request to the #{source_type} has been withdrawn."
         else
           "You left the \"#{@member.source.human_name}\" #{source_type}."
         end
-      @member.destroy
 
       redirect_to [:dashboard, @member.real_source_type.tableize], notice: notice
     else
       if cannot_leave?
         alert = "You can not leave the \"#{@member.source.human_name}\" #{source_type}."
         alert << " Transfer or delete the #{source_type}."
+
         redirect_to polymorphic_url(membershipable), alert: alert
       else
         render_403