refactor: handles in dialogs

Author: upconett

src/bot/app.py

@@ -5,7 +5,7 @@
 from aiogram.filters import ExceptionTypeFilter
 from aiogram.fsm.context import FSMContext
 from aiogram.fsm.storage.memory import MemoryStorage
-from aiogram.fsm.storage.redis import DefaultKeyBuilder, RedisStorage
+from aiogram.fsm.storage.redis import DefaultKeyBuilder, RedisStorage  # type: ignore
 from aiogram.types import ErrorEvent
 from aiogram_dialog import DialogManager, setup_dialogs
 from aiogram_dialog.api.exceptions import UnknownIntent, UnknownState

src/bot/dialogs/attendance/handles.py

@@ -1,174 +1,83 @@
-from aiogram.types import BufferedInputFile, Message
+from aiogram.types import Message
 from aiogram_dialog import DialogManager, ShowMode
 from aiogram_dialog.widgets.input import MessageInput
 
 from src.bot.dto import *
+from src.bot.extended_dialog_manager import extend
+from src.bot.user_errors import *
 from src.bot.utils import *
 from src.db.repositories import meetings_repo
 
 from .getters import *
+from .logic import *
 from .states import *
 
-MAX_ATTENDANCE_FILE_SIZE = 5_242_880  # 5 MiB
 
-
-async def get_attendance_file_close(message: Message, _: MessageInput, dialog_manager: DialogManager):
-    bot: Bot = dialog_manager.middleware_data["bot"]
-    state = get_state(dialog_manager)
-    await clear_messages(dialog_manager)
+async def get_attendance_file_close(message: Message, _: MessageInput, manager: DialogManager):
+    manager = extend(manager)
+    await clear_messages(manager)
     await message.delete()
-
-    meeting = dto_to_meeting(await state.get_value("meeting"))
-    if not meeting:
-        raise ValueError("No meeting")
-
-    if not message.document:
-        to_delete = await message.answer("You've sent no file ‼️")
-        await track_message(to_delete, dialog_manager)
-        return await dialog_manager.switch_to(AttendanceStates.close, show_mode=ShowMode.DELETE_AND_SEND)
-
-    file = await bot.get_file(message.document.file_id)
-
-    if not file.file_size:
-        raise ValueError("No file.file_size")
-    if not file.file_path:
-        raise ValueError("No file.file_path")
-
-    if file.file_size > MAX_ATTENDANCE_FILE_SIZE:
-        to_delete = await message.answer("File you've sent is over 5MiB in size, I won't accept that ‼️")
-        await track_message(to_delete, dialog_manager)
-        return await dialog_manager.switch_to(AttendanceStates.close, show_mode=ShowMode.DELETE_AND_SEND)
-
-    bytes = await bot.download_file(file.file_path)
-    if not bytes:
-        raise ValueError("No bytes")
-
-    content: str = bytes.read().decode("utf-8")
-
     try:
-        attendance = parse_attendance(content)
-        meeting.close(attendance)
-        await meetings_repo.save(meeting)
+        contents = await get_document_contents(message, manager)
+        attendance = parse_attendance(contents)
+        async with manager.state.sync_meeting() as meeting:
+            meeting.close(attendance)
+            await meetings_repo.save(meeting)
+    except NoDocumentError:
+        return await manager.answer_and_retry("You've sent no file ‼️")
+    except FileTooBigError:
+        return await manager.answer_and_retry("File you've sent is over 5MiB in size, I won't accept that ‼️")
     except Exception as e:
-        to_delete = await message.answer(f"There is an error with your file: {e}")
-        await track_message(to_delete, dialog_manager)
-        return await dialog_manager.switch_to(AttendanceStates.close, show_mode=ShowMode.DELETE_AND_SEND)
+        return await manager.answer_and_retry(f"There is an error with your file: {e}")
+    await manager.done(show_mode=ShowMode.DELETE_AND_SEND)
 
-    await state.update_data({"meeting": meeting_to_dto(meeting)})
-    await dialog_manager.done(show_mode=ShowMode.DELETE_AND_SEND)
 
-
-async def get_attendance_file_resend(message: Message, _: MessageInput, dialog_manager: DialogManager):
-    bot: Bot = dialog_manager.middleware_data["bot"]
-    state = get_state(dialog_manager)
-    await clear_messages(dialog_manager)
+async def get_attendance_file_resend(message: Message, _: MessageInput, manager: DialogManager):
+    manager = extend(manager)
+    await clear_messages(manager)
     await message.delete()
