From c4d855a1a02d1ba5901c0a16332f3817176c1912 Mon Sep 17 00:00:00 2001 From: Katie Smith Date: Mon, 10 May 2021 15:58:31 +0100 Subject: [PATCH] Remove references to broadcast provider_restriction being None None is not a value that is allowed any more. --- app/models.py | 3 +-- app/service/service_broadcast_settings_schema.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/models.py b/app/models.py index f7ef71743..84b2abdff 100644 --- a/app/models.py +++ b/app/models.py @@ -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'] diff --git a/app/service/service_broadcast_settings_schema.py b/app/service/service_broadcast_settings_schema.py index ad702428c..494b08a59 100644 --- a/app/service/service_broadcast_settings_schema.py +++ b/app/service/service_broadcast_settings_schema.py @@ -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"] }