refactor: refactor project with ruff
This commit is contained in:
@@ -14,9 +14,9 @@ from sqlalchemy.ext.asyncio import AsyncConnection
|
||||
|
||||
from api.db.connection.session import get_connection_dep
|
||||
|
||||
from api.db.logic.account import get_user_id, update_user_id, create_user,get_user_login
|
||||
from api.db.logic.account import get_user_id, update_user_id, create_user, get_user_login
|
||||
|
||||
from api.schemas.account.account import User,Status
|
||||
from api.schemas.account.account import User, Status
|
||||
from api.schemas.endpoints.account import UserUpdate
|
||||
|
||||
|
||||
@@ -30,34 +30,21 @@ api_router = APIRouter(
|
||||
)
|
||||
|
||||
|
||||
|
||||
@api_router.get("/{user_id}")
|
||||
async def get_account(user_id: int,
|
||||
request: Request,
|
||||
connection: AsyncConnection = Depends(get_connection_dep)
|
||||
):
|
||||
|
||||
|
||||
async def get_account(user_id: int, request: Request, connection: AsyncConnection = Depends(get_connection_dep)):
|
||||
current_user = request.state.current_user
|
||||
authorize_user = await db_user_role_validation(connection, current_user)
|
||||
|
||||
user = await get_user_id(connection, user_id)
|
||||
|
||||
if user is None:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
detail="Account not found")
|
||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Account not found")
|
||||
|
||||
return user
|
||||
|
||||
|
||||
@api_router.post("")
|
||||
async def create_account(
|
||||
user: UserUpdate,
|
||||
request: Request,
|
||||
connection: AsyncConnection = Depends(get_connection_dep)
|
||||
):
|
||||
|
||||
async def create_account(user: UserUpdate, request: Request, connection: AsyncConnection = Depends(get_connection_dep)):
|
||||
current_user = request.state.current_user
|
||||
|
||||
authorize_user = await db_user_role_validation(connection, current_user)
|
||||
@@ -65,40 +52,29 @@ async def create_account(
|
||||
user_validation = await get_user_login(connection, user.login)
|
||||
|
||||
if user_validation is None:
|
||||
|
||||
await create_user(connection,user,authorize_user.id)
|
||||
await create_user(connection, user, authorize_user.id)
|
||||
user_new = await get_user_login(connection, user.login)
|
||||
return user_new
|
||||
|
||||
else:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_400_BAD_REQUEST,
|
||||
detail="An account with this information already exists.")
|
||||
|
||||
|
||||
status_code=status.HTTP_400_BAD_REQUEST, detail="An account with this information already exists."
|
||||
)
|
||||
|
||||
|
||||
@api_router.put("/{user_id}")
|
||||
async def update_account(
|
||||
user_id: int,
|
||||
request: Request,
|
||||
user_update: UserUpdate,
|
||||
connection: AsyncConnection = Depends(get_connection_dep)
|
||||
):
|
||||
|
||||
user_id: int, request: Request, user_update: UserUpdate, connection: AsyncConnection = Depends(get_connection_dep)
|
||||
):
|
||||
current_user = request.state.current_user
|
||||
|
||||
authorize_user = await db_user_role_validation(connection, current_user)
|
||||
|
||||
|
||||
user = await get_user_id(connection, user_id)
|
||||
if user is None:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
detail="Account not found")
|
||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Account not found")
|
||||
|
||||
|
||||
update_values = update_user_data_changes(user_update,user)
|
||||
update_values = update_user_data_changes(user_update, user)
|
||||
|
||||
if update_values is None:
|
||||
return user
|
||||
@@ -107,42 +83,30 @@ async def update_account(
|
||||
|
||||
await update_user_id(connection, update_values, user)
|
||||
|
||||
|
||||
user = await get_user_id(connection, user_id)
|
||||
|
||||
return user
|
||||
|
||||
|
||||
@api_router.delete("/{user_id}")
|
||||
async def delete_account(
|
||||
user_id: int,
|
||||
request: Request,
|
||||
connection: AsyncConnection = Depends(get_connection_dep)
|
||||
):
|
||||
|
||||
|
||||
async def delete_account(user_id: int, request: Request, connection: AsyncConnection = Depends(get_connection_dep)):
|
||||
current_user = request.state.current_user
|
||||
|
||||
authorize_user = await db_user_role_validation(connection, current_user)
|
||||
|
||||
|
||||
user = await get_user_id(connection, user_id)
|
||||
if user is None:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
detail="Account not found")
|
||||
|
||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Account not found")
|
||||
|
||||
user_update = UserUpdate(status=Status.DELETED.value)
|
||||
|
||||
update_values = update_user_data_changes(user_update,user)
|
||||
update_values = update_user_data_changes(user_update, user)
|
||||
|
||||
if update_values is None:
|
||||
return user
|
||||
|
||||
|
||||
await update_user_id(connection, update_values, user)
|
||||
|
||||
|
||||
user = await get_user_id(connection, user_id)
|
||||
|
||||
return user
|
||||
|
Reference in New Issue
Block a user