- Added a new command `/import_duty_schedule` for importing duty schedules via JSON, restricted to admin users. - Introduced a two-step import process: specifying handover time and uploading a JSON file. - Updated the database schema to allow `telegram_user_id` to be nullable for user creation by full name. - Implemented repository functions for user management, including `get_or_create_user_by_full_name` and `delete_duties_in_range`. - Enhanced README documentation with details on the new import command and JSON format requirements. - Added comprehensive tests for the duty schedule parser and integration tests for the import functionality.
39 lines
977 B
Python
39 lines
977 B
Python
"""Database layer: SQLAlchemy models, Pydantic schemas, repository, init."""
|
|
|
|
from db.models import Base, User, Duty
|
|
from db.schemas import UserCreate, UserInDb, DutyCreate, DutyInDb, DutyWithUser
|
|
from db.session import get_engine, get_session_factory, get_session
|
|
from db.repository import (
|
|
delete_duties_in_range,
|
|
get_or_create_user,
|
|
get_or_create_user_by_full_name,
|
|
get_duties,
|
|
insert_duty,
|
|
)
|
|
|
|
__all__ = [
|
|
"Base",
|
|
"User",
|
|
"Duty",
|
|
"UserCreate",
|
|
"UserInDb",
|
|
"DutyCreate",
|
|
"DutyInDb",
|
|
"DutyWithUser",
|
|
"get_engine",
|
|
"get_session_factory",
|
|
"get_session",
|
|
"delete_duties_in_range",
|
|
"get_or_create_user",
|
|
"get_or_create_user_by_full_name",
|
|
"get_duties",
|
|
"insert_duty",
|
|
"init_db",
|
|
]
|
|
|
|
|
|
def init_db(database_url: str) -> None:
|
|
"""Create tables from metadata (Alembic migrations handle schema in production)."""
|
|
engine = get_engine(database_url)
|
|
Base.metadata.create_all(bind=engine)
|