darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-07-26 14:58:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3237 from alphagov/null-to-all

Browse Source 
Make service_broadcast_settings.provider non-nullable
This commit is contained in:
Katie Smith
2021-05-11 13:35:26 +01:00
committed by GitHub
parent 41f324451b c4d855a1a0
commit 32fa8ee418
5 changed files with 43 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/models.py
View File

@@ -560,8 +560,7 @@ class Service(db.Model, Versioned):
def get_available_broadcast_providers(self):
# 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 and self.allowed_broadcast_provider != ALL_BROADCAST_PROVIDERS:
if self.allowed_broadcast_provider != ALL_BROADCAST_PROVIDERS:
return [x for x in current_app.config['ENABLED_CBCS'] if x == self.allowed_broadcast_provider]
else:
return current_app.config['ENABLED_CBCS']
@@ -2557,7 +2556,7 @@ class ServiceBroadcastSettings(db.Model):
channel = db.Column(
db.String(255), db.ForeignKey('broadcast_channel_types.name'), nullable=False
)
provider = db.Column(db.String, db.ForeignKey('broadcast_provider_types.name'), nullable=True)
provider = db.Column(db.String, db.ForeignKey('broadcast_provider_types.name'), nullable=False)
created_at = db.Column(db.DateTime, nullable=False, default=datetime.datetime.utcnow)
updated_at = db.Column(db.DateTime, nullable=True, onupdate=datetime.datetime.utcnow)

2
app/service/service_broadcast_settings_schema.py
View File

@@ -6,7 +6,7 @@ service_broadcast_settings_schema = {
"properties": {
"broadcast_channel": {"enum": ["test", "severe"]},
"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"]
}