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

Refactor - extract common code into a method.

Browse Source
This commit is contained in:
Rebecca Law
2018-06-07 14:54:40 +01:00
parent 56c6d5101c
commit 2381850d05
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/notifications/notifications_ses_callback.py
View File

@@ -104,15 +104,6 @@ def determine_notification_bounce_type(notification_type, ses_message):
return notification_type return notification_type
def remove_emails_from_bounce(bounce_dict):
if bounce_dict.get('mail').get('headers', None):
bounce_dict['mail'].pop('headers')
if bounce_dict.get('mail').get('commonHeaders'):
bounce_dict['mail'].pop('commonHeaders')
bounce_dict['mail'].pop('destination')
bounce_dict['bounce'].pop('bouncedRecipients')
def handle_complaint(ses_message): def handle_complaint(ses_message):
remove_emails_from_complaint(ses_message) remove_emails_from_complaint(ses_message)
current_app.logger.info("Complaint from SES: \n{}".format(ses_message)) current_app.logger.info("Complaint from SES: \n{}".format(ses_message))
@@ -134,11 +125,21 @@ def handle_complaint(ses_message):
save_complaint(complaint) save_complaint(complaint)
def remove_mail_headers(dict_to_edit):
if dict_to_edit['mail'].get('headers'):
dict_to_edit['mail'].pop('headers')
if dict_to_edit['mail'].get('commonHeaders'):
dict_to_edit['mail'].pop('commonHeaders')
def remove_emails_from_bounce(bounce_dict):
remove_mail_headers(bounce_dict)
bounce_dict['mail'].pop('destination')
bounce_dict['bounce'].pop('bouncedRecipients')
def remove_emails_from_complaint(complaint_dict): def remove_emails_from_complaint(complaint_dict):
if complaint_dict.get('headers', None): remove_mail_headers(complaint_dict)
complaint_dict.pop('headers')
if complaint_dict.get('commonHeaders'):
complaint_dict.pop('commonHeaders')
complaint_dict['complaint'].pop('complainedRecipients') complaint_dict['complaint'].pop('complainedRecipients')
complaint_dict['mail'].pop('destination') complaint_dict['mail'].pop('destination')