Refactor draft app with improved state management and components
* Rename WebSocket message types for better organization * Improve state handling with dedicated methods like broadcast_state * Restructure frontend components and remove unused code
This commit is contained in:
@@ -72,18 +72,12 @@ class DraftConsumerBase(AsyncJsonWebsocketConsumer):
|
||||
"payload": {"user": self.user.username},
|
||||
},
|
||||
)
|
||||
await self.channel_layer.send(
|
||||
self.channel_name,
|
||||
await self.channel_layer.group_send(
|
||||
self.group_names.session,
|
||||
{
|
||||
"type": "direct.message",
|
||||
"subtype": DraftMessage.STATUS_SYNC_INFORM,
|
||||
"payload": {
|
||||
**self.draft_state,
|
||||
"user": self.user.username,
|
||||
"participants": [
|
||||
user.username for user in self.draft_participants
|
||||
],
|
||||
},
|
||||
"subtype": DraftMessage.DRAFT_STATUS_INFORM,
|
||||
"payload": self.draft_state.to_dict(),
|
||||
},
|
||||
)
|
||||
await self.channel_layer.send(
|
||||
@@ -101,14 +95,37 @@ class DraftConsumerBase(AsyncJsonWebsocketConsumer):
|
||||
async def receive_json(self, content):
|
||||
logger.info(f"receiving message {content}")
|
||||
event_type = content.get("type")
|
||||
if event_type == DraftMessage.STATUS_SYNC_REQUEST:
|
||||
if event_type == DraftMessage.DRAFT_STATUS_REQUEST:
|
||||
await self.send_json(
|
||||
{
|
||||
"type": DraftMessage.STATUS_SYNC_INFORM,
|
||||
"type": DraftMessage.DRAFT_STATUS_INFORM,
|
||||
"payload": self.get_draft_status(),
|
||||
}
|
||||
)
|
||||
|
||||
# --- Convenience helpers ---
|
||||
async def send_draft_state(self):
|
||||
"""Send the current draft state only to this client."""
|
||||
await self.channel_layer.send(
|
||||
self.channel_name,
|
||||
{
|
||||
"type": "direct.message",
|
||||
"subtype": DraftMessage.DRAFT_STATUS_INFORM,
|
||||
"payload": self.draft_state.to_dict(),
|
||||
},
|
||||
)
|
||||
|
||||
async def broadcast_state(self):
|
||||
"""Broadcast current draft state to all in session group."""
|
||||
await self.channel_layer.group_send(
|
||||
self.group_names.session,
|
||||
{
|
||||
"type": "broadcast.session",
|
||||
"subtype": DraftMessage.DRAFT_STATUS_INFORM,
|
||||
"payload": self.draft_state.to_dict(),
|
||||
},
|
||||
)
|
||||
|
||||
# Broadcast Handlers
|
||||
async def direct_message(self, event):
|
||||
await self._dispatch_broadcast(event)
|
||||
@@ -132,9 +149,15 @@ class DraftConsumerBase(AsyncJsonWebsocketConsumer):
|
||||
def get_draft_session(self, draft_session_id_hashed) -> DraftSession:
|
||||
draft_session_id = DraftSession.decode_id(draft_session_id_hashed)
|
||||
if draft_session_id:
|
||||
draft_session = DraftSession.objects.select_related(
|
||||
"season", "season__league", "settings",
|
||||
).prefetch_related("participants").get(pk=draft_session_id)
|
||||
draft_session = (
|
||||
DraftSession.objects.select_related(
|
||||
"season",
|
||||
"season__league",
|
||||
"settings",
|
||||
)
|
||||
.prefetch_related("participants")
|
||||
.get(pk=draft_session_id)
|
||||
)
|
||||
else:
|
||||
raise Exception()
|
||||
|
||||
@@ -155,89 +178,85 @@ class DraftAdminConsumer(DraftConsumerBase):
|
||||
|
||||
await self.channel_layer.group_add(self.group_names.admin, self.channel_name)
|
||||
|
||||
def should_accept_user(self):
|
||||
return super().should_accept_user() and self.user.is_staff
|
||||
|
||||
async def receive_json(self, content):
|
||||
await super().receive_json(content)
|
||||
logger.info(f"Receive message {content}")
|
||||
event_type = content.get("type")
|
||||
if (
|
||||
event_type == DraftMessage.PHASE_CHANGE_REQUEST
|
||||
and content.get("destination") == DraftPhase.DETERMINE_ORDER
|
||||
):
|
||||
await self.determine_draft_order()
|
||||
|
||||
if (
|
||||
event_type == DraftMessage.PHASE_CHANGE_REQUEST
|
||||
and content.get("destination") == DraftPhase.NOMINATING
|
||||
):
|
||||
await self.start_nominate()
|
||||
match event_type:
|
||||
case DraftMessage.PHASE_CHANGE_REQUEST:
|
||||
destination = content.get('destination')
|
||||
match destination:
|
||||
case DraftPhase.DETERMINE_ORDER:
|
||||
await self.set_draft_phase(DraftPhase.DETERMINE_ORDER)
|
||||
self.draft_state.determine_draft_order()
|
||||
await self.channel_layer.group_send(
|
||||
self.group_names.session,
|
||||
{
|
||||
"type": "broadcast.session",
|
||||
"subtype": DraftMessage.ORDER_DETERMINE_CONFIRM,
|
||||
"payload": {"draft_order": self.draft_state.draft_order},
|
||||
},
|
||||
)
|
||||
await self.broadcast_state()
|
||||
|
||||
if event_type == DraftMessage.DRAFT_INDEX_ADVANCE_REQUEST:
|
||||
self.draft_state.draft_index_advance()
|
||||
await self.channel_layer.group_send(
|
||||
self.group_names.session,
|
||||
{
|
||||
"type": "broadcast.session",
|
||||
"subtype": DraftMessage.DRAFT_INDEX_ADVANCE_CONFIRM,
|
||||
"payload": {**self.draft_state},
|
||||
},
|
||||
)
|
||||
case DraftPhase.NOMINATING:
|
||||
await self.set_draft_phase(DraftPhase.NOMINATING)
|
||||
await self.channel_layer.group_send(
|
||||
self.group_names.session,
|
||||
{
|
||||
"type": "broadcast.session",
|
||||
"subtype": DraftMessage.PHASE_CHANGE_CONFIRM,
|
||||
"payload": {"phase": self.draft_state.phase},
|
||||
},
|
||||
)
|
||||
await self.broadcast_state()
|
||||
|
||||
if event_type == DraftMessage.NOMINATION_SUBMIT_REQUEST:
|
||||
movie_id = content.get("payload", {}).get("movie_id")
|
||||
user = content.get("payload", {}).get("user")
|
||||
self.draft_state.start_nomination(movie_id)
|
||||
await self.channel_layer.group_send(
|
||||
self.group_names.session,
|
||||
{
|
||||
"type": "broadcast.session",
|
||||
"subtype": DraftMessage.NOMINATION_CONFIRM,
|
||||
"payload": {
|
||||
"current_movie": self.draft_state[
|
||||
"current_movie"
|
||||
],
|
||||
"nominating_participant": user,
|
||||
case DraftMessage.DRAFT_INDEX_ADVANCE_REQUEST:
|
||||
self.draft_state.draft_index_advance()
|
||||
await self.channel_layer.group_send(
|
||||
self.group_names.session,
|
||||
{
|
||||
"type": "broadcast.session",
|
||||
"subtype": DraftMessage.DRAFT_INDEX_ADVANCE_CONFIRM,
|
||||
"payload": {"draft_index": self.draft_state.draft_index},
|
||||
},
|
||||
},
|
||||
)
|
||||
if event_type == DraftMessage.BID_START_REQUEST:
|
||||
)
|
||||
await self.broadcast_state()
|
||||
|
||||
self.draft_state.start_bidding()
|
||||
await self.channel_layer.group_send(
|
||||
self.group_names.session,
|
||||
{
|
||||
"type": "broadcast.session",
|
||||
"subtype": DraftMessage.BID_START_INFORM,
|
||||
"payload": {**self.draft_state},
|
||||
},
|
||||
)
|
||||
case DraftMessage.NOMINATION_SUBMIT_REQUEST:
|
||||
movie_id = content.get("payload", {}).get("movie_id")
|
||||
user = content.get("payload", {}).get("user")
|
||||
self.draft_state.start_nomination(movie_id)
|
||||
await self.channel_layer.group_send(
|
||||
self.group_names.session,
|
||||
{
|
||||
"type": "broadcast.session",
|
||||
"subtype": DraftMessage.NOMINATION_CONFIRM,
|
||||
"payload": {
|
||||
"current_movie": self.draft_state["current_movie"],
|
||||
"nominating_participant": user,
|
||||
},
|
||||
},
|
||||
)
|
||||
await self.broadcast_state()
|
||||
|
||||
def should_accept_user(self):
|
||||
return super().should_accept_user() and self.user.is_staff
|
||||
case DraftMessage.BID_START_REQUEST:
|
||||
self.draft_state.start_bidding()
|
||||
await self.channel_layer.group_send(
|
||||
self.group_names.session,
|
||||
{
|
||||
"type": "broadcast.session",
|
||||
"subtype": DraftMessage.BID_START_INFORM,
|
||||
"payload": {**self.draft_state},
|
||||
},
|
||||
)
|
||||
await self.broadcast_state()
|
||||
|
||||
# === Draft logic ===
|
||||
async def start_nominate(self):
|
||||
await self.set_draft_phase(DraftPhase.NOMINATING)
|
||||
await self.channel_layer.group_send(
|
||||
self.group_names.session,
|
||||
{
|
||||
"type": "broadcast.session",
|
||||
"subtype": DraftMessage.PHASE_CHANGE_CONFIRM,
|
||||
"payload": {"phase": self.draft_state.phase},
|
||||
},
|
||||
)
|
||||
|
||||
async def determine_draft_order(self):
|
||||
self.draft_state.determine_draft_order()
|
||||
next_picks = self.draft_state.next_picks(include_current=True)
|
||||
|
||||
await self.channel_layer.group_send(
|
||||
self.group_names.session,
|
||||
{
|
||||
"type": "broadcast.session",
|
||||
"subtype": DraftMessage.ORDER_DETERMINE_CONFIRM,
|
||||
"payload": {**self.draft_state},
|
||||
},
|
||||
)
|
||||
# === Draft logic ===
|
||||
|
||||
async def set_draft_phase(self, destination: DraftPhase):
|
||||
self.draft_state.phase = destination
|
||||
@@ -269,7 +288,9 @@ class DraftParticipantConsumer(DraftConsumerBase):
|
||||
"subtype": DraftMessage.PARTICIPANT_JOIN_CONFIRM,
|
||||
"payload": {
|
||||
"user": self.user.username,
|
||||
"connected_participants": list(self.draft_state.connected_participants),
|
||||
"connected_participants": list(
|
||||
self.draft_state.connected_participants
|
||||
),
|
||||
},
|
||||
},
|
||||
)
|
||||
@@ -287,7 +308,9 @@ class DraftParticipantConsumer(DraftConsumerBase):
|
||||
"subtype": DraftMessage.PARTICIPANT_LEAVE_INFORM,
|
||||
"payload": {
|
||||
"user": self.user.username,
|
||||
"connected_participants": list(self.draft_state.connected_participants),
|
||||
"connected_participants": list(
|
||||
self.draft_state.connected_participants
|
||||
),
|
||||
},
|
||||
},
|
||||
)
|
||||
@@ -315,9 +338,9 @@ class DraftParticipantConsumer(DraftConsumerBase):
|
||||
},
|
||||
},
|
||||
)
|
||||
|
||||
|
||||
if event_type == DraftMessage.BID_PLACE_REQUEST:
|
||||
bid_amount = content.get('payload',{}).get('bid_amount')
|
||||
bid_amount = content.get("payload", {}).get("bid_amount")
|
||||
self.draft_state.place_bid(self.user, bid_amount)
|
||||
await self.channel_layer.group_send(
|
||||
self.group_names.session,
|
||||
|
||||
Reference in New Issue
Block a user