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

correctif(usager.fusion): leve une erreur quand on essaie de fusionner un compte sur lui même

Browse source
This commit is contained in:
Martin 2022-10-13 16:44:20 +02:00 • committed by mfo
parent 654d38626b
commit d09c47f5ce
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/models/user.rb
View file

@ -214,6 +214,7 @@ class User < ApplicationRecord
end end
def merge(old_user) def merge(old_user)
raise "Merging same user, no way" if old_user.id == self.id
transaction do transaction do
old_user.dossiers.update_all(user_id: id) old_user.dossiers.update_all(user_id: id)
old_user.invites.update_all(user_id: id) old_user.invites.update_all(user_id: id)

6
spec/models/user_spec.rb
View file

@ -423,7 +423,11 @@ describe User, type: :model do
let(:targeted_user) { create(:user) } let(:targeted_user) { create(:user) }
subject { targeted_user.merge(old_user) } subject { targeted_user.merge(old_user) }
context 'merge myself' do
it 'fails' do
expect { old_user.merge(old_user) }.to raise_error 'Merging same user, no way'
end
end
context 'and the old account has some stuff' do context 'and the old account has some stuff' do
let!(:dossier) { create(:dossier, user: old_user) } let!(:dossier) { create(:dossier, user: old_user) }
let!(:hidden_dossier) { create(:dossier, user: old_user, hidden_by_user_at: 1.hour.ago) } let!(:hidden_dossier) { create(:dossier, user: old_user, hidden_by_user_at: 1.hour.ago) }