From 4655707eb5d28dc49329930ef7c813c04e3cdc1f Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Fri, 26 May 2017 18:14:00 +0200
Subject: [PATCH] [Fix #319] Include archived dossiers in the export

---
 app/models/dossier.rb       | 2 +-
 spec/models/dossier_spec.rb | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/models/dossier.rb b/app/models/dossier.rb
index 607254391..3fd21c1c0 100644
--- a/app/models/dossier.rb
+++ b/app/models/dossier.rb
@@ -200,7 +200,7 @@ class Dossier < ActiveRecord::Base
   scope :archived, -> { where(archived: true) }
   scope :not_archived, -> { where(archived: false) }
 
-  scope :downloadable, -> { all_state }
+  scope :downloadable, -> { not_brouillon.order_by_updated_at("ASC") }
 
   def cerfa_available?
     procedure.cerfa_flag? && cerfa.size != 0
diff --git a/spec/models/dossier_spec.rb b/spec/models/dossier_spec.rb
index e964e4b0d..8b9c8244a 100644
--- a/spec/models/dossier_spec.rb
+++ b/spec/models/dossier_spec.rb
@@ -911,11 +911,13 @@ describe Dossier do
     let!(:dossier) { create(:dossier, :with_entreprise, procedure: procedure, state: :draft) }
     let!(:dossier2) { create(:dossier, :with_entreprise, procedure: procedure, state: :initiated) }
     let!(:dossier3) { create(:dossier, :with_entreprise, procedure: procedure, state: :received) }
+    let!(:dossier4) { create(:dossier, :with_entreprise, procedure: procedure, state: :received, archived: true) }
 
     subject { procedure.dossiers.downloadable }
 
     it { is_expected.not_to include(dossier)}
     it { is_expected.to include(dossier2)}
     it { is_expected.to include(dossier3)}
+    it { is_expected.to include(dossier4)}
   end
 end