Merge branch 'master' into letters-billing-table

Conflicts:
	app/models.py

migrations/versions/0088_add_schedule_serv_perm.py

@@ -0,0 +1,24 @@
+"""empty message
+
+Revision ID: 0088_add_schedule_serv_perm
+Revises: 0087_scheduled_notifications
+Create Date: 2017-05-26 14:53:18.581320
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '0088_add_schedule_serv_perm'
+down_revision = '0087_scheduled_notifications'
+
+from alembic import op
+
+
+def upgrade():
+    op.get_bind()
+    op.execute("insert into service_permission_types values('schedule_notifications')")
+
+
+def downgrade():
+    op.get_bind()
+    op.execute("delete from service_permissions where permission = 'schedule_notifications'")
+    op.execute("delete from service_permission_types where name = 'schedule_notifications'")

migrations/versions/0089_govuk_sms_sender.py

@@ -0,0 +1,25 @@
+"""empty message
+
+Revision ID: 0089_govuk_sms_sender
+Revises: 0088_add_schedule_serv_perm
+Create Date: 2017-05-22 13:46:09.584801
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '0089_govuk_sms_sender'
+down_revision = '0088_add_schedule_serv_perm'
+
+from alembic import op
+
+
+def upgrade():
+    op.execute("UPDATE services SET sms_sender = 'GOVUK' where sms_sender is null")
+    op.execute("UPDATE services_history SET sms_sender = 'GOVUK' where sms_sender is null")
+    op.alter_column('services', 'sms_sender', nullable=False)
+    op.alter_column('services_history', 'sms_sender', nullable=False)
+
+
+def downgrade():
+    op.alter_column('services_history', 'sms_sender', nullable=True)
+    op.alter_column('services', 'sms_sender', nullable=True)

migrations/versions/0090_inbound_sms.py

@@ -0,0 +1,37 @@
+"""empty message
+
+Revision ID: 0090_inbound_sms
+Revises: 0089_govuk_sms_sender
+Create Date: 2017-05-22 11:28:53.471004
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '0090_inbound_sms'
+down_revision = '0089_govuk_sms_sender'
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+def upgrade():
+    op.create_table(
+        'inbound_sms',
+        sa.Column('id', postgresql.UUID(as_uuid=True), nullable=False),
+        sa.Column('service_id', postgresql.UUID(as_uuid=True), nullable=False),
+        sa.Column('content', sa.String, nullable=False),
+        sa.Column('notify_number', sa.String, nullable=False),
+        sa.Column('user_number', sa.String, nullable=False),
+        sa.Column('created_at', sa.DateTime, nullable=False),
+        sa.Column('provider_date', sa.DateTime, nullable=True),
+        sa.Column('provider_reference', sa.String, nullable=True),
+
+        sa.ForeignKeyConstraint(['service_id'], ['services.id'], ),
+        sa.PrimaryKeyConstraint('id')
+    )
+    op.create_index(op.f('ix_inbound_sms_service_id'), 'inbound_sms', ['service_id'], unique=False)
+    op.create_index(op.f('ix_inbound_sms_user_number'), 'inbound_sms', ['user_number'], unique=False)
+
+
+def downgrade():
+    op.drop_table('inbound_sms')

migrations/versions/0091_letter_billing.py

@@ -1,7 +1,7 @@
 """empty message
 
-Revision ID: 0088_letter_billing
-Revises: 0087_scheduled_notifications
+Revision ID: 0091_letter_billing
+Revises: 0090_inbound_sms
 Create Date: 2017-05-31 11:43:55.744631
 
 """
@@ -10,8 +10,8 @@ from alembic import op
 import sqlalchemy as sa
 from sqlalchemy.dialects import postgresql
 
-revision = '0088_letter_billing'
-down_revision = '0087_scheduled_notifications'
+revision = '0091_letter_billing'
+down_revision = '0090_inbound_sms'
 
 
 def upgrade():