diff options
Diffstat (limited to 'models')
| -rw-r--r-- | models/__init__.py | 3 | ||||
| -rw-r--r-- | models/callback_data.py | 41 | ||||
| -rw-r--r-- | models/user.py | 33 |
3 files changed, 75 insertions, 2 deletions
diff --git a/models/__init__.py b/models/__init__.py index f26ee74..c458f30 100644 --- a/models/__init__.py +++ b/models/__init__.py | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # isort: off | 1 | # isort: off |
| 2 | from .base import BaseTable | 2 | from .base import BaseTable |
| 3 | from .rich_text import RichText | 3 | from .rich_text import RichText |
| 4 | from .user import User, UserRole | 4 | from .user import UserCache, User, UserRole |
| 5 | from .invoce import Invoice | 5 | from .invoce import Invoice |
| 6 | from .payment import Payment, PaymentStatus, ReceiptFile, ReceiptFileType | 6 | from .payment import Payment, PaymentStatus, ReceiptFile, ReceiptFileType |
| 7 | from .announcement import Announcement | 7 | from .announcement import Announcement |
| @@ -10,6 +10,7 @@ from . import callback_data | |||
| 10 | 10 | ||
| 11 | __all__ = [ | 11 | __all__ = [ |
| 12 | "BaseTable", | 12 | "BaseTable", |
| 13 | "UserCache", | ||
| 13 | "User", | 14 | "User", |
| 14 | "UserRole", | 15 | "UserRole", |
| 15 | "Invoice", | 16 | "Invoice", |
diff --git a/models/callback_data.py b/models/callback_data.py index 5ee38bd..b1e7e56 100644 --- a/models/callback_data.py +++ b/models/callback_data.py | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | from aiogram.filters.callback_data import CallbackData | 1 | from aiogram.filters.callback_data import CallbackData |
| 2 | 2 | ||
| 3 | from models import PaymentStatus | 3 | from models import PaymentStatus, UserRole |
| 4 | 4 | ||
| 5 | 5 | ||
| 6 | class PayInvoiceClb(CallbackData, prefix="pay_invoice"): | 6 | class PayInvoiceClb(CallbackData, prefix="pay_invoice"): |
| @@ -37,3 +37,42 @@ class PaymentPageClb(CallbackData, prefix="payment.p"): | |||
| 37 | class PaymentItemClb(CallbackData, prefix="payment.i"): | 37 | class PaymentItemClb(CallbackData, prefix="payment.i"): |
| 38 | page: int | 38 | page: int |
| 39 | payment_id: int | 39 | payment_id: int |
| 40 | |||
| 41 | |||
| 42 | class UserPageClb(CallbackData, prefix="user.p"): | ||
| 43 | page: int | ||
| 44 | |||
| 45 | |||
| 46 | class UserItemClb(CallbackData, prefix="user.i"): | ||
| 47 | page: int | ||
| 48 | user_id: int | ||
| 49 | |||
| 50 | |||
| 51 | class UserAddClb(CallbackData, prefix="user.a"): | ||
| 52 | pass | ||
| 53 | |||
| 54 | |||
| 55 | class UserRoleClb(CallbackData, prefix="user.e.r"): | ||
| 56 | page: int | ||
| 57 | user_id: int | ||
| 58 | |||
| 59 | |||
| 60 | class UserRoleSetClb(CallbackData, prefix="user.e.r.s"): | ||
| 61 | page: int | ||
| 62 | user_id: int | ||
| 63 | role: UserRole | ||
| 64 | |||
| 65 | |||
| 66 | class UserDeleteClb(CallbackData, prefix="user.e.d"): | ||
| 67 | page: int | ||
| 68 | user_id: int | ||
| 69 | |||
| 70 | |||
| 71 | class UserDeleteConfirmClb(CallbackData, prefix="user.e.d.c"): | ||
| 72 | page: int | ||
| 73 | user_id: int | ||
| 74 | |||
| 75 | |||
| 76 | class UserVpnLinkClb(CallbackData, prefix="user.e.v"): | ||
| 77 | page: int | ||
| 78 | user_id: int | ||
diff --git a/models/user.py b/models/user.py index 690083c..896ff3b 100644 --- a/models/user.py +++ b/models/user.py | |||
| @@ -1,11 +1,44 @@ | |||
| 1 | from datetime import datetime | 1 | from datetime import datetime |
| 2 | from enum import IntEnum | 2 | from enum import IntEnum |
| 3 | from typing import Self | ||
| 3 | 4 | ||
| 5 | from aiogram.types import Chat | ||
| 6 | from aiogram.types import User as TgUser | ||
| 7 | from pydantic import BaseModel | ||
| 4 | from sqlalchemy.orm import Mapped, mapped_column | 8 | from sqlalchemy.orm import Mapped, mapped_column |
| 5 | 9 | ||
| 6 | from models import BaseTable | 10 | from models import BaseTable |
| 7 | 11 | ||
| 8 | 12 | ||
| 13 | class UserCache(BaseModel): | ||
| 14 | id: int | ||
| 15 | username: str | None = None | ||
| 16 | full_name: str | ||
| 17 | |||
| 18 | @classmethod | ||
| 19 | def from_chat(cls, chat: Chat) -> Self: | ||
| 20 | return cls( | ||
| 21 | id=chat.id, | ||
| 22 | username=chat.username, | ||
| 23 | full_name=chat.full_name, | ||
| 24 | ) | ||
| 25 | |||
| 26 | @classmethod | ||
| 27 | def from_user(cls, user: TgUser) -> Self: | ||
| 28 | return cls( | ||
| 29 | id=user.id, | ||
| 30 | username=user.username, | ||
| 31 | full_name=user.full_name, | ||
| 32 | ) | ||
| 33 | |||
| 34 | @property | ||
| 35 | def mention(self) -> str: | ||
| 36 | if self.username is not None: | ||
| 37 | return f'<a href="tg://{self.username}">{self.full_name}</a>' | ||
| 38 | else: | ||
| 39 | return f'<a href="tg://user?id={self.id}">{self.full_name}</a>' | ||
| 40 | |||
| 41 | |||
| 9 | class UserRole(IntEnum): | 42 | class UserRole(IntEnum): |
| 10 | REGULAR = 0 | 43 | REGULAR = 0 |
| 11 | ADMIN = 1 | 44 | ADMIN = 1 |
