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

Greatly improve prefetching and reduce # of db calls for each trade_offer

Browse source
This commit is contained in:
badblocks 2025-05-18 15:26:34 -07:00
parent b89025a7e0
commit 95d794d8b9
5 changed files with 89 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

41
docker-compose.yml
View file

@ -7,29 +7,32 @@ services:
restart: always
volumes:
- ./seed:/seed:ro
# DANGEROUS DUE TO DOCKERFILE PACKAGE BUILDING/INSTALLATION
#- ./src/pkmntrade_club:/app/lib/python3.12/site-packages/pkmntrade_club:ro
env_file:
- .env
environment:
- DEBUG=true
- PUBLIC_HOST=localhost
- ALLOWED_HOSTS=127.0.0.1,localhost
depends_on:
db:
condition: service_healthy
db:
image: postgres:16
restart: always
ports:
- 5432:5432
volumes:
- postgres_data:/var/lib/postgresql/data/
environment:
- "POSTGRES_HOST_AUTH_METHOD=trust"
healthcheck:
test: ["CMD", "pg_isready", "-U", "postgres", "-d", "postgres"]
interval: 10s
timeout: 5s
retries: 5
- DISABLE_CACHE=false
# depends_on:
# db:
# condition: service_healthy
# db:
# image: postgres:16
# restart: always
# ports:
# - 5432:5432
# volumes:
# - postgres_data:/var/lib/postgresql/data/
# environment:
# - "POSTGRES_HOST_AUTH_METHOD=trust"
# healthcheck:
# test: ["CMD", "pg_isready", "-U", "postgres", "-d", "postgres"]
# interval: 10s
# timeout: 5s
# retries: 5
volumes:
postgres_data:
# volumes:
# postgres_data:

33
src/pkmntrade_club/home/views.py
View file

@ -89,27 +89,30 @@ class HomePageView(TemplateView):
logger.error(f"Error fetching 'All' featured offers: {str(e)}")
featured["All"] = []
try:
# Pull out distinct (rarity_level, rarity_icon) tuples
distinct_rarities = base_offer_qs.values_list("rarity_level", "rarity_icon").distinct()
# *** we only show All Featured Offers for now,
# *** we will add rarity-tabbed featured offers later
# try:
# # Pull out distinct (rarity_level, rarity_icon) tuples
# distinct_rarities = base_offer_qs.values_list("rarity_level", "rarity_icon").distinct()
# Prepare a list that holds tuples of (rarity_level, rarity_icon, offers)
rarity_offers = []
for rarity_level, rarity_icon in distinct_rarities:
offers = base_offer_qs.filter(rarity_level=rarity_level).order_by("created_at")[:6]
rarity_offers.append((rarity_level, rarity_icon, offers))
# # Prepare a list that holds tuples of (rarity_level, rarity_icon, offers)
# rarity_offers = []
# for rarity_level, rarity_icon in distinct_rarities:
# offers = base_offer_qs.filter(rarity_level=rarity_level).order_by("created_at")[:6]
# rarity_offers.append((rarity_level, rarity_icon, offers))
# Sort by rarity_level (from greatest to least)
rarity_offers.sort(key=lambda x: x[0], reverse=True)
# # Sort by rarity_level (from greatest to least)
# rarity_offers.sort(key=lambda x: x[0], reverse=True)
# Add the sorted offers to the OrderedDict
for rarity_level, rarity_icon, offers in rarity_offers:
featured[rarity_icon] = offers
except Exception as e:
logger.error(f"Error processing rarity-based featured offers: {str(e)}")
# # Add the sorted offers to the OrderedDict
# for rarity_level, rarity_icon, offers in rarity_offers:
# featured[rarity_icon] = offers
# except Exception as e:
# logger.error(f"Error processing rarity-based featured offers: {str(e)}")
context["featured_offers"] = featured
# Generate a cache key based on the pks and updated_at timestamps of all featured offers
# *** we will separate cache keys for each featured section later
all_offer_identifiers = []
for section_name,section_offers in featured.items():
# featured_section is a QuerySet. Fetch (pk, updated_at) tuples.

14
src/pkmntrade_club/trades/forms.py
View file

