Renamed run-letter-pdfs to trigger-letter-pdfs-for-day

- also set optional date_to_process argument for dao_get_count_of_letters_to_process_for_date to None, so it's set in the code instead
This commit is contained in:
Ken Tsang
2017-12-19 13:18:56 +00:00
parent b70bf1b541
commit 8103540261
4 changed files with 14 additions and 10 deletions

View File

@@ -357,9 +357,9 @@ def run_letter_jobs():
current_app.logger.info("Queued {} ready letter job ids onto {}".format(len(job_ids), QueueNames.PROCESS_FTP))
@notify_celery.task(name="run-letter-pdfs")
@notify_celery.task(name="trigger-letter-pdfs-for-day")
@statsd(namespace="tasks")
def run_letter_pdfs():
def trigger_letter_pdfs_for_day():
letter_pdfs_count = dao_get_count_of_letters_to_process_for_date()
if letter_pdfs_count:
notify_celery.send_task(

View File

@@ -240,8 +240,8 @@ class Config(object):
'schedule': crontab(hour=17, minute=30),
'options': {'queue': QueueNames.PERIODIC}
},
'run-letter-pdfs': {
'task': 'run-letter-pdfs',
'trigger-letter-pdfs-for-day': {
'task': 'trigger-letter-pdfs-for-day',
'schedule': crontab(hour=17, minute=50),
'options': {'queue': QueueNames.PERIODIC}
},

View File

@@ -586,7 +586,7 @@ def dao_get_last_notification_added_for_job_id(job_id):
return last_notification_added
def dao_get_count_of_letters_to_process_for_date(date_to_process=date.today()):
def dao_get_count_of_letters_to_process_for_date(date_to_process=None):
"""
Returns a count of letter notifications for services with letters_as_pdf permission set
to be processed today if no argument passed in otherwise will return the count for
@@ -595,6 +595,9 @@ def dao_get_count_of_letters_to_process_for_date(date_to_process=date.today()):
Note - services without letters_as_pdf permission will be ignored
"""
if date_to_process is None:
date_to_process = date.today()
day_before = date_to_process - timedelta(days=1)
letter_deadline_time = current_app.config.get('LETTER_PROCESSING_DEADLINE')