From be28f2e2de3b6b2d49a193f2ee1d49460ea5fa41 Mon Sep 17 00:00:00 2001 From: Katie Smith Date: Wed, 25 Apr 2018 10:42:00 +0100 Subject: [PATCH] Add 'archived' column to the 3 reply_to models Added a new boolean column, `archived`, with a default of False to the three models which are used to specify the 'reply to' address for notifications: * ServiceEmailReplyTo * ServiceSmsSender * ServiceLetterContact --- app/models.py | 6 ++++++ tests/app/dao/test_service_email_reply_to_dao.py | 1 + tests/app/dao/test_service_letter_contact_dao.py | 2 ++ tests/app/dao/test_service_sms_sender_dao.py | 1 + 4 files changed, 10 insertions(+) diff --git a/app/models.py b/app/models.py index f64bad1b0..547c0a0d9 100644 --- a/app/models.py +++ b/app/models.py @@ -472,6 +472,7 @@ class ServiceSmsSender(db.Model): service_id = db.Column(UUID(as_uuid=True), db.ForeignKey('services.id'), index=True, nullable=False, unique=False) service = db.relationship(Service, backref=db.backref("service_sms_senders", uselist=True)) is_default = db.Column(db.Boolean, nullable=False, default=True) + archived = db.Column(db.Boolean, nullable=False, default=False) inbound_number_id = db.Column(UUID(as_uuid=True), db.ForeignKey('inbound_numbers.id'), unique=True, index=True, nullable=True) inbound_number = db.relationship(InboundNumber, backref=db.backref("inbound_number", uselist=False)) @@ -487,6 +488,7 @@ class ServiceSmsSender(db.Model): "sms_sender": self.sms_sender, "service_id": str(self.service_id), "is_default": self.is_default, + "archived": self.archived, "inbound_number_id": str(self.inbound_number_id) if self.inbound_number_id else None, "created_at": self.created_at.strftime(DATETIME_FORMAT), "updated_at": self.updated_at.strftime(DATETIME_FORMAT) if self.updated_at else None, @@ -1670,6 +1672,7 @@ class ServiceEmailReplyTo(db.Model): email_address = db.Column(db.Text, nullable=False, index=False, unique=False) is_default = db.Column(db.Boolean, nullable=False, default=True) + archived = db.Column(db.Boolean, nullable=False, default=False) created_at = db.Column(db.DateTime, nullable=False, default=datetime.datetime.utcnow) updated_at = db.Column(db.DateTime, nullable=True, onupdate=datetime.datetime.utcnow) @@ -1679,6 +1682,7 @@ class ServiceEmailReplyTo(db.Model): 'service_id': str(self.service_id), 'email_address': self.email_address, 'is_default': self.is_default, + 'archived': self.archived, 'created_at': self.created_at.strftime(DATETIME_FORMAT), 'updated_at': self.updated_at.strftime(DATETIME_FORMAT) if self.updated_at else None } @@ -1694,6 +1698,7 @@ class ServiceLetterContact(db.Model): contact_block = db.Column(db.Text, nullable=False, index=False, unique=False) is_default = db.Column(db.Boolean, nullable=False, default=True) + archived = db.Column(db.Boolean, nullable=False, default=False) created_at = db.Column(db.DateTime, nullable=False, default=datetime.datetime.utcnow) updated_at = db.Column(db.DateTime, nullable=True, onupdate=datetime.datetime.utcnow) @@ -1703,6 +1708,7 @@ class ServiceLetterContact(db.Model): 'service_id': str(self.service_id), 'contact_block': self.contact_block, 'is_default': self.is_default, + 'archived': self.archived, 'created_at': self.created_at.strftime(DATETIME_FORMAT), 'updated_at': self.updated_at.strftime(DATETIME_FORMAT) if self.updated_at else None } diff --git a/tests/app/dao/test_service_email_reply_to_dao.py b/tests/app/dao/test_service_email_reply_to_dao.py index 30907ff92..73237a9ab 100644 --- a/tests/app/dao/test_service_email_reply_to_dao.py +++ b/tests/app/dao/test_service_email_reply_to_dao.py @@ -35,6 +35,7 @@ def test_add_reply_to_email_address_for_service_creates_first_email_for_service( assert len(results) == 1 assert results[0].email_address == 'new@address.com' assert results[0].is_default + assert not results[0].archived def test_add_reply_to_email_address_for_service_creates_another_email_for_service(notify_db_session): diff --git a/tests/app/dao/test_service_letter_contact_dao.py b/tests/app/dao/test_service_letter_contact_dao.py index 01da7910d..fba1c449d 100644 --- a/tests/app/dao/test_service_letter_contact_dao.py +++ b/tests/app/dao/test_service_letter_contact_dao.py @@ -39,9 +39,11 @@ def test_add_letter_contact_for_service_creates_additional_letter_contact_for_se assert results[0].contact_block == 'Edinburgh, ED1 1AA' assert results[0].is_default + assert not results[0].archived assert results[1].contact_block == 'Swansea, SN1 3CC' assert not results[1].is_default + assert not results[1].archived def test_add_another_letter_contact_as_default_overrides_existing(notify_db_session): diff --git a/tests/app/dao/test_service_sms_sender_dao.py b/tests/app/dao/test_service_sms_sender_dao.py index 3edf61856..5b9c9296d 100644 --- a/tests/app/dao/test_service_sms_sender_dao.py +++ b/tests/app/dao/test_service_sms_sender_dao.py @@ -58,6 +58,7 @@ def test_dao_add_sms_sender_for_service(notify_db_session): assert len(service_sms_senders) == 2 assert service_sms_senders[0].sms_sender == 'testing' assert service_sms_senders[0].is_default + assert not service_sms_senders[0].archived assert service_sms_senders[1] == new_sms_sender