@ -55,15 +55,13 @@ class TradeAcceptanceCreateForm(forms.ModelForm):
elif default_friend_code and friend_codes.filter(pk=default_friend_code.pk).exists():
self.initial["accepted_by"] = default_friend_code.pk
# Fix: Convert available 'have' cards (from through model) to Card objects.
self.fields["requested_card"].queryset = Card.objects.filter(
pk__in=trade_offer.have_cards_available_qs.values_list("card_id", flat=True)
)
available_have_items = trade_offer.have_cards_available
requested_card_pks = [item.card.pk for item in available_have_items]
self.fields["requested_card"].queryset = Card.objects.filter(pk__in=requested_card_pks).order_by('name')
# Similarly for offered_card.
self.fields["offered_card"].queryset = Card.objects.filter(
pk__in=trade_offer.want_cards_available_qs.values_list("card_id", flat=True)
)
available_want_items = trade_offer.want_cards_available
offered_card_pks = [item.card.pk for item in available_want_items]
self.fields["offered_card"].queryset = Card.objects.filter(pk__in=offered_card_pks).order_by('name')
def clean(self):
"""

60
src/pkmntrade_club/trades/models.py
View file

@ -25,20 +25,46 @@ def generate_tradeacceptance_hash():
class TradeOfferManager(models.Manager):
def get_queryset(self):
qs = super().get_queryset().select_related(
"initiated_by",
"initiated_by__user",
).prefetch_related(
"trade_offer_have_cards__card",
"trade_offer_want_cards__card",
"acceptances",
"acceptances__accepted_by",
"acceptances__requested_card",
"acceptances__offered_card",
"acceptances__accepted_by__user",
qs = super().get_queryset()
# Prefetch for have_cards (through model: TradeOfferHaveCard)
# Ensures 'card' is select_related and 'Meta.ordering' is respected/applied.
prefetch_have_cards = Prefetch(
'trade_offer_have_cards',
queryset=TradeOfferHaveCard.objects.select_related('card').order_by('card__name')
)
return qs.order_by("-updated_at")
# Prefetch for want_cards (through model: TradeOfferWantCard)
# Ensures 'card' is select_related and 'Meta.ordering' is respected/applied.
prefetch_want_cards = Prefetch(
'trade_offer_want_cards',
queryset=TradeOfferWantCard.objects.select_related('card').order_by('card__name')
)
# Prefetch for acceptances
# Ensures related 'accepted_by__user', 'requested_card', 'offered_card' are fetched.
prefetch_acceptances = Prefetch(
'acceptances',
queryset=TradeAcceptance.objects.select_related(
'accepted_by__user',
'requested_card',
'offered_card'
).order_by('-created_at') # Sensible default ordering for acceptances
)
qs = qs.select_related(
"initiated_by__user", # Fetches FriendCode and its related CustomUser
).prefetch_related(
prefetch_have_cards,
prefetch_want_cards,
prefetch_acceptances,
# If direct access like offer.have_cards.all() (the M2M to Card, not through model)
# is heavily used AND causes N+1s (e.g. via __str__), uncomment these:
Prefetch('have_cards'),
Prefetch('want_cards'),
)
return qs.order_by("-updated_at") # Default ordering for TradeOffer querysets
class TradeOffer(models.Model):
objects = TradeOfferManager()
@ -112,16 +138,6 @@ class TradeOffer(models.Model):
# Returns the list of want_cards (through objects) that still have available quantity.
return [item for item in self.trade_offer_want_cards.all() if item.quantity > item.qty_accepted]
@property
def have_cards_available_qs(self):
# Returns a queryset of TradeOfferHaveCard objects that still have available quantity
return self.trade_offer_have_cards.filter(quantity__gt=F("qty_accepted")).select_related("card")
@property
def want_cards_available_qs(self):
# Returns a queryset of TradeOfferWantCard objects that still have available quantity
return self.trade_offer_want_cards.filter(quantity__gt=F("qty_accepted")).select_related("card")
class TradeOfferHaveCard(models.Model):
"""
Through model for TradeOffer.have_cards.

10
src/pkmntrade_club/trades/templatetags/trade_offer_tags.py
View file

@ -7,11 +7,13 @@ register = template.Library()
def render_trade_offer(context, offer):
"""
Renders a trade offer including detailed trade acceptance information.
Freezes the through-model querysets to avoid extra DB hits.
Assumes 'offer' has related fields prefetched by the view.
"""
trade_offer_have_cards = list(offer.trade_offer_have_cards.select_related('card').all())
trade_offer_want_cards = list(offer.trade_offer_want_cards.select_related('card').all())
acceptances = list(offer.acceptances.select_related('accepted_by__user', 'requested_card', 'offered_card').all())
# Access prefetched data directly.
# The TradeOfferManager should have already handled select_related and prefetch_related.
trade_offer_have_cards = list(offer.trade_offer_have_cards.all())
trade_offer_want_cards = list(offer.trade_offer_want_cards.all())
acceptances = list(offer.acceptances.all())
have_cards_available = [