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

remove letters from services_dao

Browse Source
This commit is contained in:
stvnrlly
2023-02-27 16:29:10 -05:00
parent 3eca4b1d99
commit 7489743109
7 changed files with 3 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/app/dao/test_fact_billing_dao.py
View File

@@ -629,7 +629,6 @@ def test_fetch_usage_year_for_organisation(notify_db_session):
assert first_row['sms_remainder'] == 5 # because there are 5 billable units
assert first_row['chargeable_billable_sms'] == 0
assert first_row['sms_cost'] == 0.0
assert first_row['letter_cost'] == 0
assert first_row['emails_sent'] == 0
second_row = results[str(service_with_emails_for_org.id)]
@@ -639,7 +638,6 @@ def test_fetch_usage_year_for_organisation(notify_db_session):
assert second_row['sms_remainder'] == 0
assert second_row['chargeable_billable_sms'] == 0
assert second_row['sms_cost'] == 0
assert second_row['letter_cost'] == 0
assert second_row['emails_sent'] == 1100
third_row = results[str(fixtures["service_with_out_ft_billing_this_year"].id)]
@@ -649,7 +647,6 @@ def test_fetch_usage_year_for_organisation(notify_db_session):
assert third_row['sms_remainder'] == 10
assert third_row['chargeable_billable_sms'] == 0
assert third_row['sms_cost'] == 0
assert third_row['letter_cost'] == 0
assert third_row['emails_sent'] == 0
@@ -1008,9 +1005,6 @@ def test_fetch_volumes_by_service(notify_db_session):
assert results[0].sms_notifications == 2
assert results[0].sms_chargeable_units == 3
assert results[0].email_totals == 0
assert results[0].letter_totals == 0
assert results[0].letter_sheet_totals == 0
assert float(results[0].letter_cost) == 0
assert results[1].service_name == 'f - without ft_billing'
assert results[1].organisation_name == 'Org for a - with sms and letter'
@@ -1018,9 +1012,6 @@ def test_fetch_volumes_by_service(notify_db_session):
assert results[1].sms_notifications == 0
assert results[1].sms_chargeable_units == 0
assert results[1].email_totals == 0
assert results[1].letter_totals == 0
assert results[1].letter_sheet_totals == 0
assert float(results[1].letter_cost) == 0
assert results[3].service_name == 'b - chargeable sms'
assert not results[3].organisation_name
@@ -1028,9 +1019,6 @@ def test_fetch_volumes_by_service(notify_db_session):
assert results[3].sms_notifications == 2
assert results[3].sms_chargeable_units == 3
assert results[3].email_totals == 0
assert results[3].letter_totals == 0
assert results[3].letter_sheet_totals == 0
assert float(results[3].letter_cost) == 0
assert results[4].service_name == 'e - sms within allowance'
assert not results[4].organisation_name
@@ -1038,6 +1026,3 @@ def test_fetch_volumes_by_service(notify_db_session):
assert results[4].sms_notifications == 1
assert results[4].sms_chargeable_units == 2
assert results[4].email_totals == 0
assert results[4].letter_totals == 0
assert results[4].letter_sheet_totals == 0
assert float(results[4].letter_cost) == 0

11
tests/app/dao/test_services_dao.py
View File

@@ -423,20 +423,15 @@ def test_dao_fetch_live_services_data(sample_user):
'organisation_type': 'federal', 'consent_to_research': None, 'contact_name': 'Test User',
'contact_email': 'notify@digital.cabinet-office.gov.uk', 'contact_mobile': '+12028675309',
'live_date': datetime(2014, 4, 20, 10, 0), 'sms_volume_intent': None, 'email_volume_intent': None,
'letter_volume_intent': None, 'sms_totals': 2, 'email_totals': 1, 'letter_totals': 0,
'free_sms_fragment_limit': 100},
'sms_totals': 2, 'email_totals': 1, 'free_sms_fragment_limit': 100},
{'service_id': mock.ANY, 'service_name': 'third', 'organisation_name': None, 'consent_to_research': None,
'organisation_type': None, 'contact_name': None, 'contact_email': None,
'contact_mobile': None, 'live_date': datetime(2016, 4, 20, 10, 0), 'sms_volume_intent': None,
'email_volume_intent': None, 'letter_volume_intent': None,
'sms_totals': 0, 'email_totals': 0, 'letter_totals': 0,
'free_sms_fragment_limit': 200},
'email_volume_intent': None, 'sms_totals': 0, 'email_totals': 0, 'free_sms_fragment_limit': 200},
{'service_id': mock.ANY, 'service_name': 'second', 'organisation_name': None, 'consent_to_research': None,
'contact_name': 'Test User', 'contact_email': 'notify@digital.cabinet-office.gov.uk',
'contact_mobile': '+12028675309', 'live_date': datetime(2017, 4, 20, 10, 0), 'sms_volume_intent': None,
'organisation_type': None, 'email_volume_intent': None, 'letter_volume_intent': None,
'sms_totals': 0, 'email_totals': 0, 'letter_totals': 0,
'free_sms_fragment_limit': 300}
'organisation_type': None, 'email_volume_intent': None, 'sms_totals': 0, 'email_totals': 0, 'free_sms_fragment_limit': 300}
]

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

@@ -841,7 +841,6 @@ def test_get_organisation_services_usage(admin_request, notify_db_session):
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'] == 0
assert service_usage['sms_cost'] == 0.54

4
tests/app/service/test_rest.py
View File

@@ -197,8 +197,6 @@ def test_get_live_services_data(sample_user, admin_request):
'contact_name': 'Test User',
'email_totals': 1,
'email_volume_intent': None,
'letter_totals': 0,
'letter_volume_intent': None,
'live_date': 'Mon, 01 Jan 2018 00:00:00 GMT',
'organisation_name': 'test_org_1',
'service_id': ANY,
@@ -215,8 +213,6 @@ def test_get_live_services_data(sample_user, admin_request):
'contact_name': 'Test User',
'email_totals': 0,
'email_volume_intent': None,
'letter_totals': 0,
'letter_volume_intent': None,
'live_date': 'Tue, 01 Jan 2019 00:00:00 GMT',
'organisation_name': None,
'service_id': ANY,