From 400096520d582a51855939c48da357152e2e1bec Mon Sep 17 00:00:00 2001
From: Martyn Inglis <martyn.inglis@digital.cabinet-office.gov.uk>
Date: Fri, 2 Jun 2017 16:51:27 +0100
Subject: [PATCH 1/2] Not null the provider column on the inbound SMS table.

---
 app/models.py                                 |  2 +-
 .../versions/0093_notnull_inbound_provider.py | 26 +++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 migrations/versions/0093_notnull_inbound_provider.py

diff --git a/app/models.py b/app/models.py
index 6d5bf19fb..3303f397c 100644
--- a/app/models.py
+++ b/app/models.py
@@ -1166,7 +1166,7 @@ class InboundSms(db.Model):
     user_number = db.Column(db.String, nullable=False)  # the end user's number, that the msg was sent from
     provider_date = db.Column(db.DateTime)
     provider_reference = db.Column(db.String)
-    provider = db.Column(db.String, nullable=True)
+    provider = db.Column(db.String, nullable=False)
     _content = db.Column('content', db.String, nullable=False)
 
     @property
diff --git a/migrations/versions/0093_notnull_inbound_provider.py b/migrations/versions/0093_notnull_inbound_provider.py
new file mode 100644
index 000000000..35d6a9a65
--- /dev/null
+++ b/migrations/versions/0093_notnull_inbound_provider.py
@@ -0,0 +1,26 @@
+"""empty message
+
+Revision ID: 0093_notnull_inbound_provider
+Revises: 0092_populate_inbound_provider
+Create Date: 2017-06-02 16:50:11.698423
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '0093_notnull_inbound_provider'
+down_revision = '0092_populate_inbound_provider'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    op.alter_column('inbound_sms', 'provider',
+               existing_type=sa.VARCHAR(),
+               nullable=False)
+
+
+def downgrade():
+    op.alter_column('inbound_sms', 'provider',
+               existing_type=sa.VARCHAR(),
+               nullable=True)

From 21a5f018048482eccc5d054a1160b795b56a61a7 Mon Sep 17 00:00:00 2001
From: Martyn Inglis <martyn.inglis@digital.cabinet-office.gov.uk>
Date: Mon, 5 Jun 2017 13:10:54 +0100
Subject: [PATCH 2/2] Not null in own PR

---
 ...bound_provider.py => 0094_notnull_inbound_provider.py} | 8 ++++----
 tests/app/db.py                                           | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)
 rename migrations/versions/{0093_notnull_inbound_provider.py => 0094_notnull_inbound_provider.py} (71%)

diff --git a/migrations/versions/0093_notnull_inbound_provider.py b/migrations/versions/0094_notnull_inbound_provider.py
similarity index 71%
rename from migrations/versions/0093_notnull_inbound_provider.py
rename to migrations/versions/0094_notnull_inbound_provider.py
index 35d6a9a65..ebf98e3a7 100644
--- a/migrations/versions/0093_notnull_inbound_provider.py
+++ b/migrations/versions/0094_notnull_inbound_provider.py
@@ -1,14 +1,14 @@
 """empty message
 
-Revision ID: 0093_notnull_inbound_provider
-Revises: 0092_populate_inbound_provider
+Revision ID: 0094_notnull_inbound_provider
+Revises: 0093_populate_inbound_provider
 Create Date: 2017-06-02 16:50:11.698423
 
 """
 
 # revision identifiers, used by Alembic.
-revision = '0093_notnull_inbound_provider'
-down_revision = '0092_populate_inbound_provider'
+revision = '0094_notnull_inbound_provider'
+down_revision = '0093_populate_inbound_provider'
 
 from alembic import op
 import sqlalchemy as sa
diff --git a/tests/app/db.py b/tests/app/db.py
index 8fcced1b1..bfe292a97 100644
--- a/tests/app/db.py
+++ b/tests/app/db.py
@@ -193,7 +193,8 @@ def create_inbound_sms(
     user_number='447700900111',
     provider_date=None,
     provider_reference=None,
-    content='Hello'
+    content='Hello',
+    provider="mmg"
 ):
     inbound = InboundSms(
         service=service,
@@ -203,6 +204,7 @@ def create_inbound_sms(
         provider_date=provider_date or datetime.utcnow(),
         provider_reference=provider_reference or 'foo',
         content=content,
+        provider=provider
     )
     dao_create_inbound_sms(inbound)
     return inbound