Browse Source

CLDC-4226: use unscoped in block form

pull/3209/head
Nat Dean-Lewis 2 months ago
parent
commit
dde0e692fa
  1. 4
      app/models/log.rb

4
app/models/log.rb

@ -52,8 +52,8 @@ class Log < ApplicationRecord
scope :imported_2023, -> { imported.filter_by_year(2023) }
# TODO: CLDC-4273: use .union in filter_by_organisation rather than raw SQL
scope :filter_by_organisation, lambda { |orgs, _user = nil|
owned = where(owning_organisation: orgs).select(:id)
managed = where(managing_organisation: orgs).select(:id)
owned = unscoped { where(owning_organisation: orgs).select(:id) }
managed = unscoped { where(managing_organisation: orgs).select(:id) }
where("#{table_name}.id = ANY(ARRAY(#{owned.to_sql} UNION #{managed.to_sql}))")
}

Loading…
Cancel
Save