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

Revert "Merge pull request #5576 from tchak/soft-delete-users"

Browse source 
This reverts commit bf0d3914ce, reversing
changes made to 503527459e.
This commit is contained in:
clemkeirua 2020-09-17 15:39:16 +02:00
parent e0834bf4f5
commit 0307beecd6
5 changed files with 5 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

39
app/models/user.rb
View file

@ -8,8 +8,6 @@
# confirmed_at :datetime
# current_sign_in_at :datetime
# current_sign_in_ip :string
# discard_reason :string
# discarded_at :datetime
# email :string default(""), not null
# encrypted_password :string default(""), not null
# failed_attempts :integer default(0), not null
@ -31,7 +29,6 @@
#
class User < ApplicationRecord
include EmailSanitizableConcern
include Discard::Model
enum loged_in_with_france_connect: {
particulier: 'particulier',
@ -59,10 +56,6 @@ class User < ApplicationRecord
# Override of Devise::Models::Confirmable#send_confirmation_instructions
def send_confirmation_instructions
if discarded?
return
end
unless @raw_confirmation_token
generate_confirmation_token!
end
@ -146,12 +139,8 @@ class User < ApplicationRecord
last_sign_in_at.present?
end
def can_be_discarded?
administrateur.nil? && instructeur.nil?
end
def can_be_deleted?
can_be_discarded? && dossiers.with_discarded.state_instruction_commencee.empty?
administrateur.nil? && instructeur.nil? && dossiers.with_discarded.state_instruction_commencee.empty?
end
def delete_and_keep_track_dossiers(administration)
@ -166,32 +155,6 @@ class User < ApplicationRecord
destroy!
end
def discard_and_anonymize!(reason)
if !can_be_discarded?
raise "Cannot discard this user because they are also instructeur or administrateur"
end
discard!
update_columns(
discard_reason: reason,
email: "#{SecureRandom.hex}@anonymous.org",
encrypted_password: SecureRandom.hex,
unconfirmed_email: nil,
current_sign_in_at: nil,
current_sign_in_ip: nil,
last_sign_in_at: nil,
last_sign_in_ip: nil
)
end
def delete_or_discard!(administration)
if can_be_deleted?
delete_and_keep_track_dossiers(administration)
else
discard_and_anonymize!("Discarded by Manager##{administration.id}")
end
end
private
def link_invites!