Enhance database initialization and improve command handling
- Added `__all__` declaration in `db/__init__.py` for better module export management. - Simplified command text formatting in `handlers/commands.py` for improved readability. - Refactored error handler function signature in `handlers/errors.py` for better code style. - Introduced comprehensive tests for API duties and Telegram authentication in new test files.
This commit is contained in:
@@ -5,6 +5,24 @@ from db.schemas import UserCreate, UserInDb, DutyCreate, DutyInDb, DutyWithUser
|
||||
from db.session import get_engine, get_session_factory, get_session
|
||||
from db.repository import get_or_create_user, get_duties, insert_duty
|
||||
|
||||
__all__ = [
|
||||
"Base",
|
||||
"User",
|
||||
"Duty",
|
||||
"UserCreate",
|
||||
"UserInDb",
|
||||
"DutyCreate",
|
||||
"DutyInDb",
|
||||
"DutyWithUser",
|
||||
"get_engine",
|
||||
"get_session_factory",
|
||||
"get_session",
|
||||
"get_or_create_user",
|
||||
"get_duties",
|
||||
"insert_duty",
|
||||
"init_db",
|
||||
]
|
||||
|
||||
|
||||
def init_db(database_url: str) -> None:
|
||||
"""Create tables from metadata (Alembic migrations handle schema in production)."""
|
||||
|
||||
@@ -48,9 +48,7 @@ async def start(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
|
||||
async def help_cmd(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
|
||||
if update.message:
|
||||
await update.message.reply_text(
|
||||
"Доступные команды:\n"
|
||||
"/start — Начать\n"
|
||||
"/help — Показать эту справку"
|
||||
"Доступные команды:\n/start — Начать\n/help — Показать эту справку"
|
||||
)
|
||||
|
||||
|
||||
|
||||
@@ -8,7 +8,9 @@ from telegram.ext import ContextTypes
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
async def error_handler(update: Update | None, context: ContextTypes.DEFAULT_TYPE) -> None:
|
||||
async def error_handler(
|
||||
update: Update | None, context: ContextTypes.DEFAULT_TYPE
|
||||
) -> None:
|
||||
logger.exception("Exception while handling an update")
|
||||
if isinstance(update, Update) and update.effective_message:
|
||||
await update.effective_message.reply_text("Произошла ошибка. Попробуйте позже.")
|
||||
|
||||
@@ -8,7 +8,7 @@ from fastapi.testclient import TestClient
|
||||
|
||||
import config
|
||||
from api.app import app
|
||||
from api.test_telegram_auth import _make_init_data
|
||||
from tests.test_telegram_auth import _make_init_data
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
Reference in New Issue
Block a user