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

Remove references to broadcast provider_restriction being None

Browse Source 
None is not a value that is allowed any more.
This commit is contained in:
Katie Smith
2021-05-10 15:58:31 +01:00
parent 4624328c36
commit c4d855a1a0
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models.py
View File

@@ -560,8 +560,7 @@ class Service(db.Model, Versioned):
def get_available_broadcast_providers(self): def get_available_broadcast_providers(self):
# There may be future checks here if we add, for example, platform admin level provider killswitches. # There may be future checks here if we add, for example, platform admin level provider killswitches.
# NOTE: We are in the middle of changing the value for all allowed_broadcast_provider from `None`to "all" if self.allowed_broadcast_provider != ALL_BROADCAST_PROVIDERS:
if self.allowed_broadcast_provider and self.allowed_broadcast_provider != ALL_BROADCAST_PROVIDERS:
return [x for x in current_app.config['ENABLED_CBCS'] if x == self.allowed_broadcast_provider] return [x for x in current_app.config['ENABLED_CBCS'] if x == self.allowed_broadcast_provider]
else: else:
return current_app.config['ENABLED_CBCS'] return current_app.config['ENABLED_CBCS']

2
app/service/service_broadcast_settings_schema.py
View File

@@ -6,7 +6,7 @@ service_broadcast_settings_schema = {
"properties": { "properties": {
"broadcast_channel": {"enum": ["test", "severe"]}, "broadcast_channel": {"enum": ["test", "severe"]},
"service_mode": {"enum": ["training", "live"]}, "service_mode": {"enum": ["training", "live"]},
"provider_restriction": {"enum": [None, "three", "o2", "vodafone", "ee", "all"]} "provider_restriction": {"enum": ["three", "o2", "vodafone", "ee", "all"]}
}, },
"required": ["broadcast_channel", "service_mode", "provider_restriction"] "required": ["broadcast_channel", "service_mode", "provider_restriction"]
} }