Merge pull request #1655 from betagouv/fix-1654

[Fix #1654] Generate procedure export filename with libelle

app/controllers/new_gestionnaire/procedures_controller.rb

@@ -175,7 +175,7 @@ module NewGestionnaire
 
     def download_dossiers
       export = procedure.generate_export
-      filename = "dossiers_#{procedure.procedure_path.path}_#{Time.now.strftime('%Y-%m-%d_%H-%M')}"
+      filename = procedure.export_filename
 
       respond_to do |format|
         format.csv { send_data(SpreadsheetArchitect.to_csv(data: export[:data], headers: export[:headers]), filename: "#{filename}.csv") }

app/models/procedure.rb

@@ -157,6 +157,11 @@ class Procedure < ApplicationRecord
     self.dossiers.state_not_brouillon.size
   end
 
+  def export_filename
+    procedure_identifier = procedure_path&.path || "procedure-#{id}"
+    "dossiers_#{procedure_identifier}_#{Time.now.strftime('%Y-%m-%d_%H-%M')}"
+  end
+
   def generate_export
     exportable_dossiers = dossiers.downloadable_sorted
 

spec/models/procedure_spec.rb

@@ -494,4 +494,22 @@ describe Procedure do
   describe ".default_sort" do
     it { expect(Procedure.default_sort).to eq("{\"table\":\"self\",\"column\":\"id\",\"order\":\"desc\"}") }
   end
+
+  describe ".export_filename" do
+    before { Timecop.freeze(Time.new(2018, 1, 2, 23, 11, 14)) }
+
+    subject { procedure.export_filename }
+
+    context "with a path" do
+      let(:procedure) { create(:procedure, :published) }
+
+      it { is_expected.to eq("dossiers_#{procedure.procedure_path.path}_2018-01-02_23-11") }
+    end
+
+    context "without a path" do
+      let(:procedure) { create(:procedure) }
+
+      it { is_expected.to eq("dossiers_procedure-#{procedure.id}_2018-01-02_23-11") }
+    end
+  end
 end