DGNum/demarches-normaliennes
14
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

[#3477] Filter by 'column ilike values' as a scope

Browse source
This commit is contained in:
Frederic Merizen 2019-02-27 12:12:34 +01:00 • committed by Frederic Merizen
parent a87e3ac697
commit 0ba3515d41
2 changed files with 16 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/models/concerns/dossier_filtering_concern.rb
View file

@ -11,5 +11,11 @@ module DossierFilteringConcern
none none
end end
} }
scope :filter_ilike, lambda { |table, column, values|
table_column = ProcedurePresentation.sanitized_column(table, column)
q = Array.new(values.count, "(#{table_column} ILIKE ?)").join(' OR ')
where(q, *(values.map { |value| "%#{value}%" }))
}
end end
end end

35
app/models/procedure_presentation.rb
View file

@ -112,11 +112,10 @@ class ProcedurePresentation < ApplicationRecord
dossiers.filter_by_datetimes(column, dates) dossiers.filter_by_datetimes(column, dates)
when 'type_de_champ', 'type_de_champ_private' when 'type_de_champ', 'type_de_champ_private'
relation = table == 'type_de_champ' ? :champs : :champs_private relation = table == 'type_de_champ' ? :champs : :champs_private
Filter.new( dossiers
dossiers .includes(relation)
.includes(relation) .where("champs.type_de_champ_id = ?", column.to_i)
.where("champs.type_de_champ_id = ?", column.to_i) .filter_ilike(:champ, :value, values)
).where_ilike(:champ, :value, values)
when 'etablissement' when 'etablissement'
if column == 'entreprise_date_creation' if column == 'entreprise_date_creation'
dates = values.map { |v| v.to_date rescue nil } dates = values.map { |v| v.to_date rescue nil }
@ -124,16 +123,14 @@ class ProcedurePresentation < ApplicationRecord
.includes(table) .includes(table)
.where(table.pluralize => { column => dates }) .where(table.pluralize => { column => dates })
else else
Filter.new(
dossiers
.includes(table)
).where_ilike(table, column, values)
end
when 'user', 'individual'
Filter.new(
dossiers dossiers
.includes(table) .includes(table)
).where_ilike(table, column, values) .filter_ilike(table, column, values)
end
when 'user', 'individual'
dossiers
.includes(table)
.filter_ilike(table, column, values)
end.pluck(:id) end.pluck(:id)
end.reduce(:&) end.reduce(:&)
end end
@ -167,18 +164,6 @@ class ProcedurePresentation < ApplicationRecord
private private
class Filter
def initialize(dossiers)
@dossiers = dossiers
end
def where_ilike(table, column, values)
table_column = ProcedurePresentation.sanitized_column(table, column)
q = Array.new(values.count, "(#{table_column} ILIKE ?)").join(' OR ')
@dossiers.where(q, *(values.map { |value| "%#{value}%" }))
end
end
def check_allowed_displayed_fields def check_allowed_displayed_fields
displayed_fields.each do |field| displayed_fields.each do |field|
table = field['table'] table = field['table']