badblocks/pkmntrade.club
1
1
Fork 0
Code Issues 14 Pull requests Projects 1 Releases Packages Wiki Activity

Refactor database models to majorly increase queries needed and decrease load times of home from 30 secs to 5 sec (we will be caching the rest to decrease even further via background tasks)

Browse source
This commit is contained in:
badblocks 2025-03-17 14:08:01 -07:00
parent f7a9b2f823
commit 86c7eba10a
25 changed files with 1941 additions and 1560 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cards/admin.py
View file

@ -1,9 +1,7 @@
from django.contrib import admin
from .models import CardSet, Deck, Card, Rarity, DeckNameTranslation, CardNameTranslation
from .models import Deck, Card, DeckNameTranslation, CardNameTranslation
admin.site.register(CardSet)
admin.site.register(Deck)
admin.site.register(Card)
admin.site.register(Rarity)
admin.site.register(DeckNameTranslation)
admin.site.register(CardNameTranslation)

3
cards/apps.py
View file

@ -3,3 +3,6 @@ from django.apps import AppConfig
class CardsConfig(AppConfig):
name = "cards"
def ready(self):
import cards.signals

55
cards/migrations/0001_initial.py
View file

@ -1,4 +1,4 @@
# Generated by Django 5.1.2 on 2025-03-16 18:18
# Generated by Django 5.1.2 on 2025-03-17 20:39
import django.db.models.deletion
from django.db import migrations, models
@ -16,28 +16,23 @@ class Migration(migrations.Migration):
name='Card',
fields=[
('id', models.AutoField(primary_key=True, serialize=False)),
('name', models.CharField(max_length=64)),
('name', models.CharField(max_length=128)),
('cardset', models.CharField(max_length=8)),
('cardnum', models.IntegerField()),
('style', models.CharField(max_length=255)),
('rarity_icon', models.CharField(max_length=8)),
('rarity_level', models.IntegerField()),
('created_at', models.DateTimeField(auto_now_add=True)),
('updated_at', models.DateTimeField(auto_now=True)),
],
),
migrations.CreateModel(
name='CardSet',
name='Deck',
fields=[
('id', models.AutoField(primary_key=True, serialize=False)),
('name', models.CharField(max_length=64)),
('created_at', models.DateTimeField(auto_now_add=True)),
('updated_at', models.DateTimeField(auto_now=True)),
],
),
migrations.CreateModel(
name='Rarity',
fields=[
('id', models.AutoField(primary_key=True, serialize=False)),
('normalized_id', models.IntegerField()),
('name', models.CharField(max_length=64)),
('icons', models.CharField(max_length=64)),
('hex_color', models.CharField(max_length=9)),
('cardset', models.CharField(max_length=8)),
('created_at', models.DateTimeField(auto_now_add=True)),
('updated_at', models.DateTimeField(auto_now=True)),
],
@ -53,22 +48,6 @@ class Migration(migrations.Migration):
('card', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='name_translations', to='cards.card')),
],
),
migrations.AddField(
model_name='card',
name='cardset',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='cards', to='cards.cardset'),
),
migrations.CreateModel(
name='Deck',
fields=[
('id', models.AutoField(primary_key=True, serialize=False)),
('name', models.CharField(max_length=64)),
('hex_color', models.CharField(max_length=9)),
('created_at', models.DateTimeField(auto_now_add=True)),
('updated_at', models.DateTimeField(auto_now=True)),
('cardset', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='decks', to='cards.cardset')),
],
),
migrations.AddField(
model_name='card',
name='decks',
@ -85,20 +64,4 @@ class Migration(migrations.Migration):
('deck', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='name_translations', to='cards.deck')),
],
),
migrations.AddField(
model_name='card',
name='rarity',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='cards', to='cards.rarity'),
),
migrations.CreateModel(
name='RarityNameTranslation',
fields=[
('id', models.AutoField(primary_key=True, serialize=False)),
('name', models.CharField(max_length=64)),
('language', models.CharField(max_length=64)),
('created_at', models.DateTimeField(auto_now_add=True)),
('updated_at', models.DateTimeField(auto_now=True)),
('rarity', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='name_translations', to='cards.rarity')),
],
),
]

76
cards/models.py
View file

