Embroil it in controversery

pull/30654/head
Matt Jankowski 2024-06-11 11:44:11 -04:00
parent 47fd8bd086
commit bedd1173e1
3 changed files with 8 additions and 10 deletions

View File

@ -32,11 +32,7 @@ class Admin::Metrics::Measure::InstanceStatusesMeasure < Admin::Metrics::Measure
.select(:id)
.joins(:account)
.where(account_domain_sql, domain: params[:domain])
.where(
<<~SQL.squish, earliest_status_id: earliest_status_id, latest_status_id: latest_status_id
statuses.id BETWEEN :earliest_status_id AND :latest_status_id
SQL
)
.where(status_range_sql, earliest_status_id: earliest_status_id, latest_status_id: latest_status_id)
.where(daily_period(:statuses))
end

View File

@ -43,6 +43,12 @@ module Admin::Metrics::Measure::QueryHelper
SQL
end
def status_range_sql
<<~SQL.squish
statuses.id BETWEEN :earliest_status_id AND :latest_status_id
SQL
end
def account_domain_sql
if params[:include_subdomains]
<<~SQL.squish

View File

@ -28,11 +28,7 @@ class Admin::Metrics::Measure::TagServersMeasure < Admin::Metrics::Measure::Base
.reorder(nil)
.joins(:tags, :account)
.where(statuses_tags: { tag_id: tag.id })
.where(
<<~SQL.squish, earliest_status_id: earliest_status_id, latest_status_id: latest_status_id
statuses.id BETWEEN :earliest_status_id AND :latest_status_id
SQL
)
.where(status_range_sql, earliest_status_id: earliest_status_id, latest_status_id: latest_status_id)
.where(daily_period(:statuses))
end