Merge branch 'master' into inbound-sms

Conflicts:
	app/notifications/receive_notifications.py
	tests/app/notifications/test_receive_notification.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)