Merge branch 'main' into stvnrlly-remove-broadcasts

migrations/versions/0375_fix_service_name.py

@@ -6,17 +6,13 @@ Create Date: 2022-08-29 11:04:15.888017
 
 """
 
-# revision identifiers, used by Alembic.
-from datetime import datetime
-
 revision = '0375_fix_service_name'
 down_revision = '0374_fix_reg_template_history'
 
 from alembic import op
-import sqlalchemy as sa
+from flask import current_app
 
-service_id = 'd6aa2c68-a2d9-4437-ab19-3ae8eb202553'
-user_id= '6af522d0-2915-4e52-83a3-3690455a5fe6'
+service_id = current_app.config['NOTIFY_SERVICE_ID']
 
 def upgrade():
     op.get_bind()

migrations/versions/0376_add_provider_response.py

@@ -0,0 +1,30 @@
+"""empty message
+
+Revision ID: 0376_add_provider_response
+Revises: 0375_fix_service_name
+Create Date: 2022-09-14 11:04:15.888017
+
+"""
+# revision identifiers, used by Alembic.
+from datetime import datetime
+
+revision = '0376_add_provider_response'
+down_revision = '0375_fix_service_name'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('notifications', sa.Column('provider_response', sa.Text(), nullable=True))
+    op.add_column('notifications', sa.Column('queue_name', sa.Text(), nullable=True))
+    ### end Alembic commands ###
+
+
+def downgrade():
+    ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('notifications', 'provider_response')
+    op.drop_column('notifications', 'queue_name')
+    ### end Alembic commands ###
+    

migrations/versions/0377_add_inbound_sms_number.py

@@ -0,0 +1,60 @@
+"""empty message
+
+Revision ID: 0377_add_inbound_sms_number
+Revises: 0376_add_provider_response
+Create Date: 2022-09-30 11:04:15.888017
+
+"""
+import uuid
+
+from alembic import op
+from flask import current_app
+
+
+revision = '0377_add_inbound_sms_number'
+down_revision = '0376_add_provider_response'
+
+INBOUND_NUMBER_ID = '9b5bc009-b847-4b1f-8a54-f3b5f95cff18'
+INBOUND_NUMBER = current_app.config['NOTIFY_INTERNATIONAL_SMS_SENDER']
+DEFAULT_SERVICE_ID = current_app.config['NOTIFY_SERVICE_ID']
+
+def upgrade():
+    op.get_bind()
+
+    # delete the previous inbound_number with mmg as provider
+    table_name = 'inbound_numbers'
+    select_by_col = 'number'
+    select_by_val = INBOUND_NUMBER
+    op.execute(f"delete from {table_name} where {select_by_col} = '{select_by_val}'")
+    
+    # add the inbound number for the default service to inbound_numbers
+    table_name = 'inbound_numbers'
+    provider = 'sns'
+    active = 'true'
+    op.execute(f"insert into {table_name} (id, number, provider, service_id, active, created_at) VALUES('{INBOUND_NUMBER_ID}', '{INBOUND_NUMBER}', '{provider}','{DEFAULT_SERVICE_ID}', '{active}', 'now()')")
+    
+    # add the inbound number for the default service to service_sms_senders
+    table_name = 'service_sms_senders'
+    sms_sender = INBOUND_NUMBER
+    select_by_col = 'id'
+    select_by_val = '286d6176-adbe-7ea7-ba26-b7606ee5e2a4'
+    op.execute(f"update {table_name} set {'sms_sender'}='{sms_sender}' where {select_by_col} = '{select_by_val}'")
+    
+    # add the inbound number for the default service to inbound_numbers
+    table_name = 'service_permissions'
+    permission = 'inbound_sms'
+    active = 'true'
+    op.execute(f"insert into {table_name} (service_id, permission, created_at) VALUES('{DEFAULT_SERVICE_ID}', '{permission}', 'now()')")
+    # pass
+
+
+def downgrade():
+    delete_sms_sender = f"delete from service_sms_senders where inbound_number_id = '{INBOUND_NUMBER_ID}'"
+    delete_inbound_number = f"delete from inbound_numbers where number = '{INBOUND_NUMBER}'"
+    delete_service_inbound_permission = f"delete from service_permissions where service_id = '{DEFAULT_SERVICE_ID}' and permission = 'inbound_sms'"
+    recreate_mmg_inbound_number = f"insert into inbound_numbers (id, number, provider, service_id, active, created_at) VALUES('d7aea27f-340b-4428-9b20-4470dd978bda', '{INBOUND_NUMBER}', 'mmg', 'null', 'false', 'now()')"
+    op.execute(delete_sms_sender)
+    op.execute(delete_inbound_number)
+    op.execute(delete_service_inbound_permission)
+    op.execute(recreate_mmg_inbound_number)
+    # pass

migrations/versions/0378_add_org_names.py

@@ -0,0 +1,53 @@
+"""
+
+Revision ID: 0378_add_org_names
+Revises: 0377_add_inbound_sms_number
+Create Date: 2022-09-23 20:04:00.766980
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+revision = '0378_add_org_names'
+down_revision = '0377_add_inbound_sms_number'
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.get_bind()
+
+    # bluntly swap out data
+    op.execute("INSERT INTO organisation_types VALUES ('state','f','250000'),('federal','f','250000');")
+    op.execute("UPDATE services SET organisation_type = 'federal';")
+    op.execute("UPDATE organisation SET organisation_type = 'federal';")
+    op.execute("UPDATE services_history SET organisation_type = 'federal';")
+    
+    # remove uk values
+    service_delete = """DELETE FROM organisation_types WHERE name IN 
+                    ('central','local','nhs','nhs_central','nhs_local','emergency_service','school_or_college','nhs_gp')
+                """
+    op.execute(service_delete)
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    service_insert = """INSERT INTO organisation_types VALUES 
+                    ('central','','250000')
+                    ('local','f','25000')
+                    ('nhs','','25000')
+                    ('nhs_central','t','250000')
+                    ('nhs_local','f','25000')
+                    ('emergency_service','f','25000')
+                    ('school_or_college','f','25000')
+                    ('nhs_gp','f','25000')
+                """
+    op.execute(service_insert)
+    op.execute("UPDATE services SET organisation_type = 'central';")
+    op.execute("UPDATE organisation SET organisation_type = 'central';")
+    op.execute("UPDATE services_history SET organisation_type = 'central';")
+    op.execute("DELETE FROM organisation_types WHERE name IN ('federal','state')")
+
+    # ### end Alembic commands ###