maximator/warchron_app
maximator/warchron_app
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix unique participant in war & campaign

Browse source
This commit is contained in:
Maxime Réaux 2026-02-03 09:01:17 +01:00
parent 49bf6d7ea8
commit 87670329c2
3 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/warchron/model/campaign.py
View file

@ -54,11 +54,16 @@ class Campaign:
def has_participant(self, participant_id: str) -> bool: def has_participant(self, participant_id: str) -> bool:
return participant_id in self.participants return participant_id in self.participants
def has_war_participant(self, war_participant_id: str) -> bool:
return any(
part.war_participant_id == war_participant_id
for part in self.participants.values()
)
def add_campaign_participant( def add_campaign_participant(
self, war_participant_id: str, leader: str, theme: str self, war_participant_id: str, leader: str, theme: str
) -> CampaignParticipant: ) -> CampaignParticipant:
## TODO change lookup id target if self.has_war_participant(war_participant_id):
if war_participant_id in self.participants:
raise ValueError("Player already registered in this campaign") raise ValueError("Player already registered in this campaign")
participant = CampaignParticipant( participant = CampaignParticipant(
war_participant_id=war_participant_id, leader=leader, theme=theme war_participant_id=war_participant_id, leader=leader, theme=theme

5
src/warchron/model/model.py
View file

@ -123,7 +123,6 @@ class Model:
return war return war
raise KeyError(f"Objective {objective_id} not found in any War") raise KeyError(f"Objective {objective_id} not found in any War")
# TODO don't use this method as participant with same ID (player) can be in several wars!
def get_war_by_war_participant(self, participant_id: str) -> War: def get_war_by_war_participant(self, participant_id: str) -> War:
for war in self.wars.values(): for war in self.wars.values():
if war.has_participant(participant_id): if war.has_participant(participant_id):
@ -174,9 +173,7 @@ class Model:
def get_available_players(self, war_id: str) -> list[Player]: def get_available_players(self, war_id: str) -> list[Player]:
war = self.get_war(war_id) war = self.get_war(war_id)
return [ return [
player player for player in self.players.values() if not war.has_player(player.id)
for player in self.players.values()
if not war.has_participant(player.id)
] ]
def add_war_participant( def add_war_participant(

11
src/warchron/model/war.py
View file

@ -81,11 +81,14 @@ class War:
def get_all_war_participants_ids(self) -> set[str]: def get_all_war_participants_ids(self) -> set[str]:
return set(self.participants.keys()) return set(self.participants.keys())
def has_participant(self, player_id: str) -> bool: def has_participant(self, participant_id: str) -> bool:
return player_id in self.participants return participant_id in self.participants
def has_player(self, player_id: str) -> bool:
return any(part.player_id == player_id for part in self.participants.values())
def add_war_participant(self, player_id: str, faction: str) -> WarParticipant: def add_war_participant(self, player_id: str, faction: str) -> WarParticipant:
if player_id in self.participants: if self.has_player(player_id):
raise ValueError("Player already registered in this war") raise ValueError("Player already registered in this war")
participant = WarParticipant(player_id=player_id, faction=faction) participant = WarParticipant(player_id=player_id, faction=faction)
self.participants[participant.id] = participant self.participants[participant.id] = participant
@ -207,7 +210,7 @@ class War:
return [ return [
part part
for part in self.participants.values() for part in self.participants.values()
if not camp.has_participant(part.id) if not camp.has_war_participant(part.id)
] ]
def add_campaign_participant( def add_campaign_participant(