Service and User API added, working with tests. Still need to polish the edges and add more tests.

tests/app/conftest.py

@@ -1,14 +1,16 @@
 import pytest
-from app.dao.users_dao import (create_user, get_users)
-from app.dao.services_dao import (create_service, get_services)
+from app.models import (User, Service)
+from app.dao.users_dao import (create_model_user, get_model_users)
+from app.dao.services_dao import create_model_service
 
 
 @pytest.fixture(scope='function')
 def sample_user(notify_db,
                 notify_db_session,
                 email="notify@digital.cabinet-office.gov.uk"):
-    user_id = create_user(email)
-    return get_users(user_id=user_id)
+    user = User(**{'email_address': email})
+    create_model_user(user)
+    return user
 
 
 @pytest.fixture(scope='function')
@@ -18,5 +20,12 @@ def sample_service(notify_db,
                    user=None):
     if user is None:
         user = sample_user(notify_db, notify_db_session)
-    service_id = create_service(service_name, user)
-    return get_services(service_id=service_id)
+    data = {
+        'name': service_name,
+        'users': [user],
+        'limit': 1000,
+        'active': False,
+        'restricted': False}
+    service = Service(**data)
+    create_model_service(service)
+    return service