Update to strip down DAO and clarify tests

This commit is contained in:
Ken Tsang
2017-05-16 12:33:27 +01:00
parent 54d801979c
commit 733c16b2bb
4 changed files with 23 additions and 44 deletions

View File

@@ -1,8 +1,6 @@
from sqlalchemy import exc
from app import db
from app.dao.dao_utils import transactional
from app.models import Service, ServicePermission, SERVICE_PERMISSION_TYPES
from app.models import ServicePermission, SERVICE_PERMISSION_TYPES
def dao_fetch_service_permissions(service_id):
@@ -11,16 +9,13 @@ def dao_fetch_service_permissions(service_id):
@transactional
def dao_add_and_commit_service_permission(service_id, permission):
if permission not in SERVICE_PERMISSION_TYPES:
raise ValueError("'{}' not of service permission type: {}".format(permission, SERVICE_PERMISSION_TYPES))
def dao_create_service_permission(service_id, permission):
service_permission = ServicePermission(service_id=service_id, permission=permission)
db.session.add(service_permission)
def dao_remove_service_permission(service_id, permission=None):
def dao_remove_service_permission(service_id, permission):
return ServicePermission.query.filter(
ServicePermission.service_id == service_id,
ServicePermission.permission == permission if permission else None).delete()
ServicePermission.permission == permission).delete()