darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-20 15:31:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add "charged_units" to service usage APIs

Browse Source 
This can be calculated from the "free_allowance_used" field and the
"chargeable_units" field, but having it included separately is more
convenient as it can be used directly in Admin [^1].

[^1]: 417e7370bb/app/templates/views/usage.html (L38-L39)
This commit is contained in:
Ben Thorner
2022-04-26 17:56:17 +01:00
parent 555868c442
commit ebaef4b57b
4 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/dao/fact_billing_dao.py
View File

@@ -225,6 +225,7 @@ def fetch_billing_totals_for_year(service_id, year):
func.sum(query.c.chargeable_units).label("chargeable_units"),
func.sum(query.c.cost).label("cost"),
func.sum(query.c.free_allowance_used).label("free_allowance_used"),
func.sum(query.c.charged_units).label("charged_units"),
).group_by(
query.c.rate,
query.c.notification_type
@@ -284,6 +285,7 @@ def fetch_monthly_billing_for_year(service_id, year):
func.sum(query.c.chargeable_units).label("chargeable_units"),
func.sum(query.c.cost).label("cost"),
func.sum(query.c.free_allowance_used).label("free_allowance_used"),
func.sum(query.c.charged_units).label("charged_units"),
).group_by(
query.c.rate,
query.c.notification_type,
@@ -317,6 +319,7 @@ def query_service_email_usage_for_year(service_id, year):
FactBilling.notification_type,
literal(0).label("cost"),
literal(0).label("free_allowance_used"),
FactBilling.billable_units.label("charged_units"),
).filter(
FactBilling.service_id == service_id,
FactBilling.bst_date >= year_start,
@@ -342,6 +345,7 @@ def query_service_letter_usage_for_year(service_id, year):
FactBilling.notification_type,
(FactBilling.notifications_sent * FactBilling.rate).label("cost"),
literal(0).label("free_allowance_used"),
FactBilling.notifications_sent.label("charged_units"),
).filter(
FactBilling.service_id == service_id,
FactBilling.bst_date >= year_start,
@@ -421,6 +425,7 @@ def query_service_sms_usage_for_year(service_id, year):
FactBilling.notification_type,
(charged_units * FactBilling.rate).label("cost"),
free_allowance_used.label("free_allowance_used"),
charged_units.label("charged_units"),
).join(
AnnualBilling,
AnnualBilling.service_id == service_id