2025-07-26
This commit is contained in:
@@ -1,10 +1,12 @@
|
|||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
from draft.models import DraftSession, DraftParticipant, DraftMoviePool, DraftPick
|
from draft.models import DraftSession, DraftParticipant, DraftMoviePool, DraftPick, DraftSessionSettings
|
||||||
|
|
||||||
# Register your models here.
|
# Register your models here.
|
||||||
class DraftSessionAdmin(admin.ModelAdmin):
|
class DraftSessionAdmin(admin.ModelAdmin):
|
||||||
|
...
|
||||||
readonly_fields = ('hashed_id',)
|
readonly_fields = ('hashed_id',)
|
||||||
admin.site.register(DraftSession, DraftSessionAdmin)
|
admin.site.register(DraftSession, DraftSessionAdmin)
|
||||||
|
admin.site.register(DraftSessionSettings)
|
||||||
admin.site.register(DraftParticipant)
|
admin.site.register(DraftParticipant)
|
||||||
admin.site.register(DraftMoviePool)
|
admin.site.register(DraftMoviePool)
|
||||||
admin.site.register(DraftPick)
|
admin.site.register(DraftPick)
|
||||||
|
|||||||
@@ -18,21 +18,28 @@ class DraftConsumer(AsyncJsonWebsocketConsumer):
|
|||||||
self.room_group_name = f"draft_{self.draft_session.season.league.slug}_{self.draft_session.season.slug}"
|
self.room_group_name = f"draft_{self.draft_session.season.league.slug}_{self.draft_session.season.slug}"
|
||||||
|
|
||||||
# Auth check (optional)
|
# Auth check (optional)
|
||||||
user = self.scope["user"]
|
self.user = self.scope["user"]
|
||||||
if not user.is_authenticated:
|
if not self.user.is_authenticated:
|
||||||
|
await self.close()
|
||||||
|
return
|
||||||
|
|
||||||
|
try:
|
||||||
|
await self.add_draft_participant()
|
||||||
|
except Exception as e:
|
||||||
await self.close()
|
await self.close()
|
||||||
return
|
return
|
||||||
|
|
||||||
await self.channel_layer.group_add(self.room_group_name, self.channel_name)
|
await self.channel_layer.group_add(self.room_group_name, self.channel_name)
|
||||||
await self.accept()
|
await self.accept()
|
||||||
await self.send_json({"type": "connection.accepted", "user": user.username})
|
await self.send_json({"type": "connection.accepted", "user": self.user.username, "budget": self.participant.budget})
|
||||||
|
|
||||||
# Notify others (optional)
|
# Notify others (optional)
|
||||||
await self.channel_layer.group_send(
|
await self.channel_layer.group_send(
|
||||||
self.room_group_name,
|
self.room_group_name,
|
||||||
{
|
{
|
||||||
"type": "user.joined",
|
"type": "user.joined",
|
||||||
"user": user.username,
|
"user": self.user.username,
|
||||||
|
"budget": self.participant.budget
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -90,7 +97,7 @@ class DraftConsumer(AsyncJsonWebsocketConsumer):
|
|||||||
|
|
||||||
async def start_draft(self):
|
async def start_draft(self):
|
||||||
# Example: shuffle draft order
|
# Example: shuffle draft order
|
||||||
players = await self.get_draft_users()
|
players = await self.get_draft_participants()
|
||||||
draft_order = random.sample(players, len(players))
|
draft_order = random.sample(players, len(players))
|
||||||
|
|
||||||
await self.channel_layer.group_send(
|
await self.channel_layer.group_send(
|
||||||
@@ -131,10 +138,19 @@ class DraftConsumer(AsyncJsonWebsocketConsumer):
|
|||||||
# === Example DB Access ===
|
# === Example DB Access ===
|
||||||
|
|
||||||
@database_sync_to_async
|
@database_sync_to_async
|
||||||
def get_draft_users(self):
|
def add_draft_participant(self):
|
||||||
|
self.participant, _ = DraftParticipant.objects.get_or_create(
|
||||||
|
user=self.user,
|
||||||
|
draft=self.draft_session,
|
||||||
|
defaults={
|
||||||
|
"budget":self.draft_session.settings.starting_budget
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
@database_sync_to_async
|
||||||
|
def get_draft_participants(self):
|
||||||
# Replace this with real queryset to fetch users in draft
|
# Replace this with real queryset to fetch users in draft
|
||||||
return list(DraftParticipant.objects.select_related('user').filter(draft=self.draft_session).all())
|
return list(DraftParticipant.objects.select_related('user').filter(draft=self.draft_session).all())
|
||||||
return ["alice", "bob", "carol"]
|
|
||||||
|
|
||||||
@database_sync_to_async
|
@database_sync_to_async
|
||||||
def get_draft_session(self, draft_session_id_hashed, league_slug, season_slug):
|
def get_draft_session(self, draft_session_id_hashed, league_slug, season_slug):
|
||||||
|
|||||||
22
draft/migrations/0002_draftsessionsettings.py
Normal file
22
draft/migrations/0002_draftsessionsettings.py
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
# Generated by Django 5.2.4 on 2025-07-26 20:03
|
||||||
|
|
||||||
|
import django.db.models.deletion
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('draft', '0001_initial'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='DraftSessionSettings',
|
||||||
|
fields=[
|
||||||
|
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||||
|
('starting_budget', models.IntegerField(default=100)),
|
||||||
|
('draft_session', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='settings', to='draft.draftsession')),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
]
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
# Generated by Django 5.2.4 on 2025-07-26 20:12
|
||||||
|
|
||||||
|
import django.db.models.deletion
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('draft', '0002_draftsessionsettings'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterModelOptions(
|
||||||
|
name='draftsessionsettings',
|
||||||
|
options={'verbose_name_plural': 'Draft Session Settings'},
|
||||||
|
),
|
||||||
|
migrations.RemoveField(
|
||||||
|
model_name='draftsessionsettings',
|
||||||
|
name='draft_session',
|
||||||
|
),
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='draftsession',
|
||||||
|
name='settings',
|
||||||
|
field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='session', to='draft.draftsessionsettings'),
|
||||||
|
),
|
||||||
|
]
|
||||||
19
draft/migrations/0004_alter_draftsession_settings.py
Normal file
19
draft/migrations/0004_alter_draftsession_settings.py
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
# Generated by Django 5.2.4 on 2025-07-26 20:18
|
||||||
|
|
||||||
|
import django.db.models.deletion
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('draft', '0003_alter_draftsessionsettings_options_and_more'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='draftsession',
|
||||||
|
name='settings',
|
||||||
|
field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='session', to='draft.draftsessionsettings'),
|
||||||
|
),
|
||||||
|
]
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
# Generated by Django 5.2.4 on 2025-07-26 20:25
|
||||||
|
|
||||||
|
import django.db.models.deletion
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('draft', '0004_alter_draftsession_settings'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.RemoveField(
|
||||||
|
model_name='draftsession',
|
||||||
|
name='settings',
|
||||||
|
),
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='draftsessionsettings',
|
||||||
|
name='draft_session',
|
||||||
|
field=models.OneToOneField(default=1, on_delete=django.db.models.deletion.CASCADE, related_name='settings', to='draft.draftsession'),
|
||||||
|
preserve_default=False,
|
||||||
|
),
|
||||||
|
]
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
from django.db.models import ForeignKey, Model, IntegerField, BooleanField, CASCADE, PROTECT
|
from django.db.models import ForeignKey, Model, IntegerField, BooleanField, CASCADE, PROTECT, OneToOneField
|
||||||
from boxofficefantasy.models import Season, User, Movie
|
from boxofficefantasy.models import Season, User, Movie
|
||||||
from boxofficefantasy_project.utils import encode_id, decode_id
|
from boxofficefantasy_project.utils import encode_id, decode_id
|
||||||
|
|
||||||
@@ -10,11 +10,19 @@ class DraftSession(Model):
|
|||||||
|
|
||||||
@property
|
@property
|
||||||
def hashed_id(self):
|
def hashed_id(self):
|
||||||
|
if not self.pk: return ""
|
||||||
return f"{encode_id(self.pk)}"
|
return f"{encode_id(self.pk)}"
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def decode_id(cls, hashed_id:str) -> id:
|
def decode_id(cls, hashed_id:str) -> id:
|
||||||
return decode_id(hashed_id)
|
return decode_id(hashed_id)
|
||||||
|
|
||||||
|
def save(self, *args, **kwargs):
|
||||||
|
is_new = self.pk is None
|
||||||
|
super().save(*args, **kwargs)
|
||||||
|
if is_new and not hasattr(self, 'settings'):
|
||||||
|
DraftSessionSettings.objects.create(draft_session=self)
|
||||||
|
|
||||||
|
|
||||||
class DraftParticipant(Model):
|
class DraftParticipant(Model):
|
||||||
draft = ForeignKey(DraftSession, on_delete=CASCADE)
|
draft = ForeignKey(DraftSession, on_delete=CASCADE)
|
||||||
@@ -31,4 +39,18 @@ class DraftPick(Model):
|
|||||||
movie = ForeignKey(Movie, on_delete=CASCADE)
|
movie = ForeignKey(Movie, on_delete=CASCADE)
|
||||||
winner = ForeignKey(User, on_delete=CASCADE)
|
winner = ForeignKey(User, on_delete=CASCADE)
|
||||||
bid_amount = IntegerField()
|
bid_amount = IntegerField()
|
||||||
nomination_order = IntegerField()
|
nomination_order = IntegerField()
|
||||||
|
|
||||||
|
class DraftSessionSettings(Model):
|
||||||
|
starting_budget = IntegerField(default=100)
|
||||||
|
draft_session = OneToOneField(
|
||||||
|
DraftSession,
|
||||||
|
on_delete=CASCADE,
|
||||||
|
related_name="settings"
|
||||||
|
)
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
|
return f"Settings for {self.draft_session}"
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
verbose_name_plural = "Draft session settings"
|
||||||
Reference in New Issue
Block a user