From 4eebd9a83c36c4284da02eec26cf8c35e7a0a285 Mon Sep 17 00:00:00 2001 From: Imdad Ahad Date: Tue, 26 Sep 2017 15:08:08 +0100 Subject: [PATCH] Remove the letter_contact_block from the Service model --- app/models.py | 6 ++---- tests/app/test_model.py | 5 ----- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/app/models.py b/app/models.py index 930fe0744..a7ecfdddd 100644 --- a/app/models.py +++ b/app/models.py @@ -208,8 +208,7 @@ class Service(db.Model, Versioned): created_by = db.relationship('User') created_by_id = db.Column(UUID(as_uuid=True), db.ForeignKey('users.id'), index=True, nullable=False) _reply_to_email_address = db.Column("reply_to_email_address", db.Text, index=False, unique=False, nullable=True) - letter_contact_block = db.Column(db.Text, index=False, unique=False, nullable=True) - # This column is now deprecated + _letter_contact_block = db.Column('letter_contact_block', db.Text, index=False, unique=False, nullable=True) sms_sender = db.Column(db.String(11), nullable=False, default=lambda: current_app.config['FROM_NUMBER']) organisation_id = db.Column(UUID(as_uuid=True), db.ForeignKey('organisation.id'), index=True, nullable=True) organisation = db.relationship('Organisation') @@ -268,8 +267,7 @@ class Service(db.Model, Versioned): if len(default_letter_contact) > 1: raise Exception("There should only ever be one default") else: - return default_letter_contact[0].contact_block if default_letter_contact else \ - self.letter_contact_block # need to update this to None after dropping the letter_contact_block column + return default_letter_contact[0].contact_block if default_letter_contact else None class InboundNumber(db.Model): diff --git a/tests/app/test_model.py b/tests/app/test_model.py index 0303782ff..03f3fb146 100644 --- a/tests/app/test_model.py +++ b/tests/app/test_model.py @@ -274,8 +274,3 @@ def test_service_get_default_contact_letter(sample_service): create_letter_contact(service=sample_service, contact_block='London,\nNW1A 1AA') assert sample_service.get_default_letter_contact() == 'London,\nNW1A 1AA' - - -# this test will need to be removed after letter_contact_block is dropped -def test_service_get_default_letter_contact_block_from_service(sample_service): - assert sample_service.get_default_letter_contact() == sample_service.letter_contact_block