From 49fd034b34fa916112e100f4ad37eb57db06408d Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Tue, 8 Oct 2024 13:15:10 -0700
Subject: [PATCH] try by not closing session

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

diff --git a/app/dao/services_dao.py b/app/dao/services_dao.py
index 281529d7c..ff4d372de 100644
--- a/app/dao/services_dao.py
+++ b/app/dao/services_dao.py
@@ -3,7 +3,7 @@ from datetime import timedelta
 
 from flask import current_app
 from sqlalchemy import Float, cast, select
-from sqlalchemy.orm import Session, joinedload
+from sqlalchemy.orm import joinedload
 from sqlalchemy.sql.expression import and_, asc, case, func
 
 from app import db
@@ -51,21 +51,21 @@ from app.utils import (
 
 
 def dao_fetch_all_services(only_active=False):
-    with Session(db.engine) as session:
+
+    stmt = (
+        select(Service)
+        .order_by(asc(Service.created_at))
+        .options(joinedload(Service.users))
+    )
+    if only_active:
         stmt = (
             select(Service)
+            .where(Service.active is True)
             .order_by(asc(Service.created_at))
             .options(joinedload(Service.users))
         )
-        if only_active:
-            stmt = (
-                select(Service)
-                .where(Service.active is True)
-                .order_by(asc(Service.created_at))
-                .options(joinedload(Service.users))
-            )
-        result = session.execute(stmt).unique()
-        return result.scalars().all()
+    result = db.session.execute(stmt).unique()
+    return result.scalars().all()
 
 
 def get_services_by_partial_name(service_name):