From 66c60cfc593377e4d41236032603fa8ff364d4cc Mon Sep 17 00:00:00 2001 From: TheNoxium Date: Wed, 4 Jun 2025 12:03:59 +0500 Subject: [PATCH] fix: name --- api/api/db/logic/account.py | 6 +++--- api/api/db/logic/keyring.py | 4 ++-- api/api/endpoints/account.py | 20 ++++++++++---------- api/api/endpoints/keyring.py | 18 +++++++++--------- api/api/endpoints/profile.py | 10 +++++----- api/api/services/user_role_validation.py | 4 ++-- 6 files changed, 31 insertions(+), 31 deletions(-) diff --git a/api/api/db/logic/account.py b/api/api/db/logic/account.py index e1cba7f..c2e30a7 100644 --- a/api/api/db/logic/account.py +++ b/api/api/db/logic/account.py @@ -52,7 +52,7 @@ async def get_user_accaunt_page(connection: AsyncConnection, page, limit) -> Opt ) -async def get_user_id(connection: AsyncConnection, id: int) -> Optional[User]: +async def get_user_by_id(connection: AsyncConnection, id: int) -> Optional[User]: """ Получает юзера по id. """ @@ -76,7 +76,7 @@ async def get_user_id(connection: AsyncConnection, id: int) -> Optional[User]: return User.model_validate(user_data) -async def get_user_login(connection: AsyncConnection, login: str) -> Optional[User]: +async def get_user_by_login(connection: AsyncConnection, login: str) -> Optional[User]: """ Получает юзера по login. """ @@ -100,7 +100,7 @@ async def get_user_login(connection: AsyncConnection, login: str) -> Optional[Us return User.model_validate(user_data) -async def update_user_id(connection: AsyncConnection, update_values, user) -> Optional[User]: +async def update_user_by_id(connection: AsyncConnection, update_values, user) -> Optional[User]: """ Вносит изменеия в нужное поле таблицы account_table. """ diff --git a/api/api/db/logic/keyring.py b/api/api/db/logic/keyring.py index 02a5797..9d91321 100644 --- a/api/api/db/logic/keyring.py +++ b/api/api/db/logic/keyring.py @@ -12,7 +12,7 @@ from api.schemas.account.account_keyring import AccountKeyring -async def get_key_id(connection: AsyncConnection, key_id: str) -> Optional[AccountKeyring]: +async def get_key_by_id(connection: AsyncConnection, key_id: str) -> Optional[AccountKeyring]: """ Получает key по key_id. """ @@ -36,7 +36,7 @@ async def get_key_id(connection: AsyncConnection, key_id: str) -> Optional[Accou return AccountKeyring.model_validate(user_data) -async def update_key_id(connection: AsyncConnection, update_values, key) -> Optional[AccountKeyring]: +async def update_key_by_id(connection: AsyncConnection, update_values, key) -> Optional[AccountKeyring]: """ Вносит изменеия в нужное поле таблицы account_keyring_table. """ diff --git a/api/api/endpoints/account.py b/api/api/endpoints/account.py index d22705e..50de6c0 100644 --- a/api/api/endpoints/account.py +++ b/api/api/endpoints/account.py @@ -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 diff --git a/api/api/endpoints/keyring.py b/api/api/endpoints/keyring.py index 8994007..6e21f93 100644 --- a/api/api/endpoints/keyring.py +++ b/api/api/endpoints/keyring.py @@ -14,7 +14,7 @@ from sqlalchemy.ext.asyncio import AsyncConnection from api.db.connection.session import get_connection_dep -from api.db.logic.keyring import get_key_id,create_key,update_key_id +from api.db.logic.keyring import get_key_by_id,create_key,update_key_by_id @@ -44,7 +44,7 @@ async def get_keyring( authorize_user = await db_user_role_validation(connection, current_user) - keyring = await get_key_id(connection, key_id) + keyring = await get_key_by_id(connection, key_id) if keyring is None: raise HTTPException( @@ -67,7 +67,7 @@ async def create_keyring( authorize_user = await db_user_role_validation(connection, current_user) - keyring = await get_key_id(connection, key_id) + keyring = await get_key_by_id(connection, key_id) if keyring is None: keyring_new = await create_key(connection,key, key_id, ) @@ -94,7 +94,7 @@ async def update_keyring( authorize_user = await db_user_role_validation(connection, current_user) - keyring = await get_key_id(connection, key_id) + keyring = await get_key_by_id(connection, key_id) if keyring is None: raise HTTPException( status_code=status.HTTP_404_NOT_FOUND, @@ -109,10 +109,10 @@ async def update_keyring( keyring_update_data = AccountKeyring.model_validate({**keyring.model_dump(), **update_values}) - await update_key_id(connection, update_values, keyring) + await update_key_by_id(connection, update_values, keyring) - keyring = await get_key_id(connection, key_id) + keyring = await get_key_by_id(connection, key_id) return keyring @@ -129,7 +129,7 @@ async def delete_keyring( authorize_user = await db_user_role_validation(connection, current_user) - keyring = await get_key_id(connection, key_id) + keyring = await get_key_by_id(connection, key_id) if keyring is None: raise HTTPException( status_code=status.HTTP_404_NOT_FOUND, @@ -143,9 +143,9 @@ async def delete_keyring( if update_values is None: return keyring - await update_key_id(connection, update_values, keyring) + await update_key_by_id(connection, update_values, keyring) - keyring = await get_key_id(connection, key_id) + keyring = await get_key_by_id(connection, key_id) return keyring diff --git a/api/api/endpoints/profile.py b/api/api/endpoints/profile.py index bd504e2..f75f5ab 100644 --- a/api/api/endpoints/profile.py +++ b/api/api/endpoints/profile.py @@ -13,7 +13,7 @@ from fastapi import ( 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,get_user_login +from api.db.logic.account import get_user_by_id, update_user_by_id,get_user_by_login from api.services.update_data_validation import update_user_data_changes from api.schemas.endpoints.account import UserUpdate @@ -34,7 +34,7 @@ async def get_profile( # Извлекаем текущего пользователя из request.state current_user = request.state.current_user - user = await get_user_login(connection, current_user) + user = await get_user_by_login(connection, current_user) if user is None: raise HTTPException( @@ -54,7 +54,7 @@ async def update_profile( current_user = request.state.current_user - user = await get_user_login(connection, current_user) + user = await get_user_by_login(connection, current_user) if user is None: raise HTTPException( status_code=status.HTTP_404_NOT_FOUND, @@ -66,9 +66,9 @@ async def update_profile( if update_values is None: 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 else: diff --git a/api/api/services/user_role_validation.py b/api/api/services/user_role_validation.py index 5b97f83..3d33bcc 100644 --- a/api/api/services/user_role_validation.py +++ b/api/api/services/user_role_validation.py @@ -2,14 +2,14 @@ from fastapi import ( HTTPException, status, ) -from api.db.logic.account import get_user_login +from api.db.logic.account import get_user_by_login from api.db.tables.account import AccountRole async def db_user_role_validation(connection, current_user): - authorize_user = await get_user_login(connection, current_user) + authorize_user = await get_user_by_login(connection, current_user) if authorize_user.role not in {AccountRole.OWNER, AccountRole.ADMIN}: raise HTTPException( status_code=status.HTTP_403_FORBIDDEN,