diff --git a/app/celery/tasks.py b/app/celery/tasks.py index 0794ad4da..8cece7aa4 100644 --- a/app/celery/tasks.py +++ b/app/celery/tasks.py @@ -20,7 +20,10 @@ from app.dao.service_sms_sender_dao import dao_get_service_sms_senders_by_id from app.dao.templates_dao import dao_get_template_by_id from app.enums import JobStatus, KeyType, NotificationType from app.errors import TotalRequestsError -from app.notifications.process_notifications import persist_notification +from app.notifications.process_notifications import ( + get_notification, + persist_notification, +) from app.notifications.validators import check_service_over_total_message_limit from app.serialised_models import SerialisedService, SerialisedTemplate from app.service.utils import service_allowed_to_send_to @@ -329,6 +332,8 @@ def save_api_email_or_sms(self, encrypted_notification): if notification["notification_type"] == NotificationType.EMAIL else provider_tasks.deliver_sms ) + + original_notification = get_notification(notification["id"]) try: persist_notification( notification_id=notification["id"], @@ -347,10 +352,11 @@ def save_api_email_or_sms(self, encrypted_notification): document_download_count=notification["document_download_count"], ) # Only get here if save to the db was successful (i.e. first time) - provider_task.apply_async([notification["id"]], queue=q) - current_app.logger.debug( - f"{notification['notification_type']} {notification['id']} has been persisted and sent to delivery queue." - ) + if original_notification is None: + provider_task.apply_async([notification["id"]], queue=q) + current_app.logger.debug( + f"{notification['id']} has been persisted and sent to delivery queue." + ) except IntegrityError: current_app.logger.warning( diff --git a/app/dao/notifications_dao.py b/app/dao/notifications_dao.py index d231ece42..8371aaa85 100644 --- a/app/dao/notifications_dao.py +++ b/app/dao/notifications_dao.py @@ -72,7 +72,7 @@ def dao_create_notification(notification): notification.to = "1" notification.normalised_to = "1" - # notify-api-1454 change to an upsert + # notify-api-1454 insert only if it doesn't exist stmt = select(Notification).where(Notification.id == notification.id) result = db.session.execute(stmt).scalar() if result is None: diff --git a/app/notifications/process_notifications.py b/app/notifications/process_notifications.py index 4f5d8d06c..8568b8894 100644 --- a/app/notifications/process_notifications.py +++ b/app/notifications/process_notifications.py @@ -8,6 +8,7 @@ from app.config import QueueNames from app.dao.notifications_dao import ( dao_create_notification, dao_delete_notifications_by_id, + get_notification_by_id, ) from app.enums import KeyType, NotificationStatus, NotificationType from app.errors import BadRequestError @@ -53,6 +54,10 @@ def check_placeholders(template_object): raise BadRequestError(fields=[{"template": message}], message=message) +def get_notification(notification_id): + return get_notification_by_id(notification_id) + + def persist_notification( *, template_id,