darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-20 14:29:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 2721-create-enums-and-replace-hardcoded-status-strings-with-enums-3

Browse Source
This commit is contained in:
Beverly Nguyen
2025-07-16 17:21:15 -07:00
parent 1bf55e7fa3 34aff103a0
commit 28f09674df
12 changed files with 265 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/models/organization.py
View File

@@ -2,14 +2,15 @@ from collections import OrderedDict
from werkzeug.utils import cached_property
from app.enums import OrganizationType
from app.models import JSONModel, ModelList, SerialisedModelCollection, SortByNameMixin
from app.notify_client.organizations_api_client import organizations_client
class Organization(JSONModel, SortByNameMixin):
TYPE_FEDERAL = "federal"
TYPE_STATE = "state"
TYPE_OTHER = "other"
TYPE_FEDERAL = OrganizationType.FEDERAL
TYPE_STATE = OrganizationType.STATE
TYPE_OTHER = OrganizationType.OTHER
TYPE_LABELS = OrderedDict(
[

2
app/models/service.py
View File

@@ -323,7 +323,7 @@ class Service(JSONModel, SortByNameMixin):
@property
def shouldnt_use_govuk_as_sms_sender(self):
return self.organization_type != Organization.TYPE_CENTRAL
return self.organization_type != Organization.TYPE_FEDERAL
@cached_property
def sms_senders(self):