darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-01-26 20:41:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use nhs_gp not gp as org type

Browse Source 
Means we have the option of looking for anything starting with `nhs` as
a way of filtering organisations.
This commit is contained in:
Chris Hill-Scott
2019-08-28 15:21:59 +01:00
parent a5b36457f2
commit edb5790b7c
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models.py
View File

@@ -326,11 +326,11 @@ class Domain(db.Model):
ORGANISATION_TYPES = [
"central", "local", "nhs_central", "nhs_local", "gp", "emergency_service", "school_or_college", "other",
"central", "local", "nhs_central", "nhs_local", "nhs_gp", "emergency_service", "school_or_college", "other",
]
CROWN_ORGANISATION_TYPES = ["nhs_central"]
NON_CROWN_ORGANISATION_TYPES = ["local", "nhs_local", "gp", "emergency_service", "school_or_college"]
NON_CROWN_ORGANISATION_TYPES = ["local", "nhs_local", "nhs_gp", "emergency_service", "school_or_college"]
class OrganisationTypes(db.Model):

2
migrations/versions/0305_add_gp_org_type.py
View File

@@ -12,7 +12,7 @@ from alembic import op
revision = '0305_add_gp_org_type'
down_revision = '0304_remove_org_to_service'
GP_ORG_TYPE_NAME = 'gp'
GP_ORG_TYPE_NAME = 'nhs_gp'
def upgrade():

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

@@ -206,7 +206,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, gp, emergency_service, school_or_college, other]'
'[central, local, nhs_central, nhs_local, nhs_gp, emergency_service, school_or_college, other]'
)),
))
def test_post_create_organisation_with_missing_data_gives_validation_error(