fix: date-room saving bug

fixed & refactored datetime/datetime_ keys mismatch resolution in on_date_room_save_rightaway handle

Author: upconett

src/bot/dialogs/change_meeting/handles.py

@@ -293,17 +293,10 @@ async def on_date_room_save_rightaway(query: CallbackQuery, _, manager: DialogMa
     manager = extend_dialog(manager)
     async with manager.state.sync_meeting() as meeting:
         meeting_update = await manager.state.get_value("meeting_update", {})
-        for key in meeting_update:
-            attr, value = (key, meeting_update[key])
-            if attr in ["datetime", "datetime_"]:
-                attr = "datetime_"
-                value = datetime.fromisoformat(value) if value else None
-            setattr(meeting, attr, value)
+        meeting.update_from_dict(meeting_update)
         await meeting_repo.update(meeting, attrs=["datetime", "room"])
         if meeting.status >= MeetingStatus.ANNOUNCED:
-            meeting_update["datetime"] = meeting_update.get("datetime_") or meeting_update.get("datetime")
-            del meeting_update["datetime_"]
-            meeting_update_obj = MeetingUpdate(id=meeting.id, **meeting_update)
+            meeting_update_obj = MeetingUpdate.from_dict(meeting.id, meeting_update)
             await notification_manager.send_meeting_update_rightaway(meeting, meeting_update_obj)
     await manager.state.update_data({"meeting_update": None})
 

src/domain/models.py

@@ -1,5 +1,6 @@
 from datetime import datetime
 from enum import IntEnum, StrEnum
+from typing import Any
 
 from pydantic import BaseModel, EmailStr, Field, computed_field
 
@@ -95,6 +96,18 @@ class Meeting(BaseModel):
     datetime_: datetime | None = Field(None, alias="datetime")
     tutor_id: int | None = None
 
+    def update_from_dict(self, meeting_update: dict[str, Any]):
+        """Update Meeting using meeting_update dictionary
+
+        Handle "datetime", "datetime_" key mismatch
+        """
+        for orig_key, orig_value in meeting_update.items():
+            key, value = (orig_key, orig_value)
+            if key in ["datetime", "datetime_"]:
+                key = "datetime_"
+                value = datetime.fromisoformat(value) if value else None
+            setattr(self, key, value)
+
     def assign_tutor(self, tutor: "Tutor"):
         self.tutor_id = tutor.id
 
@@ -183,3 +196,14 @@ class MeetingUpdate(BaseModel):
     id: int
     room: str | None = None
     datetime_: datetime | None = Field(None, alias="datetime")
+
+    @staticmethod
+    def from_dict(meeting_id: int, meeting_update: dict[str, Any]) -> "MeetingUpdate":
+        """Construct MeetingUpdate object from meeting_id and meeting_update dict
+
+        Handle "datetime", "datetime_" key mismatch
+        """
+        meeting_update["datetime"] = meeting_update.get("datetime_") or meeting_update.get("datetime")
+        if "datetime_" in meeting_update:
+            del meeting_update["datetime_"]
+        return MeetingUpdate(id=meeting_id, **meeting_update)