darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-09-06 09:38:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Replaced first queries with one queries, which throws a NoResultFound.

Browse Source 
Able to remove many of the None checks as a result of this.
Fixed the tests were needed.
This commit is contained in:
Rebecca Law
2016-03-11 15:34:20 +00:00
parent ef5969be77
commit 123b0ead3a
14 changed files with 26 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/dao/invited_user_dao.py
View File

@@ -10,11 +10,11 @@ def save_invited_user(invited_user):
def get_invited_user(service_id, invited_user_id):
return InvitedUser.query.filter_by(service_id=service_id, id=invited_user_id).first()
return InvitedUser.query.filter_by(service_id=service_id, id=invited_user_id).one()
def get_invited_user_by_id(invited_user_id):
return InvitedUser.query.filter_by(id=invited_user_id).first()
return InvitedUser.query.filter_by(id=invited_user_id).one()
def get_invited_users_for_service(service_id):

2
app/dao/jobs_dao.py
View File

@@ -11,7 +11,7 @@ def dao_get_jobs_by_service_id(service_id):
def dao_get_job_by_id(job_id):
return Job.query.filter_by(id=job_id).first()
return Job.query.filter_by(id=job_id).one()
def dao_create_job(job):

2
app/dao/services_dao.py
View File

@@ -16,7 +16,7 @@ def dao_fetch_all_services_by_user(user_id):
def dao_fetch_service_by_id_and_user(service_id, user_id):
return Service.query.filter(Service.users.any(id=user_id)).filter_by(id=service_id).first()
return Service.query.filter(Service.users.any(id=user_id)).filter_by(id=service_id).one()
def dao_create_service(service, user):

2
app/dao/templates_dao.py
View File

@@ -18,7 +18,7 @@ def dao_get_template_by_id_and_service_id(template_id, service_id):
def dao_get_template_by_id(template_id):
return Template.query.filter_by(id=template_id).first()
return Template.query.filter_by(id=template_id).one()
def dao_get_all_templates_for_service(service_id):