darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-10 07:12:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix handle_integrity_error()

Browse Source
This commit is contained in:
Kenneth Kehl
2023-07-11 10:58:58 -07:00
parent 015a550424
commit 029aa5794d
2 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/organization/rest.py
View File

@@ -1,6 +1,6 @@
from flask import Blueprint, abort, current_app, jsonify, request
from sqlalchemy.exc import IntegrityError, SQLAlchemyError
from sqlalchemy.exc import IntegrityError
from app.config import QueueNames
from app.dao.annual_billing_dao import set_default_free_allowance_for_service
@@ -43,6 +43,8 @@ def handle_integrity_error(exc):
"""
Handle integrity errors caused by the unique constraint on ix_organization_name
"""
print(exc)
current_app.logger.exception(exc)
if 'ix_organization_name' in str(exc):
return jsonify(result="error",
message="Organization name already exists"), 400
@@ -50,7 +52,6 @@ def handle_integrity_error(exc):
return jsonify(result='error',
message='Domain already exists'), 400
current_app.logger.exception(exc)
return jsonify(result='error', message="Internal server error"), 500
@@ -92,14 +93,7 @@ def create_organization():
data = request.get_json()
validate(data, post_create_organization_schema)
organization = Organization(**data)
try:
dao_create_organization(organization)
except SQLAlchemyError as e:
error = str(e.__dict__['orig'])
if "duplicate key" in error:
return jsonify(result='error', message='Organization name already exists'), 400
else:
return jsonify(result='error', message='Error'), 400
dao_create_organization(organization)
return jsonify(organization.serialize()), 201
@@ -109,17 +103,7 @@ def update_organization(organization_id):
data = request.get_json()
validate(data, post_update_organization_schema)
try:
result = dao_update_organization(organization_id, **data)
except SQLAlchemyError as e:
error = str(e.__dict__['orig'])
if "duplicate key" in error and "domain_pkey" in error:
return jsonify(result='error', message='Domain already exists'), 400
# 'organisation' here because of ix_organisation_name index in db
elif "duplicate key" in error and "organisation_name" in error:
return jsonify(result='error', message='Organization name already exists'), 400
else:
return jsonify(result='error', message='Error'), 400
result = dao_update_organization(organization_id, **data)
if data.get('agreement_signed') is True:
# if a platform admin has manually adjusted the organization, don't tell people

17
migrations/versions/0396_rename_organisation.py
View File

@@ -25,7 +25,22 @@ def upgrade():
op.execute('ALTER TABLE invited_organization_users RENAME COLUMN organisation_id to organization_id')
op.execute('ALTER TABLE organisation RENAME COLUMN organisation_type to organization_type')
op.execute('ALTER TABLE organisation RENAME to organization')
op.drop_index(op.f('ix_organisation_name'), table_name='organization')
op.create_index(op.f('ix_organization_name'), 'organization', ['name'], unique=True)
def downgrade():
pass
op.execute('ALTER TABLE services RENAME COLUMN organization_type to organisation_type')
op.execute('ALTER TABLE services_history RENAME COLUMN organization_type to organisation_type')
op.execute('ALTER TABLE services RENAME COLUMN organization_id to organisation_id')
op.execute('ALTER TABLE services_history RENAME COLUMN organization_id to organisation_id')
op.execute('ALTER TABLE domain RENAME COLUMN organization_id to organisation_id')
op.execute('ALTER TABLE user_to_organization RENAME to user_to_organisation')
op.execute('ALTER TABLE invited_organization_users RENAME to invited_organisation_users')
op.execute('ALTER TABLE user_to_organisation RENAME COLUMN organization_id to organisation_id')
op.execute('ALTER TABLE invited_organisation_users RENAME COLUMN organization_id to organisation_id')
op.execute('ALTER TABLE organization RENAME COLUMN organization_type to organisation_type')
op.execute('ALTER TABLE organization RENAME to organisation')
op.drop_index(op.f('ix_organization_name'), table_name='organisation')
op.create_index(op.f('ix_organisation_name'), 'organisation', ['name'], unique=True)