5 files changed, 59 insertions, 9 deletions

diff --git a/models/__init__.py b/models/__init__.py
index 70c841d..412f467 100644
--- a/models/__init__.py
+++ b/models/__init__.py
@@ -1,11 +1,15 @@
 # isort: off
 from .base import BaseTable
+from .rich_text import RichText
 from .user import User
 from .invoce import Invoice
+from .payment import Payment
 # isort: on
 
 __all__ = [
     "BaseTable",
     "User",
     "Invoice",
+    "Payment",
+    "RichText",
 ]
diff --git a/models/announcement.py b/models/announcement.py
index 5f752d7..9a6eef2 100644
--- a/models/announcement.py
+++ b/models/announcement.py
@@ -1,18 +1,19 @@
-from aiogram.types import MessageEntity
-from pydantic import BaseModel
 from sqlalchemy import JSON
 from sqlalchemy.orm import Mapped, mapped_column
 
-from models import BaseTable
-
-
-class Message(BaseModel):
-    text: str
-    entities: list[MessageEntity] = []
+from models import BaseTable, RichText
 
 
 class Announcement(BaseTable):
     __tablename__ = "announcement"
 
     id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
-    message: Mapped[str] = mapped_column(JSON())
+    __message: Mapped[str] = mapped_column("message", JSON())
+
+    @property
+    def message(self) -> RichText:
+        return RichText.model_validate_json(self.__message)
+
+    @message.setter
+    def message_set(self, value: RichText) -> None:
+        self.__message = value.model_dump_json()
diff --git a/models/rich_text.py b/models/rich_text.py
new file mode 100644
index 0000000..2b433ec
--- /dev/null
+++ b/models/rich_text.py
@@ -0,0 +1,7 @@
+from aiogram.types import MessageEntity
+from pydantic import BaseModel
+
+
+class RichText(BaseModel):
+    text: str
+    entities: list[MessageEntity] = []
diff --git a/models/suggest.py b/models/suggest.py
new file mode 100644
index 0000000..1ba18a0
--- /dev/null
+++ b/models/suggest.py
@@ -0,0 +1,23 @@
+from sqlalchemy import JSON
+from sqlalchemy.orm import Mapped, mapped_column
+from sqlalchemy.sql.schema import ForeignKey
+
+from models import RichText, User
+from models.base import BaseTable
+
+
+class Suggest(BaseTable):
+    __tablename__ = "suggest"
+
+    id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
+    user_id: Mapped[int] = mapped_column(ForeignKey(User.id))
+    suggested_user_id: Mapped[int]
+    __message: Mapped[str] = mapped_column("message", JSON())
+
+    @property
+    def message(self) -> RichText:
+        return RichText.model_validate_json(self.__message)
+
+    @message.setter
+    def message_set(self, value: RichText) -> None:
+        self.__message = value.model_dump_json()
diff --git a/models/user.py b/models/user.py
index 7118725..4983a13 100644
--- a/models/user.py
+++ b/models/user.py
@@ -1,9 +1,24 @@
+from enum import IntEnum
+
 from sqlalchemy.orm import Mapped, mapped_column
 
 from models import BaseTable
 
 
+class UserRole(IntEnum):
+    REGULAR = 0
+    ADMIN = 1
+
+
 class User(BaseTable):
     __tablename__ = "user"
 
     id: Mapped[int] = mapped_column(primary_key=True, autoincrement=False)
+    role: Mapped[UserRole] = mapped_column(default=UserRole.REGULAR)
+    vpn_link: Mapped[str]
+
+    def is_regular(self) -> bool:
+        return self.role >= UserRole.REGULAR
+
+    def is_admin(self) -> bool:
+        return self.role == UserRole.ADMIN