Refactor code

- Created TaskNames for DVLA_FILES rather than have DVLA_FILES in QueueNames
- Removed PROCESS_FTP from all_queues() as this was causing problems in picking up letter job tasks
- Created test to ensure that we don't arbitrarily add queue names to all_queues
This commit is contained in:
Ken Tsang
2017-08-22 15:49:56 +01:00
parent 41fce57932
commit 4fb5e68ce7
5 changed files with 28 additions and 7 deletions

View File

@@ -37,7 +37,7 @@ from app.models import LETTER_TYPE, JOB_STATUS_READY_TO_SEND
from app.notifications.process_notifications import send_notification_to_queue
from app.statsd_decorators import statsd
from app.celery.tasks import process_job
from app.config import QueueNames
from app.config import QueueNames, TaskNames
from app.utils import convert_utc_to_bst
@@ -310,7 +310,7 @@ def populate_monthly_billing():
def run_letter_jobs():
job_ids = [job.id for job in dao_get_letter_jobs_by_status(JOB_STATUS_READY_TO_SEND)]
notify_celery.send_task(
name=QueueNames.DVLA_FILES,
name=TaskNames.DVLA_FILES,
args=(job_ids),
queue=QueueNames.PROCESS_FTP
)