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

update billing dao

Browse Source
This commit is contained in:
Kenneth Kehl
2024-10-14 11:52:42 -07:00
parent a530bab859
commit 287b7d1dec
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/dao/fact_billing_dao.py
View File

@@ -845,8 +845,8 @@ def fetch_daily_volumes_for_platform(start_date, end_date):
def fetch_daily_sms_provider_volumes_for_platform(start_date, end_date): def fetch_daily_sms_provider_volumes_for_platform(start_date, end_date):
# query to return the total notifications sent per day for each channel. NB start and end dates are inclusive # query to return the total notifications sent per day for each channel. NB start and end dates are inclusive
daily_volume_stats = ( stmt = (
db.session.query( select(
FactBilling.local_date, FactBilling.local_date,
FactBilling.provider, FactBilling.provider,
func.sum(FactBilling.notifications_sent).label("sms_totals"), func.sum(FactBilling.notifications_sent).label("sms_totals"),
@@ -860,6 +860,7 @@ def fetch_daily_sms_provider_volumes_for_platform(start_date, end_date):
* FactBilling.rate * FactBilling.rate
).label("sms_cost"), ).label("sms_cost"),
) )
.select_from(FactBilling)
.filter( .filter(
FactBilling.notification_type == NotificationType.SMS, FactBilling.notification_type == NotificationType.SMS,
FactBilling.local_date >= start_date, FactBilling.local_date >= start_date,
@@ -873,10 +874,8 @@ def fetch_daily_sms_provider_volumes_for_platform(start_date, end_date):
FactBilling.local_date, FactBilling.local_date,
FactBilling.provider, FactBilling.provider,
) )
.all()
) )
return db.session.execute(stmt).scalars().all()
return daily_volume_stats
def fetch_volumes_by_service(start_date, end_date): def fetch_volumes_by_service(start_date, end_date):
@@ -885,7 +884,7 @@ def fetch_volumes_by_service(start_date, end_date):
year_end_date = int(end_date.strftime("%Y")) year_end_date = int(end_date.strftime("%Y"))
volume_stats = ( volume_stats = (
db.session.query( select(
FactBilling.local_date, FactBilling.local_date,
FactBilling.service_id, FactBilling.service_id,
func.sum( func.sum(
@@ -916,6 +915,7 @@ def fetch_volumes_by_service(start_date, end_date):
) )
).label("email_totals"), ).label("email_totals"),
) )
.select_from(FactBilling)
.filter( .filter(
FactBilling.local_date >= start_date, FactBilling.local_date <= end_date FactBilling.local_date >= start_date, FactBilling.local_date <= end_date
) )
@@ -928,18 +928,18 @@ def fetch_volumes_by_service(start_date, end_date):
) )
annual_billing = ( annual_billing = (
db.session.query( select(
func.max(AnnualBilling.financial_year_start).label("financial_year_start"), func.max(AnnualBilling.financial_year_start).label("financial_year_start"),
AnnualBilling.service_id, AnnualBilling.service_id,
AnnualBilling.free_sms_fragment_limit, AnnualBilling.free_sms_fragment_limit,
) )
.select_from(AnnualBilling)
.filter(AnnualBilling.financial_year_start <= year_end_date) .filter(AnnualBilling.financial_year_start <= year_end_date)
.group_by(AnnualBilling.service_id, AnnualBilling.free_sms_fragment_limit) .group_by(AnnualBilling.service_id, AnnualBilling.free_sms_fragment_limit)
.subquery() .subquery()
) )
stmt = (
results = ( select(
db.session.query(
Service.name.label("service_name"), Service.name.label("service_name"),
Service.id.label("service_id"), Service.id.label("service_id"),
Service.organization_id.label("organization_id"), Service.organization_id.label("organization_id"),
@@ -977,7 +977,7 @@ def fetch_volumes_by_service(start_date, end_date):
Organization.name, Organization.name,
Service.name, Service.name,
) )
.all()
) )
results = db.session.execute(stmt).scalars().all()
return results return results