convert other daos

This commit is contained in:
Kenneth Kehl
2024-10-10 08:33:14 -07:00
parent 36a8346972
commit 556158012d

View File

@@ -176,10 +176,14 @@ def dao_fetch_live_services_data():
.subquery() .subquery()
) )
this_year_ft_billing = select(FactBilling).filter( this_year_ft_billing = (
FactBilling.local_date >= year_start_date, select(FactBilling)
FactBilling.local_date <= year_end_date, .filter(
).subquery() FactBilling.local_date >= year_start_date,
FactBilling.local_date <= year_end_date,
)
.subquery()
)
stmt = ( stmt = (
select( select(
@@ -250,8 +254,6 @@ def dao_fetch_live_services_data():
data = db.session.execute(stmt).scalars().all() data = db.session.execute(stmt).scalars().all()
results = [] results = []
for row in data: for row in data:
existing_service = next( existing_service = next(