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

fix: name function

Browse Source
This commit is contained in:
TheNoxium 2025-04-23 16:48:02 +03:00
parent f67ef7f96f
commit 22e2bca83c
6 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/api/db/logic/account.py
View File

@ -60,7 +60,7 @@ async def get_user_login(connection: AsyncConnection, login: str) -> Optional[Us
return User.model_validate(user_data) return User.model_validate(user_data)
async def put_user_id(connection: AsyncConnection, update_values, user) -> Optional[User]: async def update_user_id(connection: AsyncConnection, update_values, user) -> Optional[User]:
""" """
Вносит изменеия в нужное поле таблицы account_table. Вносит изменеия в нужное поле таблицы account_table.
""" """
@ -73,7 +73,7 @@ async def put_user_id(connection: AsyncConnection, update_values, user) -> Optio
await connection.commit() await connection.commit()
async def post_add_user(connection: AsyncConnection, user: User, creator_id: int) -> Optional[User]: async def create_user(connection: AsyncConnection, user: User, creator_id: int) -> Optional[User]:
""" """
Создает нове поле в таблице account_table. Создает нове поле в таблице account_table.
""" """

4
api/api/db/logic/keyring.py
View File

@ -36,7 +36,7 @@ async def get_key_id(connection: AsyncConnection, key_id: str) -> Optional[Accou
return AccountKeyring.model_validate(user_data) return AccountKeyring.model_validate(user_data)
async def put_key_id(connection: AsyncConnection, update_values, key) -> Optional[AccountKeyring]: async def update_key_id(connection: AsyncConnection, update_values, key) -> Optional[AccountKeyring]:
""" """
Вносит изменеия в нужное поле таблицы account_keyring_table. Вносит изменеия в нужное поле таблицы account_keyring_table.
""" """
@ -49,7 +49,7 @@ async def put_key_id(connection: AsyncConnection, update_values, key) -> Optiona
await connection.commit() await connection.commit()
async def post_add_key(connection: AsyncConnection, key: AccountKeyring, key_id:int) -> Optional[AccountKeyring]: async def create_key(connection: AsyncConnection, key: AccountKeyring, key_id:int) -> Optional[AccountKeyring]:
""" """
Создает нове поле в таблице account_keyring_table). Создает нове поле в таблице account_keyring_table).
""" """

18
api/api/endpoints/account.py
View File

