From dc4902835eb3e9b9004b80726f28326cbe7d5ec5 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Wed, 9 Oct 2024 08:34:40 -0700 Subject: [PATCH] convert more queries --- app/dao/services_dao.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/dao/services_dao.py b/app/dao/services_dao.py index 42cfa7227..e86fab52a 100644 --- a/app/dao/services_dao.py +++ b/app/dao/services_dao.py @@ -232,8 +232,15 @@ def dao_fetch_all_services_by_user(user_id, only_active=False): def dao_fetch_all_services_created_by_user(user_id): + + # query = Service.query.filter_by(created_by_id=user_id).order_by(asc(Service.created_at) + + # return query.all() + stmt = ( - select(Service).where(created_by_id=user_id).order_by(asc(Service.created_at)) + select(Service) + .filter_by(created_by_id=user_id) + .order_by(asc(Service.created_at)) ) result = db.session.execute(stmt) return result.scalars.all() @@ -278,7 +285,8 @@ def dao_fetch_service_by_id_and_user(service_id, user_id): # ) stmt = ( - select(Service).filter(Service.users.any(id=user_id), Service.id == service_id) + select(Service) + .filter(Service.users.any(id=user_id), Service.id == service_id) .options(joinedload(Service.users)) ) result = db.session.execute(stmt).scalar_one()