-
-    meeting = dto_to_meeting(await state.get_value("meeting"))
-    if not meeting:
-        raise ValueError("No meeting")
-
-    if not message.document:
-        to_delete = await message.answer("You've sent no file ‼️")
-        await track_message(to_delete, dialog_manager)
-        return await dialog_manager.switch_to(AttendanceStates.resend, show_mode=ShowMode.DELETE_AND_SEND)
-
-    file = await bot.get_file(message.document.file_id)
-
-    if not file.file_size:
-        raise ValueError("No file.file_size")
-    if not file.file_path:
-        raise ValueError("No file.file_path")
-
-    if file.file_size > MAX_ATTENDANCE_FILE_SIZE:
-        to_delete = await message.answer("File you've sent is over 5MiB in size, I won't accept that ‼️")
-        await track_message(to_delete, dialog_manager)
-        return await dialog_manager.switch_to(AttendanceStates.resend, show_mode=ShowMode.DELETE_AND_SEND)
-
-    bytes = await bot.download_file(file.file_path)
-    if not bytes:
-        raise ValueError("No bytes")
-
-    content: str = bytes.read().decode("utf-8")
-
     try:
-        attendance = parse_attendance(content)
-        meeting._attendance = attendance
-        await meetings_repo.save(meeting)
+        contents = await get_document_contents(message, manager)
+        attendance = parse_attendance(contents)
+        async with manager.state.sync_meeting() as meeting:
+            meeting._attendance = attendance
+            await meetings_repo.save(meeting)
+    except NoDocumentError:
+        return await manager.answer_and_retry("You've sent no file ‼️")
+    except FileTooBigError:
+        return await manager.answer_and_retry("File you've sent is over 5MiB in size, I won't accept that ‼️")
     except Exception as e:
-        to_delete = await message.answer(f"There is an error with your file: {e}")
-        await track_message(to_delete, dialog_manager)
-        return await dialog_manager.switch_to(AttendanceStates.resend, show_mode=ShowMode.DELETE_AND_SEND)
+        return await manager.answer_and_retry(f"There is an error with your file: {e}")
+    await manager.switch_to(state=AttendanceStates.init, show_mode=ShowMode.DELETE_AND_SEND)
 
-    await state.update_data({"meeting": meeting_to_dto(meeting)})
-    await dialog_manager.switch_to(state=AttendanceStates.init, show_mode=ShowMode.DELETE_AND_SEND)
-
-
-async def on_download_attendance(query: CallbackQuery, button: Button, dialog_manager: DialogManager):
-    state = get_state(dialog_manager)
-
-    if not query.message:
-        raise ValueError("No query.message")
-
-    meeting = dto_to_meeting(await state.get_value("meeting"))
-    if not meeting:
-        raise ValueError("No meeting")
-
-    if not meeting.attendance:
-        return await query.answer("This meeting has no attendance somehow", show_alert=True)
-
-    file_content = "\n".join([email.value for email in meeting.attendance])
-    file_content += "\n"
-
-    safe_title = re.sub(r"[^\w\s-]", "", meeting.title).strip().replace(" ", "_")
-    filename = f"attendance_{safe_title}.txt"
-
-    file_bytes = file_content.encode("utf-8")
 
+async def on_download_attendance(query: CallbackQuery, button: Button, manager: DialogManager):
+    manager = extend(manager)
     try:
-        input_file = BufferedInputFile(file_bytes, filename=filename)
+        input_file = await get_attendance_file_to_download(manager)
         await query.answer("Sending attendance file...")
-        await query.message.answer_document(document=input_file)
-        await dialog_manager.switch_to(
-            state=AttendanceStates.init, show_mode=ShowMode.DELETE_AND_SEND
-        )  # to make window appear after the document
+        await manager.bot.send_document(manager.chat.id, document=input_file)
+    except NoMeetingAttendance:
+        return await query.answer("This meeting has no attendance somehow", show_alert=True)
     except Exception as e:
-        await query.answer(f"Error: {e}", show_alert=True)
+        return await query.answer(f"Error: {e}", show_alert=True)
+    await manager.switch_to_current(ShowMode.DELETE_AND_SEND)  # to make window appear after the document
 
 
-async def get_email_to_add(message: Message, _: MessageInput, dialog_manager: DialogManager):
-    state = get_state(dialog_manager)
-    await clear_messages(dialog_manager)
+async def get_email_to_add(message: Message, _: MessageInput, manager: DialogManager):
+    manager = extend(manager)
+    await clear_messages(manager)
     await message.delete()
