Merge pull request #1232 from alphagov/create-service_sms_senders

Create service sms senders

app/models.py

@@ -245,7 +245,7 @@ class Service(db.Model, Versioned):
         if self.inbound_number and self.inbound_number.active:
             return self.inbound_number.number
         else:
-            return self.sms_sender or current_app.config['FROM_NUMBER']
+            return self.sms_sender
 
 
 class InboundNumber(db.Model):
@@ -278,6 +278,21 @@ class InboundNumber(db.Model):
         }
 
 
+class ServiceSmsSender(db.Model):
+    __tablename__ = "service_sms_senders"
+
+    id = db.Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
+    sms_sender = db.Column(db.String(11), nullable=False)
+    service_id = db.Column(UUID(as_uuid=True), db.ForeignKey('services.id'), unique=True, index=True, nullable=False)
+    service = db.relationship(Service, backref=db.backref("service_sms_senders", uselist=False))
+    is_default = db.Column(db.Boolean, nullable=False, default=True)
+    inbound_number_id = db.Column(UUID(as_uuid=True), db.ForeignKey('inbound_numbers.id'),
+                                  unique=True, index=True, nullable=True)
+    inbound_number = db.relationship(InboundNumber, backref=db.backref("inbound_number", uselist=False))
+    created_at = db.Column(db.DateTime, default=datetime.datetime.utcnow, nullable=False)
+    updated_at = db.Column(db.DateTime, nullable=True, onupdate=datetime.datetime.utcnow)
+
+
 class ServicePermission(db.Model):
     __tablename__ = "service_permissions"
 

migrations/versions/0118_service_sms_senders.py

@@ -0,0 +1,39 @@
+"""empty message
+
+Revision ID: 0118_service_sms_senders
+Revises: 0117_international_sms_notify
+Create Date: 2017-09-05 17:29:38.921045
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '0118_service_sms_senders'
+down_revision = '0117_international_sms_notify'
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+
+def upgrade():
+    op.create_table('service_sms_senders',
+                    sa.Column('id', postgresql.UUID(as_uuid=True), nullable=False),
+                    sa.Column('sms_sender', sa.String(length=11), nullable=False),
+                    sa.Column('service_id', postgresql.UUID(as_uuid=True), nullable=False),
+                    sa.Column('is_default', sa.Boolean(), nullable=False),
+                    sa.Column('inbound_number_id', postgresql.UUID(as_uuid=True), nullable=True),
+                    sa.Column('created_at', sa.DateTime(), nullable=False),
+                    sa.Column('updated_at', sa.DateTime(), nullable=True),
+                    sa.ForeignKeyConstraint(['inbound_number_id'], ['inbound_numbers.id'], ),
+                    sa.ForeignKeyConstraint(['service_id'], ['services.id'], ),
+                    sa.PrimaryKeyConstraint('id')
+                    )
+    op.create_index(op.f('ix_service_sms_senders_inbound_number_id'), 'service_sms_senders', ['inbound_number_id'],
+                    unique=True)
+    op.create_index(op.f('ix_service_sms_senders_service_id'), 'service_sms_senders', ['service_id'], unique=True)
+
+
+def downgrade():
+    op.drop_index(op.f('ix_service_sms_senders_service_id'), table_name='service_sms_senders')
+    op.drop_index(op.f('ix_service_sms_senders_inbound_number_id'), table_name='service_sms_senders')
+    op.drop_table('service_sms_senders')