darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-03 09:51:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2405 from alphagov/dvla-filename

Browse Source 
pass upload filename to notify-ftp
This commit is contained in:
Leo Hemsted
2019-03-21 11:45:37 +00:00
committed by GitHub
parent a46e7d62f2 334eb473ed
commit 31d4bfed84
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/celery/letters_pdf_tasks.py
View File

@@ -119,17 +119,23 @@ def collate_letter_pdfs_for_day(date=None):
current_app.config['LETTERS_PDF_BUCKET_NAME'], current_app.config['LETTERS_PDF_BUCKET_NAME'],
subfolder=date subfolder=date
) )
for letters in group_letters(letter_pdfs): for i, letters in enumerate(group_letters(letter_pdfs)):
# eg NOTIFY.2018-12-31.001.ZIP
dvla_filename = 'NOTIFY.{date}.{num:03}.ZIP'.format(date=date, num=i + 1)
filenames = [letter['Key'] for letter in letters] filenames = [letter['Key'] for letter in letters]
current_app.logger.info( current_app.logger.info(
'Calling task zip-and-send-letter-pdfs for {} pdfs of total size {:,} bytes'.format( 'Calling task zip-and-send-letter-pdfs for {} pdfs to upload {} with total size {:,} bytes'.format(
len(filenames), len(filenames),
dvla_filename,
sum(letter['Size'] for letter in letters) sum(letter['Size'] for letter in letters)
) )
) )
notify_celery.send_task( notify_celery.send_task(
name=TaskNames.ZIP_AND_SEND_LETTER_PDFS, name=TaskNames.ZIP_AND_SEND_LETTER_PDFS,
kwargs={'filenames_to_zip': filenames}, kwargs={
'filenames_to_zip': filenames,
'upload_filename': dvla_filename
},
queue=QueueNames.PROCESS_FTP, queue=QueueNames.PROCESS_FTP,
compression='zlib' compression='zlib'
) )

4
tests/app/celery/test_letters_pdf_tasks.py
View File

@@ -231,13 +231,13 @@ def test_collate_letter_pdfs_for_day(notify_api, mocker):
mock_group_letters.assert_called_once_with(mock_s3.return_value) mock_group_letters.assert_called_once_with(mock_s3.return_value)
assert mock_celery.call_args_list[0] == call( assert mock_celery.call_args_list[0] == call(
name='zip-and-send-letter-pdfs', name='zip-and-send-letter-pdfs',
kwargs={'filenames_to_zip': ['A.PDF', 'B.pDf']}, kwargs={'filenames_to_zip': ['A.PDF', 'B.pDf'], 'upload_filename': 'NOTIFY.2017-01-02.001.ZIP'},
queue='process-ftp-tasks', queue='process-ftp-tasks',
compression='zlib' compression='zlib'
) )
assert mock_celery.call_args_list[1] == call( assert mock_celery.call_args_list[1] == call(
name='zip-and-send-letter-pdfs', name='zip-and-send-letter-pdfs',
kwargs={'filenames_to_zip': ['C.pdf']}, kwargs={'filenames_to_zip': ['C.pdf'], 'upload_filename': 'NOTIFY.2017-01-02.002.ZIP'},
queue='process-ftp-tasks', queue='process-ftp-tasks',
compression='zlib' compression='zlib'
) )