minor: global exception names
This commit is contained in:
parent
4a97789c1a
commit
da5099e172
3 changed files with 9 additions and 9 deletions
|
|
@ -19,7 +19,7 @@ from fastapi import APIRouter, status
|
|||
from sqlalchemy.exc import IntegrityError
|
||||
from psycopg import errors
|
||||
|
||||
from src.exceptions import Conflict
|
||||
from src.exceptions import ConflictException
|
||||
from src.database import db_dependency
|
||||
from src.schemas import ResourceName
|
||||
from src.auth.exceptions import UnauthorizedException
|
||||
|
|
@ -100,7 +100,7 @@ async def create_group(db: db_dependency, org_model: org_model_root_claim_body_d
|
|||
db.flush()
|
||||
except IntegrityError as e:
|
||||
if isinstance(e.orig, errors.UniqueViolation):
|
||||
raise Conflict("Group with this name already exists")
|
||||
raise ConflictException("Group with this name already exists")
|
||||
response = GroupSchema(**group_model.__dict__)
|
||||
db.commit()
|
||||
return {"group": response}
|
||||
|
|
@ -112,7 +112,7 @@ async def add_group_permission(db: db_dependency, group_model: group_model_body_
|
|||
raise UnauthorizedException()
|
||||
|
||||
if perm_model in group_model.permission_rel:
|
||||
raise Conflict("Group already has this permission")
|
||||
raise ConflictException("Group already has this permission")
|
||||
|
||||
group_model.permission_rel.append(perm_model)
|
||||
|
||||
|
|
@ -128,7 +128,7 @@ async def add_group_user(db: db_dependency, group_model: group_model_body_depend
|
|||
raise UnauthorizedException()
|
||||
|
||||
if user_model in group_model.user_rel:
|
||||
raise Conflict("User already in group")
|
||||
raise ConflictException("User already in group")
|
||||
|
||||
group_model.user_rel.append(user_model)
|
||||
db.flush()
|
||||
|
|
@ -177,7 +177,7 @@ async def create_new_permission(db: db_dependency, su: super_admin_dependency, r
|
|||
db.add(perm_model)
|
||||
except IntegrityError as e:
|
||||
if isinstance(e.orig, errors.UniqueViolation):
|
||||
raise Conflict(message="Permission already exists")
|
||||
raise ConflictException(message="Permission already exists")
|
||||
db.flush()
|
||||
response = IAMPostPermissionResponse(permission=PermissionSchema(**perm_model.__dict__))
|
||||
db.commit()
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ from fastapi import APIRouter, status
|
|||
from psycopg.errors import UniqueViolation
|
||||
from sqlalchemy.exc import IntegrityError
|
||||
|
||||
from src.exceptions import Conflict
|
||||
from src.exceptions import ConflictException
|
||||
from src.database import db_dependency
|
||||
from src.auth.dependencies import super_admin_dependency, org_model_root_claim_query_dependency
|
||||
|
||||
|
|
@ -65,7 +65,7 @@ async def register_service(db: db_dependency, su: super_admin_dependency, reques
|
|||
db.flush()
|
||||
except IntegrityError as e:
|
||||
if isinstance(e.orig, UniqueViolation):
|
||||
raise Conflict(message="Service with this name already exists")
|
||||
raise ConflictException(message="Service with this name already exists")
|
||||
db.commit()
|
||||
response = ServiceWithKeySchema(**service_model.__dict__)
|
||||
db.commit()
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ Exports:
|
|||
from typing import Any
|
||||
|
||||
from src.database import get_db
|
||||
from src.exceptions import UnprocessableContent
|
||||
from src.exceptions import UnprocessableContentException
|
||||
|
||||
from src.user.schemas import OIDCUser
|
||||
from src.user.models import User
|
||||
|
|
@ -18,7 +18,7 @@ async def add_user_to_db(user_claims: dict[str, Any]) -> int:
|
|||
valid_user = OIDCUser(first_name=user_claims["given_name"], last_name=user_claims["family_name"], email=user_claims["email"], oidc_id=user_claims["sub"])
|
||||
except Exception as e:
|
||||
print(e)
|
||||
raise UnprocessableContent("Invalid or missing OIDC data")
|
||||
raise UnprocessableContentException("Invalid or missing OIDC data")
|
||||
|
||||
db = next(get_db())
|
||||
db_user = db.query(User).filter(User.oidc_id == valid_user.oidc_id).first()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue