summaryrefslogtreecommitdiffstats
path: root/app/controllers/admin/reports_controller.rb
diff options
context:
space:
mode:
authorMatt Jankowski <mjankowski@thoughtbot.com>2017-04-14 05:10:28 -0400
committerEugen <eugen@zeonfederated.com>2017-04-14 11:10:28 +0200
commit8b74aa42176dabf77c3b4d02c80bcc47d9d70e8e (patch)
treef39b6c185db42639a6bf43ac8cb4bc621dfc2f20 /app/controllers/admin/reports_controller.rb
parenta6807201d2003fc0d544813ba67cfe315d829e06 (diff)
Admin reports controller improvements (#1714)
* Simplify admin/reports controller filtering for index * Rename parameter to resolved * Fix issue where reports view could not access filter_link_to * Add coverage for admin/reports controller * DRY up resolution of related reports for target account * Clean up admin/reports routes * Add Report#statuses method * DRY up current account action taken params * Rubocop styles
Diffstat (limited to 'app/controllers/admin/reports_controller.rb')
-rw-r--r--app/controllers/admin/reports_controller.rb60
1 files changed, 41 insertions, 19 deletions
diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb
index 3c3082318e1..4a6f9ea7f62 100644
--- a/app/controllers/admin/reports_controller.rb
+++ b/app/controllers/admin/reports_controller.rb
@@ -5,37 +5,59 @@ module Admin
before_action :set_report, except: [:index]
def index
- @reports = Report.includes(:account, :target_account).order('id desc').page(params[:page])
- @reports = params[:action_taken].present? ? @reports.resolved : @reports.unresolved
+ @reports = filtered_reports.page(params[:page])
end
- def show
- @statuses = Status.where(id: @report.status_ids)
- end
+ def show; end
- def resolve
- @report.update(action_taken: true, action_taken_by_account_id: current_account.id)
+ def update
+ process_report
redirect_to admin_report_path(@report)
end
- def suspend
- Admin::SuspensionWorker.perform_async(@report.target_account.id)
- Report.unresolved.where(target_account: @report.target_account).update_all(action_taken: true, action_taken_by_account_id: current_account.id)
- redirect_to admin_report_path(@report)
+ private
+
+ def process_report
+ case params[:outcome].to_s
+ when 'resolve'
+ @report.update(action_taken_by_current_attributes)
+ when 'suspend'
+ Admin::SuspensionWorker.perform_async(@report.target_account.id)
+ resolve_all_target_account_reports
+ when 'silence'
+ @report.target_account.update(silenced: true)
+ resolve_all_target_account_reports
+ else
+ raise ActiveRecord::RecordNotFound
+ end
end
- def silence
- @report.target_account.update(silenced: true)
- Report.unresolved.where(target_account: @report.target_account).update_all(action_taken: true, action_taken_by_account_id: current_account.id)
- redirect_to admin_report_path(@report)
+ def action_taken_by_current_attributes
+ { action_taken: true, action_taken_by_account_id: current_account.id }
end
- def remove
- RemovalWorker.perform_async(params[:status_id])
- redirect_to admin_report_path(@report)
+ def resolve_all_target_account_reports
+ unresolved_reports_for_target_account.update_all(
+ action_taken_by_current_attributes
+ )
end
- private
+ def unresolved_reports_for_target_account
+ Report.where(
+ target_account: @report.target_account
+ ).unresolved
+ end
+
+ def filtered_reports
+ filtering_scope.order('id desc').includes(
+ :account,
+ :target_account
+ )
+ end
+
+ def filtering_scope
+ params[:resolved].present? ? Report.resolved : Report.unresolved
+ end
def set_report
@report = Report.find(params[:id])