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

wip test combining complex sms billing queries

Browse Source
This commit is contained in:
Ben Thorner
2022-05-27 14:01:18 +01:00
parent 73cdec43c0
commit e817de9e02
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/dao/fact_billing_dao.py
View File

@@ -376,6 +376,9 @@ def query_service_sms_usage_for_year(service_id, year):
on a given bst_date. This means we don't need to worry about how to assign
free allowance if it happens to run out when a rate changes.
"""
return query_sms_usage_for_year_per_service(year).filter(
Service.id == service_id
)
year_start, year_end = get_financial_year_dates(year)
this_rows_chargeable_units = FactBilling.billable_units * FactBilling.rate_multiplier
@@ -803,13 +806,19 @@ def query_sms_usage_for_year_per_service(year):
charged_units = func.greatest(this_rows_chargeable_units - remaining_free_allowance_before_this_row, 0)
free_allowance_used_to_date = chargeable_units_used_before_this_row + this_rows_chargeable_units
free_allowance_used = func.least(remaining_free_allowance_before_this_row, this_rows_chargeable_units)
return db.session.query(
FactBilling.postage, # should always be "none"
FactBilling.notifications_sent,
FactBilling.rate,
FactBilling.notification_type,
free_allowance_used.label("free_allowance_used"),
charged_units.label("charged_units"),
Service.id.label('service_id'),
FactBilling.bst_date,
this_rows_chargeable_units.label("chargeable_units"),
(charged_units * FactBilling.rate).label("cost"),
charged_units.label("charged_units"),
free_allowance_used_to_date.label("free_allowance_used_to_date"),
).join(
AnnualBilling,