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

Temporarily add generic 'nhs'

Browse Source
This commit is contained in:
Pea Tyczynska
2019-07-19 15:13:24 +01:00
parent aa88252cf7
commit edda816ffa
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/dao/services_dao.py
View File

@@ -288,7 +288,7 @@ def dao_create_service(
service.crown = organisation.crown service.crown = organisation.crown
elif service.organisation_type in CROWN_ORGANISATION_TYPES: elif service.organisation_type in CROWN_ORGANISATION_TYPES:
service.crown = True service.crown = True
elif service.organisation_type in (NON_CROWN_ORGANISATION_TYPES + ['nhs']): elif service.organisation_type in NON_CROWN_ORGANISATION_TYPES:
service.crown = False service.crown = False
service.count_as_live = not user.platform_admin service.count_as_live = not user.platform_admin

2
app/models.py
View File

@@ -330,7 +330,7 @@ ORGANISATION_TYPES = [
] ]
CROWN_ORGANISATION_TYPES = ["nhs_central"] CROWN_ORGANISATION_TYPES = ["nhs_central"]
NON_CROWN_ORGANISATION_TYPES = ["local", "nhs_local", "emergency_service", "school_or_college"] NON_CROWN_ORGANISATION_TYPES = ["local", "nhs_local", "emergency_service", "school_or_college", "nhs"]
class OrganisationTypes(db.Model): class OrganisationTypes(db.Model):

1
migrations/versions/0299_org_types_table.py
View File

@@ -29,6 +29,7 @@ def upgrade():
{'name': x, 'is_crown': y, 'annual_free_sms_fragment_limit': z} for x, y, z in [ {'name': x, 'is_crown': y, 'annual_free_sms_fragment_limit': z} for x, y, z in [
["central", None, 250000], ["central", None, 250000],
["local", False, 25000], ["local", False, 25000],
["nhs", None, 25000],
["nhs_central", True, 250000], ["nhs_central", True, 250000],
["nhs_local", False, 25000], ["nhs_local", False, 25000],
["emergency_service", False, 25000], ["emergency_service", False, 25000],