Merge pull request #186 from alphagov/email-templates

Email templates

app/main/dao/services_dao.py

@@ -1,5 +1,6 @@
 from flask import url_for
 from app import notifications_api_client
+from notifications_python_client.errors import HTTPError
 from app.utils import BrowsableItem
 
 
@@ -26,6 +27,16 @@ def get_service_by_id(id_):
     return notifications_api_client.get_service(id_)
 
 
+def get_service_by_id_or_404(id_):
+    try:
+        return get_service_by_id(id_)
+    except HTTPError as e:
+        if e.status_code == 404:
+            abort(404)
+        else:
+            raise e
+
+
 def get_services(user_id=None):
     if user_id:
         return notifications_api_client.get_services({'user_id': str(user_id)})

app/main/dao/users_dao.py

@@ -1,4 +1,5 @@
 from datetime import datetime
+from notifications_python_client import HTTPError
 
 from sqlalchemy.orm import load_only
 
@@ -47,9 +48,15 @@ def activate_user(user):
 
 
 def is_email_unique(email_address):
-    if user_api_client.get_user_by_email(email_address):
-        return False
-    return True
+    try:
+        if user_api_client.get_user_by_email(email_address):
+            return False
+        return True
+    except HTTPError as ex:
+        if ex.status_code == 404:
+            return True
+        else:
+            raise ex
 
 
 def request_password_reset(user):