darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-07-21 08:30:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixing things.

Browse Source 
Signed-off-by: Cliff Hill <Clifford.hill@gsa.gov>
This commit is contained in:
Cliff Hill
2024-11-22 16:24:59 -05:00
parent d6e5b6730e
commit 93be79c2d5
1 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
app/celery/tasks.py
View File

@@ -12,7 +12,7 @@ from app.celery import provider_tasks
from app.config import QueueNames from app.config import QueueNames
from app.dao.inbound_sms_dao import dao_get_inbound_sms_by_id 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.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 from app.dao.notifications_dao import dao_get_last_notification_added_for_job_id, get_notification_by_id
from app.dao.service_email_reply_to_dao import dao_get_reply_to_by_id from app.dao.service_email_reply_to_dao import dao_get_reply_to_by_id
from app.dao.service_inbound_api_dao import get_service_inbound_api_for_service from app.dao.service_inbound_api_dao import get_service_inbound_api_for_service
from app.dao.service_sms_sender_dao import dao_get_service_sms_senders_by_id from app.dao.service_sms_sender_dao import dao_get_service_sms_senders_by_id
@@ -219,7 +219,7 @@ def save_sms(self, service_id, notification_id, encrypted_notification, sender_i
) )
) )
current_app.logger.debug( current_app.logger.debug(
"SMS {} failed as restricted service".format(notification_id) f"SMS {notification_id} failed as restricted service"
) )
return return
@@ -259,20 +259,17 @@ def save_sms(self, service_id, notification_id, encrypted_notification, sender_i
) )
current_app.logger.debug( current_app.logger.debug(
"SMS {} created at {} for job {}".format( f"SMS {saved_notification.id} created at {saved_notification.created_at} for job {notification.get('job', None)}"
saved_notification.id,
saved_notification.created_at,
notification.get("job", None),
)
) )
except SQLAlchemyError: except SQLAlchemyError:
retry_msg = ( if not get_notification_by_id(notification_id):
f"{self.__name__} notification for job {notification.get("job", None)} " retry_msg = (
) f"{self.__name__} notification for job {notification.get("job", None)} "
f"row number {notification.get("row_number", None)} and notification id {notification_id}" )
current_app.logger.exception(retry_msg) f"row number {notification.get("row_number", None)} and notification id {notification_id}"
raise current_app.logger.exception(retry_msg)
raise
@_save_task_hander @_save_task_hander
@@ -297,9 +294,7 @@ def save_email(
reply_to_text = template.reply_to_text reply_to_text = template.reply_to_text
if not service_allowed_to_send_to(notification["to"], service, KeyType.NORMAL): if not service_allowed_to_send_to(notification["to"], service, KeyType.NORMAL):
current_app.logger.info( current_app.logger.info(f"Email {notification_id} failed as restricted service")
"Email {} failed as restricted service".format(notification_id)
)
return return
try: try:
@@ -324,17 +319,16 @@ def save_email(
) )
current_app.logger.debug( current_app.logger.debug(
"Email {} created at {}".format( f"Email {saved_notification.id} created at {saved_notification.created_at}"
saved_notification.id, saved_notification.created_at
)
) )
except SQLAlchemyError: except SQLAlchemyError:
retry_msg = ( if not get_notification_by_id(notification_id):
f"{self.__name__} notification for job {notification.get("job", None)} " retry_msg = (
f"row number {notification.get("row_number", None)} and notification id {notification_id}" f"{self.__name__} notification for job {notification.get("job", None)} "
) f"row number {notification.get("row_number", None)} and notification id {notification_id}"
current_app.logger.exception(retry_msg) )
raise current_app.logger.exception(retry_msg)
raise
def _save_api_task_handler(func): def _save_api_task_handler(func):