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

Merge pull request #9582 from demarches-simplifiees/US/fix-export-job

Browse source 
correctif(tech.export): il arrive que des exports soient mal identifié (le content-type), ce qui par la suite renvoie des exports vide (0kb)
This commit is contained in:
mfo 2023-10-10 12:22:54 +00:00 committed by GitHub
commit ade95f5f5f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/services/archive_uploader.rb
View file

@ -38,8 +38,7 @@ class ArchiveUploader
end
def upload_with_active_storage
params = blob_default_params(filepath).merge(io: File.open(filepath),
identify: false)
params = blob_default_params(filepath).merge(io: File.open(filepath))
blob = ActiveStorage::Blob.create_and_upload!(**params)
return blob
end
@ -64,7 +63,7 @@ class ArchiveUploader
key: namespaced_object_key,
filename: filename,
content_type: 'application/zip',
metadata: { analyzed: true, virus_scan_result: ActiveStorage::VirusScanner::SAFE }
metadata: { analyzed: true, identified: true, virus_scan_result: ActiveStorage::VirusScanner::SAFE }
}
end

2
app/services/procedure_export_service.rb
View file

@ -56,7 +56,7 @@ class ProcedureExportService
content_type: content_type(format),
identify: false,
# We generate the exports ourselves, so they are safe
metadata: { virus_scan_result: ActiveStorage::VirusScanner::SAFE }
metadata: { virus_scan_result: ActiveStorage::VirusScanner::SAFE, identified: true }
)
end

29
spec/jobs/export_job_spec.rb Normal file
View file

@ -0,0 +1,29 @@
describe ExportJob do
let(:procedure) { create(:procedure, instructeurs: [instructeur]) }
let(:instructeur) { create(:instructeur) }
let(:time_span_type) { :everything }
let(:status) { :tous }
let(:key) { '123' }
let(:export) do
create(:export, format:,
time_span_type:,
key:,
instructeur:,
groupe_instructeurs: procedure.groupe_instructeurs)
end
subject do
ExportJob.perform_now(export)
end
before do
allow_any_instance_of(ArchiveUploader).to receive(:syscall_to_custom_uploader).and_return(true)
end
context 'zip' do
let(:format) { :zip }
it 'does not try to identify file' do
expect { subject }.not_to raise_error(ActiveStorage::FileNotFoundError)
end
end
end