From 18bb79262cb1f836ca69fdced2bee59cdfc55bc1 Mon Sep 17 00:00:00 2001 From: Vladislav Syrochkin Date: Tue, 24 Jun 2025 13:12:31 +0500 Subject: [PATCH] feat(api): add current page to AllUserResponse and fix returning type --- api/api/db/logic/account.py | 4 ++-- api/api/schemas/endpoints/account.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/api/api/db/logic/account.py b/api/api/db/logic/account.py index 5f16ac4..06d42a6 100644 --- a/api/api/db/logic/account.py +++ b/api/api/db/logic/account.py @@ -13,7 +13,7 @@ from api.schemas.account.account import User from api.schemas.endpoints.account import AllUserResponse, all_user_adapter -async def get_user_accaunt_page(connection: AsyncConnection, page, limit) -> Optional[User]: +async def get_user_accaunt_page(connection: AsyncConnection, page, limit) -> Optional[AllUserResponse]: """ Получает список ползовелей заданных значениями page, limit. """ @@ -47,7 +47,7 @@ async def get_user_accaunt_page(connection: AsyncConnection, page, limit) -> Opt validated_users = all_user_adapter.validate_python(users_data) - return AllUserResponse(users=validated_users, amount_count=total_count, amount_pages=total_pages) + return AllUserResponse(users=validated_users, amount_count=total_count, amount_pages=total_pages, current_page=page) async def get_user_by_id(connection: AsyncConnection, id: int) -> Optional[User]: diff --git a/api/api/schemas/endpoints/account.py b/api/api/schemas/endpoints/account.py index 37ceeea..6366ce7 100644 --- a/api/api/schemas/endpoints/account.py +++ b/api/api/schemas/endpoints/account.py @@ -35,6 +35,7 @@ class AllUserResponse(Base): users: List[AllUser] amount_count: int amount_pages: int + current_page: int all_user_adapter = TypeAdapter(List[AllUser])