fix: исправить алиасы в эндпоинтах и удалить неиспользуемые DTO

This commit is contained in:
Artem 2025-12-03 05:31:17 +01:00
parent 38a57b3e31
commit f1503b2fda
No known key found for this signature in database
GPG key ID: 833485276B7902CE
7 changed files with 22 additions and 28 deletions

View file

@ -19,6 +19,7 @@ from remnawave.models import (
RevokeUserRequestDto,
GetSubscriptionRequestsResponseDto
)
from remnawave.models.users import GetUserSubscriptionRequestHistoryResponseDto
from tests.utils import generate_email, generate_random_string
@ -110,7 +111,7 @@ class TestUsersFetch:
@pytest.mark.asyncio
async def test_get_all_users(self, remnawave):
all_users = await remnawave.users.get_all_users_v2()
all_users = await remnawave.users.get_all_users()
assert isinstance(all_users, UsersResponseDto)
@pytest.mark.asyncio
@ -173,12 +174,10 @@ class TestUsersFetch:
"""Test fetching user subscription request history"""
string_uuid = str(test_user.uuid)
try:
subscription_requests = await remnawave.users.get_subscription_requests(uuid=string_uuid)
assert isinstance(subscription_requests, GetSubscriptionRequestsResponseDto)
subscription_requests = await remnawave.users.get_user_subscription_request_history(uuid=string_uuid)
assert isinstance(subscription_requests, GetUserSubscriptionRequestHistoryResponseDto)
assert hasattr(subscription_requests, 'total')
assert hasattr(subscription_requests, 'records')
# Даже если записей нет, модель должна быть правильно сформирована
# с пустым списком records и total=0
except ApiError as e:
# Этот блок должен срабатывать только если API вернуло ошибку
# (404, 403 и т.д.), но не когда просто нет записей

View file

@ -4,7 +4,7 @@ from typing import List
import pytest
import pytz
from remnawave.models import BulkResponseDto, UpdateUserFields
from remnawave.models import BulkResponseDto, UpdateUserFields, BulkUpdateUsersRequestDto
from tests.conftest import REMNAWAVE_USER_UUID
@ -12,14 +12,15 @@ from tests.conftest import REMNAWAVE_USER_UUID
async def test_users_bulk_actions(remnawave):
expire_at = datetime.now(tz=pytz.utc) + timedelta(days=14)
description = "TEST_DESCRIPTION"
uuids: List[str] = [REMNAWAVE_USER_UUID]
bulk_update_users = await remnawave.users_bulk_actions.bulk_update_users(
uuids=uuids,
fields=UpdateUserFields(
description=description,
expire_at=expire_at,
body=BulkUpdateUsersRequestDto(
uuids=[REMNAWAVE_USER_UUID],
fields=UpdateUserFields(
expire_at=expire_at,
description=description,
),
),
)
assert isinstance(bulk_update_users, BulkResponseDto)
assert bulk_update_users.affected_rows == len(uuids)
assert bulk_update_users.affected_rows > 0