small changes and fixes

Author: petrCher

userdata_api/routes/admin.py

@@ -3,32 +3,32 @@
 from auth_lib.fastapi import UnionAuth
 from fastapi import APIRouter, Depends
 
-from userdata_api.schemas.admin import UserDebugCardGet, UserDebugCardUpdate
+from userdata_api.schemas.admin import UserCardGet, UserCardUpdate
 from userdata_api.schemas.response_model import StatusResponseModel
-from userdata_api.utils.admin import get_user_info as get
-from userdata_api.utils.admin import patch_user_info as patch
+from userdata_api.utils.admin import get_user_info
+from userdata_api.utils.admin import patch_user_info
 
 
 admin = APIRouter(prefix="/admin", tags=["Admin"])
 
 
-@admin.get("/user/{user_id}", response_model=UserDebugCardGet)
-async def get_user_debug_card(
+@admin.get("/user/{user_id}", response_model=UserCardGet)
+async def get_user_card(
     user_id: int,
     user: dict[str, Any] = Depends(UnionAuth(scopes=["userdata.info.admin"], allow_none=False, auto_error=True)),
-) -> UserDebugCardGet:
+) -> UserCardGet:
     """
     Получает профсоюзную информацию пользователя.
 
     Скоупы: `["userdata.info.admin"]`
     """
 
-    return UserDebugCardGet.model_validate(await get(user_id, user))
+    return UserCardGet.model_validate(await get_user_info(user_id, user))
 
 
 @admin.patch("/user/{user_id}", response_model=StatusResponseModel)
-async def update_user_debug_card(
-    new_info: UserDebugCardUpdate,
+async def update_user_card(
+    new_info: UserCardUpdate,
     user_id: int,
     user: dict[str, Any] = Depends(UnionAuth(scopes=["userdata.info.admin"], allow_none=False, auto_error=True)),
 ) -> StatusResponseModel:
@@ -38,9 +38,7 @@ async def update_user_debug_card(
     Скоупы: `["userdata.info.admin"]`
 
      - **user_id**: id пользователя.
-
-    Возвращает **ObjectNotFound** пользователь с указанным user_id не найден.
     """
 
-    await patch(new_info, user_id, user)
+    await patch_user_info(new_info, user_id, user)
     return StatusResponseModel(status="Success", message="User patch succeeded", ru="Изменение успешно")

userdata_api/schemas/admin.py

@@ -1,14 +1,14 @@
 from .base import Base
 
 
-class UserDebugCardGet(Base):
+class UserCardGet(Base):
     user_id: int
     full_name: str | None = None
     student_card_number: str | None = None
     union_card_number: str | None = None
-    is_union_member: str
+    is_union_member: bool
 
 
-class UserDebugCardUpdate(Base):
+class UserCardUpdate(Base):
     full_name: str | None = None
     student_card_number: str | None = None

userdata_api/utils/admin.py

@@ -3,14 +3,14 @@
 from fastapi_sqlalchemy import db
 
 from userdata_api.models.db import Info, Param
-from userdata_api.schemas.admin import UserDebugCardGet, UserDebugCardUpdate
+from userdata_api.schemas.admin import UserCardGet, UserCardUpdate
 from userdata_api.schemas.user import UserInfo, UserInfoUpdate
 
 from .user import patch_user_info as user_patch
 
 
 async def patch_user_info(
-    new: UserDebugCardUpdate, user_id: int, user: dict[str, int | list[dict[str, str | int]]]
+    new: UserCardUpdate, user_id: int, user: dict[str, int | list[dict[str, str | int]]]
 ) -> None:
     """
     Обновить информацию о пользователе в соотетствии с переданным токеном.
@@ -36,7 +36,7 @@ async def patch_user_info(
         await user_patch(update_request, user_id, user)
 
 
-async def get_user_info(user_id: int, user: dict[str, int | list[dict[str, str | int]]]) -> UserDebugCardGet:
+async def get_user_info(user_id: int, user: dict[str, int | list[dict[str, str | int]]]) -> UserCardGet:
     """
     Получить профсоюзную информацию пользователя для админки.
 
@@ -79,6 +79,6 @@ async def get_user_info(user_id: int, user: dict[str, int | list[dict[str, str |
         "full_name": full_name.value if full_name else None,
         "student_card_number": student_card_number.value if student_card_number else None,
         "union_card_number": union_card_number.value if union_card_number else None,
-        "is_union_member": is_union_member.value if is_union_member else "false",
+        "is_union_member": is_union_member.value if is_union_member else False,
     }
     return result