refactor(payloads): delegate session detail gameplay payload
This commit is contained in:
@@ -61,8 +61,7 @@ class LobbyGameplayExtractionTests(TestCase):
|
||||
self.assertIs(lobby_views._show_question, gameplay_services.show_question)
|
||||
self.assertIs(lobby_views._start_next_round, gameplay_services.start_next_round)
|
||||
self.assertIs(lobby_views._finish_game, gameplay_services.finish_game)
|
||||
self.assertIs(lobby_views._build_phase_view_model, gameplay_payloads.build_phase_view_model)
|
||||
self.assertIs(lobby_views._build_round_question_payload, gameplay_payloads.build_round_question_payload)
|
||||
self.assertIs(lobby_views._build_session_detail_gameplay_payload, gameplay_payloads.build_session_detail_gameplay_payload)
|
||||
self.assertIs(lobby_views._build_scoreboard_phase_event, gameplay_payloads.build_scoreboard_phase_event)
|
||||
|
||||
def test_start_round_view_source_stays_http_thin(self):
|
||||
@@ -113,10 +112,12 @@ class LobbyGameplayExtractionTests(TestCase):
|
||||
|
||||
self.assertIn("session = _maybe_promote_reveal_to_scoreboard(session)", source)
|
||||
self.assertIn("current_round_question = _get_current_round_question(session)", source)
|
||||
self.assertIn("round_question_payload = _build_round_question_payload(current_round_question)", source)
|
||||
self.assertIn("phase_view_model = _build_phase_view_model(", source)
|
||||
self.assertIn('"scoreboard": _build_scoreboard_phase_event(session)["payload"]["leaderboard"]', source)
|
||||
self.assertIn('"reveal": _build_reveal_payload(current_round_question)', source)
|
||||
self.assertIn("gameplay_payload = _build_session_detail_gameplay_payload(", source)
|
||||
self.assertIn("**gameplay_payload", source)
|
||||
self.assertNotIn("build_round_question_payload", source)
|
||||
self.assertNotIn("build_phase_view_model", source)
|
||||
self.assertNotIn("build_reveal_payload", source)
|
||||
self.assertNotIn("build_scoreboard_phase_event(session)[\"payload\"][\"leaderboard\"]", source)
|
||||
self.assertNotIn("lies.select_related", source)
|
||||
self.assertNotIn("guesses.select_related", source)
|
||||
self.assertNotIn("Player.objects.filter(session=session)", source)
|
||||
|
||||
@@ -11,9 +11,7 @@ from django.views.decorators.http import require_GET, require_POST
|
||||
from fupogfakta.models import GameSession, Guess, LieAnswer, Player, RoundConfig, RoundQuestion, ScoreEvent
|
||||
from fupogfakta.payloads import (
|
||||
build_leaderboard as _build_leaderboard,
|
||||
build_phase_view_model as _build_phase_view_model,
|
||||
build_reveal_payload as _build_reveal_payload,
|
||||
build_round_question_payload as _build_round_question_payload,
|
||||
build_session_detail_gameplay_payload as _build_session_detail_gameplay_payload,
|
||||
build_scoreboard_phase_event as _build_scoreboard_phase_event,
|
||||
)
|
||||
from fupogfakta.services import (
|
||||
@@ -192,13 +190,10 @@ def session_detail(request: HttpRequest, code: str) -> JsonResponse:
|
||||
|
||||
session = _maybe_promote_reveal_to_scoreboard(session)
|
||||
current_round_question = _get_current_round_question(session)
|
||||
|
||||
round_question_payload = _build_round_question_payload(current_round_question)
|
||||
|
||||
phase_view_model = _build_phase_view_model(
|
||||
gameplay_payload = _build_session_detail_gameplay_payload(
|
||||
session,
|
||||
current_round_question=current_round_question,
|
||||
players_count=len(players),
|
||||
has_round_question=bool(current_round_question),
|
||||
)
|
||||
|
||||
return JsonResponse(
|
||||
@@ -211,14 +206,7 @@ def session_detail(request: HttpRequest, code: str) -> JsonResponse:
|
||||
"players_count": len(players),
|
||||
},
|
||||
"players": players,
|
||||
"round_question": round_question_payload,
|
||||
"reveal": _build_reveal_payload(current_round_question)
|
||||
if session.status in {GameSession.Status.REVEAL, GameSession.Status.SCOREBOARD} and current_round_question
|
||||
else None,
|
||||
"scoreboard": _build_scoreboard_phase_event(session)["payload"]["leaderboard"]
|
||||
if session.status in {GameSession.Status.SCOREBOARD, GameSession.Status.FINISHED}
|
||||
else None,
|
||||
"phase_view_model": phase_view_model,
|
||||
**gameplay_payload,
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user