fix: name
This commit is contained in:
@@ -11,7 +11,7 @@ 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,get_user_accaunt_page
|
||||
from api.db.logic.account import get_user_by_id, update_user_by_id, create_user,get_user_by_login,get_user_accaunt_page
|
||||
|
||||
from api.schemas.account.account import User
|
||||
from api.db.tables.account import AccountStatus
|
||||
@@ -57,7 +57,7 @@ async def get_account(user_id: int, request: Request, connection: AsyncConnectio
|
||||
current_user = request.state.current_user
|
||||
authorize_user = await db_user_role_validation(connection, current_user)
|
||||
|
||||
user = await get_user_id(connection, user_id)
|
||||
user = await get_user_by_id(connection, user_id)
|
||||
|
||||
if user is None:
|
||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Account not found")
|
||||
@@ -77,12 +77,12 @@ async def create_account(
|
||||
|
||||
authorize_user = await db_user_role_validation(connection, current_user)
|
||||
|
||||
user_validation = await get_user_login(connection, user.login)
|
||||
user_validation = await get_user_by_login(connection, user.login)
|
||||
|
||||
if user_validation is None:
|
||||
|
||||
await create_user(connection,user,authorize_user.id)
|
||||
user_new = await get_user_login(connection, user.login)
|
||||
user_new = await get_user_by_login(connection, user.login)
|
||||
return user_new
|
||||
|
||||
else:
|
||||
@@ -106,7 +106,7 @@ async def update_account(
|
||||
authorize_user = await db_user_role_validation(connection, current_user)
|
||||
|
||||
|
||||
user = await get_user_id(connection, user_id)
|
||||
user = await get_user_by_id(connection, user_id)
|
||||
if user is None:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
@@ -120,10 +120,10 @@ async def update_account(
|
||||
|
||||
user_update_data = User.model_validate({**user.model_dump(), **update_values})
|
||||
|
||||
await update_user_id(connection, update_values, user)
|
||||
await update_user_by_id(connection, update_values, user)
|
||||
|
||||
|
||||
user = await get_user_id(connection, user_id)
|
||||
user = await get_user_by_id(connection, user_id)
|
||||
|
||||
return user
|
||||
|
||||
@@ -140,7 +140,7 @@ async def delete_account(
|
||||
authorize_user = await db_user_role_validation(connection, current_user)
|
||||
|
||||
|
||||
user = await get_user_id(connection, user_id)
|
||||
user = await get_user_by_id(connection, user_id)
|
||||
if user is None:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
@@ -155,9 +155,9 @@ async def delete_account(
|
||||
return user
|
||||
|
||||
|
||||
await update_user_id(connection, update_values, user)
|
||||
await update_user_by_id(connection, update_values, user)
|
||||
|
||||
|
||||
user = await get_user_id(connection, user_id)
|
||||
user = await get_user_by_id(connection, user_id)
|
||||
|
||||
return user
|
||||
|
Reference in New Issue
Block a user