From 2d66a67564b2c41366f33986d68d97a833321467 Mon Sep 17 00:00:00 2001 From: Lisa Durand Date: Thu, 13 Jun 2024 16:54:55 +0200 Subject: [PATCH] use automatic flag for dossier operation log --- app/models/dossier.rb | 7 ++++--- app/models/dossier_operation_log.rb | 5 ----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/app/models/dossier.rb b/app/models/dossier.rb index 84ebd034b..3f0582f77 100644 --- a/app/models/dossier.rb +++ b/app/models/dossier.rb @@ -601,7 +601,7 @@ class Dossier < ApplicationRecord end def can_be_deleted_by_automatic?(reason) - brouillon? || en_construction? || termine? || reason == :expired + reason == :expired && !en_instruction? end def can_terminer_automatiquement_by_sva_svr? @@ -849,15 +849,16 @@ class Dossier < ApplicationRecord transaction do if author_is_administration(author) && can_be_deleted_by_administration?(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? 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) 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 raise "Unauthorized dossier hide attempt Dossier##{id} by #{author} for reason #{reason}" end - - log_dossier_operation(author, :supprimer, self) end if en_construction? && !hidden_by_administration? diff --git a/app/models/dossier_operation_log.rb b/app/models/dossier_operation_log.rb index 9cf45552f..902626a85 100644 --- a/app/models/dossier_operation_log.rb +++ b/app/models/dossier_operation_log.rb @@ -80,11 +80,6 @@ class DossierOperationLog < ApplicationRecord def self.serialize_author(author) if author.nil? nil - elsif author == :automatic - { - id: "Automatic", - email: CONTACT_EMAIL - }.as_json else { id: serialize_author_id(author),