diff --git a/app/db/memory.py b/app/db/memory.py index b141de6..85a2e89 100644 --- a/app/db/memory.py +++ b/app/db/memory.py @@ -53,13 +53,14 @@ def save_bookings(bookings): _save_json(BOOKINGS_FILE, bookings) -def create_booking(user_id, service, master, date, time): +def create_booking(user_id, service, master, date, time, user_name=""): from app.logger import logger logger.debug("create_booking called: uid={uid}, svc={svc}, master={mst}, date={dt}, time={tm}", uid=user_id, svc=service, mst=master, dt=date, tm=time) bookings = load_bookings() booking = { "id": len(bookings) + 1, "user_id": user_id, + "user_name": user_name, "service": service, "master": master, "date": date, diff --git a/app/main.py b/app/main.py index b918dc1..ab0537f 100644 --- a/app/main.py +++ b/app/main.py @@ -16,6 +16,7 @@ from app.handlers.mybookings import router as mybookings_router from app.handlers.services import router as services_router from app.handlers.about import router as about_router from app.handlers.contacts import router as contacts_router +from app.handlers.admin import router as admin_router bot = Bot(token=BOT_TOKEN) dp = Dispatcher() @@ -29,6 +30,7 @@ dp.include_routers( services_router, about_router, contacts_router, + admin_router, ) diff --git a/app/services/booking_service.py b/app/services/booking_service.py index f2d4874..7dc88a3 100644 --- a/app/services/booking_service.py +++ b/app/services/booking_service.py @@ -11,8 +11,8 @@ from app.db.memory import ( from app.logger import logger -async def create_booking(user_id, service, master, date, time): - return db_create_booking(user_id, service, master, date, time) +async def create_booking(user_id, service, master, date, time, user_name=""): + return db_create_booking(user_id, service, master, date, time, user_name) async def get_busy_times(master, date):