Merge pull request #7167 from betagouv/main

2022-04-14-01

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

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

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