added change time

bomzheg · Oct 8, 2024 · 97056e7 · 97056e7
1 parent 0e24cd3
commit 97056e7
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/shvatka/common/factory.py b/shvatka/common/factory.py
@@ -37,7 +37,7 @@ def create_telegraph(self, bot_config: BotConfig) -> Telegraph:
 
 
 REQUIRED_GAME_RECIPES = [
-    loader(HintsList, lambda x: HintsList(x), Chain.LAST),
+    loader(HintsList, lambda x: HintsList.parse(x), Chain.LAST),
     ABCProxy(HintsList, list[TimeHint]),  # internal class, can be broken in next version adaptix
     dumper(set, lambda x: tuple(x)),
 ]

diff --git a/shvatka/core/models/dto/scn/level.py b/shvatka/core/models/dto/scn/level.py
@@ -46,12 +46,16 @@ def normalize(hints: list[TimeHint]) -> list[TimeHint]:
 
     @staticmethod
     def verify(hints: Iterable[TimeHint]) -> None:
+        current_time = -1
         times: set[int] = set()
         for hint in hints:
             if hint.time in times:
                 raise exceptions.LevelError(
                     text=f"Contains multiple times hints for time {hint.time}"
                 )
+            if hint.time <= current_time:
+                raise exceptions.LevelError(text="hints are not sorted")
+            current_time = hint.time
             times.add(hint.time)
             if not hint.hint:
                 raise exceptions.LevelError(text=f"There is no hint for time {hint.time}")

diff --git a/shvatka/infrastructure/db/models/level.py b/shvatka/infrastructure/db/models/level.py
@@ -1,7 +1,7 @@
 import typing
 from typing import Any
 
-from adaptix import Retort, dumper
+from adaptix import Retort
 from sqlalchemy import Integer, Text, ForeignKey, JSON, TypeDecorator, UniqueConstraint
 from sqlalchemy.engine import Dialect
 from sqlalchemy.orm import relationship, mapped_column, Mapped
@@ -20,7 +20,7 @@ class ScenarioField(TypeDecorator):
     impl = JSON
     cache_ok = True
     retort = Retort(
-        recipe=[*REQUIRED_GAME_RECIPES, dumper(set, lambda x: list(x))],
+        recipe=REQUIRED_GAME_RECIPES,
     )
 
     def coerce_compared_value(self, op: Any, value: Any):

diff --git a/shvatka/tgbot/dialogs/time_hint/dialogs.py b/shvatka/tgbot/dialogs/time_hint/dialogs.py
@@ -67,7 +67,7 @@
         Button(
             Const("✅К следующей подсказке"),
             id="to_next_hint",
-            when=lambda data, *args: data["has_hints"],
+            when=F["has_hints"],
             on_click=on_finish,
         ),
         Back(text=Const("⏱️Изменить время")),

diff --git a/shvatka/tgbot/dialogs/time_hint/handlers.py b/shvatka/tgbot/dialogs/time_hint/handlers.py
@@ -46,10 +46,7 @@ async def process_time_message(m: Message, dialog_: Any, manager: DialogManager)
     except ValueError:
         await m.answer("Некорректный формат времени. Пожалуйста введите время в формате ЧЧ:ММ")
         return
-    try:
-        await set_time(time_, manager)
-    except ValueError:
-        await m.answer("Время выхода данной подсказки должно быть больше, чем предыдущей")
+    await set_time(time_, manager)
 
 
 async def edit_single_hint(c: CallbackQuery, widget: Any, manager: DialogManager):
@@ -92,8 +89,6 @@ async def save_edited_time_hint(c: CallbackQuery, widget: Any, manager: DialogMa
 
 
 async def set_time(time_minutes: int, manager: DialogManager):
-    if time_minutes <= int(manager.start_data["previous_time"]):
-        raise ValueError("Время меньше предыдущего")
     data = manager.dialog_data
     if not isinstance(data, dict):
         data = {}