#106 fix for old constructor call

bomzheg · Nov 7, 2024 · 2aa55d1 · 2aa55d1
1 parent e5d75d6
commit 2aa55d1
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 16 deletions.
diff --git a/shvatka/common/data_examples.py b/shvatka/common/data_examples.py
@@ -39,7 +39,7 @@
             name_id="level_100",
             game_id=10,
             number_in_game=0,
-            scenario=scn.LevelScenario(
+            scenario=scn.LevelScenario.legacy_factory(
                 id="level_100",
                 keys={"SH1"},
                 time_hints=scn.HintsList(
@@ -102,7 +102,7 @@
             name_id="level_101",
             game_id=10,
             number_in_game=1,
-            scenario=scn.LevelScenario(
+            scenario=scn.LevelScenario.legacy_factory(
                 id="level_101",
                 keys={"SH2"},
                 time_hints=scn.HintsList(
@@ -165,7 +165,7 @@
             name_id="level_102",
             game_id=10,
             number_in_game=0,
-            scenario=scn.LevelScenario(
+            scenario=scn.LevelScenario.legacy_factory(
                 id="level_102",
                 keys={"SH3"},
                 time_hints=scn.HintsList(
@@ -228,7 +228,7 @@
             name_id="level_103",
             game_id=10,
             number_in_game=0,
-            scenario=scn.LevelScenario(
+            scenario=scn.LevelScenario.legacy_factory(
                 id="level_103",
                 keys={"SH4"},
                 time_hints=scn.HintsList(

diff --git a/shvatka/core/models/dto/action/__init__.py b/shvatka/core/models/dto/action/__init__.py
@@ -1,4 +1,4 @@
-from .interface import WinCondition, Action, State, Decision, DecisionType, StateHolder
+from .interface import Condition, Action, State, Decision, DecisionType, StateHolder
 from .decisions import NotImplementedActionDecision, Decisions
 from .keys import (
     SHKey,

diff --git a/shvatka/core/models/dto/action/interface.py b/shvatka/core/models/dto/action/interface.py
@@ -5,7 +5,7 @@
 from typing import Protocol
 
 
-class WinCondition(Protocol):
+class Condition(Protocol):
     def check(self, action: Action, state_holder: StateHolder) -> Decision:
         raise NotImplementedError
 

diff --git a/shvatka/core/models/dto/action/keys.py b/shvatka/core/models/dto/action/keys.py
@@ -5,7 +5,7 @@
 from shvatka.core.models import enums
 from . import StateHolder
 from .decisions import NotImplementedActionDecision
-from .interface import Action, State, Decision, WinCondition, DecisionType
+from .interface import Action, State, Decision, Condition, DecisionType
 
 SHKey: typing.TypeAlias = str
 
@@ -66,7 +66,7 @@ def key_text(self) -> str:
 
 
 @dataclass
-class KeyWinCondition(WinCondition):
+class KeyWinCondition(Condition):
     keys: set[SHKey]
 
     def check(self, action: Action, state_holder: StateHolder) -> Decision:
@@ -110,7 +110,7 @@ def key_text(self) -> str:
 
 
 @dataclass
-class KeyBonusCondition(WinCondition):
+class KeyBonusCondition(Condition):
     keys: set[BonusKey]
 
     def check(self, action: Action, state_holder: StateHolder) -> Decision:

diff --git a/shvatka/core/models/dto/scn/level.py b/shvatka/core/models/dto/scn/level.py
@@ -9,7 +9,7 @@
 from .hint_part import AnyHint
 from .time_hint import TimeHint, EnumeratedTimeHint
 from shvatka.core.models.dto.action import (
-    WinCondition,
+    Condition,
     Action,
     Decision,
     StateHolder,
@@ -133,13 +133,13 @@ def __repr__(self):
         return repr(self.hints)
 
 
-class Conditions(Sequence[WinCondition]):
-    def __init__(self, conditions: Sequence[WinCondition]):
+class Conditions(Sequence[Condition]):
+    def __init__(self, conditions: Sequence[Condition]):
         self.validate(conditions)
         self.conditions = conditions
 
     @staticmethod
-    def validate(conditions: Sequence[WinCondition]) -> None:
+    def validate(conditions: Sequence[Condition]) -> None:
         keys: set[str] = set()
         win_conditions = []
         for c in conditions:
@@ -174,11 +174,11 @@ def get_bonus_keys(self) -> set[BonusKey]:
         return result
 
     @overload
-    def __getitem__(self, index: int) -> WinCondition:
+    def __getitem__(self, index: int) -> Condition:
         return self.conditions[index]
 
     @overload
-    def __getitem__(self, index: slice) -> Sequence[WinCondition]:
+    def __getitem__(self, index: slice) -> Sequence[Condition]:
         return self.conditions[index]
 
     def __getitem__(self, index):
@@ -258,3 +258,20 @@ def hints_count(self) -> int:
 
     def get_hints_for_timedelta(self, delta: timedelta) -> list[TimeHint]:
         return self.time_hints.get_hints_for_timedelta(delta)
+
+    @classmethod
+    def legacy_factory(
+        cls,
+        id: str,  # noqa: A002
+        time_hints: HintsList,
+        keys: set[SHKey],
+        bonus_keys: set[BonusKey] | None = None,
+    ) -> "LevelScenario":
+        conditions: list[Condition] = [KeyWinCondition(keys)]
+        if bonus_keys:
+            conditions.append(KeyBonusCondition(bonus_keys))
+        return cls(
+            id=id,
+            time_hints=time_hints,
+            conditions=Conditions(conditions),
+        )
diff --git a/shvatka/tgbot/dialogs/level_scn/handlers.py b/shvatka/tgbot/dialogs/level_scn/handlers.py
@@ -222,7 +222,9 @@ async def save_level(c: CallbackQuery, button: Button, manager: DialogManager):
         data.get("bonus_keys", []), set[shvatka.core.models.dto.action.keys.BonusKey]
     )
 
-    level_scn = scn.LevelScenario(id=id_, keys=keys, time_hints=time_hints, bonus_keys=bonus_keys)
+    level_scn = scn.LevelScenario.legacy_factory(
+        id=id_, keys=keys, time_hints=time_hints, bonus_keys=bonus_keys
+    )
     level = await upsert_level(author=author, scenario=level_scn, dao=dao.level)
     await manager.done(result={"level": retort.dump(level)})
     await c.answer(text="Уровень успешно сохранён")
diff --git a/tests/unit/domain/level_test.py b/tests/unit/domain/level_test.py