Fix migration and small refactor

This commit is contained in:
Imdad Ahad
2017-03-08 09:49:47 +00:00
parent f6dbc6a06c
commit 1ccaf08003
2 changed files with 20 additions and 8 deletions

View File

@@ -42,15 +42,15 @@ def get_provider_versions(provider_details_id):
@provider_details.route('/<uuid:provider_details_id>', methods=['POST'])
def update_provider_details(provider_details_id):
valid_keys = {'priority', 'created_by', 'active'}
invalid_keys = request.get_json().keys() - valid_keys
req_json = request.get_json()
invalid_keys = req_json.keys() - valid_keys
if invalid_keys:
message = "Not permitted to be updated"
errors = {key: [message] for key in invalid_keys}
raise InvalidRequest(errors, status_code=400)
provider = get_provider_details_by_id(provider_details_id)
req_json = request.get_json()
# Handle created_by differently due to how history entry is created
if 'created_by' in req_json:

View File

@@ -2,7 +2,7 @@
Revision ID: 0068_add_created_by_to_provider
Revises: 0067_service_contact_block
Create Date: 2017-03-02 17:47:17.586815
Create Date: 2017-03-06 17:19:28.492005
"""
@@ -14,23 +14,35 @@ from alembic import op
import sqlalchemy as sa
from sqlalchemy.dialects import postgresql
def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.add_column('provider_details', sa.Column('created_by_id', postgresql.UUID(as_uuid=True), nullable=True))
op.create_index(op.f('ix_provider_details_created_by_id'), 'provider_details', ['created_by_id'], unique=False)
op.create_foreign_key(None, 'provider_details', 'users', ['created_by_id'], ['id'])
op.create_foreign_key('provider_details_created_by_id_fkey', 'provider_details', 'users', ['created_by_id'], ['id'])
op.add_column('provider_details_history', sa.Column('created_by_id', postgresql.UUID(as_uuid=True), nullable=True))
op.create_index(op.f('ix_provider_details_history_created_by_id'), 'provider_details_history', ['created_by_id'], unique=False)
op.create_foreign_key(None, 'provider_details_history', 'users', ['created_by_id'], ['id'])
op.create_index(
op.f('ix_provider_details_history_created_by_id'),
'provider_details_history',
['created_by_id'],
unique=False
)
op.create_foreign_key(
'provider_details_history_created_by_id_fkey',
'provider_details_history',
'users',
['created_by_id'],
['id']
)
# ### end Alembic commands ###
def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.drop_constraint(None, 'provider_details_history', type_='foreignkey')
op.drop_constraint('provider_details_history_created_by_id_fkey', 'provider_details_history', type_='foreignkey')
op.drop_index(op.f('ix_provider_details_history_created_by_id'), table_name='provider_details_history')
op.drop_column('provider_details_history', 'created_by_id')
op.drop_constraint(None, 'provider_details', type_='foreignkey')
op.drop_constraint('provider_details_created_by_id_fkey', 'provider_details', type_='foreignkey')
op.drop_index(op.f('ix_provider_details_created_by_id'), table_name='provider_details')
op.drop_column('provider_details', 'created_by_id')
# ### end Alembic commands ###