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

refacto file and class names

Browse source
This commit is contained in:
Maxime Réaux 2026-03-19 15:23:50 +01:00
parent 3d0d7874e3
commit 956fa63c0b
12 changed files with 126 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/warchron/controller/campaign_controller.py
View file

@ -19,9 +19,9 @@ from warchron.model.war import War
from warchron.model.campaign import Campaign
from warchron.model.campaign_participant import CampaignParticipant
from warchron.model.sector import Sector
from warchron.model.tie_manager import TieContext, TieResolver
from warchron.model.score_service import ScoreService
from warchron.controller.closure_workflow import CampaignClosureWorkflow
from warchron.model.tiebreaking import TieContext, TieBreaker
from warchron.model.scoring import ScoreComputer
from warchron.controller.workflows import CampaignClosureWorkflow
from warchron.controller.presenter import Presenter
from warchron.view.campaign_dialog import CampaignDialog
@ -53,7 +53,7 @@ class CampaignController:
for sect in sectors
]
self.app.view.display_campaign_sectors(sectors_for_display)
scores = ScoreService.compute_scores(war, ContextType.CAMPAIGN, campaign_id)
scores = ScoreComputer.compute_scores(war, ContextType.CAMPAIGN, campaign_id)
rows: List[CampaignParticipantScoreDTO] = []
vp_icon_map: Dict[str, QIcon] = {}
objective_icon_maps: Dict[str, Dict[str, QIcon]] = {}
@ -171,7 +171,7 @@ class CampaignController:
) -> Dict[tuple[str, str, int | None, str | None, str | None], Dict[str, bool]]:
bids_map = {}
for ctx in contexts:
active = TieResolver.get_active_participants(war, ctx, ctx.participants)
active = TieBreaker.get_active_participants(war, ctx, ctx.participants)
players = [
ParticipantOption(id=pid, name=self.app.model.get_participant_name(pid))
for pid in active
@ -189,7 +189,7 @@ class CampaignController:
context_name=data.title,
)
if not dialog.exec():
TieResolver.cancel_tie_break(war, ctx)
TieBreaker.cancel_tie_break(war, ctx)
raise AbortedOperation("Tie resolution cancelled")
bids_map[ctx.key()] = dialog.get_bids()
return bids_map

8
src/warchron/controller/presenter.py
View file