@ -23,91 +23,29 @@ class CardNameTranslation(models.Model):
def __str__(self):
return self.name
class RarityNameTranslation(models.Model):
id = models.AutoField(primary_key=True)
name = models.CharField(max_length=64)
rarity = models.ForeignKey("Rarity", on_delete=models.PROTECT, related_name='name_translations')
language = models.CharField(max_length=64)
created_at = models.DateTimeField(auto_now_add=True)
updated_at = models.DateTimeField(auto_now=True)
def __str__(self):
return self.name
class CardSet(models.Model):
id = models.AutoField(primary_key=True)
name = models.CharField(max_length=64)
created_at = models.DateTimeField(auto_now_add=True)
updated_at = models.DateTimeField(auto_now=True)
def __str__(self):
return self.name
class Deck(models.Model):
id = models.AutoField(primary_key=True)
name = models.CharField(max_length=64)
hex_color = models.CharField(max_length=9)
cardset = models.ForeignKey("CardSet", on_delete=models.PROTECT, related_name='decks')
cardset = models.CharField(max_length=8)
created_at = models.DateTimeField(auto_now_add=True)
updated_at = models.DateTimeField(auto_now=True)
def __str__(self):
return self.name
class Rarity(models.Model):
id = models.AutoField(primary_key=True)
normalized_id = models.IntegerField(null=False)
name = models.CharField(max_length=64)
icons = models.CharField(max_length=64)
created_at = models.DateTimeField(auto_now_add=True)
updated_at = models.DateTimeField(auto_now=True)
def __str__(self):
return self.name
# Custom Manager for Card model
class CardPrefetchManager(models.Manager):
def get_queryset(self):
return (
super()
.get_queryset()
.select_related("cardset", "rarity")
.prefetch_related(
"decks",
"decks__cardset",
)
)
class CardManager(models.Manager):
def get_queryset(self):
return (
super()
.get_queryset()
.select_related("cardset", "rarity")
)
class Card(models.Model):
id = models.AutoField(primary_key=True)
name = models.CharField(max_length=64)
name = models.CharField(max_length=128)
decks = models.ManyToManyField("Deck")
cardset = models.ForeignKey("CardSet", on_delete=models.PROTECT, related_name='cards')
cardset = models.CharField(max_length=8)
cardnum = models.IntegerField()
rarity = models.ForeignKey(Rarity, on_delete=models.PROTECT, related_name='cards')
style = models.CharField(max_length=255, null=False)
rarity_icon = models.CharField(max_length=8)
rarity_level = models.IntegerField()
created_at = models.DateTimeField(auto_now_add=True)
updated_at = models.DateTimeField(auto_now=True)
# Use the custom manager to ensure optimized querysets everywhere.
objects = CardPrefetchManager()
objects_no_prefetch = CardManager()
def __str__(self):
# For display, we show the original rarity icons.
return f"{self.name} {self.rarity.icons} {self.cardset.name}"
@property
def normalized_rarity(self):
"""
Returns the canonical rarity id for trade logic.
"""
return self.rarity.normalized_id
return f"{self.name} {self.rarity_icon} {self.cardset}"

17
cards/signals.py Normal file
View file

@ -0,0 +1,17 @@
from django.db.models.signals import m2m_changed
from django.dispatch import receiver
from .models import Card
@receiver(m2m_changed, sender=Card.decks.through)
def update_card_style(sender, instance, action, **kwargs):
if action == "post_add":
decks = instance.decks.all()
num_decks = decks.count()
if num_decks == 1:
instance.style = "background-color: " + decks.first().hex_color + ";"
elif num_decks >= 2:
hex_colors = [deck.hex_color for deck in decks]
instance.style = f"background: linear-gradient(to right, {', '.join(hex_colors)});"
else:
instance.style = "background: linear-gradient(to right, #AAAAAA, #AAAAAA, #AAAAAA);"
instance.save(update_fields=["style"])

16
cards/templatetags/card_badge.py
View file

@ -6,13 +6,12 @@ register = template.Library()
@register.inclusion_tag("templatetags/card_badge.html")
def card_badge(card, quantity=1):
# Freeze the decks queryset once so that both the iteration and count use the same data
decks = list(card.decks.all()) if card else []
return {
'card': card,
'quantity': quantity,
'decks': decks,
'num_decks': len(decks),
'style': card.style,
'name': card.name,
'rarity': card.rarity_icon,
'cardset': card.cardset,
}
@register.filter
@ -21,9 +20,10 @@ def card_badge_inline(card, quantity=1):
Renders an inline card badge.
"""
html = render_to_string("templatetags/card_badge.html", {
'card': card,
'quantity': quantity,
'decks': list(card.decks.all()) if card else [],
'num_decks': len(list(card.decks.all())) if card else 0,
'style': card.style,
'name': card.name,
'rarity': card.rarity_icon,
'cardset': card.cardset,
})
return mark_safe(html)