Merge pull request #3643 from alphagov/broadcast-org

move service to broadcast org when broadcasting is enabled
This commit is contained in:
Leo Hemsted
2020-09-24 13:13:34 +01:00
committed by GitHub
4 changed files with 50 additions and 4 deletions

View File

@@ -84,6 +84,8 @@ class Config(object):
ASSET_DOMAIN = ''
ASSET_PATH = '/static/'
BROADCAST_ORGANISATION_ID = os.environ.get('BROADCAST_ORGANISATION_ID')
NOTIFY_SERVICE_ID = 'd6aa2c68-a2d9-4437-ab19-3ae8eb202553'
@@ -177,6 +179,8 @@ 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

View File

@@ -100,9 +100,16 @@ class Service(JSONModel):
)
def force_broadcast_permission_on(self):
return self.update_permissions(
ret = self.update_permissions(
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
)
return ret
def update_permissions(self, permissions):
return self.update(permissions=list(permissions))