api/api/db/logic/account.py

@@ -60,7 +60,7 @@ async def get_user_login(connection: AsyncConnection, login: str) -> Optional[Us
     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.
     """
@@ -73,7 +73,7 @@ async def put_user_id(connection: AsyncConnection, update_values, user) -> Optio
     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.
     """

api/api/db/logic/keyring.py

@@ -36,7 +36,7 @@ async def get_key_id(connection: AsyncConnection, key_id: str) -> Optional[Accou
     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.
     """
@@ -49,7 +49,7 @@ async def put_key_id(connection: AsyncConnection, update_values, key) -> Optiona
     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).
     """

api/api/endpoints/account.py

@@ -17,14 +17,14 @@ from sqlalchemy.ext.asyncio import AsyncConnection
 
 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.endpoints.account import UserUpdate
 
 from api.services.access_token_validadtion import AccessTokenValidadtion
 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(
@@ -54,7 +54,7 @@ async def get_account(user_id: int,
 
 
 @api_router.post("")
-async def post_account(
+async def create_account(
     user: UserUpdate,
     connection: AsyncConnection = Depends(get_connection_dep),
     Authorize: AuthJWT = Depends()
@@ -68,7 +68,7 @@ async def post_account(
     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)
         return user_new
 
@@ -81,7 +81,7 @@ async def post_account(
 
 
 @api_router.put("/{user_id}")
-async def put_account(
+async def update_account(
     user_id: int,
     user_update: UserUpdate,
     connection: AsyncConnection = Depends(get_connection_dep),
@@ -99,14 +99,14 @@ async def put_account(
             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:
         return user
 
     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)
@@ -133,13 +133,13 @@ async def delete_account(
 
     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:
         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)

api/api/endpoints/keyring.py

@@ -16,7 +16,7 @@ from sqlalchemy.ext.asyncio import AsyncConnection
 from api.db.connection.session import get_connection_dep
 
 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
@@ -26,7 +26,7 @@ from api.schemas.account.account_keyring import AccountKeyring
 
 from api.services.access_token_validadtion import AccessTokenValidadtion
 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(
@@ -56,7 +56,7 @@ async def get_keyring(
 
 
 @api_router.post("/{user_id}/{key_id}")
-async def post_keyring(
+async def create_keyring(
     user_id: int,
     key_id: str,
     key: AccountKeyringUpdate,
@@ -72,7 +72,7 @@ async def post_keyring(
 
     if keyring is None:
         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
 
     else:
@@ -83,7 +83,7 @@ async def post_keyring(
 
 
 @api_router.put("/{user_id}/{key_id}")
-async def put_keyring(
+async def update_keyring(
     user_id: int,
     key_id: str,
     keyring_update: AccountKeyringUpdate,
@@ -102,13 +102,13 @@ async def put_keyring(
             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:
         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)
@@ -136,12 +136,12 @@ async def delete_keyring(
 
     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:
         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)

api/api/endpoints/pofile.py

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

api/api/services/update_data_validation.py

@@ -3,7 +3,7 @@ from typing import Optional
 from api.schemas.endpoints.account import UserUpdate, Role, Status
 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
 
-def put_key_data_changes(update_data: AccountKeyringUpdate, key) -> Optional[dict]:
+def update_key_data_changes(update_data: AccountKeyringUpdate, key) -> Optional[dict]:
     """
     Сравнивает данные для обновления с текущими значениями пользователя.
     Возвращает: