From 9e9b8ab1a3408355304e9ca616fba5fb28738b8b Mon Sep 17 00:00:00 2001
From: Rebecca Law <rebecca.law@digital.cabinet-office.gov.uk>
Date: Fri, 5 Jan 2018 15:32:43 +0000
Subject: [PATCH 1/2] There was a misunderstanding about how we wanted the
 feature to work.

There is no need for the extra column.
If a template does not have a default address set - they address will be blank.
Otherwise use the address of the service_letter_contact.

There will be another PR to do a db migration.
Template.service_letter_contact = blank if no service_letter_contacts for service ELSE use set Template.serivce_letter_contact_id = service default service_letter_contact
---
 app/models.py                           |  4 ----
 migrations/versions/0154_revert_0153.py | 20 ++++++++++++++++++++
 tests/app/template/test_rest.py         |  1 -
 3 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 migrations/versions/0154_revert_0153.py

diff --git a/app/models.py b/app/models.py
index 4f4a6cafc..214979611 100644
--- a/app/models.py
+++ b/app/models.py
@@ -582,10 +582,6 @@ class TemplateBase(db.Model):
     content = db.Column(db.Text, nullable=False)
     archived = db.Column(db.Boolean, nullable=False, default=False)
     subject = db.Column(db.Text)
-    is_letter_contact_blank = db.Column(db.Boolean, nullable=False, default=False)
-
-    # if is_letter_contact = True then service_letter_contact must be null.
-    CheckConstraint("Not(is_letter_contact_blank = True and service_letter_contact_id is not Null)")
 
     @declared_attr
     def service_id(cls):
diff --git a/migrations/versions/0154_revert_0153.py b/migrations/versions/0154_revert_0153.py
new file mode 100644
index 000000000..24ffe3f23
--- /dev/null
+++ b/migrations/versions/0154_revert_0153.py
@@ -0,0 +1,20 @@
+"""
+
+Revision ID: 0154_revert_0153
+Revises: 0153_add_is_letter_contact_blank
+Create Date: 2018-01-05 14:09:21.200102
+
+"""
+from alembic import op
+
+revision = '0154_revert_0153'
+down_revision = '0153_add_is_letter_contact_blank'
+
+
+def upgrade():
+    op.drop_column('templates', 'is_letter_contact_blank')
+    op.drop_column('templates_history', 'is_letter_contact_blank')
+
+
+def downgrade():
+    pass
diff --git a/tests/app/template/test_rest.py b/tests/app/template/test_rest.py
index ab2533e0f..89830827e 100644
--- a/tests/app/template/test_rest.py
+++ b/tests/app/template/test_rest.py
@@ -625,7 +625,6 @@ def test_get_template_reply_to(client, sample_letter_template):
     assert 'service_letter_contact_id' not in json_resp['data']
     assert json_resp['data']['reply_to'] == str(letter_contact.id)
     assert json_resp['data']['reply_to_text'] == letter_contact.contact_block
-    assert not json_resp['data']['is_letter_contact_blank']
 
 
 def test_update_template_reply_to(client, sample_letter_template):

From f34a380f7fbcde70b24106a0a2afbc0ad745c7ce Mon Sep 17 00:00:00 2001
From: Rebecca Law <rebecca.law@digital.cabinet-office.gov.uk>
Date: Fri, 5 Jan 2018 16:00:29 +0000
Subject: [PATCH 2/2] Fix file name

---
 .../versions/{0154_revert_0153.py => 0155_revert_0153.py} | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename migrations/versions/{0154_revert_0153.py => 0155_revert_0153.py} (61%)

diff --git a/migrations/versions/0154_revert_0153.py b/migrations/versions/0155_revert_0153.py
similarity index 61%
rename from migrations/versions/0154_revert_0153.py
rename to migrations/versions/0155_revert_0153.py
index 24ffe3f23..70613ec71 100644
--- a/migrations/versions/0154_revert_0153.py
+++ b/migrations/versions/0155_revert_0153.py
@@ -1,14 +1,14 @@
 """
 
-Revision ID: 0154_revert_0153
-Revises: 0153_add_is_letter_contact_blank
+Revision ID: 0155_revert_0153
+Revises: 0154_nullable_is_blank
 Create Date: 2018-01-05 14:09:21.200102
 
 """
 from alembic import op
 
-revision = '0154_revert_0153'
-down_revision = '0153_add_is_letter_contact_blank'
+revision = '0155_revert_0153'
+down_revision = '0154_nullable_is_blank'
 
 
 def upgrade():