From 09907cc4afd7ef8810719132b73fc38224bcc8c4 Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Tue, 21 Oct 2025 14:50:30 -0700 Subject: [PATCH] removed the next() lookup --- app/dao/fact_billing_dao.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/dao/fact_billing_dao.py b/app/dao/fact_billing_dao.py index 8e72d6ad3..36e65b887 100644 --- a/app/dao/fact_billing_dao.py +++ b/app/dao/fact_billing_dao.py @@ -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)][