Slight changes to match new API features:

- get user now throws a 404 so handle that
- making a service now needs one user not many to create

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):
+    try:
-        return False
+        if user_api_client.get_user_by_email(email_address):
-    return True
+            return False
+        return True
+    except HTTPError as ex:
+        if ex.status_code == 404:
+            return True
+        else:
+            raise ex
 
 
 def request_password_reset(user):

app/main/views/register.py

@@ -26,7 +26,6 @@ def register():
         return redirect(url_for('main.choose_service'))
 
     form = RegisterUserForm()
-
     if form.validate_on_submit():
         if users_dao.is_email_unique(form.email_address.data):
             try:

app/notify_client/api_client.py

@@ -24,7 +24,7 @@ class NotificationsAdminAPIClient(NotificationsAPIClient):
             "name": service_name,
             "active": active,
             "limit": limit,
-            "users": [user_id],
+            "user_id": user_id,
             "restricted": restricted
         }
         return self.post("/service", data)