Merge pull request #1013 from alphagov/firetext-inbound-sms-not-null-provider

Firetext inbound sms not null provider

app/models.py

@@ -1172,7 +1172,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

migrations/versions/0097_notnull_inbound_provider.py

@@ -0,0 +1,26 @@
+"""empty message
+
+Revision ID: 0097_notnull_inbound_provider
+Revises: 0096_update_job_stats
+Create Date: 2017-06-02 16:50:11.698423
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '0097_notnull_inbound_provider'
+down_revision = '0096_update_job_stats'
+
+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)

tests/app/db.py

@@ -197,6 +197,7 @@ def create_inbound_sms(
     provider_date=None,
     provider_reference=None,
     content='Hello',
+    provider="mmg",
     created_at=None
 ):
     inbound = InboundSms(
@@ -207,6 +208,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