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

use automatic flag for dossier operation log

Browse source
This commit is contained in:
Lisa Durand 2024-06-13 16:54:55 +02:00
parent 9346020889
commit 2d66a67564
No known key found for this signature in database
GPG key ID: 0DF91F2CA1E8B816
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/models/dossier.rb
View file

@ -601,7 +601,7 @@ class Dossier < ApplicationRecord
end end
def can_be_deleted_by_automatic?(reason) def can_be_deleted_by_automatic?(reason)
brouillon? || en_construction? || termine? || reason == :expired reason == :expired && !en_instruction?
end end
def can_terminer_automatiquement_by_sva_svr? def can_terminer_automatiquement_by_sva_svr?
@ -849,15 +849,16 @@ class Dossier < ApplicationRecord
transaction do transaction do
if author_is_administration(author) && can_be_deleted_by_administration?(reason) if author_is_administration(author) && can_be_deleted_by_administration?(reason)
update(hidden_by_administration_at: Time.zone.now, hidden_by_reason: reason) update(hidden_by_administration_at: Time.zone.now, hidden_by_reason: reason)
log_dossier_operation(author, :supprimer, self)
elsif author_is_user(author) && can_be_deleted_by_user? elsif author_is_user(author) && can_be_deleted_by_user?
update(hidden_by_user_at: Time.zone.now, dossier_transfer_id: nil, hidden_by_reason: reason) update(hidden_by_user_at: Time.zone.now, dossier_transfer_id: nil, hidden_by_reason: reason)
log_dossier_operation(author, :supprimer, self)
elsif author_is_automatic(author) && can_be_deleted_by_automatic?(reason) elsif author_is_automatic(author) && can_be_deleted_by_automatic?(reason)
update(hidden_by_administration_at: Time.zone.now, hidden_by_user_at: Time.zone.now, hidden_by_reason: reason) update(hidden_by_administration_at: Time.zone.now, hidden_by_user_at: Time.zone.now, hidden_by_reason: reason)
log_automatic_dossier_operation(:supprimer, self)
else else
raise "Unauthorized dossier hide attempt Dossier##{id} by #{author} for reason #{reason}" raise "Unauthorized dossier hide attempt Dossier##{id} by #{author} for reason #{reason}"
end end
log_dossier_operation(author, :supprimer, self)
end end
if en_construction? && !hidden_by_administration? if en_construction? && !hidden_by_administration?

5
app/models/dossier_operation_log.rb
View file

@ -80,11 +80,6 @@ class DossierOperationLog < ApplicationRecord
def self.serialize_author(author) def self.serialize_author(author)
if author.nil? if author.nil?
nil nil
elsif author == :automatic
{
id: "Automatic",
email: CONTACT_EMAIL
}.as_json
else else
{ {
id: serialize_author_id(author), id: serialize_author_id(author),