From de491ab83b3a7044b41e7298fcf10f94074cfae4 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Wed, 19 Jul 2023 15:11:51 -0700 Subject: [PATCH] more --- migrations/versions/0091_letter_billing.py | 50 ------------- .../versions/0092_add_inbound_provider.py | 4 +- .../versions/0151_refactor_letter_rates.py | 71 ------------------- .../0152_kill_service_free_fragments.py | 4 +- .../0232_noti_postage_constraint_3.py | 4 +- .../0233_updated_first_class_dates.py | 30 -------- .../versions/0234_ft_billing_postage.py | 4 +- .../versions/0372_remove_provider_rates.py | 32 --------- .../versions/0373_add_notifications_view.py | 4 +- .../0382_remove_old_sms_providers_.py | 23 ------ .../versions/0383_update_default_templates.py | 4 +- migrations/versions/0385_remove postage_.py | 4 +- .../versions/0386_remove_letter_rates_.py | 34 --------- .../versions/0387_remove_letter_perms_.py | 8 +-- .../versions/0388_no_serv_letter_contact.py | 8 +-- migrations/versions/0389_no_more_letters.py | 8 +-- .../versions/0390_drop_dvla_provider.py | 10 +-- .../versions/0391_update_sms_numbers.py | 4 +- 18 files changed, 34 insertions(+), 272 deletions(-) delete mode 100644 migrations/versions/0091_letter_billing.py delete mode 100644 migrations/versions/0151_refactor_letter_rates.py delete mode 100644 migrations/versions/0233_updated_first_class_dates.py delete mode 100644 migrations/versions/0372_remove_provider_rates.py delete mode 100644 migrations/versions/0382_remove_old_sms_providers_.py delete mode 100644 migrations/versions/0386_remove_letter_rates_.py diff --git a/migrations/versions/0091_letter_billing.py b/migrations/versions/0091_letter_billing.py deleted file mode 100644 index 7dda9bb70..000000000 --- a/migrations/versions/0091_letter_billing.py +++ /dev/null @@ -1,50 +0,0 @@ -"""empty message - -Revision ID: 0091_letter_billing -Revises: 0090_inbound_sms -Create Date: 2017-05-31 11:43:55.744631 - -""" -import uuid -from alembic import op -import sqlalchemy as sa -from sqlalchemy.dialects import postgresql - -revision = '0091_letter_billing' -down_revision = '0090_inbound_sms' - - -def upgrade(): - op.create_table('letter_rates', - sa.Column('id', postgresql.UUID(as_uuid=True), nullable=False), - sa.Column('valid_from', sa.DateTime(), nullable=False), - sa.PrimaryKeyConstraint('id') - ) - op.create_table('letter_rate_details', - sa.Column('id', postgresql.UUID(as_uuid=True), nullable=False), - sa.Column('letter_rate_id', postgresql.UUID(as_uuid=True), nullable=False), - sa.Column('page_total', sa.Integer(), nullable=False), - sa.Column('rate', sa.Numeric(), nullable=False), - sa.ForeignKeyConstraint(['letter_rate_id'], ['letter_rates.id'], ), - sa.PrimaryKeyConstraint('id') - ) - op.create_index(op.f('ix_letter_rate_details_letter_rate_id'), 'letter_rate_details', ['letter_rate_id'], - unique=False) - - op.get_bind() - letter_id = uuid.uuid4() - op.execute("insert into letter_rates(id, valid_from) values('{}', '2017-03-31 23:00:00')".format(letter_id)) - insert_details = "insert into letter_rate_details(id, letter_rate_id, page_total, rate) values('{}', '{}', {}, {})" - op.execute( - insert_details.format(uuid.uuid4(), letter_id, 1, 29.3)) - op.execute( - insert_details.format(uuid.uuid4(), letter_id, 2, 32)) - op.execute( - insert_details.format(uuid.uuid4(), letter_id, 3, 35)) - - -def downgrade(): - op.get_bind() - op.drop_index('ix_letter_rate_details_letter_rate_id') - op.drop_table('letter_rate_details') - op.drop_table('letter_rates') diff --git a/migrations/versions/0092_add_inbound_provider.py b/migrations/versions/0092_add_inbound_provider.py index f7e5f510e..19eef3f9f 100644 --- a/migrations/versions/0092_add_inbound_provider.py +++ b/migrations/versions/0092_add_inbound_provider.py @@ -1,14 +1,14 @@ """empty message Revision ID: 0092_add_inbound_provider -Revises: 0091_letter_billing +Revises: 0090_inbound_sms Create Date: 2017-06-02 16:07:35.445423 """ # revision identifiers, used by Alembic. revision = '0092_add_inbound_provider' -down_revision = '0091_letter_billing' +down_revision = '0090_inbound_sms' from alembic import op import sqlalchemy as sa diff --git a/migrations/versions/0151_refactor_letter_rates.py b/migrations/versions/0151_refactor_letter_rates.py deleted file mode 100644 index 7a969cc42..000000000 --- a/migrations/versions/0151_refactor_letter_rates.py +++ /dev/null @@ -1,71 +0,0 @@ -""" - -Revision ID: 0151_refactor_letter_rates -Revises: 0150_another_letter_org -Create Date: 2017-12-05 10:24:41.232128 - -""" -import uuid -from datetime import datetime - -from alembic import op -import sqlalchemy as sa -from sqlalchemy.dialects import postgresql - -revision = '0151_refactor_letter_rates' -down_revision = '0150_another_letter_org' - - -def upgrade(): - op.drop_table('letter_rate_details') - op.drop_table('letter_rates') - op.create_table('letter_rates', - sa.Column('id', postgresql.UUID(as_uuid=True), nullable=False), - sa.Column('start_date', sa.DateTime(), nullable=False), - sa.Column('end_date', sa.DateTime(), nullable=True), - sa.Column('sheet_count', sa.Integer(), nullable=False), - sa.Column('rate', sa.Numeric(), nullable=False), - sa.Column('crown', sa.Boolean(), nullable=False), - sa.Column('post_class', sa.String(), nullable=False), - sa.PrimaryKeyConstraint('id') - ) - - start_date = datetime(2016, 3, 31, 23, 00, 00) - op.execute("insert into letter_rates values('{}', '{}', null, 1, 0.30, True, 'second')".format( - str(uuid.uuid4()), start_date) - ) - op.execute("insert into letter_rates values('{}', '{}', null, 2, 0.33, True, 'second')".format( - str(uuid.uuid4()), start_date) - ) - op.execute("insert into letter_rates values('{}', '{}', null, 3, 0.36, True, 'second')".format( - str(uuid.uuid4()), start_date) - ) - - op.execute("insert into letter_rates values('{}', '{}', null, 1, 0.33, False, 'second')".format( - str(uuid.uuid4()), start_date) - ) - op.execute("insert into letter_rates values('{}', '{}', null, 2, 0.39, False, 'second')".format( - str(uuid.uuid4()), start_date) - ) - op.execute("insert into letter_rates values('{}', '{}', null, 3, 0.45, False, 'second')".format( - str(uuid.uuid4()), start_date) - ) - - -def downgrade(): - op.drop_table('letter_rates') - op.create_table('letter_rates', - sa.Column('id', postgresql.UUID(), autoincrement=False, nullable=False), - sa.Column('valid_from', postgresql.TIMESTAMP(), autoincrement=False, nullable=False), - sa.PrimaryKeyConstraint('id', name='letter_rates_pkey'), - postgresql_ignore_search_path=False - ) - op.create_table('letter_rate_details', - sa.Column('id', postgresql.UUID(), autoincrement=False, nullable=False), - sa.Column('letter_rate_id', postgresql.UUID(), autoincrement=False, nullable=False), - sa.Column('page_total', sa.INTEGER(), autoincrement=False, nullable=False), - sa.Column('rate', sa.NUMERIC(), autoincrement=False, nullable=False), - sa.ForeignKeyConstraint(['letter_rate_id'], ['letter_rates.id'], - name='letter_rate_details_letter_rate_id_fkey'), - sa.PrimaryKeyConstraint('id', name='letter_rate_details_pkey') - ) diff --git a/migrations/versions/0152_kill_service_free_fragments.py b/migrations/versions/0152_kill_service_free_fragments.py index 038b978da..61be50982 100644 --- a/migrations/versions/0152_kill_service_free_fragments.py +++ b/migrations/versions/0152_kill_service_free_fragments.py @@ -1,7 +1,7 @@ """ Revision ID: 0152_kill_service_free_fragments -Revises: 0151_refactor_letter_rates +Revises: 0150_another_letter_org Create Date: 2017-12-01 16:49:51.178455 """ @@ -9,7 +9,7 @@ from alembic import op import sqlalchemy as sa revision = '0152_kill_service_free_fragments' -down_revision = '0151_refactor_letter_rates' +down_revision = '0150_another_letter_org' def upgrade(): diff --git a/migrations/versions/0232_noti_postage_constraint_3.py b/migrations/versions/0232_noti_postage_constraint_3.py index 4535d96b9..5e7304c70 100644 --- a/migrations/versions/0232_noti_postage_constraint_3.py +++ b/migrations/versions/0232_noti_postage_constraint_3.py @@ -1,6 +1,6 @@ """ -Revision ID: 0230_noti_postage_constraint_3 +Revision ID: 0232_noti_postage_constraint_3 Revises: 0230_noti_postage_constraint_2 Create Date: 2018-09-19 11:42:52.229430 @@ -8,7 +8,7 @@ Create Date: 2018-09-19 11:42:52.229430 from alembic import op -revision = '0230_noti_postage_constraint_3' +revision = '0232_noti_postage_constraint_3' down_revision = '0230_noti_postage_constraint_2' diff --git a/migrations/versions/0233_updated_first_class_dates.py b/migrations/versions/0233_updated_first_class_dates.py deleted file mode 100644 index 736435d6b..000000000 --- a/migrations/versions/0233_updated_first_class_dates.py +++ /dev/null @@ -1,30 +0,0 @@ -"""empty message - -Revision ID: 0233_updated_first_class_dates -Revises: 0230_noti_postage_constraint_3 - -""" - -revision = '0233_updated_first_class_dates' -down_revision = '0230_noti_postage_constraint_3' - -from datetime import datetime -from alembic import op -from sqlalchemy.sql import text - - -START_DATE = datetime(2018, 8, 31, 23, 0) - - -def upgrade(): - conn = op.get_bind() - conn.execute(text( - """UPDATE letter_rates SET start_date = :start_date WHERE post_class = 'first'""" - ), start_date=START_DATE) - - -def downgrade(): - ''' - This data migration should not be downgraded. Downgrading may cause billing errors - and the /montly-usage endpoint to stop working. - ''' diff --git a/migrations/versions/0234_ft_billing_postage.py b/migrations/versions/0234_ft_billing_postage.py index b9744d1ad..f267bf2f4 100644 --- a/migrations/versions/0234_ft_billing_postage.py +++ b/migrations/versions/0234_ft_billing_postage.py @@ -1,7 +1,7 @@ """ Revision ID: 0234_ft_billing_postage -Revises: 0233_updated_first_class_dates +Revises: 0232_noti_postage_constraint_3 Create Date: 2018-09-28 14:43:26.100884 """ @@ -10,7 +10,7 @@ import sqlalchemy as sa revision = '0234_ft_billing_postage' -down_revision = '0233_updated_first_class_dates' +down_revision = '0232_noti_postage_constraint_3' def upgrade(): diff --git a/migrations/versions/0372_remove_provider_rates.py b/migrations/versions/0372_remove_provider_rates.py deleted file mode 100644 index 1d883539a..000000000 --- a/migrations/versions/0372_remove_provider_rates.py +++ /dev/null @@ -1,32 +0,0 @@ -""" - -Revision ID: 0372_remove_provider_rates -Revises: 0364_drop_old_column -Create Date: 2022-04-26 09:39:45.260951 - -""" - -from alembic import op -import sqlalchemy as sa -from sqlalchemy.dialects import postgresql - -revision = '0372_remove_provider_rates' -down_revision = '0364_drop_old_column' - - -def upgrade(): - pass - # op.drop_table('provider_rates') - - -def downgrade(): - pass - # op.create_table( - # 'provider_rates', - # sa.Column('id', postgresql.UUID(as_uuid=True), nullable=False), - # sa.Column('valid_from', sa.DateTime(), nullable=False), - # sa.Column('provider_id', postgresql.UUID(as_uuid=True), nullable=True), - # sa.Column('rate', sa.Numeric(), nullable=False), - # sa.PrimaryKeyConstraint('id'), - # sa.ForeignKeyConstraint(['provider_id'], ['provider_details.id'], ), - # ) diff --git a/migrations/versions/0373_add_notifications_view.py b/migrations/versions/0373_add_notifications_view.py index 3344603b8..d5ba99c6f 100644 --- a/migrations/versions/0373_add_notifications_view.py +++ b/migrations/versions/0373_add_notifications_view.py @@ -1,7 +1,7 @@ """ Revision ID: 0373_add_notifications_view -Revises: 0372_remove_provider_rates +Revises: 0364_drop_old_column Create Date: 2022-05-18 09:39:45.260951 """ @@ -11,7 +11,7 @@ import sqlalchemy as sa from sqlalchemy.dialects import postgresql revision = '0373_add_notifications_view' -down_revision = '0372_remove_provider_rates' +down_revision = '0364_drop_old_column' def upgrade(): diff --git a/migrations/versions/0382_remove_old_sms_providers_.py b/migrations/versions/0382_remove_old_sms_providers_.py deleted file mode 100644 index 6023044c4..000000000 --- a/migrations/versions/0382_remove_old_sms_providers_.py +++ /dev/null @@ -1,23 +0,0 @@ -""" - -Revision ID: 0382_remove_old_sms_providers -Revises: 0381_encrypted_column_types -Create Date: 2022-12-16 12:52:14.182717 - -""" -from alembic import op -import sqlalchemy as sa - - -revision = '0382_remove_old_providers' -down_revision = '0381_encrypted_column_types' - - -def upgrade(): - pass - # op.execute("DELETE FROM provider_details WHERE identifier IN ('mmg', 'firetext')") - # op.execute("DELETE FROM provider_details_history WHERE identifier IN ('mmg', 'firetext')") - - -def downgrade(): - raise Exception("Irreversible migration") diff --git a/migrations/versions/0383_update_default_templates.py b/migrations/versions/0383_update_default_templates.py index 3313abfa4..01eca2c1b 100644 --- a/migrations/versions/0383_update_default_templates.py +++ b/migrations/versions/0383_update_default_templates.py @@ -1,7 +1,7 @@ """ Revision ID: 0383_update_default_templates.py -Revises: 0382_remove_old_providers +Revises: 0381_encrypted_column_types Create Date: 2023-01-10 11:42:25.633265 """ @@ -12,7 +12,7 @@ from sqlalchemy.dialects import postgresql from flask import current_app revision = '0383_update_default_templates.py' -down_revision = '0382_remove_old_providers' +down_revision = '0381_encrypted_column_types' def upgrade(): diff --git a/migrations/versions/0385_remove postage_.py b/migrations/versions/0385_remove postage_.py index e4ec15642..e446a5d16 100644 --- a/migrations/versions/0385_remove postage_.py +++ b/migrations/versions/0385_remove postage_.py @@ -1,6 +1,6 @@ """ -Revision ID: 0385_remove postage_.py +Revision ID: 0385_remove postage_ Revises: 0384_remove_letter_branding_ Create Date: 2023-02-10 12:20:39.411493 @@ -9,7 +9,7 @@ from alembic import op import sqlalchemy as sa from sqlalchemy.dialects import postgresql -revision = '0385_remove postage_.py' +revision = '0385_remove_postage_' down_revision = '0384_remove_letter_branding_' diff --git a/migrations/versions/0386_remove_letter_rates_.py b/migrations/versions/0386_remove_letter_rates_.py deleted file mode 100644 index 81b036250..000000000 --- a/migrations/versions/0386_remove_letter_rates_.py +++ /dev/null @@ -1,34 +0,0 @@ -""" - -Revision ID: 0386_remove_letter_rates_.py -Revises: 0385_remove postage_.py -Create Date: 2023-02-15 10:24:55.107467 - -""" -from alembic import op -import sqlalchemy as sa -from sqlalchemy.dialects import postgresql - -revision = '0386_remove_letter_rates_.py' -down_revision = '0385_remove postage_.py' - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.drop_table('letter_rates') - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.create_table('letter_rates', - sa.Column('id', postgresql.UUID(), autoincrement=False, nullable=False), - sa.Column('start_date', postgresql.TIMESTAMP(), autoincrement=False, nullable=False), - sa.Column('end_date', postgresql.TIMESTAMP(), autoincrement=False, nullable=True), - sa.Column('sheet_count', sa.INTEGER(), autoincrement=False, nullable=False), - sa.Column('rate', sa.NUMERIC(), autoincrement=False, nullable=False), - sa.Column('crown', sa.BOOLEAN(), autoincrement=False, nullable=False), - sa.Column('post_class', sa.VARCHAR(), autoincrement=False, nullable=False), - sa.PrimaryKeyConstraint('id', name='letter_rates_pkey') - ) - # ### end Alembic commands ### diff --git a/migrations/versions/0387_remove_letter_perms_.py b/migrations/versions/0387_remove_letter_perms_.py index c54b30a45..d2679a8f2 100644 --- a/migrations/versions/0387_remove_letter_perms_.py +++ b/migrations/versions/0387_remove_letter_perms_.py @@ -1,7 +1,7 @@ """ -Revision ID: 0387_remove_letter_perms_.py -Revises: 0386_remove_letter_rates_.py +Revision ID: 0387_remove_letter_perms_ +Revises: 0385_remove_postage_ Create Date: 2023-02-17 11:56:00.993409 """ @@ -9,8 +9,8 @@ from alembic import op import sqlalchemy as sa from sqlalchemy.dialects import postgresql -revision = '0387_remove_letter_perms_.py' -down_revision = '0386_remove_letter_rates_.py' +revision = '0387_remove_letter_perms_' +down_revision = '0385_remove_postage_' def upgrade(): diff --git a/migrations/versions/0388_no_serv_letter_contact.py b/migrations/versions/0388_no_serv_letter_contact.py index bbbafa6c5..1dc908eda 100644 --- a/migrations/versions/0388_no_serv_letter_contact.py +++ b/migrations/versions/0388_no_serv_letter_contact.py @@ -1,7 +1,7 @@ """ -Revision ID: 0388_no_serv_letter_contact.py -Revises: 0387_remove_letter_perms_.py +Revision ID: 0388_no_serv_letter_contact +Revises: 0387_remove_letter_perms_ Create Date: 2023-02-17 14:42:52.679425 """ @@ -9,8 +9,8 @@ from alembic import op import sqlalchemy as sa from sqlalchemy.dialects import postgresql -revision = '0388_no_serv_letter_contact.py' -down_revision = '0387_remove_letter_perms_.py' +revision = '0388_no_serv_letter_contact' +down_revision = '0387_remove_letter_perms_' def upgrade(): diff --git a/migrations/versions/0389_no_more_letters.py b/migrations/versions/0389_no_more_letters.py index e69c4615b..96125cdd2 100644 --- a/migrations/versions/0389_no_more_letters.py +++ b/migrations/versions/0389_no_more_letters.py @@ -1,7 +1,7 @@ """ -Revision ID: 0389_no_more_letters.py -Revises: 0388_no_serv_letter_contact.py +Revision ID: 0389_no_more_letters +Revises: 0388_no_serv_letter_contact Create Date: 2023-02-28 08:58:38.310095 """ @@ -9,8 +9,8 @@ from alembic import op import sqlalchemy as sa from sqlalchemy.dialects import postgresql -revision = '0389_no_more_letters.py' -down_revision = '0388_no_serv_letter_contact.py' +revision = '0389_no_more_letters' +down_revision = '0388_no_serv_letter_contact' def upgrade(): diff --git a/migrations/versions/0390_drop_dvla_provider.py b/migrations/versions/0390_drop_dvla_provider.py index 53d7d74ed..f9bebd396 100644 --- a/migrations/versions/0390_drop_dvla_provider.py +++ b/migrations/versions/0390_drop_dvla_provider.py @@ -1,16 +1,18 @@ """ -Revision ID: 0390_drop_dvla_provider.py -Revises: 0389_no_more_letters.py +Revision ID: 0390_drop_dvla_provider +Revises: 0389_no_more_letters Create Date: 2023-02-28 14:25:50.751952 """ +import uuid + from alembic import op import sqlalchemy as sa from sqlalchemy.dialects import postgresql -revision = '0390_drop_dvla_provider.py' -down_revision = '0389_no_more_letters.py' +revision = '0390_drop_dvla_provider' +down_revision = '0389_no_more_letters' def upgrade(): diff --git a/migrations/versions/0391_update_sms_numbers.py b/migrations/versions/0391_update_sms_numbers.py index 0fceb33a9..ed5e0562e 100644 --- a/migrations/versions/0391_update_sms_numbers.py +++ b/migrations/versions/0391_update_sms_numbers.py @@ -1,7 +1,7 @@ """ Revision ID: 0391_update_sms_numbers -Revises: 0390_drop_dvla_provider.py +Revises: 0390_drop_dvla_provider Create Date: 2023-03-01 12:36:38.226954 """ @@ -11,7 +11,7 @@ import sqlalchemy as sa revision = '0391_update_sms_numbers' -down_revision = '0390_drop_dvla_provider.py' +down_revision = '0390_drop_dvla_provider' OLD_SMS_NUMBER = "18446120782" NEW_SMS_NUMBER = current_app.config['NOTIFY_INTERNATIONAL_SMS_SENDER'].strip('+')