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

Merge pull request #1204 from alphagov/ken-fix-scheduled-letter-job

Browse Source 
Made celery task arg a tuple
This commit is contained in:
kentsanggds
2017-08-24 15:15:16 +01:00
committed by GitHub
parent 7a6c6c4855 1b35731fb2
commit aeb817614f
4 changed files with 24 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/celery/scheduled_tasks.py
View File

@@ -13,7 +13,7 @@ from app.dao.date_util import get_month_start_and_end_date_in_utc
from app.dao.inbound_sms_dao import delete_inbound_sms_created_more_than_a_week_ago from app.dao.inbound_sms_dao import delete_inbound_sms_created_more_than_a_week_ago
from app.dao.invited_user_dao import delete_invitations_created_more_than_two_days_ago from app.dao.invited_user_dao import delete_invitations_created_more_than_two_days_ago
from app.dao.jobs_dao import ( from app.dao.jobs_dao import (
dao_get_letter_jobs_by_status, dao_get_letter_job_ids_by_status,
dao_set_scheduled_jobs_to_pending, dao_set_scheduled_jobs_to_pending,
dao_get_jobs_older_than_limited_by dao_get_jobs_older_than_limited_by
) )
@@ -308,10 +308,10 @@ def populate_monthly_billing():
@notify_celery.task(name="run-letter-jobs") @notify_celery.task(name="run-letter-jobs")
@statsd(namespace="tasks") @statsd(namespace="tasks")
def run_letter_jobs(): def run_letter_jobs():
job_ids = [job.id for job in dao_get_letter_jobs_by_status(JOB_STATUS_READY_TO_SEND)] job_ids = dao_get_letter_job_ids_by_status(JOB_STATUS_READY_TO_SEND)
notify_celery.send_task( notify_celery.send_task(
name=TaskNames.DVLA_FILES, name=TaskNames.DVLA_FILES,
args=(job_ids), args=(job_ids,),
queue=QueueNames.PROCESS_FTP queue=QueueNames.PROCESS_FTP
) )
current_app.logger.info("Queued {} ready letter job ids onto {}".format(len(job_ids), QueueNames.PROCESS_FTP)) current_app.logger.info("Queued {} ready letter job ids onto {}".format(len(job_ids), QueueNames.PROCESS_FTP))

6
app/dao/jobs_dao.py
View File

@@ -157,8 +157,8 @@ def dao_get_all_letter_jobs():
).all() ).all()
def dao_get_letter_jobs_by_status(status): def dao_get_letter_job_ids_by_status(status):
return db.session.query( jobs = db.session.query(
Job Job
).join( ).join(
Job.template Job.template
@@ -172,6 +172,8 @@ def dao_get_letter_jobs_by_status(status):
desc(Job.created_at) desc(Job.created_at)
).all() ).all()
return [str(job.id) for job in jobs]
@statsd(namespace="dao") @statsd(namespace="dao")
def dao_get_job_statistics_for_job(service_id, job_id): def dao_get_job_statistics_for_job(service_id, job_id):

7
tests/app/celery/test_scheduled_tasks.py
View File

@@ -687,14 +687,15 @@ def test_populate_monthly_billing_updates_correct_month_in_bst(sample_template):
def test_run_letter_jobs(client, mocker, sample_letter_template): def test_run_letter_jobs(client, mocker, sample_letter_template):
jobs = [create_job(template=sample_letter_template, job_status=JOB_STATUS_READY_TO_SEND), jobs = [create_job(template=sample_letter_template, job_status=JOB_STATUS_READY_TO_SEND),
create_job(template=sample_letter_template, job_status=JOB_STATUS_READY_TO_SEND)] create_job(template=sample_letter_template, job_status=JOB_STATUS_READY_TO_SEND)]
job_ids = [str(job.id) for job in jobs]
mocker.patch( mocker.patch(
"app.celery.scheduled_tasks.dao_get_letter_jobs_by_status", "app.celery.scheduled_tasks.dao_get_letter_job_ids_by_status",
return_value=jobs return_value=job_ids
) )
mock_celery = mocker.patch("app.celery.tasks.notify_celery.send_task") mock_celery = mocker.patch("app.celery.tasks.notify_celery.send_task")
run_letter_jobs() run_letter_jobs()
mock_celery.assert_called_once_with(name=TaskNames.DVLA_FILES, mock_celery.assert_called_once_with(name=TaskNames.DVLA_FILES,
args=([job.id for job in jobs]), args=(job_ids,),
queue=QueueNames.PROCESS_FTP) queue=QueueNames.PROCESS_FTP)

