mirror of
https://github.com/GSA/notifications-api.git
synced 2026-02-05 02:41:14 -05:00
In this PR we remove trigger-letter-pdfs-for-day scheduled task and just call collate_letter_pdfs_for_day instead.
There was a datetime bug in the query which resulted in files not being sent to the postal provider. The trigger-letter-pdfs-for-day task is no longer needed, so rather than fix the query just call collate_letter_pdfs_for_day directly. Less code is always better. Deployment considerations: I realized this is strictly not backwards compatible if the scheduled job is in progress and a task is on the queue that no longer exists. This is ok since we will deploy this well before 17:50.
This commit is contained in:
@@ -3,7 +3,6 @@ import string
|
||||
from datetime import (
|
||||
datetime,
|
||||
timedelta,
|
||||
date
|
||||
)
|
||||
|
||||
from boto.exception import BotoClientError
|
||||
@@ -31,7 +30,6 @@ from app.models import (
|
||||
Notification,
|
||||
NotificationHistory,
|
||||
ScheduledNotification,
|
||||
Service,
|
||||
Template,
|
||||
TemplateHistory,
|
||||
KEY_TYPE_TEST,
|
||||
@@ -607,37 +605,6 @@ 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=None):
|
||||
"""
|
||||
Returns a count of letter notifications to be processed today if no
|
||||
argument passed in otherwise will return the count for the date passed in.
|
||||
Records processed today = yesterday 17:30 to today 17:29:59
|
||||
|
||||
Note - services in research mode are 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')
|
||||
|
||||
start_datetime = datetime.combine(day_before, letter_deadline_time)
|
||||
end_datetime = start_datetime + timedelta(days=1)
|
||||
|
||||
count_of_letters_to_process_for_date = Notification.query.join(
|
||||
Service
|
||||
).filter(
|
||||
Notification.created_at >= start_datetime,
|
||||
Notification.created_at < end_datetime,
|
||||
Notification.notification_type == LETTER_TYPE,
|
||||
Notification.status == NOTIFICATION_CREATED,
|
||||
Notification.key_type != KEY_TYPE_TEST,
|
||||
Service.research_mode.is_(False)
|
||||
).count()
|
||||
|
||||
return count_of_letters_to_process_for_date
|
||||
|
||||
|
||||
def notifications_not_yet_sent(should_be_sending_after_seconds, notification_type):
|
||||
older_than_date = datetime.utcnow() - timedelta(seconds=should_be_sending_after_seconds)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user