Merge pull request #9818 from colinux/correction-remove-from-message

ETQ instructeur, ma demande de correction est supprimée (résolue) lorsque je supprime son message associé

app/models/commentaire.rb

@@ -74,9 +74,13 @@ class Commentaire < ApplicationRecord
   end
 
   def soft_delete!
+    transaction do
+      discard!
+      dossier_correction&.resolve!
+      update! body: ''
+    end
+
     piece_jointe.purge_later if piece_jointe.attached?
-    discard!
-    update! body: ''
   end
 
   def flagged_pending_correction?

app/models/concerns/dossier_correctable_concern.rb

@@ -41,9 +41,7 @@ module DossierCorrectableConcern
     end
 
     def resolve_pending_correction
-      return if pending_correction.nil?
-
-      pending_correction.resolved_at = Time.current
+      pending_correction&.resolve
     end
 
     def resolve_pending_correction!

app/models/dossier_correction.rb

@@ -15,4 +15,15 @@ class DossierCorrection < ApplicationRecord
   def resolved?
     resolved_at.present?
   end
+
+  def resolve
+    self.resolved_at = Time.current
+  end
+
+  def resolve!
+    resolve
+    save!
+  end
+
+  def pending? = !resolved?
 end