From 23707d603343fbd827e60e1dfcfce805ae45b8c5 Mon Sep 17 00:00:00 2001
From: simon lehericey <mail@simon.lehericey.net>
Date: Thu, 14 Apr 2022 12:18:46 +0200
Subject: [PATCH 1/2] ignore file not found error when cloning procedure

---
 app/models/procedure.rb       |  5 ++++-
 spec/models/procedure_spec.rb | 10 ++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/models/procedure.rb b/app/models/procedure.rb
index 2fe7dd2e6..49ffade30 100644
--- a/app/models/procedure.rb
+++ b/app/models/procedure.rb
@@ -454,7 +454,10 @@ class Procedure < ApplicationRecord
     }
     include_list[:groupe_instructeurs] = :instructeurs if !is_different_admin
     procedure = self.deep_clone(include: include_list) do |original, kopy|
-      PiecesJustificativesService.clone_attachments(original, kopy)
+      begin
+        PiecesJustificativesService.clone_attachments(original, kopy)
+      rescue ActiveStorage::FileNotFoundError
+      end
     end
     procedure.path = SecureRandom.uuid
     procedure.aasm_state = :brouillon
diff --git a/spec/models/procedure_spec.rb b/spec/models/procedure_spec.rb
index b5327b1ff..d2a3f4ecf 100644
--- a/spec/models/procedure_spec.rb
+++ b/spec/models/procedure_spec.rb
@@ -647,6 +647,16 @@ describe Procedure do
         expect(subject.canonical_procedure).to be_nil
       end
     end
+
+    context 'with an pj not found' do
+      let(:procedure) { create(:procedure) }
+
+      before do
+        expect(PiecesJustificativesService).to receive(:clone_attachments).at_least(:once).and_raise(ActiveStorage::FileNotFoundError)
+      end
+
+      it { expect { procedure.clone(administrateur, false) }.not_to raise_error }
+    end
   end
 
   describe '#publish!' do

From 22f23c58c74baa9e3d0667769313d224d5f2ab7a Mon Sep 17 00:00:00 2001
From: Paul Chavard <pro@paul.chavard.net>
Date: Thu, 14 Apr 2022 17:04:42 +0200
Subject: [PATCH 2/2] fix(dossiers): fix columns order

---
 app/models/procedure_presentation.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/procedure_presentation.rb b/app/models/procedure_presentation.rb
index 4b2459a25..47e04267e 100644
--- a/app/models/procedure_presentation.rb
+++ b/app/models/procedure_presentation.rb
@@ -87,8 +87,8 @@ class ProcedurePresentation < ApplicationRecord
 
   def displayed_fields_for_headers
     [
-      *displayed_fields,
       field_hash('self', 'id', classname: 'number-col'),
+      *displayed_fields,
       field_hash('self', 'state', classname: 'state-col')
     ]
   end