diff --git a/remnawave/models/hwid.py b/remnawave/models/hwid.py index 8ff3ee1..5223ac9 100644 --- a/remnawave/models/hwid.py +++ b/remnawave/models/hwid.py @@ -22,7 +22,8 @@ class DeleteUserHwidDeviceRequestDto(BaseModel): class HwidDeviceDto(BaseModel): hwid: str - user_uuid: UUID = Field(alias="userUuid") + user_id: int = Field(alias="userId") + request_ip: Optional[str] = Field(None, alias="requestIp") platform: Optional[str] = None os_version: Optional[str] = Field(None, alias="osVersion") device_model: Optional[str] = Field(None, alias="deviceModel") diff --git a/remnawave/models/subscription_request_history.py b/remnawave/models/subscription_request_history.py index 3987304..4fa9dee 100644 --- a/remnawave/models/subscription_request_history.py +++ b/remnawave/models/subscription_request_history.py @@ -1,13 +1,12 @@ from datetime import datetime from typing import List, Optional -from uuid import UUID from pydantic import BaseModel, Field class SubscriptionRequestHistoryRecord(BaseModel): id: int - user_uuid: UUID = Field(alias="userUuid") + user_id: int = Field(alias="userId") request_ip: Optional[str] = Field(alias="requestIp") user_agent: Optional[str] = Field(alias="userAgent") request_at: datetime = Field(alias="requestAt") diff --git a/remnawave/models/users.py b/remnawave/models/users.py index 18bff5b..02746bf 100644 --- a/remnawave/models/users.py +++ b/remnawave/models/users.py @@ -222,7 +222,7 @@ class ResolveUserResponseDto(BaseModel): class SubscriptionRequestRecord(BaseModel): """Subscription request history record""" id: int - user_uuid: UUID = Field(alias="userUuid") + user_id: int = Field(alias="userId") request_at: datetime = Field(alias="requestAt") request_ip: Optional[str] = Field(alias="requestIp") user_agent: Optional[str] = Field(alias="userAgent") diff --git a/remnawave/models/webhook.py b/remnawave/models/webhook.py index 1a539bd..618aee2 100644 --- a/remnawave/models/webhook.py +++ b/remnawave/models/webhook.py @@ -119,7 +119,8 @@ class UserEventDto(BaseModel): class HwidUserDeviceDto(BaseModel): hwid: str - user_uuid: UUID + user_id: Optional[int] = None + request_ip: Optional[str] = None platform: Optional[str] = None os_version: Optional[str] = None device_model: Optional[str] = None