Only return non-archived email reply_to addresses

Updated the DAO methods which return a single email reply_to address and
all reply_to addresses to only return the non-archived addresses.

Changed the type of error that gets raised when using the Admin
interface to be BadRequestError instead of a SQLAlchemyError.

app/dao/service_email_reply_to_dao.py

@@ -10,7 +10,8 @@ def dao_get_reply_to_by_service_id(service_id):
     reply_to = db.session.query(
         ServiceEmailReplyTo
     ).filter(
-        ServiceEmailReplyTo.service_id == service_id
+        ServiceEmailReplyTo.service_id == service_id,
+        ServiceEmailReplyTo.archived == False  # noqa
     ).order_by(desc(ServiceEmailReplyTo.is_default), desc(ServiceEmailReplyTo.created_at)).all()
     return reply_to
 
@@ -20,7 +21,8 @@ def dao_get_reply_to_by_id(service_id, reply_to_id):
         ServiceEmailReplyTo
     ).filter(
         ServiceEmailReplyTo.service_id == service_id,
-        ServiceEmailReplyTo.id == reply_to_id
+        ServiceEmailReplyTo.id == reply_to_id,
+        ServiceEmailReplyTo.archived == False  # noqa
     ).order_by(ServiceEmailReplyTo.created_at).one()
     return reply_to
 

app/service/send_notification.py

@@ -1,3 +1,5 @@
+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
@@ -89,7 +91,11 @@ def get_reply_to_text(notification_type, sender_id, service, template):
     reply_to = None
     if sender_id:
         if notification_type == EMAIL_TYPE:
-            reply_to = dao_get_reply_to_by_id(service.id, sender_id).email_address
+            try:
+                reply_to = dao_get_reply_to_by_id(service.id, sender_id).email_address
+            except NoResultFound:
+                message = 'Reply to email address not found'
+                raise BadRequestError(message=message)
         elif notification_type == SMS_TYPE:
             reply_to = dao_get_service_sms_senders_by_id(service.id, sender_id).get_reply_to_text()
     else: