merge from main

app/service/rest.py

@@ -1,7 +1,6 @@
 import itertools
 from datetime import datetime, timedelta
 
-from botocore.exceptions import ClientError
 from flask import Blueprint, current_app, jsonify, request
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm.exc import NoResultFound
@@ -497,37 +496,24 @@ def get_all_notifications_for_service(service_id):
 
     for notification in pagination.items:
         if notification.job_id is not None:
-            try:
-                notification.personalisation = get_personalisation_from_s3(
-                    notification.service_id,
-                    notification.job_id,
-                    notification.job_row_number,
-                )
-            except ClientError as ex:
-                if ex.response["Error"]["Code"] == "NoSuchKey":
-                    notification.personalisation = ""
-                else:
-                    raise ex
+            notification.personalisation = get_personalisation_from_s3(
+                notification.service_id,
+                notification.job_id,
+                notification.job_row_number,
+            )
 
-            try:
-                recipient = get_phone_number_from_s3(
-                    notification.service_id,
-                    notification.job_id,
-                    notification.job_row_number,
-                )
+            recipient = get_phone_number_from_s3(
+                notification.service_id,
+                notification.job_id,
+                notification.job_row_number,
+            )
 
-                notification.to = recipient
-                notification.normalised_to = recipient
-            except ClientError as ex:
-                if ex.response["Error"]["Code"] == "NoSuchKey":
-                    notification.to = ""
-                    notification.normalised_to = ""
-                else:
-                    raise ex
+            notification.to = recipient
+            notification.normalised_to = recipient
 
         else:
-            notification.to = "1"
-            notification.normalised_to = "1"
+            notification.to = ""
+            notification.normalised_to = ""
 
     kwargs = request.args.to_dict()
     kwargs["service_id"] = service_id

app/service/send_notification.py

@@ -1,12 +1,11 @@
 from sqlalchemy.orm.exc import NoResultFound
 
-from app.config import QueueNames
 from app.dao.service_email_reply_to_dao import dao_get_reply_to_by_id
 from app.dao.service_sms_sender_dao import dao_get_service_sms_senders_by_id
 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.enums import KeyType, NotificationType
 from app.errors import BadRequestError
 from app.notifications.process_notifications import (
     persist_notification,
@@ -80,11 +79,7 @@ def send_one_off_notification(service_id, post_data):
         client_reference=client_reference,
     )
 
-    queue_name = (
-        QueueNames.PRIORITY
-        if template.process_type == TemplateProcessType.PRIORITY
-        else None
-    )
+    queue_name = None
 
     send_notification_to_queue(
         notification=notification,