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

fix(merge): transfers hidden procedures

Browse source
This commit is contained in:
simon lehericey 2022-11-07 14:11:05 +01:00
parent f391207919
commit 1760ccbc01
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/models/administrateur.rb
View file

@ -110,7 +110,9 @@ class Administrateur < ApplicationRecord
def merge(old_admin) def merge(old_admin)
return if old_admin.nil? return if old_admin.nil?
procedures_with_new_admin, procedures_without_new_admin = old_admin.procedures procedures_with_new_admin, procedures_without_new_admin = old_admin
.procedures
.with_discarded
.partition { |p| p.administrateurs.exists?(id) } .partition { |p| p.administrateurs.exists?(id) }
procedures_with_new_admin.each do |p| procedures_with_new_admin.each do |p|

7
spec/models/administrateur_spec.rb
View file

@ -91,16 +91,17 @@ describe Administrateur, type: :model do
context 'when the old admin has a procedure' do context 'when the old admin has a procedure' do
let(:procedure) { create(:procedure) } let(:procedure) { create(:procedure) }
let(:discarded_procedure) { create(:procedure, :discarded) }
before do before do
old_admin.procedures << procedure old_admin.procedures << procedure << discarded_procedure
subject subject
[new_admin, old_admin].map(&:reload) [new_admin, old_admin].map(&:reload)
end end
it 'transfers the procedure' do it 'transfers the procedure' do
expect(new_admin.procedures).to match_array(procedure) expect(new_admin.procedures.with_discarded).to match_array([procedure, discarded_procedure])
expect(old_admin.procedures).to be_empty expect(old_admin.procedures.with_discarded).to be_empty
end end
end end