diff --git a/app/models/admin/account_action.rb b/app/models/admin/account_action.rb index 7c66b6e6462..4443d6343b6 100644 --- a/app/models/admin/account_action.rb +++ b/app/models/admin/account_action.rb @@ -185,7 +185,7 @@ class Admin::AccountAction @reports ||= if type == 'none' with_report? ? [report] : [] else - Report.where(target_account: target_account).unresolved + target_account.targeted_reports.unresolved end end diff --git a/app/models/form/account_batch.rb b/app/models/form/account_batch.rb index 4665a586798..98e3be1a0c9 100644 --- a/app/models/form/account_batch.rb +++ b/app/models/form/account_batch.rb @@ -128,7 +128,7 @@ class Form::AccountBatch # Suspending a single account closes their associated reports, so # mass-suspending would be consistent. - Report.where(target_account: account).unresolved.find_each do |report| + account.targeted_reports.unresolved.find_each do |report| authorize(report, :update?) log_action(:resolve, report) report.resolve!(current_account) diff --git a/app/services/delete_account_service.rb b/app/services/delete_account_service.rb index 20d6ee8d64e..6557dda48fb 100644 --- a/app/services/delete_account_service.rb +++ b/app/services/delete_account_service.rb @@ -297,7 +297,7 @@ class DeleteAccountService < BaseService end def reported_status_ids - @reported_status_ids ||= Report.where(target_account: @account).unresolved.pluck(:status_ids).flatten.uniq + @reported_status_ids ||= @account.targeted_reports.unresolved.pluck(:status_ids).flatten.uniq end def associations_for_destruction