Исправление создания брони: await перед create_booking/update_booking, фикс cancel_booking, логирование в save_bookings
This commit is contained in:
+6
-2
@@ -48,10 +48,14 @@ def load_bookings():
|
|||||||
|
|
||||||
|
|
||||||
def save_bookings(bookings):
|
def save_bookings(bookings):
|
||||||
|
from app.logger import logger
|
||||||
|
logger.debug("save_bookings: saving {n} bookings", n=len(bookings))
|
||||||
_save_json(BOOKINGS_FILE, bookings)
|
_save_json(BOOKINGS_FILE, bookings)
|
||||||
|
|
||||||
|
|
||||||
def create_booking(user_id, service, master, date, time):
|
def create_booking(user_id, service, master, date, time):
|
||||||
|
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()
|
bookings = load_bookings()
|
||||||
booking = {
|
booking = {
|
||||||
"id": len(bookings) + 1,
|
"id": len(bookings) + 1,
|
||||||
@@ -63,7 +67,7 @@ def create_booking(user_id, service, master, date, time):
|
|||||||
"status": "active",
|
"status": "active",
|
||||||
}
|
}
|
||||||
bookings.append(booking)
|
bookings.append(booking)
|
||||||
save_bookings(bookings)
|
_save_json(BOOKINGS_FILE, bookings)
|
||||||
return booking
|
return booking
|
||||||
|
|
||||||
|
|
||||||
@@ -88,7 +92,7 @@ def cancel_booking(booking_id):
|
|||||||
for b in bookings:
|
for b in bookings:
|
||||||
if b["id"] == booking_id:
|
if b["id"] == booking_id:
|
||||||
b["status"] = "cancelled"
|
b["status"] = "cancelled"
|
||||||
save_bookings(bookings)
|
_save_json(BOOKINGS_FILE, bookings)
|
||||||
return True
|
return True
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|||||||
@@ -198,7 +198,7 @@ async def confirm_booking_callback(
|
|||||||
|
|
||||||
if editing_booking_id:
|
if editing_booking_id:
|
||||||
|
|
||||||
update_booking(
|
await update_booking(
|
||||||
booking_id=editing_booking_id,
|
booking_id=editing_booking_id,
|
||||||
service=data.get('service', '?'),
|
service=data.get('service', '?'),
|
||||||
master=data.get('master', '?'),
|
master=data.get('master', '?'),
|
||||||
@@ -210,7 +210,7 @@ async def confirm_booking_callback(
|
|||||||
|
|
||||||
else:
|
else:
|
||||||
|
|
||||||
create_booking(
|
await create_booking(
|
||||||
user_id=callback.from_user.id,
|
user_id=callback.from_user.id,
|
||||||
service=data.get('service', '?'),
|
service=data.get('service', '?'),
|
||||||
master=data.get('master', '?'),
|
master=data.get('master', '?'),
|
||||||
|
|||||||
Reference in New Issue
Block a user