add campaign & round

src/warchron/model/campaign.py

@@ -9,7 +9,7 @@ class Campaign:
         self.name = name
         self.month = datetime.now().month
         self.entrants = {}
-        self.rounds = {}
+        self.rounds = []
         self.is_over = False
 
     def set_id(self, new_id):
@@ -42,4 +42,20 @@ class Campaign:
         ## entrants placeholder
         ## rounds placeholder
         tmp.set_state(is_over)
-        return tmp
+        return tmp
+    
+    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]
+
+    def get_all_rounds(self) -> list[Round]:
+        return list(self.rounds)
+    
+    def add_round(self) -> Round:
+        round = Round()
+        self.rounds.append(round)
+        return round

src/warchron/model/model.py

@@ -4,6 +4,8 @@ import shutil
 
 from warchron.model.player import Player
 from warchron.model.war import War
+from warchron.model.campaign import Campaign
+from warchron.model.round import Round
 
 class Model:
     def __init__(self):
@@ -69,13 +71,36 @@ class Model:
     def get_all_players(self) -> list[Player]:
         return list(self.players.values())
 
-    def add_war(self, name):
+    def add_war(self, name) -> War:
         war = War(name)
         self.wars[war.id] = war
         return war
 
-    def get_war(self, id):
+    def get_war(self, id) -> War:
         return self.wars[id]
 
     def get_all_wars(self) -> list[War]:
         return list(self.wars.values())
+    
+    def add_campaign(self, war_id: str, name: str) -> Campaign:
+        war = self.get_war(war_id)
+        return war.add_campaign(name)
+
+    def get_campaign(self, campaign_id) -> Campaign:
+        for war in self.wars.values():
+            for campaign in war.campaigns:
+                if campaign.id == campaign_id:
+                    return campaign
+        raise KeyError("Campaign not found")
+
+    def add_round(self, campaign_id: str) -> Round:
+        campaign = self.get_campaign(campaign_id)
+        return campaign.add_round()
+    
+    def get_round(self, round_id: str) -> Round:
+        for war in self.wars.values():
+            for campaign in war.campaigns:
+                for rnd in campaign.rounds:
+                    if rnd.id == round_id:
+                        return rnd
+        raise KeyError("Round not found")

src/warchron/model/round.py

@@ -1,20 +1,21 @@
+from uuid import uuid4 
+
 class Round:
-    def __init__(self, number):
-        self.number = number
+    def __init__(self):
+        self.id = str(uuid4())
         self.sectors = {}
         self.choices = {}
         self.battles = {}
         self.is_over = False
 
-    def set_number(self, new_number):
-        self.number = new_number
+    def set_id(self, new_id):
+        self.id = new_id
 
     def set_state(self, new_state):
         self.is_over = new_state
 
     def toDict(self):
         return {
-            "number" : self.number,
             "sectors" : self.sectors,
             "choices" : self.choices,
             "battles" : self.battles,
@@ -22,8 +23,9 @@ class Round:
         }
 
     @staticmethod
-    def fromDict(id, number, sectors, choices, battles, is_over):
-        tmp = Round(number=number)
+    def fromDict(id, sectors, choices, battles, is_over):
+        tmp = Round()
+        tmp.set_id(id)
         ## sectors placeholder
         ## choices placeholder
         ## battles placeholder

src/warchron/model/war.py

@@ -9,10 +9,9 @@ class War:
         self.name = name
         self.year = datetime.now().year
         self.entrants = {}
-        self.campaigns = {}
+        self.campaigns = []
         self.is_over = False
 
-        
     def set_id(self, new_id):
         self.id = new_id
 
@@ -43,4 +42,20 @@ class War:
         ## entrants placeholder
         ## campaigns placeholder
         tmp.set_state(is_over)
-        return tmp
+        return tmp
+    
+    def add_campaign(self, name) -> Campaign:
+        campaign = Campaign(name)
+        self.campaigns.append(campaign)
+        return campaign
+
+    def get_campaign(self, campaign_id) -> Campaign:
+        return self.campaigns[campaign_id]
+
+    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