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

do not extract twice the same dossier_id if the dossier is followed twice

Browse source
This commit is contained in:
simon lehericey 2021-05-04 15:37:29 +02:00 committed by Pierre de La Morinerie
parent ef8745fb10
commit 50f679746f
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/models/procedure_presentation.rb
View file

@ -121,6 +121,7 @@ class ProcedurePresentation < ApplicationRecord
.joins('LEFT OUTER JOIN users instructeurs_users ON instructeurs_users.instructeur_id = instructeurs.id')
.order("instructeurs_users.email #{order}")
.pluck(:id)
.uniq
when 'self', 'user', 'individual', 'etablissement', 'groupe_instructeur'
(table == 'self' ? dossiers : dossiers.includes(table))
.order("#{self.class.sanitized_column(table, column)} #{order}")

1
spec/models/procedure_presentation_spec.rb
View file

@ -273,6 +273,7 @@ describe ProcedurePresentation do
before do
create(:follow, dossier: dossier_a, instructeur: create(:instructeur, email: 'abaca@exemple.fr'))
create(:follow, dossier: dossier_a, instructeur: create(:instructeur, email: 'abaca2@exemple.fr'))
create(:follow, dossier: dossier_z, instructeur: create(:instructeur, email: 'zythum@exemple.fr'))
end