Merge pull request #3650 from alphagov/broadcast-org-always-on

Broadcast org always on

app/config.py

@@ -84,7 +84,8 @@ class Config(object):
     ASSET_DOMAIN = ''
     ASSET_PATH = '/static/'
 
-    BROADCAST_ORGANISATION_ID = os.environ.get('BROADCAST_ORGANISATION_ID')
+    # as defined in api db migration 0331_add_broadcast_org.py
+    BROADCAST_ORGANISATION_ID = '38e4bf69-93b0-445d-acee-53ea53fe02df'
 
     NOTIFY_SERVICE_ID = 'd6aa2c68-a2d9-4437-ab19-3ae8eb202553'
 
@@ -179,8 +180,6 @@ class Live(Config):
     ASSET_DOMAIN = 'static.notifications.service.gov.uk'
     ASSET_PATH = 'https://static.notifications.service.gov.uk/'
 
-    BROADCAST_ORGANISATION_ID = '38e4bf69-93b0-445d-acee-53ea53fe02df'
-
 
 class CloudFoundryConfig(Config):
     pass

app/models/service.py

@@ -104,11 +104,10 @@ class Service(JSONModel):
             set(self.permissions) - {'email', 'sms', 'letter'} | {'broadcast'}
         )
         broadcast_org_id = current_app.config['BROADCAST_ORGANISATION_ID']
-        if broadcast_org_id:
-            organisations_client.update_service_organisation(
-                service_id=self.id,
-                org_id=broadcast_org_id
-            )
+        organisations_client.update_service_organisation(
+            service_id=self.id,
+            org_id=broadcast_org_id
+        )
         return ret
 
     def update_permissions(self, permissions):

tests/app/main/views/service_settings/test_service_setting_permissions.py

@@ -93,6 +93,7 @@ def test_service_set_permission(
     platform_admin_client,
     service_one,
     mock_get_inbound_number_for_service,
+    mock_update_service_organisation,
     permission,
     initial_permissions,
     form_data,
@@ -235,18 +236,3 @@ def test_setting_broadcast_sets_organisation_if_config_value_set(
         service_id=SERVICE_ONE_ID,
         org_id=fake_uuid
     )
-
-
-def test_setting_broadcast_doesnt_set_organisation_if_config_value_not_set(
-    mock_update_service_organisation,
-    mock_update_service,
-    platform_admin_client,
-):
-    with set_config(platform_admin_client.application, 'BROADCAST_ORGANISATION_ID', None):
-        response = platform_admin_client.post(
-            url_for('main.service_set_permission', service_id=SERVICE_ONE_ID, permission='broadcast'),
-            data={'enabled': True}
-        )
-        assert response.status_code == 302
-        assert response.location == url_for('main.service_settings', service_id=SERVICE_ONE_ID, _external=True)
-    assert not mock_update_service_organisation.called