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

Fix misleading billable_units in letter test data

Browse Source 
Letters are weird:

- "rate" is adjusted based on the number of pages [^1].

- "billable_units" is the number of sheets [^2], but doesn't seem
to be used for anything.

Instead of "billable_units", we multiply "notifications_sent" and
the page-adjusted "rate" to determine the cost of a batch [^3][^4].

[^1]: a4fe11a3aa/app/dao/fact_billing_dao.py (L473)
[^2]: a4fe11a3aa/app/letters/utils.py (L230)
[^3]: a4fe11a3aa/app/dao/fact_billing_dao.py (L828)
[^4]: a4fe11a3aa/app/dao/fact_billing_dao.py (L128)
This commit is contained in:
Ben Thorner
2022-04-27 15:07:49 +01:00
parent bf66614899
commit 46cbac62ef
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tests/app/dao/test_ft_billing_dao.py
View File

@@ -76,7 +76,16 @@ def set_up_yearly_data_variable_rates():
create_ft_billing(bst_date='2018-05-17', template=sms_template, rate_multiplier=2, rate=0.162, billable_unit=2) create_ft_billing(bst_date='2018-05-17', template=sms_template, rate_multiplier=2, rate=0.162, billable_unit=2)
create_ft_billing(bst_date='2018-05-16', template=sms_template, rate_multiplier=2, rate=0.0150, billable_unit=2) create_ft_billing(bst_date='2018-05-16', template=sms_template, rate_multiplier=2, rate=0.0150, billable_unit=2)
create_ft_billing(bst_date='2018-05-16', template=letter_template, rate=0.33, postage='second') create_ft_billing(bst_date='2018-05-16', template=letter_template, rate=0.33, postage='second')
create_ft_billing(bst_date='2018-05-17', template=letter_template, rate=0.36, billable_unit=2, postage='second')
create_ft_billing(
bst_date='2018-05-17',
template=letter_template,
rate=0.36,
notifications_sent=2,
billable_unit=4, # 2 pages each
postage='second'
)
return service return service
@@ -464,8 +473,8 @@ def test_fetch_monthly_billing_for_year_variable_rates(notify_db_session):
assert str(results[1].month) == "2018-05-01" assert str(results[1].month) == "2018-05-01"
assert results[1].notification_type == 'letter' assert results[1].notification_type == 'letter'
assert results[1].notifications_sent == 1 assert results[1].notifications_sent == 2
assert results[1].billable_units == 1 assert results[1].billable_units == 2
assert results[1].rate == Decimal('0.36') assert results[1].rate == Decimal('0.36')
assert str(results[2].month) == "2018-05-01" assert str(results[2].month) == "2018-05-01"
@@ -537,8 +546,8 @@ def test_fetch_billing_totals_for_year_variable_rates(notify_db_session):
assert results[0].rate == Decimal('0.33') assert results[0].rate == Decimal('0.33')
assert results[1].notification_type == 'letter' assert results[1].notification_type == 'letter'
assert results[1].notifications_sent == 1 assert results[1].notifications_sent == 2
assert results[1].billable_units == 1 assert results[1].billable_units == 2
assert results[1].rate == Decimal('0.36') assert results[1].rate == Decimal('0.36')
assert results[2].notification_type == 'sms' assert results[2].notification_type == 'sms'