37
tests/app/dao/test_jobs_dao.py
View File

@@ -19,7 +19,7 @@ from app.dao.jobs_dao import (
dao_get_jobs_older_than_limited_by, dao_get_jobs_older_than_limited_by,
dao_get_job_statistics_for_job, dao_get_job_statistics_for_job,
dao_get_job_stats_for_service, dao_get_job_stats_for_service,
dao_get_letter_jobs_by_status) dao_get_letter_job_ids_by_status)
from app.dao.statistics_dao import create_or_update_job_sending_statistics, update_job_stats_outcome_count from app.dao.statistics_dao import create_or_update_job_sending_statistics, update_job_stats_outcome_count
from app.models import ( from app.models import (
Job, JobStatistics, Job, JobStatistics,
@@ -551,35 +551,24 @@ def stats_set_up(notify_db, notify_db_session, service):
return job_1, job_2 return job_1, job_2
def test_dao_get_letter_jobs_by_status(sample_service): def test_dao_get_letter_job_ids_by_status(sample_service):
another_service = create_db_service(service_name="another service") another_service = create_db_service(service_name="another service")
sms_template = create_db_template(service=sample_service, template_type=SMS_TYPE) sms_template = create_db_template(service=sample_service, template_type=SMS_TYPE)
email_template = create_db_template(service=sample_service, template_type=EMAIL_TYPE) email_template = create_db_template(service=sample_service, template_type=EMAIL_TYPE)
letter_template = create_db_template(service=sample_service, template_type=LETTER_TYPE) letter_template_1 = create_db_template(service=sample_service, template_type=LETTER_TYPE)
another_letter_template = create_db_template(service=another_service, template_type=LETTER_TYPE) letter_template_2 = create_db_template(service=another_service, template_type=LETTER_TYPE)
ready_letter_jobs = [] letter_job_1 = create_db_job(letter_template_1, job_status=JOB_STATUS_READY_TO_SEND, original_file_name='1.csv')
ready_letter_jobs.append( letter_job_2 = create_db_job(letter_template_2, job_status=JOB_STATUS_READY_TO_SEND, original_file_name='2.csv')
create_db_job( ready_letter_job_ids = [str(letter_job_1.id), str(letter_job_2.id)]
letter_template,
job_status=JOB_STATUS_READY_TO_SEND,
original_file_name='1.csv'
)
)
ready_letter_jobs.append(
create_db_job(
another_letter_template,
job_status=JOB_STATUS_READY_TO_SEND,
original_file_name='2.csv'
)
)
create_db_job(sms_template, job_status=JOB_STATUS_FINISHED) create_db_job(sms_template, job_status=JOB_STATUS_FINISHED)
create_db_job(email_template, job_status=JOB_STATUS_FINISHED) create_db_job(email_template, job_status=JOB_STATUS_FINISHED)
create_db_job(letter_template, job_status=JOB_STATUS_SENT_TO_DVLA) create_db_job(letter_template_1, job_status=JOB_STATUS_SENT_TO_DVLA)
create_db_job(letter_template, job_status=JOB_STATUS_FINISHED) create_db_job(letter_template_1, job_status=JOB_STATUS_FINISHED)
create_db_job(letter_template, job_status=JOB_STATUS_PENDING) create_db_job(letter_template_2, job_status=JOB_STATUS_PENDING)
result = dao_get_letter_jobs_by_status(JOB_STATUS_READY_TO_SEND) result = dao_get_letter_job_ids_by_status(JOB_STATUS_READY_TO_SEND)
assert len(result) == 2 assert len(result) == 2
assert set(result) == set(ready_letter_jobs) assert set(result) == set(ready_letter_job_ids)