darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-09-09 17:45:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

upgrade org and template dao to sqlalchemy 2.0

Browse Source
This commit is contained in:
Kenneth Kehl
2024-10-11 13:30:59 -07:00
parent 70022c0596
commit 7e16eeb386
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/dao/organization_dao.py
View File

@@ -1,3 +1,4 @@
from sqlalchemy import select
from sqlalchemy.sql.expression import func from sqlalchemy.sql.expression import func
from app import db from app import db
@@ -6,14 +7,15 @@ from app.models import Domain, Organization, Service, User
def dao_get_organizations(): def dao_get_organizations():
return Organization.query.order_by( stmt = select(Organization).order_by(
Organization.active.desc(), Organization.name.asc() Organization.active.desc(), Organization.name.asc()
).all() )
return db.session.execute(stmt).scalars().all()
def dao_count_organizations_with_live_services(): def dao_count_organizations_with_live_services():
return ( stmt = (
db.session.query(Organization.id) select(func.count(Organization.id))
.join(Organization.services) .join(Organization.services)
.filter( .filter(
Service.active.is_(True), Service.active.is_(True),
@@ -21,8 +23,8 @@ def dao_count_organizations_with_live_services():
Service.count_as_live.is_(True), Service.count_as_live.is_(True),
) )
.distinct() .distinct()
.count()
) )
return db.session.execute(stmt).scalar() or 0
def dao_get_organization_services(organization_id): def dao_get_organization_services(organization_id):