darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-04 18:31:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

convert more queries

Browse Source
This commit is contained in:
Kenneth Kehl
2024-10-09 14:23:43 -07:00
parent f771c30430
commit ae60cbe564
1 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
app/dao/services_dao.py
View File

@@ -704,23 +704,34 @@ def dao_find_services_with_high_failure_rates(start_date, end_date, threshold=10
def get_live_services_with_organization(): def get_live_services_with_organization():
query = ( # query = (
db.session.query( # db.session.query(
Service.id.label("service_id"), # Service.id.label("service_id"),
# Service.name.label("service_name"),
# Organization.id.label("organization_id"),
# Organization.name.label("organization_name"),
# )
# .outerjoin(Service.organization)
# .filter(
# Service.count_as_live.is_(True),
# Service.active.is_(True),
# Service.restricted.is_(False),
# )
# .order_by(Organization.name, Service.name)
# )
# return query.all()
stmt = select(Service.id.label("service_id"),
Service.name.label("service_name"), Service.name.label("service_name"),
Organization.id.label("organization_id"), Organization.id.label("organization_id"),
Organization.name.label("organization_name"), Organization.name.label("organization_name")).select_from(Service).outerjoin(Service.organization).filter(
)
.outerjoin(Service.organization)
.filter(
Service.count_as_live.is_(True), Service.count_as_live.is_(True),
Service.active.is_(True), Service.active.is_(True),
Service.restricted.is_(False), Service.restricted.is_(False),
) ).order_by(Organization.name, Service.name)
.order_by(Organization.name, Service.name)
)
return query.all() return db.session.execute(stmt).all()
def fetch_notification_stats_for_service_by_month_by_user( def fetch_notification_stats_for_service_by_month_by_user(