src/warchron/controller/dtos.py

@@ -62,7 +62,7 @@ class CampaignParticipantDTO:
 class SectorDTO:
     id: str
     name: str
-    round_index: int | None
+    round_index: int
     major: str
     minor: str
     influence: str
@@ -71,7 +71,7 @@ class SectorDTO:
 @dataclass
 class RoundDTO:
     id: str
-    index: int | None
+    index: int
 
 
 @dataclass(frozen=True, slots=True)

src/warchron/model/battle.py

@@ -1,7 +1,3 @@
-from __future__ import annotations
-from typing import Any, Dict
-
-
 class Battle:
     def __init__(
         self,
@@ -37,27 +33,3 @@ class Battle:
 
     def set_comment(self, new_comment: str | None) -> None:
         self.comment = new_comment
-
-    def toDict(self) -> Dict[str, Any]:
-        return {
-            "sector_id": self.sector_id,
-            "player_1_id": self.player_1_id,
-            "player_2_id": self.player_2_id,
-            "winner_id": self.winner_id,
-            "score": self.score,
-            "victory_condition": self.victory_condition,
-            "comment": self.comment,
-        }
-
-    @staticmethod
-    def fromDict(data: Dict[str, Any]) -> Battle:
-        battle = Battle(
-            data["sector_id"],
-            data.get("player_1_id"),
-            data.get("player_2_id"),
-        )
-        battle.winner_id = data.get("winner_id")
-        battle.score = data.get("score")
-        battle.victory_condition = data.get("victory_condition")
-        battle.comment = data.get("comment")
-        return battle

src/warchron/model/campaign.py

@@ -40,8 +40,7 @@ class Campaign:
             "id": self.id,
             "name": self.name,
             "month": self.month,
-            "participants": [p.toDict() for p in self.participants.values()],
+            # "participants" : self.participants,
-            "sectors": [s.toDict() for s in self.sectors.values()],
             "rounds": [rnd.toDict() for rnd in self.rounds],
             "is_over": self.is_over,
         }
@@ -50,12 +49,7 @@ class Campaign:
     def fromDict(data: Dict[str, Any]) -> Campaign:
         camp = Campaign(name=data["name"], month=data["month"])
         camp.set_id(data["id"])
-        for p in data.get("participants", []):
+        # camp.participants = data.get("participants", {})
-            part = CampaignParticipant.fromDict(p)
-            camp.participants[part.id] = part
-        for s in data.get("sectors", []):
-            sec = Sector.fromDict(s)
-            camp.sectors[sec.id] = sec
         for rnd_data in data.get("rounds", []):
             camp.rounds.append(Round.fromDict(rnd_data))
         camp.set_state(data.get("is_over", False))
@@ -269,13 +263,10 @@ class Campaign:
 
     def remove_round(self, round_id: str) -> None:
         rnd = next((r for r in self.rounds if r.id == round_id), None)
-        for sect in self.sectors.values():
-            if sect.round_id == round_id:
-                sect.round_id = None
         if rnd:
             self.rounds.remove(rnd)
 
-    def get_round_index(self, round_id: str | None) -> int | None:
+    def get_round_index(self, round_id: str) -> int:
         if round_id is None:
             return None
         for index, rnd in enumerate(self.rounds, start=1):

src/warchron/model/campaign_participant.py

@@ -1,5 +1,4 @@
 from __future__ import annotations
-from typing import Any, Dict
 from uuid import uuid4
 
 
@@ -23,21 +22,3 @@ class CampaignParticipant:
 
     def set_theme(self, new_theme: str) -> None:
         self.theme = new_theme
-
-    def toDict(self) -> Dict[str, Any]:
-        return {
-            "id": self.id,
-            "war_participant_id": self.war_participant_id,
-            "leader": self.leader,
-            "theme": self.theme,
-        }
-
-    @staticmethod
-    def fromDict(data: Dict[str, Any]) -> CampaignParticipant:
-        part = CampaignParticipant(
-            war_participant_id=data["war_participant_id"],
-            leader=data.get("leader"),
-            theme=data.get("theme"),
-        )
-        part.set_id(data["id"])
-        return part

src/warchron/model/choice.py

