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

pj_and_path only take dossier id

Browse source
This commit is contained in:
simon lehericey 2022-04-04 23:00:54 +02:00
parent 7ac1288905
commit 34b0578d70
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,16 +1,16 @@
class ActiveStorage::DownloadableFile class ActiveStorage::DownloadableFile
def self.create_list_from_dossiers(dossiers, for_expert = false) def self.create_list_from_dossiers(dossiers, for_expert = false)
dossiers dossiers
.map { |d| pj_and_path(d, PiecesJustificativesService.generate_dossier_export(d)) } + .map { |d| pj_and_path(d.id, PiecesJustificativesService.generate_dossier_export(d)) } +
PiecesJustificativesService.liste_documents(dossiers, for_expert) PiecesJustificativesService.liste_documents(dossiers, for_expert)
end end
private private
def self.pj_and_path(dossier, pj) def self.pj_and_path(dossier_id, pj)
[ [
pj, pj,
"dossier-#{dossier.id}/#{self.timestamped_filename(pj)}" "dossier-#{dossier_id}/#{self.timestamped_filename(pj)}"
] ]
end end

2
app/services/pieces_justificatives_service.rb
View file

@ -5,7 +5,7 @@ class PiecesJustificativesService
pjs_for_commentaires(dossier) + pjs_for_commentaires(dossier) +
pjs_for_dossier(dossier, for_expert) pjs_for_dossier(dossier, for_expert)
pjs.map { |piece_justificative| ActiveStorage::DownloadableFile.pj_and_path(dossier, piece_justificative) } pjs.map { |piece_justificative| ActiveStorage::DownloadableFile.pj_and_path(dossier.id, piece_justificative) }
end end
end end

2
spec/services/procedure_archive_service_spec.rb
View file

@ -106,7 +106,7 @@ describe ProcedureArchiveService do
) )
end end
let(:documents) { [pj, bad_pj].map { |p| ActiveStorage::DownloadableFile.pj_and_path(dossier, p) } } let(:documents) { [pj, bad_pj].map { |p| ActiveStorage::DownloadableFile.pj_and_path(dossier.id, p) } }
before do before do
allow(PiecesJustificativesService).to receive(:liste_documents).and_return(documents) allow(PiecesJustificativesService).to receive(:liste_documents).and_return(documents)
end end