darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-04 18:31:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #703 from alphagov/fix-job-status

Browse Source 
Fix for the job status
This commit is contained in:
Rebecca Law
2016-10-06 12:03:42 +01:00
committed by GitHub
parent 8aca768c30 6065ed57cf
commit fff74bb4f7
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/celery/tasks.py
View File

@@ -41,7 +41,7 @@ def process_job(job_id):
total_sent = fetch_todays_total_message_count(service.id) total_sent = fetch_todays_total_message_count(service.id)
if total_sent + job.notification_count > service.message_limit: if total_sent + job.notification_count > service.message_limit:
job.status = 'sending limits exceeded' job.job_status = 'sending limits exceeded'
job.processing_finished = datetime.utcnow() job.processing_finished = datetime.utcnow()
dao_update_job(job) dao_update_job(job)
current_app.logger.info( current_app.logger.info(
@@ -50,7 +50,7 @@ def process_job(job_id):
) )
return return
job.status = 'in progress' job.job_status = 'in progress'
dao_update_job(job) dao_update_job(job)
template = Template( template = Template(
@@ -94,7 +94,7 @@ def process_job(job_id):
) )
finished = datetime.utcnow() finished = datetime.utcnow()
job.status = 'finished' job.job_status = 'finished'
job.processing_started = start job.processing_started = start
job.processing_finished = finished job.processing_finished = finished
dao_update_job(job) dao_update_job(job)

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

@@ -83,7 +83,7 @@ def test_should_process_sms_job(sample_job, mocker):
queue="db-sms" queue="db-sms"
) )
job = jobs_dao.dao_get_job_by_id(sample_job.id) job = jobs_dao.dao_get_job_by_id(sample_job.id)
assert job.status == 'finished' assert job.job_status == 'finished'
@freeze_time("2016-01-01 11:09:00.061258") @freeze_time("2016-01-01 11:09:00.061258")
@@ -157,7 +157,7 @@ def test_should_not_process_sms_job_if_would_exceed_send_limits(notify_db,
s3.get_job_from_s3.assert_not_called() s3.get_job_from_s3.assert_not_called()
job = jobs_dao.dao_get_job_by_id(job.id) job = jobs_dao.dao_get_job_by_id(job.id)
assert job.status == 'sending limits exceeded' assert job.job_status == 'sending limits exceeded'
tasks.send_sms.apply_async.assert_not_called() tasks.send_sms.apply_async.assert_not_called()
@@ -177,7 +177,7 @@ def test_should_not_process_sms_job_if_would_exceed_send_limits_inc_today(notify
process_job(job.id) process_job(job.id)
job = jobs_dao.dao_get_job_by_id(job.id) job = jobs_dao.dao_get_job_by_id(job.id)
assert job.status == 'sending limits exceeded' assert job.job_status == 'sending limits exceeded'
s3.get_job_from_s3.assert_not_called() s3.get_job_from_s3.assert_not_called()
tasks.send_sms.apply_async.assert_not_called() tasks.send_sms.apply_async.assert_not_called()
@@ -197,7 +197,7 @@ def test_should_not_process_email_job_if_would_exceed_send_limits_inc_today(noti
process_job(job.id) process_job(job.id)
job = jobs_dao.dao_get_job_by_id(job.id) job = jobs_dao.dao_get_job_by_id(job.id)
assert job.status == 'sending limits exceeded' assert job.job_status == 'sending limits exceeded'
s3.get_job_from_s3.assert_not_called() s3.get_job_from_s3.assert_not_called()
tasks.send_email.apply_async.assert_not_called() tasks.send_email.apply_async.assert_not_called()
@@ -217,7 +217,7 @@ def test_should_not_process_email_job_if_would_exceed_send_limits(notify_db, not
s3.get_job_from_s3.assert_not_called s3.get_job_from_s3.assert_not_called
job = jobs_dao.dao_get_job_by_id(job.id) job = jobs_dao.dao_get_job_by_id(job.id)
assert job.status == 'sending limits exceeded' assert job.job_status == 'sending limits exceeded'
tasks.send_email.apply_async.assert_not_called tasks.send_email.apply_async.assert_not_called
@@ -241,7 +241,7 @@ def test_should_process_email_job_if_exactly_on_send_limits(notify_db,
str(job.id) str(job.id)
) )
job = jobs_dao.dao_get_job_by_id(job.id) job = jobs_dao.dao_get_job_by_id(job.id)
assert job.status == 'finished' assert job.job_status == 'finished'
tasks.send_email.apply_async.assert_called_with( tasks.send_email.apply_async.assert_called_with(
( (
str(job.service_id), str(job.service_id),
@@ -264,7 +264,7 @@ def test_should_not_create_send_task_for_empty_file(sample_job, mocker):
str(sample_job.id) str(sample_job.id)
) )
job = jobs_dao.dao_get_job_by_id(sample_job.id) job = jobs_dao.dao_get_job_by_id(sample_job.id)
assert job.status == 'finished' assert job.job_status == 'finished'
@freeze_time("2016-01-01 11:09:00.061258") @freeze_time("2016-01-01 11:09:00.061258")
@@ -294,7 +294,7 @@ def test_should_process_email_job(sample_email_job, mocker):
queue="db-email" queue="db-email"
) )
job = jobs_dao.dao_get_job_by_id(sample_email_job.id) job = jobs_dao.dao_get_job_by_id(sample_email_job.id)
assert job.status == 'finished' assert job.job_status == 'finished'
def test_should_process_all_sms_job(sample_job, def test_should_process_all_sms_job(sample_job,
@@ -318,7 +318,7 @@ def test_should_process_all_sms_job(sample_job,
assert encryption.encrypt.call_args[0][0]['personalisation'] == {'name': 'chris'} assert encryption.encrypt.call_args[0][0]['personalisation'] == {'name': 'chris'}
tasks.send_sms.apply_async.call_count == 10 tasks.send_sms.apply_async.call_count == 10
job = jobs_dao.dao_get_job_by_id(sample_job_with_placeholdered_template.id) job = jobs_dao.dao_get_job_by_id(sample_job_with_placeholdered_template.id)
assert job.status == 'finished' assert job.job_status == 'finished'
def test_should_send_template_to_correct_sms_task_and_persist(sample_template_with_placeholders, mocker): def test_should_send_template_to_correct_sms_task_and_persist(sample_template_with_placeholders, mocker):