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

[WIP]

Browse Source 
Fix the query to count rather than sum the billing units.
Need to fix the query that returns the monhtly billing, there is only one row but there should be two if there are two rates.
This commit is contained in:
Rebecca Law
2017-12-15 17:29:32 +00:00
parent c08f67ea63
commit e0e64d51d5
4 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/billing/rest.py
View File

@@ -9,7 +9,7 @@ from app.dao.monthly_billing_dao import (
)
from app.dao.date_util import get_financial_year, get_months_for_financial_year
from app.errors import register_errors
from app.models import SMS_TYPE, EMAIL_TYPE
from app.models import SMS_TYPE, EMAIL_TYPE, LETTER_TYPE
from app.utils import convert_utc_to_bst
from app.dao.annual_billing_dao import (dao_get_free_sms_fragment_limit_for_year,
dao_get_all_free_sms_fragment_limit,
@@ -40,6 +40,9 @@ def get_yearly_usage_by_month(service_id):
billing_for_month = get_monthly_billing_by_notification_type(service_id, month, SMS_TYPE)
if billing_for_month:
results.append(_transform_billing_for_month(billing_for_month))
letter_billing_for_month = get_monthly_billing_by_notification_type(service_id, month, LETTER_TYPE)
if letter_billing_for_month:
results.append(_transform_billing_for_month(letter_billing_for_month))
return json.dumps(results)
except TypeError:
@@ -51,7 +54,7 @@ def get_yearly_billing_usage_summary(service_id):
try:
year = int(request.args.get('year'))
billing_data = get_billing_data_for_financial_year(service_id, year)
notification_types = [SMS_TYPE, EMAIL_TYPE]
notification_types = [SMS_TYPE, EMAIL_TYPE, LETTER_TYPE]
response = [
_get_total_billable_units_and_rate_for_notification_type(billing_data, notification_type)
for notification_type in notification_types