DGNum/demarches-normaliennes
13
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

always call create_list_from_dossiers

Browse source
This commit is contained in:
simon lehericey 2022-04-05 14:20:59 +02:00
parent cf79e340ef
commit 51b71aaa01
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/experts/avis_controller.rb
View file

@ -139,7 +139,7 @@ module Experts
end
def telecharger_pjs
files = ActiveStorage::DownloadableFile.create_list_from_dossier(@dossier, true)
files = ActiveStorage::DownloadableFile.create_list_from_dossiers(Dossier.where(id: @dossier.id), true)
zipline(files, "dossier-#{@dossier.id}.zip")
end

2
app/controllers/instructeurs/dossiers_controller.rb
View file

@ -218,7 +218,7 @@ module Instructeurs
end
def telecharger_pjs
files = ActiveStorage::DownloadableFile.create_list_from_dossier(dossier)
files = ActiveStorage::DownloadableFile.create_list_from_dossiers(Dossier.where(id: dossier.id))
zipline(files, "dossier-#{dossier.id}.zip")
end

4
app/lib/active_storage/downloadable_file.rb
View file

@ -10,9 +10,9 @@ class ActiveStorage::DownloadableFile
end
end
def self.create_list_from_dossiers(dossiers)
def self.create_list_from_dossiers(dossiers, for_expert = false)
dossiers.flat_map do |dossier|
create_list_from_dossier(dossier)
create_list_from_dossier(dossier, for_expert)
end
end

6
spec/lib/active_storage/downloadable_file_spec.rb
View file

@ -1,9 +1,9 @@
describe ActiveStorage::DownloadableFile do
let(:dossier) { create(:dossier, :en_construction) }
subject(:list) { ActiveStorage::DownloadableFile.create_list_from_dossier(dossier) }
subject(:list) { ActiveStorage::DownloadableFile.create_list_from_dossiers(Dossier.where(id: dossier.id)) }
describe 'create_list_from_dossier' do
describe 'create_list_from_dossiers' do
context 'when no piece_justificative is present' do
it { expect(list.length).to eq 1 }
it { expect(list.first[0].name).to eq "pdf_export_for_instructeur" }
@ -60,7 +60,7 @@ describe ActiveStorage::DownloadableFile do
let(:champ) { dossier.champs.first }
let(:avis) { create(:avis, dossier: dossier, claimant: instructeur, experts_procedure: experts_procedure, confidentiel: true) }
subject(:list) { ActiveStorage::DownloadableFile.create_list_from_dossier(dossier, true) }
subject(:list) { ActiveStorage::DownloadableFile.create_list_from_dossiers(Dossier.where(id: dossier.id), true) }
before do
dossier.champs_private << create(:champ_piece_justificative, :with_piece_justificative_file, private: true, dossier: dossier)