@ -17,14 +17,14 @@ from sqlalchemy.ext.asyncio import AsyncConnection
from api.db.connection.session import get_connection_dep from api.db.connection.session import get_connection_dep
from api.db.logic.account import get_user_id, put_user_id, post_add_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,Role,Status from api.schemas.account.account import User,Role,Status
from api.schemas.endpoints.account import UserUpdate from api.schemas.endpoints.account import UserUpdate
from api.services.access_token_validadtion import AccessTokenValidadtion from api.services.access_token_validadtion import AccessTokenValidadtion
from api.services.user_role_validation import db_user_role_validation from api.services.user_role_validation import db_user_role_validation
from api.services.update_data_validation import put_user_data_changes from api.services.update_data_validation import update_user_data_changes
api_router = APIRouter( api_router = APIRouter(
@ -54,7 +54,7 @@ async def get_account(user_id: int,
@api_router.post("") @api_router.post("")
async def post_account( async def create_account(
user: UserUpdate, user: UserUpdate,
connection: AsyncConnection = Depends(get_connection_dep), connection: AsyncConnection = Depends(get_connection_dep),
Authorize: AuthJWT = Depends() Authorize: AuthJWT = Depends()
@ -68,7 +68,7 @@ async def post_account(
if user_validation is None: if user_validation is None:
await post_add_user(connection,user,authorize_user.id) await create_user(connection,user,authorize_user.id)
user_new = await get_user_login(connection, user.login) user_new = await get_user_login(connection, user.login)
return user_new return user_new
@ -81,7 +81,7 @@ async def post_account(
@api_router.put("/{user_id}") @api_router.put("/{user_id}")
async def put_account( async def update_account(
user_id: int, user_id: int,
user_update: UserUpdate, user_update: UserUpdate,
connection: AsyncConnection = Depends(get_connection_dep), connection: AsyncConnection = Depends(get_connection_dep),
@ -99,14 +99,14 @@ async def put_account(
detail="Account not found") detail="Account not found")
update_values = put_user_data_changes(user_update,user) update_values = update_user_data_changes(user_update,user)
if update_values is None: if update_values is None:
return user return user
user_update_data = User.model_validate(update_values) user_update_data = User.model_validate(update_values)
await put_user_id(connection, update_values, 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)
@ -133,13 +133,13 @@ async def delete_account(
user_update = UserUpdate(status=Status.DELETED.value) user_update = UserUpdate(status=Status.DELETED.value)
update_values = put_user_data_changes(user_update,user) update_values = update_user_data_changes(user_update,user)
if update_values is None: if update_values is None:
return user return user
await put_user_id(connection, update_values, 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)

18
api/api/endpoints/keyring.py
View File

@ -16,7 +16,7 @@ from sqlalchemy.ext.asyncio import AsyncConnection
from api.db.connection.session import get_connection_dep from api.db.connection.session import get_connection_dep
from api.db.logic.account import get_user_login from api.db.logic.account import get_user_login
from api.db.logic.keyring import get_key_id,post_add_key,put_key_id from api.db.logic.keyring import get_key_id,create_key,update_key_id
from api.schemas.account.account import Role,Status from api.schemas.account.account import Role,Status
@ -26,7 +26,7 @@ from api.schemas.account.account_keyring import AccountKeyring
from api.services.access_token_validadtion import AccessTokenValidadtion from api.services.access_token_validadtion import AccessTokenValidadtion
from api.services.user_role_validation import db_user_role_validation from api.services.user_role_validation import db_user_role_validation
from api.services.update_data_validation import put_key_data_changes from api.services.update_data_validation import update_key_data_changes
api_router = APIRouter( api_router = APIRouter(
@ -56,7 +56,7 @@ async def get_keyring(
@api_router.post("/{user_id}/{key_id}") @api_router.post("/{user_id}/{key_id}")
async def post_keyring( async def create_keyring(
user_id: int, user_id: int,
key_id: str, key_id: str,
key: AccountKeyringUpdate, key: AccountKeyringUpdate,
@ -72,7 +72,7 @@ async def post_keyring(
if keyring is None: if keyring is None:
print(key.key_type) print(key.key_type)
user_new = await post_add_key(connection,key, key_id, ) user_new = await create_key(connection,key, key_id, )
return user_new return user_new
else: else:
@ -83,7 +83,7 @@ async def post_keyring(
@api_router.put("/{user_id}/{key_id}") @api_router.put("/{user_id}/{key_id}")
async def put_keyring( async def update_keyring(
user_id: int, user_id: int,
key_id: str, key_id: str,
keyring_update: AccountKeyringUpdate, keyring_update: AccountKeyringUpdate,
@ -102,13 +102,13 @@ async def put_keyring(
detail="keyring not found") detail="keyring not found")
update_values = put_key_data_changes(keyring_update,keyring) update_values = update_key_data_changes(keyring_update,keyring)
if update_values is None: if update_values is None:
return keyring return keyring
await put_key_id(connection, update_values, keyring) await update_key_id(connection, update_values, keyring)
keyring = await get_key_id(connection, key_id) keyring = await get_key_id(connection, key_id)
@ -136,12 +136,12 @@ async def delete_keyring(
keyring_update = AccountKeyringUpdate(status=Status.DELETED.value) keyring_update = AccountKeyringUpdate(status=Status.DELETED.value)
update_values = put_key_data_changes(keyring_update,keyring) update_values = update_key_data_changes(keyring_update,keyring)
if update_values is None: if update_values is None:
return keyring return keyring
await put_key_id(connection, update_values, keyring) await update_key_id(connection, update_values, keyring)
keyring = await get_key_id(connection, key_id) keyring = await get_key_id(connection, key_id)

10
api/api/endpoints/pofile.py
View File

@ -14,8 +14,8 @@ from fastapi_jwt_auth import AuthJWT
from sqlalchemy.ext.asyncio import AsyncConnection from sqlalchemy.ext.asyncio import AsyncConnection
from api.db.connection.session import get_connection_dep from api.db.connection.session import get_connection_dep
from api.db.logic.account import get_user_id, put_user_id,get_user_login from api.db.logic.account import get_user_id, update_user_id,get_user_login
from api.services.update_data_validation import put_user_data_changes from api.services.update_data_validation import update_user_data_changes
from api.schemas.endpoints.account import UserUpdate from api.schemas.endpoints.account import UserUpdate
@ -53,7 +53,7 @@ async def get_pofile(user_id: int,
@api_router.put("/{user_id}") @api_router.put("/{user_id}")
async def put_pofile( async def update_pofile(
user_id: int, user_id: int,
user_updata: UserUpdate, user_updata: UserUpdate,
connection: AsyncConnection = Depends(get_connection_dep), connection: AsyncConnection = Depends(get_connection_dep),
@ -76,12 +76,12 @@ async def put_pofile(
detail="Account not found") detail="Account not found")
update_values = put_user_data_changes(user_updata,user) update_values = update_user_data_changes(user_updata,user)
if update_values is None: if update_values is None:
return user return user
await put_user_id(connection, update_values, 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)

4
api/api/services/update_data_validation.py
View File

@ -3,7 +3,7 @@ from typing import Optional
from api.schemas.endpoints.account import UserUpdate, Role, Status from api.schemas.endpoints.account import UserUpdate, Role, Status
from api.schemas.endpoints.account_keyring import AccountKeyringUpdate, StatusKey, TypeKey from api.schemas.endpoints.account_keyring import AccountKeyringUpdate, StatusKey, TypeKey
def put_user_data_changes(update_data: UserUpdate, user) -> Optional[dict]: def update_user_data_changes(update_data: UserUpdate, user) -> Optional[dict]:
""" """
Сравнивает данные для обновления с текущими значениями пользователя. Сравнивает данные для обновления с текущими значениями пользователя.
Возвращает: Возвращает:
@ -36,7 +36,7 @@ def put_user_data_changes(update_data: UserUpdate, user) -> Optional[dict]:
return changes if changes else None return changes if changes else None
def put_key_data_changes(update_data: AccountKeyringUpdate, key) -> Optional[dict]: def update_key_data_changes(update_data: AccountKeyringUpdate, key) -> Optional[dict]:
""" """
Сравнивает данные для обновления с текущими значениями пользователя. Сравнивает данные для обновления с текущими значениями пользователя.
Возвращает: Возвращает: