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

feat: do not suggest unconfirmed experts

Browse source
This commit is contained in:
simon lehericey 2024-04-16 15:26:06 +02:00
parent 1502635327
commit 8d95df2250
No known key found for this signature in database
GPG key ID: CDE670D827C7B3C5
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/models/expert.rb
View file

@ -33,6 +33,7 @@ class Expert < ApplicationRecord
experts = Expert
.joins(:experts_procedures, :user)
.where(experts_procedures: { procedure: procedure })
.where.not(users: { confirmed_at: nil })
if procedure.experts_require_administrateur_invitation?
experts = experts

9
spec/models/expert_spec.rb
View file

@ -101,16 +101,17 @@ RSpec.describe Expert, type: :model do
let(:procedure) { create(:procedure, experts_require_administrateur_invitation: true) }
let(:expert) { create(:expert) }
let(:revoked_expert) { create(:expert) }
let(:unconfirmed_expert) { create(:expert) }
before do
procedure.experts << expert << revoked_expert
procedure.experts << expert << revoked_expert << unconfirmed_expert
ExpertsProcedure.find_by(expert: revoked_expert, procedure: procedure)
.update!(revoked_at: 1.day.ago)
unconfirmed_expert.user.update!(confirmed_at: nil)
end
context 'when procedure experts need administrateur invitation' do
it 'returns only not revoked experts' do
it 'returns only confirmed not revoked experts' do
expect(subject).to eq([expert.user.email])
end
end
@ -118,7 +119,7 @@ RSpec.describe Expert, type: :model do
context 'when procedure experts can be anyone' do
let(:procedure) { create(:procedure, experts_require_administrateur_invitation: false) }
it 'prefill autocomplete with all experts in the procedure' do
it 'prefill autocomplete with all confirmed experts in the procedure' do
expect(subject).to eq([expert.user.email, revoked_expert.user.email])
end
end