Working tests, hopefully all code changes done.

app/main/dao/roles_dao.py

@@ -1,11 +0,0 @@
-from app import db
-from app.models import Roles
-
-
-def insert_role(role):
-    db.session.add(role)
-    db.session.commit()
-
-
-def get_role_by_id(id):
-    return Roles.query.filter_by(id=id).first()

app/main/dao/users_dao.py

@@ -2,8 +2,7 @@ from datetime import datetime
 
 from sqlalchemy.orm import load_only
 
-from app import db, login_manager
-from app.models import User
+from app import login_manager
 from app.main.encryption import hashpw
 
 from app import user_api_client
@@ -14,12 +13,6 @@ def load_user(user_id):
     return get_user_by_id(user_id)
 
 
-def insert_user(user):
-    user.password = hashpw(user.password)
-    db.session.add(user)
-    db.session.commit()
-
-
 # TODO Would be better to have a generic get and update for user
 # something that replicates the sql functionality.
 def get_user_by_id(id):
@@ -39,7 +32,7 @@ def verify_password(user, password):
 
 
 def update_user(user):
-    return user_api_client.update_user(user) 
+    return user_api_client.update_user(user)
 
 
 def increment_failed_login_count(id):
@@ -55,27 +48,37 @@ def activate_user(user):
 def update_email_address(id, email_address):
     user = get_user_by_id(id)
     user.email_address = email_address
-    db.session.add(user)
-    db.session.commit()
+    # TODO update user
+
+
+def is_email_unique(email_address):
+    if user_api_client.get_user_by_email(email_address):
+        return False
+    return True
 
 
 def update_mobile_number(id, mobile_number):
     user = get_user_by_id(id)
     user.mobile_number = mobile_number
-    db.session.add(user)
-    db.session.commit()
+    # TODO update user
 
 
 def update_password(user, password):
     user.password = hashpw(password)
     user.password_changed_at = datetime.now()
     user.state = 'active'
-    db.session.add(user)
-    db.session.commit()
+    # TODO update user
 
 
 def request_password_reset(email):
     user = get_user_by_email(email)
     user.state = 'request_password_reset'
-    db.session.add(user)
-    db.session.commit()
+    # TODO update user
+
+
+def send_verify_code(user_id, code_type):
+    return user_api_client.send_verify_code(user_id, code_type)
+
+
+def check_verify_code(user_id, code, code_type):
+    return user_api_client.check_verify_code(user_id, code, code_type)

app/main/dao/verify_codes_dao.py

@@ -1,55 +0,0 @@
-from datetime import datetime, timedelta
-
-from app import db
-from app.main.encryption import hashpw
-from app.models import VerifyCodes
-
-
-def add_code(user_id, code, code_type):
-    code = VerifyCodes(user_id=user_id,
-                       code=hashpw(code),
-                       code_type=code_type,
-                       expiry_datetime=datetime.now() + timedelta(hours=1))
-
-    db.session.add(code)
-    db.session.commit()
-    return code
-
-
-def get_codes(user_id, code_type=None):
-    if not code_type:
-        return VerifyCodes.query.filter_by(user_id=user_id, code_used=False).all()
-    return VerifyCodes.query.filter_by(user_id=user_id, code_type=code_type, code_used=False).all()
-
-
-def get_code_by_code(user_id, code, code_type):
-    return VerifyCodes.query.filter_by(user_id=user_id, code=hashpw(code), code_type=code_type).first()
-
-
-def use_code(id):
-    verify_code = VerifyCodes.query.get(id)
-    verify_code.code_used = True
-    db.session.add(verify_code)
-    db.session.commit()
-
-
-def use_code_for_user_and_type(user_id, code_type):
-    codes = VerifyCodes.query.filter_by(user_id=user_id, code_type=code_type, code_used=False).all()
-    for verify_code in codes:
-        verify_code.code_used = True
-        db.session.add(verify_code)
-    db.session.commit()
-
-
-def get_code_by_id(id):
-    return VerifyCodes.query.get(id)
-
-
-def add_code_with_expiry(user_id, code, code_type, expiry):
-    code = VerifyCodes(user_id=user_id,
-                       code=hashpw(code),
-                       code_type=code_type,
-                       expiry_datetime=expiry)
-
-    db.session.add(code)
-    db.session.commit()