-
-    if not message.text:
-        to_delete = await message.answer("️There's no text in your message, enter email of a person to add")
-        await track_message(to_delete, dialog_manager)
-        return await dialog_manager.switch_to(AttendanceStates.add_email, show_mode=ShowMode.DELETE_AND_SEND)
-
-    meeting = dto_to_meeting(await state.get_value("meeting"))
-    if not meeting:
-        raise ValueError("No meeting")
-
-    if not meeting.attendance:
-        to_delete = await message.answer("Somehow there is no attendance for this meeting, resend the file maybe")
-        await track_message(to_delete, dialog_manager)
-        return await dialog_manager.switch_to(AttendanceStates.add_email, show_mode=ShowMode.DELETE_AND_SEND)
-
     try:
-        email = Email(message.text)
+        email = await extract_email(message)
+    except NoMessageText:
+        return await manager.answer_and_retry("There's no text in your message, enter email of a person to add")
+    try:
+        await add_email_to_attendance(email, manager)
+    except NoMeetingAttendance:
+        return await manager.answer_and_retry("Somehow there is no attendance for this meeting, resend the file maybe")
+    except EmailAlreadyPresent:
+        return await manager.answer_and_retry(f'"{email.value}" is already present')
     except Exception as e:
-        to_delete = await message.answer(f"️Error: {e}")
-        await track_message(to_delete, dialog_manager)
-        return await dialog_manager.switch_to(AttendanceStates.add_email, show_mode=ShowMode.DELETE_AND_SEND)
-
-    if email in meeting.attendance:
-        to_delete = await message.answer(f'"{email.value}" is already present')
-        await track_message(to_delete, dialog_manager)
-        return await dialog_manager.switch_to(AttendanceStates.add_email, show_mode=ShowMode.DELETE_AND_SEND)
-
-    meeting.attendance.append(email)
-    await state.update_data({"meeting": meeting_to_dto(meeting)})
-    await meetings_repo.save(meeting)
-
-    await dialog_manager.switch_to(AttendanceStates.init, show_mode=ShowMode.DELETE_AND_SEND)
+        return await manager.answer_and_retry(f"️Error: {e}")
+    await manager.switch_to(AttendanceStates.init, show_mode=ShowMode.DELETE_AND_SEND)

src/bot/dialogs/attendance/logic.py

@@ -0,0 +1,57 @@
+from aiogram.types import BufferedInputFile, InputFile
+from aiogram_dialog import DialogManager
+
+from src.bot.extended_dialog_manager import extend
+from src.bot.scheduling import *
+from src.bot.user_errors import *
+from src.bot.utils import *
+from src.db.repositories import meetings_repo
+
+MAX_ATTENDANCE_FILE_SIZE = 5_242_880  # 5 MiB
+
+
+async def get_document_contents(message: Message, manager: DialogManager) -> str:
+    manager = extend(manager)
+    if not message.document:
+        raise NoDocumentError()
+    file = await manager.bot.get_file(message.document.file_id)
+    if not file.file_size:
+        raise ValueError("No file.file_size")
+    if not file.file_path:
+        raise ValueError("No file.file_path")
+    if file.file_size > MAX_ATTENDANCE_FILE_SIZE:
+        raise FileTooBigError()
+    bytes = await manager.bot.download_file(file.file_path)
+    if not bytes:
+        raise ValueError("No bytes")
+    return bytes.read().decode("utf-8")
+
+
+async def get_attendance_file_to_download(manager: DialogManager) -> InputFile:
+    manager = extend(manager)
+    meeting = await manager.state.get_meeting()
+    if not meeting.attendance:
+        raise NoMeetingAttendance()
+    file_content = "\n".join([email.value for email in meeting.attendance])
+    file_content += "\n"
+    safe_title = re.sub(r"[^\w\s-]", "", meeting.title).strip().replace(" ", "_")
+    filename = f"attendance_{safe_title}.txt"
+    file_bytes = file_content.encode("utf-8")
+    return BufferedInputFile(file_bytes, filename=filename)
+
+
+async def extract_email(message: Message) -> Email:
+    if not message.text:
+        raise NoMessageText()
+    return Email(message.text)
+
+
+async def add_email_to_attendance(email: Email, manager: DialogManager):
+    manager = extend(manager)
+    async with manager.state.sync_meeting() as meeting:
+        if not meeting.attendance:
+            raise NoMeetingAttendance()
+        if email in meeting.attendance:
+            raise EmailAlreadyPresent()
+        meeting.attendance.append(email)
+        await meetings_repo.save(meeting)