Add new_invoice command

4 files changed, 26 insertions, 4 deletions

diff --git a/models/__init__.py b/models/__init__.py
index 9d56b33..0547429 100644
--- a/models/__init__.py
+++ b/models/__init__.py
@@ -5,6 +5,7 @@ from .user import User
 from .invoce import Invoice
 from .payment import Payment
 from .announcement import Announcement
+from . import callback_data
 # isort: on
 
 __all__ = [
@@ -14,4 +15,5 @@ __all__ = [
     "Payment",
     "RichText",
     "Announcement",
+    "callback_data",
 ]
diff --git a/models/callback_data.py b/models/callback_data.py
new file mode 100644
index 0000000..d3e6d61
--- /dev/null
+++ b/models/callback_data.py
@@ -0,0 +1,5 @@
+from aiogram.filters.callback_data import CallbackData
+
+
+class PayInvoiceData(CallbackData, prefix="pay_invoice"):
+    invoice_id: int
diff --git a/models/invoce.py b/models/invoce.py
index 54a445e..66ff019 100644
--- a/models/invoce.py
+++ b/models/invoce.py
@@ -1,13 +1,22 @@
 from datetime import datetime
 
+from sqlalchemy import JSON
 from sqlalchemy.orm import Mapped, mapped_column
 
-from models import BaseTable
+from models import BaseTable, RichText
 
 
 class Invoice(BaseTable):
     __tablename__ = "invoice"
 
     id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
-    amount: Mapped[float]
+    __message: Mapped[str] = mapped_column("message", JSON())
     datetime: Mapped[datetime]
+
+    @property
+    def message(self) -> RichText:
+        return RichText.model_validate_json(self.__message)
+
+    @message.setter
+    def message(self, value: RichText) -> None:
+        self.__message = value.model_dump_json()
diff --git a/models/rich_text.py b/models/rich_text.py
index e5441b6..6d1c1cb 100644
--- a/models/rich_text.py
+++ b/models/rich_text.py
@@ -1,7 +1,7 @@
 from typing import Self
 
 from aiogram import Bot
-from aiogram.types import Message, MessageEntity
+from aiogram.types import Message, MessageEntity, ReplyMarkupUnion
 from pydantic import BaseModel
 
 
@@ -34,10 +34,16 @@ class RichText(BaseModel):
 
         return result
 
-    async def send(self, bot: Bot, chat_id: int) -> Message:
+    async def send(
+        self,
+        bot: Bot,
+        chat_id: int,
+        reply_markup: ReplyMarkupUnion | None = None,
+    ) -> Message:
         return await bot.send_message(
             chat_id=chat_id,
             text=self.text,
             entities=self.entities,
             parse_mode=None,
+            reply_markup=reply_markup,
         )