Merge branch 'main' into 1006-new-api-failed-and-delivered-messages-7-days

app/service/rest.py

@@ -569,11 +569,6 @@ def get_all_notifications_for_service(service_id):
         )
     current_app.logger.debug(f"number of notifications are {len(notifications)}")
 
-    if len(notifications) > 0:
-        current_app.logger.debug(f"first notification is {notifications[0]}")
-    else:
-        current_app.logger.debug("there are no notifications to show")
-
     # We try and get the next page of results to work out if we need provide a pagination link to the next page
     # in our response if it exists. Note, this could be done instead by changing `count_pages` in the previous
     # call to be True which will enable us to use Flask-Sqlalchemy to tell if there is a next page of results but

app/service/send_notification.py

@@ -7,6 +7,7 @@ from app.dao.services_dao import dao_fetch_service_by_id
 from app.dao.templates_dao import dao_get_template_by_id_and_service_id
 from app.dao.users_dao import get_user_by_id
 from app.enums import KeyType, NotificationType, TemplateProcessType
+from app.errors import BadRequestError
 from app.notifications.process_notifications import (
     persist_notification,
     send_notification_to_queue,
@@ -16,7 +17,6 @@ from app.notifications.validators import (
     validate_and_format_recipient,
     validate_template,
 )
-from app.v2.errors import BadRequestError
 
 
 def validate_created_by(service, created_by_id):