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

swap out uk org types for us-specific org types

Browse Source
This commit is contained in:
stvnrlly
2022-09-26 16:47:57 +00:00
parent 5e50e54a4b
commit 0186095920
13 changed files with 80 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/app/billing/test_rest.py
View File

@@ -108,7 +108,7 @@ def test_get_free_sms_fragment_limit_current_year_creates_new_row_if_annual_bill
)
assert json_response['financial_year_start'] == 2021
assert json_response['free_sms_fragment_limit'] == 10000 # based on other organisation type
assert json_response['free_sms_fragment_limit'] == 150000 # based on other organisation type
def test_update_free_sms_fragment_limit_data(client, sample_service):

42
tests/app/dao/test_annual_billing_dao.py
View File

@@ -47,31 +47,17 @@ def test_dao_update_annual_billing_for_future_years(notify_db_session, sample_se
@pytest.mark.parametrize('org_type, year, expected_default',
[('central', 2021, 150000),
('local', 2021, 25000),
('nhs_central', 2021, 150000),
('nhs_local', 2021, 25000),
('nhs_gp', 2021, 10000),
('emergency_service', 2021, 25000),
('school_or_college', 2021, 10000),
('other', 2021, 10000),
(None, 2021, 10000),
('central', 2020, 250000),
('local', 2020, 25000),
('nhs_central', 2020, 250000),
('nhs_local', 2020, 25000),
('nhs_gp', 2020, 25000),
('emergency_service', 2020, 25000),
('school_or_college', 2020, 25000),
('other', 2020, 25000),
(None, 2020, 25000),
('central', 2019, 250000),
('school_or_college', 2022, 10000),
('central', 2022, 40000),
('local', 2022, 20000),
('nhs_local', 2022, 20000),
('emergency_service', 2022, 20000),
('central', 2023, 40000),
[('federal', 2021, 150000),
('state', 2021, 150000),
(None, 2021, 150000),
('federal', 2020, 250000),
('state', 2020, 250000),
('other', 2020, 250000),
(None, 2020, 250000),
('federal', 2019, 250000),
('federal', 2022, 40000),
('state', 2022, 40000),
('federal', 2023, 40000),
])
def test_set_default_free_allowance_for_service(notify_db_session, org_type, year, expected_default):
@@ -93,7 +79,7 @@ def test_set_default_free_allowance_for_service_using_correct_year(sample_servic
mock_dao.assert_called_once_with(
sample_service.id,
25000,
250000,
2020
)
@@ -105,9 +91,9 @@ def test_set_default_free_allowance_for_service_updates_existing_year(sample_ser
assert not sample_service.organisation_type
assert len(annual_billing) == 1
assert annual_billing[0].service_id == sample_service.id
assert annual_billing[0].free_sms_fragment_limit == 10000
assert annual_billing[0].free_sms_fragment_limit == 150000
sample_service.organisation_type = 'central'
sample_service.organisation_type = 'federal'
set_default_free_allowance_for_service(service=sample_service, year_start=None)
annual_billing = AnnualBilling.query.all()

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

@@ -162,6 +162,7 @@ def test_create_service_with_organisation(notify_db_session):
# the NHS branding set up
('SHN', False),
))
@pytest.mark.skip(reason='Update for TTS')
def test_create_nhs_service_get_default_branding_based_on_email_address(
notify_db_session,
branding_name_to_create,

2
tests/app/db.py
View File

@@ -122,7 +122,7 @@ def create_service(
email_from=None,
prefix_sms=True,
message_limit=1000,
organisation_type='central',
organisation_type='federal',
check_if_service_exists=False,
go_live_user=None,
go_live_at=None,

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

@@ -26,7 +26,7 @@ from tests.app.db import (
def test_get_all_organisations(admin_request, notify_db_session):
create_organisation(name='inactive org', active=False, organisation_type='nhs_central')
create_organisation(name='inactive org', active=False, organisation_type='federal')
create_organisation(name='active org', domains=['example.com'])
response = admin_request.get(
@@ -52,7 +52,7 @@ def test_get_all_organisations(admin_request, notify_db_session):
assert response[1]['active'] is False
assert response[1]['count_of_live_services'] == 0
assert response[1]['domains'] == []
assert response[1]['organisation_type'] == 'nhs_central'
assert response[1]['organisation_type'] == 'federal'
def test_get_organisation_by_id(admin_request, notify_db_session):
@@ -169,7 +169,7 @@ def test_post_create_organisation(admin_request, notify_db_session, crown):
'name': 'test organisation',
'active': True,
'crown': crown,
'organisation_type': 'local',
'organisation_type': 'state',
}
response = admin_request.post(
@@ -191,6 +191,7 @@ def test_post_create_organisation(admin_request, notify_db_session, crown):
@pytest.mark.parametrize('org_type', ["nhs_central", "nhs_local", "nhs_gp"])
@pytest.mark.skip(reason='Update for TTS')
def test_post_create_organisation_sets_default_nhs_branding_for_nhs_orgs(
admin_request, notify_db_session, nhs_email_branding, org_type
):
@@ -218,7 +219,7 @@ def test_post_create_organisation_existing_name_raises_400(admin_request, sample
'name': sample_organisation.name,
'active': True,
'crown': True,
'organisation_type': 'central',
'organisation_type': 'federal',
}
response = admin_request.post(
@@ -237,12 +238,12 @@ def test_post_create_organisation_existing_name_raises_400(admin_request, sample
({
'active': False,
'crown': True,
'organisation_type': 'central',
'organisation_type': 'federal',
}, 'name is a required property'),
({
'active': False,
'name': 'Service name',
'organisation_type': 'central',
'organisation_type': 'federal',
}, 'crown is a required property'),
({
'active': False,
@@ -253,7 +254,7 @@ def test_post_create_organisation_existing_name_raises_400(admin_request, sample
'active': False,
'name': 'Service name',
'crown': None,
'organisation_type': 'central',
'organisation_type': 'federal',
}, 'crown None is not of type boolean'),
({
'active': False,
@@ -262,7 +263,7 @@ def test_post_create_organisation_existing_name_raises_400(admin_request, sample
'organisation_type': 'foo',
}, (
'organisation_type foo is not one of '
'[central, local, nhs_central, nhs_local, nhs_gp, emergency_service, school_or_college, other]'
'[federal, state, other]'
)),
))
def test_post_create_organisation_with_missing_data_gives_validation_error(
@@ -295,7 +296,7 @@ def test_post_update_organisation_updates_fields(
'name': 'new organisation name',
'active': False,
'crown': crown,
'organisation_type': 'central',
'organisation_type': 'federal',
}
assert org.crown is None
@@ -314,7 +315,7 @@ def test_post_update_organisation_updates_fields(
assert organisation[0].active == data['active']
assert organisation[0].crown == crown
assert organisation[0].domains == []
assert organisation[0].organisation_type == 'central'
assert organisation[0].organisation_type == 'federal'
@pytest.mark.parametrize('domain_list', (
@@ -371,6 +372,7 @@ def test_update_other_organisation_attributes_doesnt_clear_domains(
@pytest.mark.parametrize('new_org_type', ["nhs_central", "nhs_local", "nhs_gp"])
@pytest.mark.skip(reason='Update for TTS')
def test_post_update_organisation_to_nhs_type_updates_branding_if_none_present(
admin_request,
nhs_email_branding,
@@ -398,6 +400,7 @@ def test_post_update_organisation_to_nhs_type_updates_branding_if_none_present(
@pytest.mark.parametrize('new_org_type', ["nhs_central", "nhs_local", "nhs_gp"])
@pytest.mark.skip(reason='Update for TTS')
def test_post_update_organisation_to_nhs_type_does_not_update_branding_if_default_branding_set(
admin_request,
nhs_email_branding,
@@ -581,7 +584,7 @@ def test_post_link_service_to_organisation(admin_request, sample_service):
data = {
'service_id': str(sample_service.id)
}
organisation = create_organisation(organisation_type='central')
organisation = create_organisation(organisation_type='federal')
admin_request.post(
'organisation.link_service_to_organisation',
@@ -590,7 +593,7 @@ def test_post_link_service_to_organisation(admin_request, sample_service):
_expected_status=204
)
assert len(organisation.services) == 1
assert sample_service.organisation_type == 'central'
assert sample_service.organisation_type == 'federal'
@freeze_time('2021-09-24 13:30')
@@ -598,7 +601,7 @@ def test_post_link_service_to_organisation_inserts_annual_billing(admin_request,
data = {
'service_id': str(sample_service.id)
}
organisation = create_organisation(organisation_type='central')
organisation = create_organisation(organisation_type='federal')
assert len(organisation.services) == 0
assert len(AnnualBilling.query.all()) == 0
admin_request.post(
@@ -623,7 +626,7 @@ def test_post_link_service_to_organisation_rollback_service_if_annual_billing_up
}
assert not sample_service.organisation_type
organisation = create_organisation(organisation_type='central')
organisation = create_organisation(organisation_type='federal')
assert len(organisation.services) == 0
assert len(AnnualBilling.query.all()) == 0
with pytest.raises(expected_exception=SQLAlchemyError):
@@ -655,7 +658,7 @@ def test_post_link_service_to_another_org(
assert len(sample_organisation.services) == 1
assert not sample_service.organisation_type
new_org = create_organisation(organisation_type='central')
new_org = create_organisation(organisation_type='federal')
admin_request.post(
'organisation.link_service_to_organisation',
_data=data,
@@ -664,7 +667,7 @@ def test_post_link_service_to_another_org(
)
assert not sample_organisation.services
assert len(new_org.services) == 1
assert sample_service.organisation_type == 'central'
assert sample_service.organisation_type == 'federal'
annual_billing = AnnualBilling.query.all()
assert len(annual_billing) == 1
assert annual_billing[0].free_sms_fragment_limit == 150000

5
tests/app/test_commands.py
View File

@@ -43,9 +43,8 @@ def test_local_dev_broadcast_permissions(
@pytest.mark.parametrize("organisation_type, expected_allowance",
[('central', 40000),
('local', 20000),
('nhs_gp', 10000)])
[('federal', 40000),
('state', 40000)])
def test_populate_annual_billing_with_defaults(
notify_db_session, notify_api, organisation_type, expected_allowance
):