@ -12,12 +12,12 @@ from warchron.constants import (
)
from warchron.controller.dtos import TieDialogData
from warchron.model.tie_manager import TieContext, TieResolver
from warchron.model.tiebreaking import TieContext, TieBreaker
from warchron.model.war import War
from warchron.model.campaign import Campaign
from warchron.model.round import Round
from warchron.model.score_service import ParticipantScore
from warchron.model.result_checker import ResultChecker
from warchron.model.scoring import ParticipantScore
from warchron.model.checking import ResultChecker
from warchron.model.exception import DomainError
@ -160,7 +160,7 @@ class Presenter:
base_icon = IconName.TIEBREAK
if base_icon is None:
return None
spent = TieResolver.participant_spent_token(
spent = TieBreaker.participant_spent_token(
war,
ContextType.BATTLE,
battle.sector_id,

6
src/warchron/controller/round_controller.py
View file

@ -17,7 +17,7 @@ from warchron.model.exception import (
DomainError,
RequiresConfirmation,
)
from warchron.model.tie_manager import TieResolver, TieContext
from warchron.model.tiebreaking import TieBreaker, TieContext
from warchron.model.pairing import Pairing
from warchron.model.round import Round
from warchron.model.war import War
@ -31,7 +31,7 @@ from warchron.controller.dtos import (
ChoiceDTO,
BattleDTO,
)
from warchron.controller.closure_workflow import (
from warchron.controller.workflows import (
RoundClosureWorkflow,
RoundPairingWorkflow,
)
@ -274,7 +274,7 @@ class RoundController:
context_name=data.title,
)
if not dialog.exec():
TieResolver.cancel_tie_break(war, ctx)
TieBreaker.cancel_tie_break(war, ctx)
raise AbortedOperation("Tie resolution cancelled")
bids_map[ctx.key()] = dialog.get_bids()
return bids_map

12
src/warchron/controller/war_controller.py
View file

@ -24,9 +24,9 @@ from warchron.controller.dtos import (
from warchron.model.war import War
from warchron.model.war_participant import WarParticipant
from warchron.model.objective import Objective
from warchron.model.tie_manager import TieContext, TieResolver
from warchron.model.score_service import ScoreService
from warchron.controller.closure_workflow import WarClosureWorkflow
from warchron.model.tiebreaking import TieContext, TieBreaker
from warchron.model.scoring import ScoreComputer
from warchron.controller.workflows import WarClosureWorkflow
from warchron.controller.presenter import Presenter
from warchron.view.war_dialog import WarDialog
@ -57,7 +57,7 @@ class WarController:
ObjectiveDTO(id=obj.id, name=obj.name, description=obj.description)
for obj in war.get_objectives_used_as_maj_or_min()
]
scores = ScoreService.compute_scores(war, ContextType.WAR, war.id)
scores = ScoreComputer.compute_scores(war, ContextType.WAR, war.id)
rows: List[WarParticipantScoreDTO] = []
vp_icon_map: Dict[str, QIcon] = {}
objective_icon_maps: Dict[str, Dict[str, QIcon]] = {}
@ -161,7 +161,7 @@ class WarController:
) -> Dict[tuple[str, str, int | None, str | None, str | None], Dict[str, bool]]:
bids_map = {}
for ctx in contexts:
active = TieResolver.get_active_participants(
active = TieBreaker.get_active_participants(
war,
ctx,
ctx.participants,
@ -184,7 +184,7 @@ class WarController:
context_name=data.title,
)
if not dialog.exec():
TieResolver.cancel_tie_break(war, ctx)
TieBreaker.cancel_tie_break(war, ctx)
raise AbortedOperation("Tie resolution cancelled")
bids_map[ctx.key()] = dialog.get_bids()
return bids_map

76
src/warchron/controller/closure_workflow.py → src/warchron/controller/workflows.py
View file

@ -6,51 +6,51 @@ if TYPE_CHECKING:
from warchron.model.war import War
from warchron.model.campaign import Campaign
from warchron.model.round import Round
from warchron.model.closure_service import ClosureService
from warchron.model.tie_manager import TieResolver
from warchron.model.closing import Closer
from warchron.model.tiebreaking import TieBreaker
from warchron.model.pairing import Pairing
class ClosureWorkflow:
class Workflow:
def __init__(self, controller: "AppController"):
self.app = controller
class RoundClosureWorkflow(ClosureWorkflow):
class RoundClosureWorkflow(Workflow):
def start(self, war: War, campaign: Campaign, round: Round) -> None:
ClosureService.check_round_closable(round)
ties = TieResolver.find_battle_ties(war, round.id)
Closer.check_round_closable(round)
ties = TieBreaker.find_battle_ties(war, round.id)
while ties:
bids_map = self.app.rounds.resolve_ties(war, ties)
for tie in ties:
bids = bids_map[tie.key()]
tie_id = TieResolver.find_active_tie_id(war, tie) or str(uuid4())
TieResolver.apply_bids(war, tie, tie_id, bids)
TieResolver.resolve_tie_state(war, tie, tie_id, bids)
ties = TieResolver.find_battle_ties(war, round.id)
tie_id = TieBreaker.find_active_tie_id(war, tie) or str(uuid4())
TieBreaker.apply_bids(war, tie, tie_id, bids)
TieBreaker.resolve_tie_state(war, tie, tie_id, bids)
ties = TieBreaker.find_battle_ties(war, round.id)
for battle in round.battles.values():
ClosureService.apply_battle_outcomes(war, campaign, battle)
ClosureService.finalize_round(round)
Closer.apply_battle_outcomes(war, campaign, battle)
Closer.finalize_round(round)
class CampaignClosureWorkflow(ClosureWorkflow):
class CampaignClosureWorkflow(Workflow):
def start(self, war: War, campaign: Campaign) -> None:
ClosureService.check_campaign_closable(campaign)
ties = TieResolver.find_campaign_ties(war, campaign.id)
Closer.check_campaign_closable(campaign)
ties = TieBreaker.find_campaign_ties(war, campaign.id)
while ties:
bids_map = self.app.campaigns.resolve_ties(war, ties)
for tie in ties:
bids = bids_map[tie.key()]
tie_id = TieResolver.find_active_tie_id(war, tie) or str(uuid4())
TieResolver.apply_bids(war, tie, tie_id, bids)
TieResolver.resolve_tie_state(war, tie, tie_id, bids)
ties = TieResolver.find_campaign_ties(war, campaign.id)
tie_id = TieBreaker.find_active_tie_id(war, tie) or str(uuid4())
TieBreaker.apply_bids(war, tie, tie_id, bids)
TieBreaker.resolve_tie_state(war, tie, tie_id, bids)
ties = TieBreaker.find_campaign_ties(war, campaign.id)
for obj in war.get_objectives_used_as_maj_or_min():
objective_id = obj.id
ties = TieResolver.find_campaign_objective_ties(
ties = TieBreaker.find_campaign_objective_ties(
war,
campaign.id,
objective_id,
@ -59,33 +59,33 @@ class CampaignClosureWorkflow(ClosureWorkflow):
bids_map = self.app.campaigns.resolve_ties(war, ties)
for tie in ties:
bids = bids_map[tie.key()]
tie_id = TieResolver.find_active_tie_id(war, tie) or str(uuid4())
TieResolver.apply_bids(war, tie, tie_id, bids)
TieResolver.resolve_tie_state(war, tie, tie_id, bids)
ties = TieResolver.find_campaign_objective_ties(
tie_id = TieBreaker.find_active_tie_id(war, tie) or str(uuid4())
TieBreaker.apply_bids(war, tie, tie_id, bids)
TieBreaker.resolve_tie_state(war, tie, tie_id, bids)
ties = TieBreaker.find_campaign_objective_ties(
war,
campaign.id,
objective_id,
)
ClosureService.finalize_campaign(campaign)
Closer.finalize_campaign(campaign)
class WarClosureWorkflow(ClosureWorkflow):
class WarClosureWorkflow(Workflow):
def start(self, war: War) -> None:
ClosureService.check_war_closable(war)
ties = TieResolver.find_war_ties(war)
Closer.check_war_closable(war)
ties = TieBreaker.find_war_ties(war)
while ties:
bids_map = self.app.wars.resolve_ties(war, ties)
for tie in ties:
bids = bids_map[tie.key()]
tie_id = TieResolver.find_active_tie_id(war, tie) or str(uuid4())
TieResolver.apply_bids(war, tie, tie_id, bids)
TieResolver.resolve_tie_state(war, tie, tie_id, bids)
ties = TieResolver.find_war_ties(war)
tie_id = TieBreaker.find_active_tie_id(war, tie) or str(uuid4())
TieBreaker.apply_bids(war, tie, tie_id, bids)
TieBreaker.resolve_tie_state(war, tie, tie_id, bids)
ties = TieBreaker.find_war_ties(war)
for obj in war.get_objectives_used_as_maj_or_min():
objective_id = obj.id
ties = TieResolver.find_war_objective_ties(
ties = TieBreaker.find_war_objective_ties(
war,
objective_id,
)
@ -93,14 +93,14 @@ class WarClosureWorkflow(ClosureWorkflow):
bids_map = self.app.wars.resolve_ties(war, ties)
for tie in ties:
bids = bids_map[tie.key()]
tie_id = TieResolver.find_active_tie_id(war, tie) or str(uuid4())
TieResolver.apply_bids(war, tie, tie_id, bids)
TieResolver.resolve_tie_state(war, tie, tie_id, bids)
ties = TieResolver.find_war_objective_ties(
tie_id = TieBreaker.find_active_tie_id(war, tie) or str(uuid4())
TieBreaker.apply_bids(war, tie, tie_id, bids)
TieBreaker.resolve_tie_state(war, tie, tie_id, bids)
ties = TieBreaker.find_war_objective_ties(
war,
objective_id,
)
ClosureService.finalize_war(war)
Closer.finalize_war(war)
class RoundPairingWorkflow: