From c9b5bf5d0bae2bb5620af641ba51f66827e5ada9 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 9 Oct 2024 09:05:14 -0700
Subject: [PATCH] convert more queries

---
 app/dao/services_dao.py | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/dao/services_dao.py b/app/dao/services_dao.py
index e86fab52a..c688caecd 100644
--- a/app/dao/services_dao.py
+++ b/app/dao/services_dao.py
@@ -233,17 +233,19 @@ 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)
-        .filter_by(created_by_id=user_id)
-        .order_by(asc(Service.created_at))
+    query = Service.query.filter_by(created_by_id=user_id).order_by(
+        asc(Service.created_at)
     )
-    result = db.session.execute(stmt)
-    return result.scalars.all()
+
+    return query.all()
+
+    # stmt = (
+    #     select(Service)
+    #     .filter_by(created_by_id=user_id)
+    #     .order_by(asc(Service.created_at))
+    # )
+    # result = db.session.execute(stmt)
+    # return result.scalars.all()
 
 
 @autocommit