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

Add more realistic test

Browse Source 
Add statsd
Fix imports
This commit is contained in:
Rebecca Law
2020-02-25 17:47:03 +00:00
parent 67c64a8715
commit f7a564a17c
3 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,7 +18,9 @@ from app.dao.fact_billing_dao import (
get_rates_for_billing,
fetch_sms_free_allowance_remainder,
fetch_sms_billing_for_all_services,
fetch_letter_costs_for_all_services, fetch_letter_line_items_for_all_services, fetch_usage_year_for_organisation
fetch_letter_costs_for_all_services,
fetch_letter_line_items_for_all_services,
fetch_usage_year_for_organisation
)
from app.dao.organisation_dao import dao_add_service_to_organisation
from app.models import (
@@ -583,8 +585,6 @@ def test_fetch_sms_billing_for_all_services_with_remainder(notify_db_session):
results = fetch_sms_billing_for_all_services(datetime(2019, 5, 1), datetime(2019, 5, 31))
assert len(results) == 3
# (organisation_name, organisation_id, service_name, free_sms_fragment_limit, sms_rate,
# sms_remainder, sms_billable_units, chargeable_billable_sms, sms_cost)
assert results[0] == (org.name, org.id, service.name, service.id, 10, Decimal('0.11'), 8, 3, 0, Decimal('0'))
assert results[1] == (org_2.name, org_2.id, service_2.name, service_2.id, 10, Decimal('0.11'), 0, 3, 3,
Decimal('0.33'))

19
tests/app/organisation/test_rest.py
View File

@@ -15,7 +15,8 @@ from tests.app.db import (
create_service,
create_user,
create_template,
create_ft_billing
create_ft_billing,
create_annual_billing
)
@@ -750,7 +751,9 @@ def test_get_organisation_services_usage(admin_request, notify_db_session):
service = create_service()
template = create_template(service=service)
dao_add_service_to_organisation(service=service, organisation_id=org.id)
create_ft_billing(bst_date=datetime.utcnow().date(), template=template, billable_unit=19, notifications_sent=19)
create_annual_billing(service_id=service.id, free_sms_fragment_limit=10, financial_year_start=2019)
create_ft_billing(bst_date=datetime.utcnow().date(), template=template, billable_unit=19, rate=0.060,
notifications_sent=19)
response = admin_request.get(
'organisation.get_organisation_services_usage',
organisation_id=org.id,
@@ -758,8 +761,16 @@ def test_get_organisation_services_usage(admin_request, notify_db_session):
)
assert len(response) == 1
assert len(response['services']) == 1
print(response)
assert response['services'][0]['service_id'] == str(service.id)
service_usage = response['services'][0]
assert service_usage['service_id'] == str(service.id)
assert service_usage['service_name'] == service.name
assert service_usage['chargeable_billable_sms'] == 9.0
assert service_usage['emails_sent'] == 0
assert service_usage['free_sms_limit'] == 10
assert service_usage['letter_cost'] == 0
assert service_usage['sms_billable_units'] == 19
assert service_usage['sms_remainder'] == 10
assert service_usage['sms_cost'] == 0.54
def test_get_organisation_services_usage_returns_400_if_year_is_invalid(admin_request):