From b4036e062da282dca126a13e8916fa26f82b51ca Mon Sep 17 00:00:00 2001
From: Leo Hemsted <leo.hemsted@digital.cabinet-office.gov.uk>
Date: Thu, 16 Feb 2017 12:44:40 +0000
Subject: [PATCH] rework query to use count()

---
 app/dao/users_dao.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/dao/users_dao.py b/app/dao/users_dao.py
index 949ad2c7c..020830b7c 100644
--- a/app/dao/users_dao.py
+++ b/app/dao/users_dao.py
@@ -81,12 +81,12 @@ def delete_user_verify_codes(user):
 
 
 def count_user_verify_codes(user):
-    query = db.session.query(
-        func.count().label('count')
-    ).filter(VerifyCode.user == user,
-             VerifyCode.expiry_datetime > datetime.utcnow(),
-             VerifyCode.code_used.is_(False)).one()
-    return query.count
+    query = VerifyCode.query.filter(
+        VerifyCode.user == user,
+        VerifyCode.expiry_datetime > datetime.utcnow(),
+        VerifyCode.code_used.is_(False)
+    )
+    return query.count()
 
 
 def get_user_by_id(user_id=None):