Tests added for dao.

app/main/dao/services_dao.py

@@ -1,47 +1,58 @@
 from datetime import datetime
-
+from client.errors import HTTPError, InvalidResponse
 from sqlalchemy.orm import load_only
-
-from app import db
-from app.models import Service
+from flask.ext.login import current_user
+from app import (db, notifications_api_client)
 
 
-def insert_new_service(service_name, user):
-    service = Service(name=service_name,
-                      created_at=datetime.now(),
-                      limit=1000,
-                      active=False,
-                      restricted=True)
-    add_service(service)
-    service.users.append(user)
-    db.session.commit()
-    return service.id
+def insert_new_service(service_name, user_id):
+    # Add a service with default attributes
+    # Should we try and handle exception here
+    resp = notifications_api_client.create_service(
+        service_name, False, 1000, True, user_id)
+
+    return resp['data']['id']
 
 
-def get_service_by_id(id):
-    return Service.query.get(id)
+def get_service_by_id(id_):
+    return notifications_api_client.get_service(id_)
 
 
 def unrestrict_service(service_id):
-    service = get_service_by_id(service_id)
-    service.restricted = False
-    add_service(service)
+    resp = notifications_api_client.get_service(service_id)
+    if resp['data']['restricted']:
+        resp = notifications_api_client.update_service(
+            service_id,
+            resp['data']['name'],
+            resp['data']['active'],
+            resp['data']['limit'],
+            False,
+            resp['data']['users'])
 
 
 def activate_service(service_id):
-    service = get_service_by_id(service_id)
-    service.active = True
-    add_service(service)
-
-
-def add_service(service):
-    db.session.add(service)
-    db.session.commit()
+    resp = notifications_api_client.get_service(service_id)
+    if not resp['data']['active']:
+        resp = notifications_api_client.update_service(
+            service_id,
+            resp['data']['name'],
+            True,
+            resp['data']['limit'],
+            resp['data']['restricted'],
+            resp['data']['users'])
 
 
+# TODO Fix when functionality is added to the api.
 def find_service_by_service_name(service_name):
-    return Service.query.filter_by(name=service_name).first()
+    resp = notifications_api_client.get_services()
+    retval = None
+    for srv_json in resp['data']:
+        if srv_json['name'] == service_name:
+            retval = srv_json
+            break
+    return retval
 
 
 def find_all_service_names():
-    return [x.name for x in Service.query.options(load_only("name")).all()]
+    resp = notifications_api_client.get_services()
+    return [x['name'] for x in resp['data']]

app/main/views/add_service.py

@@ -8,9 +8,9 @@ from app.main.forms import AddServiceForm
 @main.route("/add-service", methods=['GET', 'POST'])
 @login_required
 def add_service():
+	# TODO fix up this 
     form = AddServiceForm(services_dao.find_all_service_names())
     if form.validate_on_submit():
-
         user = users_dao.get_user_by_id(session['user_id'])
         services_dao.insert_new_service(form.service_name.data, user)
         return redirect(url_for('.dashboard', service_id=123))