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

Merge pull request #6223 from betagouv/main

Browse source 
2021-05-20-02
This commit is contained in:
LeSim 2021-05-20 16:31:46 +02:00 committed by GitHub
commit 1cfedb2bce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/dossier.rb
View file

@ -537,7 +537,7 @@ class Dossier < ApplicationRecord
def avis_for_expert(expert) def avis_for_expert(expert)
Avis Avis
.where(dossier_id: id, confidentiel: false) .where(dossier_id: id, confidentiel: false)
.or(Avis.where(id: expert.avis)) .or(Avis.where(id: expert.avis, dossier_id: id))
.order(created_at: :asc) .order(created_at: :asc)
end end

6
spec/models/dossier_spec.rb
View file

@ -363,6 +363,12 @@ describe Dossier do
it { expect(dossier.avis_for_instructeur(instructeur)).to match([avis_2, avis_1, avis_3]) } it { expect(dossier.avis_for_instructeur(instructeur)).to match([avis_2, avis_1, avis_3]) }
it { expect(dossier.avis_for_expert(expert_1)).to match([avis_2, avis_1, avis_3]) } it { expect(dossier.avis_for_expert(expert_1)).to match([avis_2, avis_1, avis_3]) }
end end
context 'when they are a advice published on another dossier' do
let!(:avis) { create(:avis, dossier: create(:dossier, procedure: procedure), claimant: instructeur, experts_procedure: experts_procedure, confidentiel: false, created_at: Time.zone.parse('9/01/2010')) }
it { expect(dossier.avis_for_expert(expert_1)).to match([]) }
end
end end
describe '#update_state_dates' do describe '#update_state_dates' do