From 031b74759fe9e29b62cb63629149ae81b7c30d23 Mon Sep 17 00:00:00 2001
From: Christophe Robillard <christophe.robillard@beta.gouv.fr>
Date: Wed, 4 Aug 2021 15:08:14 +0200
Subject: [PATCH] archives: move bugreport

---
 app/services/procedure_archive_service.rb       | 8 ++++++--
 spec/services/procedure_archive_service_spec.rb | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/services/procedure_archive_service.rb b/app/services/procedure_archive_service.rb
index 347989634..bf3b4d320 100644
--- a/app/services/procedure_archive_service.rb
+++ b/app/services/procedure_archive_service.rb
@@ -27,7 +27,7 @@ class ProcedureArchiveService
     Zip::OutputStream.open(tmp_file) do |zipfile|
       bug_reports = ''
       files.each do |attachment, pj_filename|
-        zipfile.put_next_entry("procedure-#{@procedure.id}/#{pj_filename}")
+        zipfile.put_next_entry("#{zip_root_folder(@procedure)}/#{pj_filename}")
         begin
           zipfile.puts(attachment.download)
         rescue
@@ -35,7 +35,7 @@ class ProcedureArchiveService
         end
       end
       if !bug_reports.empty?
-        zipfile.put_next_entry("LISEZMOI.txt")
+        zipfile.put_next_entry("#{zip_root_folder(@procedure)}/LISEZMOI.txt")
         zipfile.puts(bug_reports)
       end
     end
@@ -58,6 +58,10 @@ class ProcedureArchiveService
 
   private
 
+  def zip_root_folder(procedure)
+    "procedure-#{@procedure.id}"
+  end
+
   def create_list_of_attachments(dossiers)
     dossiers.flat_map do |dossier|
       ActiveStorage::DownloadableFile.create_list_from_dossier(dossier)
diff --git a/spec/services/procedure_archive_service_spec.rb b/spec/services/procedure_archive_service_spec.rb
index dc6ec2ebc..ba84050a9 100644
--- a/spec/services/procedure_archive_service_spec.rb
+++ b/spec/services/procedure_archive_service_spec.rb
@@ -90,7 +90,7 @@ describe ProcedureArchiveService do
           archive.file.open do |f|
             files = ZipTricks::FileReader.read_zip_structure(io: f)
             expect(files.size).to be 4
-            expect(files.last.filename).to include("LISEZMOI")
+            expect(files.last.filename).to eq("procedure-#{procedure.id}/LISEZMOI.txt")
             expect(extract(f, files.last)).to match(/Impossible de .*cni.*png/)
           end
         end