Vorkout/connect
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: profile

Browse Source
This commit is contained in:
TheNoxium 2025-05-12 21:20:36 +05:00
parent 19f8236b47
commit 3554d43d15
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -39,6 +39,7 @@ revision:
venv-api: venv-api:
cd api && \ cd api && \
poetry env activate \
poetry install poetry install
install: install:

28
api/api/endpoints/profile.py
View File

@ -26,16 +26,15 @@ api_router = APIRouter(
) )
@api_router.get("/{user_id}") @api_router.get("")
async def get_profile( async def get_profile(
user_id: int,
request: Request, request: Request,
connection: AsyncConnection = Depends(get_connection_dep), connection: AsyncConnection = Depends(get_connection_dep),
): ):
# Извлекаем текущего пользователя из request.state # Извлекаем текущего пользователя из request.state
current_user = request.state.current_user current_user = request.state.current_user
user = await get_user_id(connection, user_id) user = await get_user_login(connection, current_user)
if user is None: if user is None:
raise HTTPException( raise HTTPException(
@ -45,9 +44,8 @@ async def get_profile(
return user return user
@api_router.put("/{user_id}") @api_router.put("")
async def update_profile( async def update_profile(
user_id: int,
request: Request, request: Request,
user_updata: UserUpdate, user_updata: UserUpdate,
connection: AsyncConnection = Depends(get_connection_dep), connection: AsyncConnection = Depends(get_connection_dep),
@ -56,20 +54,24 @@ async def update_profile(
current_user = request.state.current_user current_user = request.state.current_user
user = await get_user_id(connection, user_id) user = await get_user_login(connection, current_user)
if user is None: if user is None:
raise HTTPException( raise HTTPException(
status_code=status.HTTP_404_NOT_FOUND, status_code=status.HTTP_404_NOT_FOUND,
detail="Account not found") detail="Account not found")
if user_updata.role == None and user_updata.login == None:
update_values = update_user_data_changes(user_updata,user)
update_values = update_user_data_changes(user_updata,user) if update_values is None:
return user
if update_values is None: await update_user_id(connection, update_values, user)
return user
await update_user_id(connection, update_values, user) user = await get_user_id(connection, user.id)
user = await get_user_id(connection, user_id) return user
else:
return user raise HTTPException(
status_code=status.HTTP_422_UNPROCESSABLE_ENTITY ,
detail="Bad body")