Merge pull request #2915 from betagouv/dev

2018-10-26-02
This commit is contained in:
LeSim 2018-10-26 17:02:13 +02:00 committed by GitHub
commit 73ebf6afa6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions

View file

@ -111,7 +111,7 @@ class ProcedurePresentation < ApplicationRecord
column = sanitized_column(filter) column = sanitized_column(filter)
case table case table
when 'self' when 'self'
date = Time.zone.parse(filter['value']) date = Time.zone.parse(filter['value']) rescue nil
if date.present? if date.present?
dossiers.where("#{column} BETWEEN ? AND ?", date, date + 1.day) dossiers.where("#{column} BETWEEN ? AND ?", date, date + 1.day)
else else

View file

@ -406,9 +406,17 @@ describe ProcedurePresentation do
end end
context 'for a malformed date' do context 'for a malformed date' do
context 'when its a string' do
let(:filter) { [{ 'table' => 'self', 'column' => 'updated_at', 'value' => 'malformed date' }] } let(:filter) { [{ 'table' => 'self', 'column' => 'updated_at', 'value' => 'malformed date' }] }
it { is_expected.to match([]) } it { is_expected.to match([]) }
end end
context 'when its a number' do
let(:filter) { [{ 'table' => 'self', 'column' => 'updated_at', 'value' => '177500' }] }
it { is_expected.to match([]) }
end
end
end end
context 'for type_de_champ table' do context 'for type_de_champ table' do