From 66d8f99a30f9e6062f1bff37d5115beddce9b55d Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Tue, 18 Apr 2017 13:36:18 -0400 Subject: Admin reports with accounts (#2092) * Add a ReportFilter class * Add reports and targeted_reports relationships to Account * Use ReportFilter from admin/reports controller * Link to admin/reports filtered views from admin account show view * Add indexes to reports.account_id and reports.target_account_id --- app/models/account.rb | 4 ++++ app/models/report_filter.rb | 30 ++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 app/models/report_filter.rb (limited to 'app/models') diff --git a/app/models/account.rb b/app/models/account.rb index 259a87451..2a10f8345 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -55,6 +55,10 @@ class Account < ApplicationRecord # PuSH subscriptions has_many :subscriptions, dependent: :destroy + # Report relationships + has_many :reports + has_many :targeted_reports, class_name: 'Report', foreign_key: :target_account_id + scope :remote, -> { where.not(domain: nil) } scope :local, -> { where(domain: nil) } scope :without_followers, -> { where('(select count(f.id) from follows as f where f.target_account_id = accounts.id) = 0') } diff --git a/app/models/report_filter.rb b/app/models/report_filter.rb new file mode 100644 index 000000000..56ab28df7 --- /dev/null +++ b/app/models/report_filter.rb @@ -0,0 +1,30 @@ +# frozen_string_literal: true + +class ReportFilter + attr_reader :params + + def initialize(params) + @params = params + end + + def results + scope = Report.unresolved + params.each do |key, value| + scope = scope.merge scope_for(key, value) + end + scope + end + + def scope_for(key, value) + case key.to_sym + when :resolved + Report.resolved + when :account_id + Report.where(account_id: value) + when :target_account_id + Report.where(target_account_id: value) + else + raise "Unknown filter: #{key}" + end + end +end -- cgit