@@ -1,7 +1,3 @@
-from __future__ import annotations
-from typing import Any, Dict
-
-
 class Choice:
     def __init__(
         self,
@@ -29,21 +25,3 @@ class Choice:
 
     def set_comment(self, new_comment: str | None) -> None:
         self.comment = new_comment
-
-    def toDict(self) -> Dict[str, Any]:
-        return {
-            "participant_id": self.participant_id,
-            "priority_sector_id": self.priority_sector_id,
-            "secondary_sector_id": self.secondary_sector_id,
-            "comment": self.comment,
-        }
-
-    @staticmethod
-    def fromDict(data: Dict[str, Any]) -> Choice:
-        choice = Choice(
-            data["participant_id"],
-            data.get("priority_sector_id"),
-            data.get("secondary_sector_id"),
-        )
-        choice.comment = data.get("comment")
-        return choice

src/warchron/model/model.py

@@ -380,9 +380,7 @@ class Model:
                         return rnd
         raise KeyError("Round not found")
 
-    def get_round_index(self, round_id: str | None) -> int | None:
+    def get_round_index(self, round_id: str) -> int:
-        if round_id is None:
-            return None
         camp = self.get_campaign_by_round(round_id)
         return camp.get_round_index(round_id)
 

src/warchron/model/objective.py

@@ -1,5 +1,4 @@
 from __future__ import annotations
-from typing import Any, Dict
 from uuid import uuid4
 
 
@@ -17,16 +16,3 @@ class Objective:
 
     def set_description(self, new_description: str) -> None:
         self.description = new_description
-
-    def toDict(self) -> Dict[str, Any]:
-        return {
-            "id": self.id,
-            "name": self.name,
-            "description": self.description,
-        }
-
-    @staticmethod
-    def fromDict(data: Dict[str, Any]) -> Objective:
-        obj = Objective(data["name"], data["description"])
-        obj.set_id(data["id"])
-        return obj

src/warchron/model/round.py

@@ -22,8 +22,9 @@ class Round:
     def toDict(self) -> Dict[str, Any]:
         return {
             "id": self.id,
-            "choices": [c.toDict() for c in self.choices.values()],
+            # "sectors" : self.sectors,
-            "battles": [b.toDict() for b in self.battles.values()],
+            # "choices" : self.choices,
+            # "battles" : self.battles,
             "is_over": self.is_over,
         }
 
@@ -31,12 +32,9 @@ class Round:
     def fromDict(data: Dict[str, Any]) -> Round:
         rnd = Round()
         rnd.set_id(data["id"])
-        for c in data.get("choices", []):
+        # rnd.sectors = data.get("sectors", {})
-            choice = Choice.fromDict(c)
+        # rnd.choices = data.get("choices", {})
-            rnd.choices[choice.participant_id] = choice
+        # rnd.battles = data.get("battles", {})
-        for b in data.get("battles", []):
-            battle = Battle.fromDict(b)
-            rnd.battles[battle.sector_id] = battle
         rnd.set_state(data.get("is_over", False))
         return rnd
 

src/warchron/model/sector.py

@@ -1,5 +1,4 @@
 from __future__ import annotations
-from typing import Any, Dict
 from uuid import uuid4
 
 
@@ -7,14 +6,14 @@ class Sector:
     def __init__(
         self,
         name: str,
-        round_id: str | None,
+        round_id: str,
         major_id: str | None,
         minor_id: str | None,
         influence_id: str | None,
     ):
         self.id: str = str(uuid4())
         self.name: str = name
-        self.round_id: str | None = round_id
+        self.round_id: str = round_id
         self.major_objective_id: str | None = major_id  # ref to War.objectives
         self.minor_objective_id: str | None = minor_id  # ref to War.objectives
         self.influence_objective_id: str | None = influence_id  # ref to War.objectives
@@ -38,29 +37,3 @@ class Sector:
 
     def set_influence(self, new_influence_id: str) -> None:
         self.influence_objective_id = new_influence_id
-
-    def toDict(self) -> Dict[str, Any]:
-        return {
-            "id": self.id,
-            "name": self.name,
-            "round_id": self.round_id,
-            "major_objective_id": self.major_objective_id,
-            "minor_objective_id": self.minor_objective_id,
-            "influence_objective_id": self.influence_objective_id,
-            "mission": self.mission,
-            "description": self.description,
-        }
-
-    @staticmethod
-    def fromDict(data: Dict[str, Any]) -> Sector:
-        sec = Sector(
-            data["name"],
-            data["round_id"],
-            data.get("major_objective_id"),
-            data.get("minor_objective_id"),
-            data.get("influence_objective_id"),
-        )
-        sec.set_id(data["id"])
-        sec.mission = data.get("mission")
-        sec.description = data.get("description")
-        return sec

src/warchron/model/war.py

@@ -41,8 +41,7 @@ class War:
             "id": self.id,
             "name": self.name,
             "year": self.year,
-            "participants": [part.toDict() for part in self.participants.values()],
+            # "participants" : self.participants,
-            "objectives": [obj.toDict() for obj in self.objectives.values()],
             "campaigns": [camp.toDict() for camp in self.campaigns],
             "is_over": self.is_over,
         }
