From c8a8290053679ad5142411ade71f515c1b588219 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 9 Oct 2024 07:35:13 -0700
Subject: [PATCH] convert more queries

---
 app/dao/services_dao.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/dao/services_dao.py b/app/dao/services_dao.py
index c853f0596..d78d108f4 100644
--- a/app/dao/services_dao.py
+++ b/app/dao/services_dao.py
@@ -278,12 +278,11 @@ def dao_fetch_service_by_id_and_user(service_id, user_id):
     # )
 
     stmt = (
-        select(Service.users.any(id=user_id), Service.id == service_id)
-        .select_from(Service)
+        select(Service).filter(Service.users.any(id=user_id), Service.id == service_id)
         .options(joinedload(Service.users))
     )
-    result = db.session.execute(stmt)
-    return result.scalars().one()
+    result = db.session.execute(stmt).scalar_one()
+    return result
 
 
 @autocommit