From 0958053c7205dc86504663d1cfc26a6042c07a1c Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Tue, 7 Feb 2023 10:27:51 +0100 Subject: [PATCH 1/2] chore(dossier): can destroy dossier having dossier_batch_operations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ça peut arriver lors des démarches en test, avec des dossiers tests en cours d'instruction. --- app/models/dossier.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/dossier.rb b/app/models/dossier.rb index 45f72aabd..db8893a17 100644 --- a/app/models/dossier.rb +++ b/app/models/dossier.rb @@ -147,7 +147,7 @@ class Dossier < ApplicationRecord belongs_to :user, optional: true belongs_to :parent_dossier, class_name: 'Dossier', optional: true belongs_to :batch_operation, optional: true - has_many :dossier_batch_operations + has_many :dossier_batch_operations, dependent: :destroy has_many :batch_operations, through: :dossier_batch_operations has_one :france_connect_information, through: :user From 786c3d06d6333e4033938dbd50582341dec2be4b Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Tue, 7 Feb 2023 10:38:44 +0100 Subject: [PATCH 2/2] chore(sentry): set procedure tag to administrateur controller --- app/controllers/administrateurs/administrateur_controller.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/controllers/administrateurs/administrateur_controller.rb b/app/controllers/administrateurs/administrateur_controller.rb index 9a9726694..a3ba5a858 100644 --- a/app/controllers/administrateurs/administrateur_controller.rb +++ b/app/controllers/administrateurs/administrateur_controller.rb @@ -7,6 +7,10 @@ module Administrateurs id = params[:procedure_id] || params[:id] @procedure = current_administrateur.procedures.find(id) + + Sentry.configure_scope do |scope| + scope.set_tags(procedure: @procedure.id) + end rescue ActiveRecord::RecordNotFound flash.alert = 'Démarche inexistante' redirect_to admin_procedures_path, status: 404