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

[#3477] Do not use string interpolation for where_datetime_matches

Browse source
This commit is contained in:
Frederic Merizen 2019-02-26 16:53:31 +01:00 • committed by Frederic Merizen
parent 664956d8c6
commit 3c96c2e83d
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/models/procedure_presentation.rb
View file

@ -112,7 +112,7 @@ class ProcedurePresentation < ApplicationRecord
.compact
Filter.new(
dossiers
).where_datetime_matches(table_column, dates)
).where_datetime_matches(column, dates)
when 'type_de_champ', 'type_de_champ_private'
relation = table == 'type_de_champ' ? :champs : :champs_private
Filter.new(
@ -176,11 +176,11 @@ class ProcedurePresentation < ApplicationRecord
@dossiers = dossiers
end
def where_datetime_matches(table_column, dates)
dates = dates.flat_map { |d| [d, d + 1.day] }
def where_datetime_matches(column, dates)
if dates.present?
q = Array.new(dates.count / 2, "(#{table_column} BETWEEN ? AND ?)").join(' OR ')
@dossiers.where(q, *dates)
dates
.map { |date| @dossiers.where(column => date..(date + 1.day)) }
.reduce(:or)
else
[]
end