@@ -51,12 +50,7 @@ class War:
     def fromDict(data: Dict[str, Any]) -> War:
         war = War(name=data["name"], year=data["year"])
         war.set_id(data["id"])
-        for part_data in data.get("participants", []):
+        # war.participants = data.get("participants", {})
-            part = WarParticipant.fromDict(part_data)
-            war.participants[part.id] = part
-        for obj_data in data.get("objectives", []):
-            obj = Objective.fromDict(obj_data)
-            war.objectives[obj.id] = obj
         for camp_data in data.get("campaigns", []):
             war.campaigns.append(Campaign.fromDict(camp_data))
         war.set_state(data.get("is_over", False))

src/warchron/model/war_participant.py

@@ -1,12 +1,11 @@
 from __future__ import annotations
-from typing import Any, Dict
 from uuid import uuid4
 
 
 class WarParticipant:
     def __init__(self, *, player_id: str, faction: str):
         self.id: str = str(uuid4())
-        self.player_id: str = player_id  # ref to Model.players
+        self.player_id: str = player_id  # ref to WarModel.players
         self.faction: str = faction
 
     def set_id(self, new_id: str) -> None:
@@ -17,19 +16,3 @@ class WarParticipant:
 
     def set_faction(self, new_faction: str) -> None:
         self.faction = new_faction
-
-    def toDict(self) -> Dict[str, Any]:
-        return {
-            "id": self.id,
-            "player_id": self.player_id,
-            "faction": self.faction,
-        }
-
-    @staticmethod
-    def fromDict(data: Dict[str, Any]) -> WarParticipant:
-        part = WarParticipant(
-            player_id=data["player_id"],
-            faction=data["faction"],
-        )
-        part.set_id(data["id"])
-        return part

src/warchron/view/helpers.py

@@ -21,7 +21,7 @@ def format_campaign_label(camp: CampaignDTO) -> str:
     return f"{camp.name} ({calendar.month_name[camp.month]})"
 
 
-def format_round_label(index: int | None) -> str:
+def format_round_label(index: int) -> str:
     if index is None:
         return ""
     return f"Round {index}"

src/warchron/view/sector_dialog.py

@@ -23,11 +23,10 @@ class SectorDialog(QDialog):
         super().__init__(parent)
         self.ui: Ui_sectorDialog = Ui_sectorDialog()
         self.ui.setupUi(self)  # type: ignore
-        self.ui.sectorName.setText(default_name)
         self.ui.majorComboBox.addItem("(none)", None)
         self.ui.minorComboBox.addItem("(none)", None)
         self.ui.influenceComboBox.addItem("(none)", None)
-        self.ui.roundComboBox.addItem("(none)", None)
+        self.ui.sectorName.setText(default_name)
         for index, rnd in enumerate(rounds, start=1):
             self.ui.roundComboBox.addItem(format_round_label(index), rnd.id)
         select_if_exists(self.ui.roundComboBox, default_round_id)

src/warchron/view/view.py

@@ -448,7 +448,7 @@ class View(QtWidgets.QMainWindow, Ui_MainWindow):
         if action == edit_action and self.on_edit_item:
             self.on_edit_item(ItemType.BATTLE, battle_id)
 
-    def show_round_details(self, *, index: int | None) -> None:
+    def show_round_details(self, *, index: int) -> None:
         self.roundNb.setText(f"Round {index}")
 
     def display_round_choices(self, participants: List[ChoiceDTO]) -> None: