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

Merge pull request #2960 from alphagov/int-ft-billing

Browse Source 
Set 'international' for letters in ft_billing
This commit is contained in:
Katie Smith
2020-08-25 10:27:51 +01:00
committed by GitHub
parent 6439200c71 b30701d7e1
commit cf20588603
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/dao/fact_billing_dao.py
View File

@@ -401,7 +401,7 @@ def _query_for_billing_data(table, notification_type, start_date, end_date, serv
literal(notification_type).label('notification_type'),
literal('dvla').label('sent_by'),
rate_multiplier.label('rate_multiplier'),
literal(False).label('international'), # todo: this may change in the future.
table.international,
table.billable_units.label('letter_page_count'),
postage.label('postage'),
func.sum(table.billable_units).label('billable_units'),
@@ -417,7 +417,8 @@ def _query_for_billing_data(table, notification_type, start_date, end_date, serv
table.template_id,
rate_multiplier,
table.billable_units,
postage
postage,
table.international
)
query_funcs = {

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

@@ -175,15 +175,17 @@ def test_fetch_billing_data_for_day_is_grouped_by_rate_mulitplier(notify_db_sess
def test_fetch_billing_data_for_day_is_grouped_by_international(notify_db_session):
service = create_service()
template = create_template(service=service)
create_notification(template=template, status='delivered', international=True)
create_notification(template=template, status='delivered', international=False)
sms_template = create_template(service=service)
letter_template = create_template(template_type='letter', service=service)
create_notification(template=sms_template, status='delivered', international=True)
create_notification(template=sms_template, status='delivered', international=False)
create_notification(template=letter_template, status='delivered', international=True)
create_notification(template=letter_template, status='delivered', international=False)
today = convert_utc_to_bst(datetime.utcnow())
results = fetch_billing_data_for_day(today.date())
assert len(results) == 2
assert results[0].notifications_sent == 1
assert results[1].notifications_sent == 1
assert len(results) == 4
assert all(result.notifications_sent == 1 for result in results)
def test_fetch_billing_data_for_day_is_grouped_by_notification_type(notify_db_session):
@@ -212,11 +214,13 @@ def test_fetch_billing_data_for_day_groups_by_postage(notify_db_session):
create_notification(template=letter_template, status='delivered', postage='first')
create_notification(template=letter_template, status='delivered', postage='first')
create_notification(template=letter_template, status='delivered', postage='second')
create_notification(template=letter_template, status='delivered', postage='europe')
create_notification(template=letter_template, status='delivered', postage='rest-of-world')
create_notification(template=email_template, status='delivered')
today = convert_utc_to_bst(datetime.utcnow())
results = fetch_billing_data_for_day(today.date())
assert len(results) == 3
assert len(results) == 5
def test_fetch_billing_data_for_day_groups_by_sent_by(notify_db_session):