darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-05-01 06:40:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

clean up comments and method dupes

Browse Source
This commit is contained in:
jimmoffet
2022-09-15 15:48:37 -07:00
parent b0f819dbd9
commit f1aec54665
8 changed files with 30 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
app/celery/process_ses_receipts_tasks.py
View File

@@ -97,13 +97,15 @@ def sns_callback_handler():
@notify_celery.task(bind=True, name="process-ses-result", max_retries=5, default_retry_delay=300)
@statsd(namespace="tasks")
def process_ses_results(self, response):
try:
ses_message = json.loads(response["Message"])
notification_type = ses_message["notificationType"]
print(f"ses_message is: {ses_message}")
if notification_type == "Complaint":
bounce_message = None
if notification_type == 'Bounce':
bounce_message = _determine_notification_bounce_type(ses_message)
elif notification_type == 'Complaint':
_check_and_queue_complaint_callback_task(*handle_complaint(ses_message))
return True
@@ -111,21 +113,26 @@ def process_ses_results(self, response):
notification_status = aws_response_dict["notification_status"]
reference = ses_message["mail"]["messageId"]
print(f"notification_status is: {notification_status}")
try:
notification = notifications_dao.dao_get_notification_by_reference(reference)
except NoResultFound:
message_time = iso8601.parse_date(ses_message["mail"]["timestamp"]).replace(tzinfo=None)
if datetime.utcnow() - message_time < timedelta(minutes=5):
current_app.logger.info(
f"notification not found for reference: {reference} (while attempting update to {notification_status}). "
f"Callback may have arrived before notification was persisted to the DB. Adding task to retry queue"
)
self.retry(queue=QueueNames.RETRY)
else:
current_app.logger.warning(
"notification not found for reference: {} (update to {})".format(reference, notification_status)
"notification not found for reference: {} (while attempting update to {})".format(reference, notification_status)
)
return
if bounce_message:
current_app.logger.info(f"SES bounce for notification ID {notification.id}: {bounce_message}")
if notification.status not in {NOTIFICATION_SENDING, NOTIFICATION_PENDING}:
notifications_dao._duplicate_update_warning(
notification,
@@ -166,71 +173,3 @@ def process_ses_results(self, response):
current_app.logger.exception("Error processing SES results: {}".format(type(e)))
self.retry(queue=QueueNames.RETRY)
# def process_ses_results(self, response):
# try:
# ses_message = json.loads(response['Message'])
# print(f"ses_message is {ses_message}")
# notification_type = ses_message['notificationType']
# print(f"notification_type is {notification_type}")
# if notification_type == 'Bounce':
# notification_type = _determine_notification_bounce_type(ses_message)
# elif notification_type == 'Complaint':
# _check_and_queue_complaint_callback_task(*handle_complaint(ses_message))
# return True
# aws_response_dict = get_aws_responses(notification_type)
# print(f"aws_response_dict is {aws_response_dict}")
# notification_status = aws_response_dict['notification_status']
# print(f"notification_status is {notification_status}")
# reference = ses_message['mail']['messageId']
# try:
# notification = notifications_dao.dao_get_notification_by_reference(reference)
# print(f"notification is {notification}")
# except NoResultFound:
# print(f"notification not found")
# message_time = iso8601.parse_date(ses_message['mail']['timestamp']).replace(tzinfo=None)
# if datetime.utcnow() - message_time < timedelta(minutes=5):
# self.retry(queue=QueueNames.RETRY)
# else:
# current_app.logger.warning(
# "notification not found for reference: {} (update to {})".format(reference, notification_status)
# )
# return
# print(f"notification.status is {notification.status}")
# if notification.status not in {NOTIFICATION_SENDING, NOTIFICATION_PENDING}:
# print(f"notification.status is not in [{NOTIFICATION_SENDING}, {NOTIFICATION_PENDING}]")
# notifications_dao._duplicate_update_warning(notification, notification_status)
# return
# notifications_dao._update_notification_status(
# notification=notification,
# status=notification_status,
# provider_response=None
# )
# if not aws_response_dict['success']:
# current_app.logger.info(
# "SES delivery failed: notification id {} and reference {} has error found. Status {}".format(
# notification.id, reference, aws_response_dict['message']
# )
# )
# print(
# "SES delivery failed: notification id {} and reference {} has error found. Status {}".format(
# notification.id, reference, aws_response_dict['message']
# )
# )
# else:
# current_app.logger.info('SES callback return status of {} for notification: {}'.format(
# notification_status, notification.id
# ))
# print('SES callback return status of {} for notification: {}'.format(
# notification_status, notification.id
# ))
# statsd_client.incr('callback.ses.{}'.format(notification_status))
# if notification.sent_at:
# statsd_client.timing_with_dates('callback.ses.elapsed-time', datetime.utcnow(), notification.sent_at)
# check_and_queue_callback_task(notification)
# return True
# except Retry:
# raise
# except Exception as e:
# current_app.logger.exception('Error processing SES results: {}'.format(type(e)))
# self.retry(queue=QueueNames.RETRY)

4
app/celery/tasks.py
View File

@@ -21,7 +21,7 @@ from app.dao.inbound_sms_dao import dao_get_inbound_sms_by_id
from app.dao.jobs_dao import dao_get_job_by_id, dao_update_job
from app.dao.notifications_dao import (
dao_get_last_notification_added_for_job_id,
dao_get_notification_or_history_by_reference,
dao_get_notification_history_by_reference,
dao_update_notifications_by_reference,
get_notification_by_id,
update_notification_status_by_reference,
@@ -547,7 +547,7 @@ def update_letter_notification(filename, temporary_failures, update):
def check_billable_units(notification_update):
notification = dao_get_notification_or_history_by_reference(notification_update.reference)
notification = dao_get_notification_history_by_reference(notification_update.reference)
if int(notification_update.page_count) != notification.billable_units:
msg = 'Notification with id {} has {} billable_units but DVLA says page count is {}'.format(

12
app/dao/notifications_dao.py
View File

@@ -592,18 +592,6 @@ def dao_get_notification_by_reference(reference):
).one()
def dao_get_notification_or_history_by_reference(reference):
try:
# This try except is necessary because in test keys and research mode does not create notification history.
# Otherwise we could just search for the NotificationHistory object
return Notification.query.filter(
Notification.reference == reference
).one()
except NoResultFound:
return NotificationHistory.query.filter(
NotificationHistory.reference == reference
).one()
def dao_get_notification_history_by_reference(reference):
try:
# This try except is necessary because in test keys and research mode does not create notification history.

4
app/delivery/send_to_providers.py
View File

@@ -163,8 +163,8 @@ def update_notification_to_sending(notification, provider):
notification.sent_at = datetime.utcnow()
notification.sent_by = provider.name
if notification.status not in NOTIFICATION_STATUS_TYPES_COMPLETED:
# We currently have no callback method for SNS
# TODO create celery task to request delivery receipts from cloudwatch api
# We currently have no callback method for SMS deliveries
# TODO create celery task to request SMS delivery receipts from cloudwatch api
notification.status = NOTIFICATION_SENT if notification.notification_type == "sms" else NOTIFICATION_SENDING
dao_update_notification(notification)

15
app/notifications/notifications_ses_callback.py
View File

@@ -112,8 +112,8 @@ def remove_mail_headers(dict_to_edit):
def remove_emails_from_bounce(bounce_dict):
remove_mail_headers(bounce_dict)
bounce_dict["mail"].pop("destination")
bounce_dict["bounce"].pop("bouncedRecipients")
bounce_dict["mail"].pop("destination", None)
bounce_dict["bounce"].pop("bouncedRecipients", None)
def remove_emails_from_complaint(complaint_dict):
@@ -121,6 +121,7 @@ def remove_emails_from_complaint(complaint_dict):
complaint_dict["complaint"].pop("complainedRecipients")
return complaint_dict["mail"].pop("destination")
def check_and_queue_callback_task(notification):
# queue callback task only if the service_callback_api exists
service_callback_api = get_service_delivery_status_callback_api_for_service(service_id=notification.service_id)
@@ -128,17 +129,11 @@ def check_and_queue_callback_task(notification):
notification_data = create_delivery_status_callback_data(notification, service_callback_api)
send_delivery_status_to_service.apply_async([str(notification.id), notification_data], queue=QueueNames.CALLBACKS)
def check_and_queue_callback_task(notification):
# queue callback task only if the service_callback_api exists
service_callback_api = get_service_delivery_status_callback_api_for_service(service_id=notification.service_id)
if service_callback_api:
notification_data = create_delivery_status_callback_data(notification, service_callback_api)
send_delivery_status_to_service.apply_async([str(notification.id), notification_data],
queue=QueueNames.CALLBACKS)
def _check_and_queue_complaint_callback_task(complaint, notification, recipient):
# queue callback task only if the service_callback_api exists
service_callback_api = get_service_complaint_callback_api_for_service(service_id=notification.service_id)
if service_callback_api:
complaint_data = create_complaint_callback_data(complaint, notification, service_callback_api, recipient)
send_complaint_to_service.apply_async([complaint_data], queue=QueueNames.CALLBACKS)
send_complaint_to_service.apply_async([complaint_data], queue=QueueNames.CALLBACKS)