Clearify who deletes the user

CHANGELOG

@@ -39,6 +39,7 @@ v 8.6.0 (unreleased)
   - Add ability to show archived projects on dashboard, explore and group pages
   - Move group activity to separate page
   - Continue parameters are checked to ensure redirection goes to the same instance
+  - User deletion is now done in the background so the request can not time out
 
 v 8.5.6
   - Obtain a lease before querying LDAP
@@ -60,7 +61,6 @@ v 8.5.3
   - Show commit message in JIRA mention comment
   - Makes issue page and merge request page usable on mobile browsers.
   - Improved UI for profile settings
-  - User deletion is now done in the background so the request can not time out
 
 v 8.5.2
   - Fix sidebar overlapping content when screen width was below 1200px

app/controllers/admin/abuse_reports_controller.rb

@@ -6,7 +6,7 @@ class Admin::AbuseReportsController < Admin::ApplicationController
   def destroy
     abuse_report = AbuseReport.find(params[:id])
 
-    abuse_report.remove_user(current_user) if params[:remove_user]
+    abuse_report.remove_user(deleted_by: current_user) if params[:remove_user]
     abuse_report.destroy
 
     render nothing: true

app/models/abuse_report.rb

@@ -19,9 +19,9 @@ class AbuseReport < ActiveRecord::Base
   validates :message, presence: true
   validates :user_id, uniqueness: { message: 'has already been reported' }
 
-  def remove_user(current_user)
+  def remove_user(deleted_by:)
     user.block
-    DeleteUserWorker.perform_async(current_user.id, user.id, force: true)
+    DeleteUserWorker.perform_async(deleted_by.id, user.id, delete_solo_owned_groups: true)
   end
 
   def notify

app/services/delete_user_service.rb

@@ -6,7 +6,7 @@ class DeleteUserService
   end
 
   def execute(user, options = {})
-    if !options[:force] && user.solo_owned_groups.present?
+    if !options[:delete_solo_owned_groups] && user.solo_owned_groups.present?
       user.errors[:base] << 'You must transfer ownership or delete groups before you can remove user'
       return user
     end

spec/models/abuse_report_spec.rb

@@ -32,13 +32,14 @@ RSpec.describe AbuseReport, type: :model do
 
   describe '#remove_user' do
     it 'blocks the user' do
-      expect { subject.remove_user(user) }.to change { subject.user.blocked? }.to(true)
+      expect { subject.remove_user(deleted_by: user) }.to change { subject.user.blocked? }.to(true)
     end
 
     it 'lets a worker delete the user' do
-      expect(DeleteUserWorker).to receive(:perform_async).with(user.id, subject.user.id, force: true)
+      expect(DeleteUserWorker).to receive(:perform_async).with(user.id, subject.user.id,
+                                                              delete_solo_owned_groups: true)
 
-      subject.remove_user(user)
+      subject.remove_user(deleted_by: user)
     end
   end
 

spec/workers/delete_user_worker_spec.rb

@@ -43,7 +43,7 @@ describe DeleteUserWorker do
 
       before do
         solo_owned.group_members = [member]
-        DeleteUserWorker.new.perform(current_user.id, user.id, "force" => true)
+        DeleteUserWorker.new.perform(current_user.id, user.id, "delete_solo_owned_groups" => true)
       end
 
       it 'deletes solo owned groups' do