add only_active flag to get services functionality

This commit is contained in:
Leo Hemsted
2016-11-09 15:07:23 +00:00
parent d4a300ec7a
commit b0e240267a
3 changed files with 60 additions and 21 deletions

View File

@@ -41,22 +41,32 @@ def dao_fetch_all_services(only_active=False):
return query.all()
def dao_fetch_service_by_id(service_id):
return Service.query.filter_by(
def dao_fetch_service_by_id(service_id, only_active=False):
query = Service.query.filter_by(
id=service_id
).options(
joinedload('users')
).one()
)
if only_active:
query = query.filter(Service.active)
return query.one()
def dao_fetch_all_services_by_user(user_id):
return Service.query.filter(
def dao_fetch_all_services_by_user(user_id, only_active=False):
query = Service.query.filter(
Service.users.any(id=user_id)
).order_by(
asc(Service.created_at)
).options(
joinedload('users')
).all()
)
if only_active:
query = query.filter(Service.active)
return query.all()
def dao_fetch_service_by_id_and_user(service_id, user_id):