edit/delete player/war/campaign/round

src/warchron/model/campaign.py

@@ -4,10 +4,10 @@ from datetime import datetime
 from warchron.model.round import Round
 
 class Campaign:
-    def __init__(self, name):
+    def __init__(self, name, month):
         self.id = str(uuid4())
         self.name = name
-        self.month = datetime.now().month
+        self.month = month
         self.entrants = {}
         self.rounds = []
         self.is_over = False
@@ -36,20 +36,14 @@ class Campaign:
     
     @staticmethod
     def fromDict(data: dict):
-        camp = Campaign(name=data["name"])
+        camp = Campaign(name=data["name"], month=data["month"])
         camp.set_id(data["id"])
-        camp.set_month(data["month"])
         # camp.entrants = data.get("entrants", {})
         for rnd_data in data.get("rounds", []):
             camp.rounds.append(Round.fromDict(rnd_data))
         camp.set_state(data.get("is_over", False))
         return camp
     
-    def add_round(self, number: int) -> Round:
-        round = Round()
-        self.rounds.append(round)
-        return round
-    
     def get_round(self, round_id) -> Round:
         return self.rounds[round_id]
 
@@ -59,4 +53,9 @@ class Campaign:
     def add_round(self) -> Round:
         round = Round()
         self.rounds.append(round)
-        return round
+        return round
+    
+    def remove_round(self, round_id: str):
+        rnd = next((r for r in self.rounds if r.id == round_id), None)
+        if rnd:
+            self.rounds.remove(rnd)

src/warchron/model/model.py

@@ -1,6 +1,7 @@
 from pathlib import Path
 import json
 import shutil
+from datetime import datetime
 
 from warchron.model.player import Player
 from warchron.model.war import War
@@ -60,8 +61,8 @@ class Model:
     def get_player(self, id):
         return self.players[id]
         
-    def update_player(self, id, name):
-        player = self.get_player(id)
+    def update_player(self, player_id: str, *, name: str):
+        player = self.get_player(player_id)
         player.set_name(name)
 
     def delete_player(self, id):
@@ -70,20 +71,41 @@ class Model:
     def get_all_players(self) -> list[Player]:
         return list(self.players.values())
 
-    def add_war(self, name) -> War:
-        war = War(name)
+    def get_default_war_values(self) -> dict:
+        return {
+            "year": datetime.now().year
+        }
+
+    def add_war(self, name: str, year: int) -> War:
+        war = War(name, year)
         self.wars[war.id] = war
         return war
 
     def get_war(self, id) -> War:
         return self.wars[id]
+    
+    def get_war_by_campaign(self, campaign_id: str) -> War:
+        for war in self.wars.values():
+            for camp in war.campaigns:
+                if camp.id == campaign_id:
+                    return war
+        raise KeyError(f"Campaign {campaign_id} not found in any War")
+
+    def update_war(self, war_id: str, *, name: str, year: int):
+        war = self.get_war(war_id)
+        war.set_name(name)
+        war.set_year(year)
 
     def get_all_wars(self) -> list[War]:
         return list(self.wars.values())
-    
-    def add_campaign(self, war_id: str, name: str) -> Campaign:
+
+    def get_default_campaign_values(self, war_id: str) -> dict:
         war = self.get_war(war_id)
-        return war.add_campaign(name)
+        return war.get_default_campaign_values()
+
+    def add_campaign(self, war_id: str, name: str, month: int) -> Campaign:
+        war = self.get_war(war_id)
+        return war.add_campaign(name, month)
 
     def get_campaign(self, campaign_id) -> Campaign:
         for war in self.wars.values():
@@ -92,6 +114,17 @@ class Model:
                     return campaign
         raise KeyError("Campaign not found")
 
+    def get_campaign_by_round(self, round_id: str) -> Campaign:
+        for war in self.wars.values():
+            camp = war.get_campaign_by_round(round_id)
+            if camp is not None:
+                return camp
+        raise KeyError(f"Round {round_id} not found")
+    
+    def update_campaign(self, campaign_id: str, *, name: str, month: int):
+        war = self.get_war_by_campaign(campaign_id)
+        war.update_campaign(campaign_id, name=name, month=month)
+
     def add_round(self, campaign_id: str) -> Round:
         campaign = self.get_campaign(campaign_id)
         return campaign.add_round()
@@ -102,4 +135,18 @@ class Model:
                 for rnd in campaign.rounds:
                     if rnd.id == round_id:
                         return rnd
-        raise KeyError("Round not found")
+        raise KeyError("Round not found")
+    
+    def remove_player(self, player_id: str):
+        del self.players[player_id]
+
+    def remove_war(self, war_id: str):
+        del self.wars[war_id]
+
+    def remove_campaign(self, campaign_id: str):
+        war = self.get_war_by_campaign(campaign_id)
+        war.remove_campaign(campaign_id)
+
+    def remove_round(self, round_id: str):
+        camp = self.get_campaign_by_round(round_id)
+        camp.remove_round(round_id)

src/warchron/model/war.py

@@ -4,10 +4,10 @@ from datetime import datetime
 from warchron.model.campaign import Campaign
 
 class War:
-    def __init__(self, name):
+    def __init__(self, name, year):
         self.id = str(uuid4())
         self.name = name
-        self.year = datetime.now().year
+        self.year = year
         self.entrants = {}
         self.campaigns = []
         self.is_over = False
@@ -36,27 +36,47 @@ class War:
     
     @staticmethod
     def fromDict(data: dict):
-        war = War(name=data["name"])
+        war = War(name=data["name"], year=data["year"])
         war.set_id(data["id"])
-        war.set_year(data["year"])
         # war.entrants = data.get("entrants", {})
         for camp_data in data.get("campaigns", []):
             war.campaigns.append(Campaign.fromDict(camp_data))
         war.set_state(data.get("is_over", False))
         return war
 
-    def add_campaign(self, name) -> Campaign:
-        campaign = Campaign(name)
+    def get_default_campaign_values(self) -> dict:
+        return {
+            "month": datetime.now().month
+        }
+    
+    def add_campaign(self, name: str, month: int | None = None) -> Campaign:
+        if month is None:
+            month = self.get_default_campaign_values()["month"]
+        campaign = Campaign(name, month)
         self.campaigns.append(campaign)
         return campaign
 
     def get_campaign(self, campaign_id) -> Campaign:
-        return self.campaigns[campaign_id]
+        for camp in self.campaigns:
+            if camp.id == campaign_id:
+                return camp
+        raise KeyError(f"Campaign {campaign_id} not found in War {self.id}")
 
+    def get_campaign_by_round(self, round_id: str) -> Campaign:
+        for camp in self.campaigns:
+            for rnd in camp.rounds:
+                if rnd.id == round_id:
+                    return camp
+        raise KeyError(f"Round {round_id} not found in any Campaign")
+
+    def update_campaign(self, campaign_id: str, *, name: str, month: int):
+        camp = self.get_campaign(campaign_id)
+        camp.set_name(name)
+        camp.set_month(month)
+        
     def get_all_campaigns(self) -> list[Campaign]:
         return list(self.campaigns)
     
-    def add_campaign(self, name: str) -> Campaign:
-        campaign = Campaign(name)
-        self.campaigns.append(campaign)
-        return campaign
+    def remove_campaign(self, campaign_id: str):
+        camp = self.get_campaign(campaign_id)
+        self.campaigns.remove(camp)