bot rafactor and bugfix

app/models/bot.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 from datetime import datetime
-from sqlalchemy import ForeignKey, String, func, DateTime
+from sqlalchemy import ForeignKey, String, func, DateTime, Column
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 from app.db.session import Base
 
@@ -8,6 +8,7 @@ class Bot(Base):
     __tablename__ = "bots"
 
     id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
+    bot_id: Mapped[int] = mapped_column()  # Telegram bot ID
     owner_id: Mapped[int] = mapped_column(ForeignKey("users.id", ondelete="CASCADE"))
     name: Mapped[str] = mapped_column(String(64))
     username: Mapped[str | None] = mapped_column(String(64))
@@ -15,3 +16,4 @@ class Bot(Base):
     created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), server_default=func.now())
 
     owner = relationship("User")
+    channels = relationship("Channel", back_populates="bot")

app/models/channel.py

@@ -3,7 +3,8 @@ from datetime import datetime
 from sqlalchemy import ForeignKey, String, BigInteger, Boolean, UniqueConstraint, func, DateTime
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 from app.db.session import Base
-from app.models.user import User  # Добавляем импорт User
+from app.models.user import User
+from app.models.bot import Bot
 
 class Channel(Base):
     __tablename__ = "channels"
@@ -11,12 +12,14 @@ class Channel(Base):
 
     id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
     owner_id: Mapped[int] = mapped_column(ForeignKey("users.id", ondelete="CASCADE"))
-    chat_id: Mapped[int] = mapped_column(BigInteger, index=True)
+    bot_id: Mapped[int] = mapped_column(ForeignKey("bots.id", ondelete="CASCADE"))
+    chat_id: Mapped[int] = mapped_column(index=True)
     title: Mapped[str | None] = mapped_column(String(128))
     username: Mapped[str | None] = mapped_column(String(64))
     created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), server_default=func.now())
 
     owner = relationship("User")
+    bot = relationship("Bot", back_populates="channels")
 
 class BotChannel(Base):
     __tablename__ = "bot_channels"

app/models/post.py

@@ -26,8 +26,8 @@ class Post(Base):
     bot_id: Mapped[Optional[int]] = mapped_column(ForeignKey("bots.id", ondelete="SET NULL"), nullable=True)
     channel_id: Mapped[int] = mapped_column(ForeignKey("channels.id", ondelete="CASCADE"))
 
-    type: Mapped[PostType] = mapped_column(Enum(PostType))
-    text: Mapped[Optional[str]] = mapped_column(String(4096))
+    type: Mapped[PostType] = mapped_column()
+    text: Mapped[str | None] = mapped_column(String(4096))
     media_file_id: Mapped[Optional[str]] = mapped_column(String(512))
     parse_mode: Mapped[Optional[str]] = mapped_column(String(16))
     keyboard_id: Mapped[Optional[int]] = mapped_column(ForeignKey("keyboards.id", ondelete="SET NULL"))

app/models/templates.py

@@ -8,6 +8,12 @@ from app.db.session import Base
 from app.models.post import PostType
 from enum import Enum as PyEnum
 
+class PostStatus(str, PyEnum):
+    draft = "draft"
+    scheduled = "scheduled"
+    sent = "sent"
+    failed = "failed"
+
 class TemplateVisibility(str, PyEnum):
     private = "private"
     org = "org"
@@ -18,6 +24,58 @@ class Template(Base):
     __table_args__ = (
         UniqueConstraint("owner_id", "name", name="uq_template_owner_name"),
     )
+    
+    id: Mapped[int] = mapped_column(primary_key=True)
+    owner_id: Mapped[int] = mapped_column(ForeignKey("users.id"))
+    name: Mapped[str] = mapped_column(String(100))
+    title: Mapped[str] = mapped_column(String(200))
+    description: Mapped[Optional[str]] = mapped_column(Text, nullable=True)
+    content: Mapped[str] = mapped_column(Text)
+    keyboard_tpl: Mapped[Optional[dict]] = mapped_column(JSON, nullable=True)
+    parse_mode: Mapped[str] = mapped_column(String(20), default="HTML")
+    type: Mapped[PostType] = mapped_column(Enum(PostType))
+    visibility: Mapped[TemplateVisibility] = mapped_column(
+        EnumType(TemplateVisibility), 
+        default=TemplateVisibility.private
+    )
+    created_at: Mapped[datetime] = mapped_column(DateTime, server_default=func.now())
+    updated_at: Mapped[datetime] = mapped_column(
+        DateTime, 
+        server_default=func.now(),
+        onupdate=func.now()
+    )
+    
+    @classmethod
+    async def get_by_name(cls, session, name: str) -> Optional[Template]:
+        """Получение шаблона по имени."""
+        stmt = cls.__table__.select().where(cls.__table__.c.name == name)
+        result = await session.execute(stmt)
+        return result.scalar_one_or_none()
+        
+    async def render(self, template_vars: dict, context: dict) -> dict:
+        """Рендеринг шаблона.
+        
+        Args:
+            template_vars: Переменные для подстановки
+            context: Дополнительный контекст
+            
+        Returns:
+            Отрендеренные данные
+        """
+        text = self.content
+        keyboard = self.keyboard_tpl
+        
+        # Подстановка переменных
+        for key, value in template_vars.items():
+            text = text.replace(f"{{${key}}}", str(value))
+            
+        # Подготовка данных для отправки
+        return {
+            "type": self.type,
+            "text": text,
+            "keyboard": keyboard,
+            "parse_mode": self.parse_mode
+        }
 
     id: Mapped[int] = mapped_column(primary_key=True)
     owner_id: Mapped[int] = mapped_column(ForeignKey("users.id", ondelete="CASCADE"), index=True)

app/models/user.py

@@ -8,7 +8,7 @@ class User(Base):
     __tablename__ = "users"
 
     id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
-    tg_user_id: Mapped[int] = mapped_column(BigInteger, unique=True, index=True)
+    tg_user_id: Mapped[int] = mapped_column(unique=True, index=True)
     username: Mapped[str | None] = mapped_column(String(64))
     role: Mapped[str] = mapped_column(String(16), default="user")
     created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), server_default=func.now())