use new send-jobs-to-dvla task instead of send-files-to-dvla

the tasks (on the ftp app) do the same thing, but to improve clarity
i've renamed it to jobs, because we'll be adding a notifications one
soon
This commit is contained in:
Leo Hemsted
2017-09-12 16:13:07 +01:00
parent ca1856eb20
commit 2c758cbccd
6 changed files with 8 additions and 7 deletions

View File

@@ -314,7 +314,7 @@ def populate_monthly_billing():
def run_letter_jobs():
job_ids = dao_get_letter_job_ids_by_status(JOB_STATUS_READY_TO_SEND)
notify_celery.send_task(
name=TaskNames.DVLA_FILES,
name=TaskNames.DVLA_JOBS,
args=(job_ids,),
queue=QueueNames.PROCESS_FTP
)

View File

@@ -48,7 +48,8 @@ class QueueNames(object):
class TaskNames(object):
DVLA_FILES = 'send-files-to-dvla'
DVLA_JOBS = 'send-jobs-to-dvla'
DVLA_NOTIFICATIONS = 'send-notifications-to-dvla'
class Config(object):
@@ -226,7 +227,7 @@ class Config(object):
},
'run-letter-jobs': {
'task': 'run-letter-jobs',
'schedule': crontab(minute=30, hour=17),
'schedule': crontab(hour=17, minute=30),
'options': {'queue': QueueNames.PERIODIC}
}
}

View File

@@ -16,7 +16,7 @@ register_errors(letter_job)
@letter_job.route('/send-letter-jobs', methods=['POST'])
def send_letter_jobs():
job_ids = validate(request.get_json(), letter_job_ids)
notify_celery.send_task(name=TaskNames.DVLA_FILES, args=(job_ids['job_ids'],), queue=QueueNames.PROCESS_FTP)
notify_celery.send_task(name=TaskNames.DVLA_JOBS, args=(job_ids['job_ids'],), queue=QueueNames.PROCESS_FTP)
return jsonify(data={"response": "Task created to send files to DVLA"}), 201

View File

@@ -151,7 +151,7 @@ def process_letter_notification(*, letter_data, api_key, template):
raise BadRequestError(message='Cannot send letters with a team api key', status_code=403)
if api_key.service.restricted and api_key.key_type != KEY_TYPE_TEST:
raise BadRequestError(message='Cannot send letters when service is in trial mode', status_code=403)
raise BadRequestError(message='Cannot send letters when service is in trial mode', status_code=403)
job = create_letter_api_job(template)
notification = create_letter_notification(letter_data, job, api_key)