darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-09-06 19:38:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1472 from alphagov/ken-fix-incomplete-jobs-letters-processing

Browse Source 
Fixed processing of incomplete letter jobs
This commit is contained in:
kentsanggds
2017-12-07 13:48:58 +00:00
committed by GitHub
parent a08411bde0 68659bab1b
commit 1c1e5b230e
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/celery/tasks.py
View File

@@ -580,4 +580,4 @@ def process_incomplete_job(job_id):
if row_number > resume_from_row: if row_number > resume_from_row:
process_row(row_number, recipient, personalisation, template, job, job.service) process_row(row_number, recipient, personalisation, template, job, job.service)
job_complete(job, job.service, template, resumed=True) job_complete(job, job.service, template.template_type, resumed=True)

6
tests/app/celery/test_tasks.py
View File

@@ -1439,6 +1439,7 @@ def test_process_incomplete_job_letter(mocker, sample_letter_template):
mocker.patch('app.celery.tasks.s3.get_job_from_s3', return_value=load_example_csv('multiple_letter')) mocker.patch('app.celery.tasks.s3.get_job_from_s3', return_value=load_example_csv('multiple_letter'))
mock_letter_saver = mocker.patch('app.celery.tasks.save_letter.apply_async') mock_letter_saver = mocker.patch('app.celery.tasks.save_letter.apply_async')
mock_build_dvla = mocker.patch('app.celery.tasks.build_dvla_file.apply_async')
job = create_job(template=sample_letter_template, notification_count=10, job = create_job(template=sample_letter_template, notification_count=10,
created_at=datetime.utcnow() - timedelta(hours=2), created_at=datetime.utcnow() - timedelta(hours=2),
@@ -1453,8 +1454,5 @@ def test_process_incomplete_job_letter(mocker, sample_letter_template):
process_incomplete_job(str(job.id)) process_incomplete_job(str(job.id))
completed_job = Job.query.filter(Job.id == job.id).one() assert mock_build_dvla.called
assert completed_job.job_status == JOB_STATUS_FINISHED
assert mock_letter_saver.call_count == 8 assert mock_letter_saver.call_count == 8