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

Update ft_billing DAO functions to use postage

Browse Source 
* Updated the 'fetch_billing_data_for_day' DAO function to take postage into
account
* Updated the 'update_fact_billing' DAO function to insert postage for
new rows. When updating rows which are identical apart from the postage, the
original row will be kept. (This behaviour will change once postage is
added to the primary key - at this point, upserting will add a new row.)
* Also changed some fixtures / test set up functions to take postage
into account
This commit is contained in:
Katie Smith
2018-09-26 11:28:59 +01:00
parent 0b5da2b8ad
commit 6727f0e0f5
6 changed files with 95 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/app/billing/test_billing.py
View File

@@ -200,7 +200,8 @@ def test_get_yearly_usage_by_monthly_from_ft_billing(client, notify_db_session):
template=letter_template,
notification_type='letter',
billable_unit=1,
rate=0.33)
rate=0.33,
postage='second')
response = client.get('service/{}/billing/ft-monthly-usage?year=2016'.format(service.id),
headers=[('Content-Type', 'application/json'), create_authorization_header()])
@@ -257,7 +258,8 @@ def set_up_yearly_data():
service=service,
template=letter_template,
notification_type='letter',
rate=0.33)
rate=0.33,
postage='second')
start_date, end_date = get_month_start_and_end_date_in_utc(datetime(2016, int(mon), 1))
return service
@@ -429,7 +431,8 @@ def set_up_data_for_all_cases():
international=False,
rate=0.33,
billable_unit=1,
notifications_sent=1)
notifications_sent=1,
postage='second')
create_ft_billing(bst_date='2018-05-17',
notification_type='letter',
template=letter_template,
@@ -438,7 +441,8 @@ def set_up_data_for_all_cases():
international=False,
rate=0.36,
billable_unit=2,
notifications_sent=1)
notifications_sent=1,
postage='second')
create_ft_billing(bst_date='2018-05-18',
notification_type='letter',
template=letter_template,
@@ -447,5 +451,6 @@ def set_up_data_for_all_cases():
international=False,
rate=0.39,
billable_unit=3,
notifications_sent=1)
notifications_sent=1,
postage='second')
return service