wpp/weirsoe-party-protocol
8
0
Fork 0
Code Issues 19 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(gameplay): scope next-round selection to target round
Some checks failed
CI / test-and-quality (push) Failing after 11s
Details
CI / test-and-quality (pull_request) Failing after 11s
Details

Browse Source
This commit is contained in:
DEV-bot
2026-03-18 03:54:25 +00:00
parent 06e4ccac61
commit e246bd648f
2 changed files with 52 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
fupogfakta/services.py
View File

@@ -51,9 +51,9 @@ class ScoreboardTransitionResult:
phase_event_payload: dict[str, Any] | None = None
def get_current_round_question(session: GameSession) -> RoundQuestion | None:
def get_round_question(session: GameSession, round_number: int) -> RoundQuestion | None:
return (
RoundQuestion.objects.filter(session=session, round_number=session.current_round)
RoundQuestion.objects.filter(session=session, round_number=round_number)
.select_related("question")
.order_by("-id")
.first()
@@ -61,6 +61,11 @@ def get_current_round_question(session: GameSession) -> RoundQuestion | None:
def get_current_round_question(session: GameSession) -> RoundQuestion | None:
return get_round_question(session, session.current_round)
def reset_round_question_bootstrap_state(round_question: RoundQuestion) -> RoundQuestion:
Guess.objects.filter(round_question=round_question).delete()
LieAnswer.objects.filter(round_question=round_question).delete()
@@ -78,8 +83,14 @@ def reset_round_question_bootstrap_state(round_question: RoundQuestion) -> Round
def select_round_question(session: GameSession, round_config: RoundConfig) -> RoundQuestion:
existing_round_question = get_current_round_question(session)
def select_round_question(
session: GameSession,
round_config: RoundConfig,
*,
round_number: int | None = None,
) -> RoundQuestion:
target_round_number = session.current_round if round_number is None else round_number
existing_round_question = get_round_question(session, target_round_number)
if existing_round_question is not None and existing_round_question.question.category_id == round_config.category_id:
return existing_round_question
@@ -101,7 +112,7 @@ def select_round_question(session: GameSession, round_config: RoundConfig) -> Ro
return RoundQuestion.objects.create(
session=session,
round_number=session.current_round,
round_number=target_round_number,
question=question,
correct_answer=question.correct_answer,
)
@@ -262,7 +273,9 @@ def start_next_round(session: GameSession) -> RoundTransitionResult:
locked_session.current_round = next_round_number
round_question = reset_round_question_bootstrap_state(select_round_question(locked_session, next_round_config))
round_question = reset_round_question_bootstrap_state(
select_round_question(locked_session, next_round_config, round_number=next_round_number)
)
locked_session.status = GameSession.Status.LIE
locked_session.save(update_fields=["current_round", "status"])