Compare commits

...

2 Commits

Author SHA1 Message Date
Pea Tyczynska
517688c5f4 Add setter dao methods for requested and allowed broadcast areas 2021-04-14 10:59:00 +01:00
Pea Tyczynska
1cae8a620e Add columns for requested and allowed broadcast areas for a service
We want to restrict where broadcast services can broadcast to.

Hence we are creating columns on service_broadcast_settings table
to store the lists of allowed_broadcast_areas and
requested_allowed_broadcast_areas.
2021-04-14 10:58:25 +01:00
3 changed files with 44 additions and 0 deletions

View File

@@ -75,3 +75,13 @@ def insert_or_update_service_broadcast_settings(service, channel, provider_restr
service.service_broadcast_settings.channel = channel
service.service_broadcast_settings.provider = provider_restriction
db.session.add(service.service_broadcast_settings)
def insert_or_update_requested_allowed_broadcast_areas(service, requested_allowed_broadcast_areas):
service.service_broadcast_settings.requested_allowed_broadcast_areas = requested_allowed_broadcast_areas
db.session.add(service.service_broadcast_settings)
def insert_or_update_allowed_broadcast_areas(service):
service.service_broadcast_settings.allowed_broadcast_areas = service.service_broadcast_settings.requested_allowed_broadcast_areas # noqa
db.session.add(service.service_broadcast_settings)

View File

@@ -2557,6 +2557,9 @@ class ServiceBroadcastSettings(db.Model):
created_at = db.Column(db.DateTime, nullable=False, default=datetime.datetime.utcnow)
updated_at = db.Column(db.DateTime, nullable=True, onupdate=datetime.datetime.utcnow)
allowed_broadcast_areas = db.Column(JSONB(none_as_null=True), nullable=False, default=list)
requested_allowed_broadcast_areas = db.Column(JSONB(none_as_null=True), nullable=True)
class BroadcastChannelTypes(db.Model):
__tablename__ = 'broadcast_channel_types'

View File

@@ -0,0 +1,31 @@
"""
Revision ID: 0351_allowed_broadcast_areas
Revises: 0350_update_rates
Create Date: 2021-04-09 12:51:17.158043
"""
from alembic import op
import sqlalchemy as sa
from sqlalchemy.dialects import postgresql
revision = '0351_allowed_broadcast_areas'
down_revision = '0350_update_rates'
def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.add_column('service_broadcast_settings', sa.Column(
'allowed_broadcast_areas', postgresql.JSONB(none_as_null=True, astext_type=sa.Text()), nullable=True)
)
op.add_column('service_broadcast_settings', sa.Column(
'requested_allowed_broadcast_areas', postgresql.JSONB(none_as_null=True, astext_type=sa.Text()), nullable=True)
)
# ### end Alembic commands ###
def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.drop_column('service_broadcast_settings', 'requested_allowed_broadcast_areas')
op.drop_column('service_broadcast_settings', 'allowed_broadcast_areas')
# ### end Alembic commands ###