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

removed the next() lookup

Browse Source
This commit is contained in:
Beverly Nguyen
2025-10-21 14:50:30 -07:00
parent 0267c52098
commit 09907cc4af
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/dao/fact_billing_dao.py
View File

@@ -616,6 +616,8 @@ def fetch_sms_billing_for_organization(organization_id, financial_year):
func.coalesce(chargeable_sms, 0).label("chargeable_billable_sms"),
func.coalesce(sms_cost, 0).label("sms_cost"),
Service.active,
Service.restricted,
Service.created_at,
)
.select_from(Service)
.outerjoin(
@@ -734,7 +736,6 @@ def fetch_usage_year_for_organization(organization_id, year, include_all_service
organization_id, year_start, year_end
)
for usage in sms_usages:
service = next(s for s in services if s.id == usage.service_id)
service_with_usage[str(usage.service_id)] = {
"service_id": usage.service_id,
"service_name": usage.service_name,
@@ -745,8 +746,8 @@ def fetch_usage_year_for_organization(organization_id, year, include_all_service
"sms_cost": float(usage.sms_cost),
"emails_sent": 0,
"active": usage.active,
"restricted": service.restricted,
"created_at": service.created_at.strftime(DATETIME_FORMAT),
"restricted": usage.restricted,
"created_at": usage.created_at.strftime(DATETIME_FORMAT),
}
for email_usage in email_usages:
service_with_usage[str(email_usage.service_id)][