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

cleanup

Browse Source
This commit is contained in:
Kenneth Kehl
2024-12-13 09:48:48 -08:00
parent 26e53a80ba
commit f706086bbf
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/celery/provider_tasks.py
View File

@@ -14,7 +14,6 @@ from app.config import Config, QueueNames
from app.dao import notifications_dao from app.dao import notifications_dao
from app.dao.notifications_dao import ( from app.dao.notifications_dao import (
sanitize_successful_notification_by_id, sanitize_successful_notification_by_id,
update_notification_message_id,
update_notification_status_by_id, update_notification_status_by_id,
) )
from app.delivery import send_to_providers from app.delivery import send_to_providers
@@ -129,8 +128,6 @@ def deliver_sms(self, notification_id):
) )
# Code branches off to send_to_providers.py # Code branches off to send_to_providers.py
message_id = send_to_providers.send_sms_to_provider(notification) message_id = send_to_providers.send_sms_to_provider(notification)
if message_id is not None: # can be none if technical failure happens
update_notification_message_id(notification_id, message_id)
# DEPRECATED # DEPRECATED
# We have to put it in UTC. For other timezones, the delay # We have to put it in UTC. For other timezones, the delay

2
app/dao/notifications_dao.py
View File

@@ -114,7 +114,7 @@ def update_notification_message_id(notification_id, message_id):
stmt = ( stmt = (
update(Notification) update(Notification)
.where(Notification.id == notification_id) .where(Notification.id == notification_id)
.values({"message_id": message_id}) .values(message_id=message_id)
) )
db.session.execute(stmt) db.session.execute(stmt)
db.session.commit() db.session.commit()

3
app/delivery/send_to_providers.py
View File

@@ -16,7 +16,7 @@ from app import (
from app.aws.s3 import get_personalisation_from_s3, get_phone_number_from_s3 from app.aws.s3 import get_personalisation_from_s3, get_phone_number_from_s3
from app.celery.test_key_tasks import send_email_response, send_sms_response from app.celery.test_key_tasks import send_email_response, send_sms_response
from app.dao.email_branding_dao import dao_get_email_branding_by_id from app.dao.email_branding_dao import dao_get_email_branding_by_id
from app.dao.notifications_dao import dao_update_notification from app.dao.notifications_dao import dao_update_notification, update_notification_message_id
from app.dao.provider_details_dao import get_provider_details_by_notification_type from app.dao.provider_details_dao import get_provider_details_by_notification_type
from app.dao.service_sms_sender_dao import dao_get_sms_senders_by_service_id from app.dao.service_sms_sender_dao import dao_get_sms_senders_by_service_id
from app.enums import BrandType, KeyType, NotificationStatus, NotificationType from app.enums import BrandType, KeyType, NotificationStatus, NotificationType
@@ -117,6 +117,7 @@ def send_sms_to_provider(notification):
message_id = provider.send_sms(**send_sms_kwargs) message_id = provider.send_sms(**send_sms_kwargs)
current_app.logger.info(f"got message_id {message_id}") current_app.logger.info(f"got message_id {message_id}")
update_notification_message_id(notification.id, message_id)
except Exception as e: except Exception as e:
n = notification n = notification
msg = f"FAILED send to sms, job_id: {n.job_id} row_number {n.job_row_number} message_id {message_id}" msg = f"FAILED send to sms, job_id: {n.job_id} row_number {n.job_row_number} message_id {message_id}"