darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-01 23:55:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Return postage from the monthly-usage endpoint

Browse Source 
We were already returning the month, notification_type, billing_units
and rate from the /monthly-usage billing endpoint. This adds in the
postage too so that we can display postage details on the usage page of
admin.
This commit is contained in:
Katie Smith
2018-09-27 13:58:01 +01:00
parent 0843503b7a
commit 236bbc5f28
4 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/billing/billing_schemas.py
View File

@@ -22,6 +22,7 @@ def serialize_ft_billing_remove_emails(data):
"notification_type": notification.notification_type,
"billing_units": notification.billable_units,
"rate": float(notification.rate),
"postage": notification.postage,
}
results.append(json_result)
return results

12
app/dao/fact_billing_dao.py
View File

@@ -87,7 +87,8 @@ def fetch_monthly_billing_for_year(service_id, year):
func.sum(FactBilling.notifications_sent).label("notifications_sent"),
func.sum(FactBilling.notifications_sent).label("billable_units"),
FactBilling.rate.label('rate'),
FactBilling.notification_type.label('notification_type')
FactBilling.notification_type.label('notification_type'),
FactBilling.postage
).filter(
FactBilling.service_id == service_id,
FactBilling.bst_date >= year_start_date,
@@ -96,7 +97,8 @@ def fetch_monthly_billing_for_year(service_id, year):
).group_by(
'month',
FactBilling.rate,
FactBilling.notification_type
FactBilling.notification_type,
FactBilling.postage
)
sms = db.session.query(
@@ -104,7 +106,8 @@ def fetch_monthly_billing_for_year(service_id, year):
func.sum(FactBilling.notifications_sent).label("notifications_sent"),
func.sum(FactBilling.billable_units * FactBilling.rate_multiplier).label("billable_units"),
FactBilling.rate,
FactBilling.notification_type
FactBilling.notification_type,
FactBilling.postage
).filter(
FactBilling.service_id == service_id,
FactBilling.bst_date >= year_start_date,
@@ -113,7 +116,8 @@ def fetch_monthly_billing_for_year(service_id, year):
).group_by(
'month',
FactBilling.rate,
FactBilling.notification_type
FactBilling.notification_type,
FactBilling.postage
)
yearly_data = email_and_letters.union_all(sms).order_by(