feat: render schedule from svg

pyproject.toml

@@ -31,6 +31,7 @@ sqlalchemy = "^2.0.23"
 uvicorn = "^0.31.0"
 babel = "^2.16.0"
 fluent-runtime = "^0.4.0"
+cairosvg = "^2.7.1"
 
 [tool.ruff]
 line-length = 120

src/api/bookings/routes.py

@@ -82,8 +82,9 @@ async def get_my_bookings(verified: VerifiedDepWithUserID) -> list[ViewBooking]:
 )
 async def form_schedule(
     start_of_week: datetime.date | None = Query(default_factory=_get_start_of_week, example=_get_start_of_week()),
+    from_user_id: int | None = None,
 ) -> Response:
-    image_bytes = await booking_repository.form_schedule(start_of_week)
+    image_bytes = await booking_repository.form_schedule(start_of_week, from_user_id)
     return Response(content=image_bytes, media_type="image/png")
 
 

src/bot/api.py

@@ -127,8 +127,8 @@ async def delete_booking(self, booking_id: int, telegram_id: int) -> bool:
             response = await client.delete(f"/bookings/{booking_id}")
             return True if response.status_code == 200 else False
 
-    async def get_image_schedule(self, start_of_week: datetime.date) -> bytes | None:
-        params = {"start_of_week": start_of_week.isoformat()}
+    async def get_image_schedule(self, start_of_week: datetime.date, from_user_id: int) -> bytes | None:
+        params = {"start_of_week": start_of_week.isoformat(), "from_user_id": from_user_id}
         async with self._create_client() as client:
             response = await client.get("/bookings/form_schedule", params=params)
             if response.status_code == 200:

src/bot/routers/booking/widgets/time_range.py

@@ -165,6 +165,11 @@ async def _render_keyboard(self, data: dict, manager: DialogManager) -> list[lis
                         keyboard_builer.button(text="🔴", url=f"https://t.me/{booked_by_alias}")
                 elif available and not blocked:
                     keyboard_builer.button(text=time_text, callback_data=time_callback_data)
+                else:
+                    keyboard_builer.button(
+                        text=" ",
+                        callback_data=self._item_callback_data("None"),
+                    )
             else:
                 keyboard_builer.button(
                     text=" ",

src/bot/routers/schedule.py

@@ -40,7 +40,7 @@ def get_image_schedule_kb() -> types.InlineKeyboardMarkup:
 )
 async def get_image_schedule(message: types.Message):
     start_of_week = get_start_of_week()
-    image_bytes = await api_client.get_image_schedule(start_of_week)
+    image_bytes = await api_client.get_image_schedule(start_of_week, message.from_user.id)
     photo = BufferedInputFile(image_bytes, "schedule.png")
     await message.answer(_("Sending image for the current week..."))
     await message.answer_photo(photo=photo)
@@ -70,7 +70,7 @@ async def get_image_schedule_for_current_week(callback: types.CallbackQuery):
     choice = callback.data
     chat_id = callback.from_user.id
     start_of_week = get_start_of_week(choice == "schedule:current_week")
-    image_bytes = await api_client.get_image_schedule(start_of_week)
+    image_bytes = await api_client.get_image_schedule(start_of_week, callback.from_user.id)
     photo = BufferedInputFile(image_bytes, "schedule.png")
     if choice == "schedule:current_week":
         await callback.message.answer(_("Sending image for the current week..."))