From 25ce3851eb0807bee1943196245c93ace7f5aff8 Mon Sep 17 00:00:00 2001 From: Imdad Ahad Date: Tue, 25 Apr 2017 10:36:37 +0100 Subject: [PATCH 1/4] Add international support flag for providers --- app/models.py | 3 +++ .../0074_add_intl_flag_to_provider.py | 27 +++++++++++++++++++ tests/app/provider_details/test_rest.py | 4 +-- 3 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 migrations/versions/0074_add_intl_flag_to_provider.py diff --git a/app/models.py b/app/models.py index d54f413e4..11cb1803c 100644 --- a/app/models.py +++ b/app/models.py @@ -443,6 +443,8 @@ class ProviderDetails(db.Model): updated_at = db.Column(db.DateTime, nullable=True, onupdate=datetime.datetime.utcnow) created_by_id = db.Column(UUID(as_uuid=True), db.ForeignKey('users.id'), index=True, nullable=True) created_by = db.relationship('User') + supports_international = db.Column(db.Boolean, nullable=False, default=False) + class ProviderDetailsHistory(db.Model, HistoryModel): @@ -458,6 +460,7 @@ class ProviderDetailsHistory(db.Model, HistoryModel): updated_at = db.Column(db.DateTime, nullable=True, onupdate=datetime.datetime.utcnow) created_by_id = db.Column(UUID(as_uuid=True), db.ForeignKey('users.id'), index=True, nullable=True) created_by = db.relationship('User') + supports_international = db.Column(db.Boolean, nullable=False, default=False) JOB_STATUS_PENDING = 'pending' diff --git a/migrations/versions/0074_add_intl_flag_to_provider.py b/migrations/versions/0074_add_intl_flag_to_provider.py new file mode 100644 index 000000000..687eb5ea3 --- /dev/null +++ b/migrations/versions/0074_add_intl_flag_to_provider.py @@ -0,0 +1,27 @@ +"""empty message + +Revision ID: 0074_add_intl_flag_to_provider +Revises: 0073_add_international_sms_flag +Create Date: 2017-04-25 09:44:13.194164 + +""" + +# revision identifiers, used by Alembic. +revision = '0074_add_intl_flag_to_provider' +down_revision = '0073_add_international_sms_flag' + +from alembic import op +import sqlalchemy as sa + + +def upgrade(): + op.add_column('provider_details', sa.Column('supports_international', sa.Boolean(), nullable=False, server_default=sa.false())) + op.add_column('provider_details_history', sa.Column('supports_international', sa.Boolean(), nullable=False, server_default=sa.false())) + + op.execute("UPDATE provider_details SET supports_international=True WHERE identifier='mmg'") + op.execute("UPDATE provider_details_history SET supports_international=True WHERE identifier='mmg'") + + +def downgrade(): + op.drop_column('provider_details_history', 'supports_international') + op.drop_column('provider_details', 'supports_international') diff --git a/tests/app/provider_details/test_rest.py b/tests/app/provider_details/test_rest.py index 15e2381be..36a40d2a0 100644 --- a/tests/app/provider_details/test_rest.py +++ b/tests/app/provider_details/test_rest.py @@ -47,7 +47,7 @@ def test_get_provider_details_contains_correct_fields(client, notify_db): allowed_keys = { "id", "created_by", "display_name", "identifier", "priority", 'notification_type', - "active", "version", "updated_at" + "active", "version", "updated_at", "supports_international" } assert allowed_keys == set(json_resp[0].keys()) @@ -116,7 +116,7 @@ def test_get_provider_versions_contains_correct_fields(client, notify_db): allowed_keys = { "id", "created_by", "display_name", "identifier", "priority", 'notification_type', - "active", "version", "updated_at" + "active", "version", "updated_at", "supports_international" } assert allowed_keys == set(json_resp[0].keys()) From 20d6d9d333bb32a4891db271076c06cae20c7bca Mon Sep 17 00:00:00 2001 From: Imdad Ahad Date: Tue, 25 Apr 2017 17:35:22 +0100 Subject: [PATCH 2/4] Update migration off master --- ...lag_to_provider.py => 0076_add_intl_flag_to_provider.py} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename migrations/versions/{0074_add_intl_flag_to_provider.py => 0076_add_intl_flag_to_provider.py} (85%) diff --git a/migrations/versions/0074_add_intl_flag_to_provider.py b/migrations/versions/0076_add_intl_flag_to_provider.py similarity index 85% rename from migrations/versions/0074_add_intl_flag_to_provider.py rename to migrations/versions/0076_add_intl_flag_to_provider.py index 687eb5ea3..240acf038 100644 --- a/migrations/versions/0074_add_intl_flag_to_provider.py +++ b/migrations/versions/0076_add_intl_flag_to_provider.py @@ -1,14 +1,14 @@ """empty message -Revision ID: 0074_add_intl_flag_to_provider +Revision ID: 0076_add_intl_flag_to_provider Revises: 0073_add_international_sms_flag Create Date: 2017-04-25 09:44:13.194164 """ # revision identifiers, used by Alembic. -revision = '0074_add_intl_flag_to_provider' -down_revision = '0073_add_international_sms_flag' +revision = '0076_add_intl_flag_to_provider' +down_revision = '0075_create_rates_table' from alembic import op import sqlalchemy as sa From 51715479907c1b7216951802a0e4be36737465c0 Mon Sep 17 00:00:00 2001 From: Imdad Ahad Date: Wed, 26 Apr 2017 09:52:02 +0100 Subject: [PATCH 3/4] Remove blank lines --- app/models.py | 1 - 1 file changed, 1 deletion(-) diff --git a/app/models.py b/app/models.py index 11cb1803c..71957d99c 100644 --- a/app/models.py +++ b/app/models.py @@ -446,7 +446,6 @@ class ProviderDetails(db.Model): supports_international = db.Column(db.Boolean, nullable=False, default=False) - class ProviderDetailsHistory(db.Model, HistoryModel): __tablename__ = 'provider_details_history' From c69ee2405a78e2137543ed23fdde16ed58ef2c86 Mon Sep 17 00:00:00 2001 From: Imdad Ahad Date: Wed, 26 Apr 2017 10:37:12 +0100 Subject: [PATCH 4/4] Fix comment --- migrations/versions/0076_add_intl_flag_to_provider.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migrations/versions/0076_add_intl_flag_to_provider.py b/migrations/versions/0076_add_intl_flag_to_provider.py index 240acf038..921bb85dd 100644 --- a/migrations/versions/0076_add_intl_flag_to_provider.py +++ b/migrations/versions/0076_add_intl_flag_to_provider.py @@ -1,7 +1,7 @@ """empty message Revision ID: 0076_add_intl_flag_to_provider -Revises: 0073_add_international_sms_flag +Revises: 0075_create_rates_table Create Date: 2017-04-25 09:44:13.194164 """