Add DatabaseMiddleware
This commit is contained in:
parent
3ec83e408c
commit
f62e05fd06
@ -19,7 +19,7 @@ def create_bot(config: Config, i18n: I18N, engine):
|
|||||||
use_class_middlewares=True,
|
use_class_middlewares=True,
|
||||||
state_storage=state_storage)
|
state_storage=state_storage)
|
||||||
register_handlers(bot)
|
register_handlers(bot)
|
||||||
setup_middlewares(bot, i18n)
|
setup_middlewares(bot, i18n, engine)
|
||||||
add_custom_filters(bot, config)
|
add_custom_filters(bot, config)
|
||||||
return bot
|
return bot
|
||||||
|
|
||||||
|
|||||||
@ -2,6 +2,7 @@ from sqlalchemy import create_engine
|
|||||||
from sqlalchemy.orm import DeclarativeBase
|
from sqlalchemy.orm import DeclarativeBase
|
||||||
|
|
||||||
from ..config import DatabaseConfig
|
from ..config import DatabaseConfig
|
||||||
|
from .models import User
|
||||||
|
|
||||||
|
|
||||||
def get_engine(config: DatabaseConfig):
|
def get_engine(config: DatabaseConfig):
|
||||||
|
|||||||
@ -8,5 +8,8 @@ class User (Base):
|
|||||||
__tablename__ = "user"
|
__tablename__ = "user"
|
||||||
|
|
||||||
id: Mapped[int] = mapped_column(BIGINT, primary_key=True, unique=True, autoincrement=False)
|
id: Mapped[int] = mapped_column(BIGINT, primary_key=True, unique=True, autoincrement=False)
|
||||||
username: Mapped[int] = mapped_column(String(32), unique=True, nullable=True)
|
username: Mapped[str] = mapped_column(String(32), unique=True, nullable=True)
|
||||||
# additional fields go here
|
# additional fields go here
|
||||||
|
|
||||||
|
def __init__(self, id: int, username: str):
|
||||||
|
super().__init__(id=id, username=username)
|
||||||
|
|||||||
@ -1,8 +1,10 @@
|
|||||||
from telebot import TeleBot
|
from telebot import TeleBot
|
||||||
|
|
||||||
from .arguments import ArgumentsMiddleware
|
|
||||||
from ..i18n import I18N
|
from ..i18n import I18N
|
||||||
|
from .arguments import ArgumentsMiddleware
|
||||||
|
from .database import DatabaseMiddleware
|
||||||
|
|
||||||
|
|
||||||
def setup_middlewares(bot: TeleBot, i18n: I18N):
|
def setup_middlewares(bot: TeleBot, i18n: I18N, engine):
|
||||||
bot.setup_middleware(ArgumentsMiddleware(i18n))
|
bot.setup_middleware(ArgumentsMiddleware(i18n))
|
||||||
|
bot.setup_middleware(DatabaseMiddleware(engine))
|
||||||
|
|||||||
29
mybot/middlewares/database.py
Normal file
29
mybot/middlewares/database.py
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
from telebot.handler_backends import BaseMiddleware
|
||||||
|
from telebot.types import Message, CallbackQuery
|
||||||
|
|
||||||
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
|
from ..database import User
|
||||||
|
|
||||||
|
|
||||||
|
class DatabaseMiddleware (BaseMiddleware):
|
||||||
|
def __init__(self, engine):
|
||||||
|
super().__init__()
|
||||||
|
self.engine = engine
|
||||||
|
self.update_types = ["message", "callback_query"]
|
||||||
|
|
||||||
|
def pre_process(self, obj: [Message, CallbackQuery], data: dict):
|
||||||
|
session = Session(self.engine)
|
||||||
|
user = session.get(User, obj.from_user.id)
|
||||||
|
if user is None:
|
||||||
|
user = User(id=obj.from_user.id, username=obj.from_user.username)
|
||||||
|
session.add(user)
|
||||||
|
session.commit()
|
||||||
|
data["db"] = session
|
||||||
|
data["user"] = user
|
||||||
|
|
||||||
|
def post_process(self, message, data: dict, exception: BaseException):
|
||||||
|
if "db" in data:
|
||||||
|
session: Session = data["db"]
|
||||||
|
session.rollback()
|
||||||
|
session.close()
|
||||||
Loading…
x
Reference in New Issue
Block a user