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

[#2179] Extract dossiers_by_exact_id_for_gestionnaire method

Browse source
This commit is contained in:
Frederic Merizen 2018-07-31 14:29:37 +02:00
parent a72388bb37
commit d734f978a3
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/services/dossier_search_service.rb
View file

@ -1,14 +1,7 @@
class DossierSearchService class DossierSearchService
def self.matching_dossiers_for_gestionnaire(search_terms, gestionnaire) def self.matching_dossiers_for_gestionnaire(search_terms, gestionnaire)
# exact id match? # exact id match?
id = search_terms.to_i dossiers = dossier_by_exact_id_for_gestionnaire(search_terms, gestionnaire)
if id != 0 && id_compatible?(id) # Sometimes gestionnaire is searching dossiers with a big number (ex: SIRET), ActiveRecord can't deal with them and throws ActiveModel::RangeError. id_compatible? prevents this.
dossiers = dossiers_by_id(id, gestionnaire)
end
if dossiers.nil?
dossiers = Dossier.none
end
# full text search # full text search
if dossiers.empty? if dossiers.empty?
@ -23,6 +16,17 @@ class DossierSearchService
private private
def self.dossier_by_exact_id_for_gestionnaire(search_terms, gestionnaire)
id = search_terms.to_i
if id != 0 && id_compatible?(id) # Sometimes gestionnaire is searching dossiers with a big number (ex: SIRET), ActiveRecord can't deal with them and throws ActiveModel::RangeError. id_compatible? prevents this.
dossiers = dossiers_by_id(id, gestionnaire)
end
if dossiers.nil?
dossiers = Dossier.none
end
end
def self.dossiers_by_id(id, gestionnaire) def self.dossiers_by_id(id, gestionnaire)
dossiers = gestionnaire.dossiers.where(id: id) + dossiers = gestionnaire.dossiers.where(id: id) +
gestionnaire.dossiers_from_avis.where(id: id) gestionnaire.dossiers_from_avis.where(id: id)