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

Some optimizations to trade_offers to reduce loading times

Browse source
This commit is contained in:
badblocks 2025-03-15 15:23:00 -07:00
parent 0ac8ac8d5c
commit 9ce5d525b3
13 changed files with 255 additions and 222 deletions
Download patch file Download diff file Expand all files Collapse all files

115
trades/views.py
View file

@ -74,31 +74,7 @@ class TradeOfferAllListView(ListView):
context["show_closed"] = show_closed
# Build the queryset with our related objects.
queryset = (
TradeOffer.objects.select_related('initiated_by')
.prefetch_related(
'trade_offer_have_cards__card',
'trade_offer_want_cards__card',
Prefetch(
'acceptances',
queryset=TradeAcceptance.objects.select_related('accepted_by', 'requested_card', 'offered_card').prefetch_related(
'requested_card__decks',
'offered_card__decks',
'requested_card__rarity',
'offered_card__rarity',
'requested_card__cardset',
'offered_card__cardset',
)
),
'trade_offer_have_cards__card__decks',
'trade_offer_want_cards__card__decks',
'trade_offer_have_cards__card__rarity',
'trade_offer_want_cards__card__rarity',
'trade_offer_have_cards__card__cardset',
'trade_offer_want_cards__card__cardset'
)
.order_by("-updated_at")
)
queryset = TradeOffer.objects
if show_closed:
queryset = queryset.filter(is_closed=True)
else:
@ -116,31 +92,7 @@ class TradeOfferAllListView(ListView):
page = self.request.GET.get("page")
show_closed = self.request.GET.get("show_closed", "false").lower() == "true"
queryset = (
TradeOffer.objects.select_related('initiated_by')
.prefetch_related(
'trade_offer_have_cards__card',
'trade_offer_want_cards__card',
Prefetch(
'acceptances',
queryset=TradeAcceptance.objects.select_related('accepted_by', 'requested_card', 'offered_card').prefetch_related(
'requested_card__decks',
'offered_card__decks',
'requested_card__rarity',
'offered_card__rarity',
'requested_card__cardset',
'offered_card__cardset',
)
),
'trade_offer_have_cards__card__decks',
'trade_offer_want_cards__card__decks',
'trade_offer_have_cards__card__rarity',
'trade_offer_want_cards__card__rarity',
'trade_offer_have_cards__card__cardset',
'trade_offer_want_cards__card__cardset'
)
.order_by("-updated_at")
)
queryset = TradeOffer.objects.all()
if show_closed:
queryset = queryset.filter(is_closed=True)
else:
@ -162,20 +114,6 @@ class TradeOfferMyListView(LoginRequiredMixin, ListView):
raise PermissionDenied("No friend codes available for your account.")
return super().dispatch(request, *args, **kwargs)
def get_queryset(self):
return (
TradeOffer.objects.select_related('initiated_by')
.prefetch_related(
'trade_offer_have_cards__card',
'trade_offer_want_cards__card',
Prefetch(
'acceptances',
queryset=TradeAcceptance.objects.select_related('accepted_by', 'requested_card', 'offered_card')
)
)
.order_by("-updated_at")
)
def get_selected_friend_code(self):
friend_codes = self.request.user.friend_codes.all()
friend_code_param = self.request.GET.get("friend_code")
@ -448,21 +386,6 @@ class TradeOfferDetailView(LoginRequiredMixin, DetailView):
model = TradeOffer
template_name = "trades/trade_offer_detail.html"
def get_queryset(self):
return (
TradeOffer.objects.select_related('initiated_by')
.prefetch_related(
'trade_offer_have_cards__card',
'trade_offer_want_cards__card',
Prefetch(
'acceptances',
queryset=TradeAcceptance.objects.select_related(
'accepted_by', 'requested_card', 'offered_card'
)
)
)
)
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
trade_offer = self.get_object()
@ -492,10 +415,15 @@ class TradeOfferDetailView(LoginRequiredMixin, DetailView):
else:
context["is_initiator"] = False
# Determine the user's default friend code (or fallback as needed).
default_friend_code = self.request.user.default_friend_code or user_friend_codes.first()
# If the current user is not the initiator and the offer is open, allow a new acceptance.
if trade_offer.initiated_by not in user_friend_codes and not trade_offer.is_closed:
context["acceptance_form"] = TradeAcceptanceCreateForm(
trade_offer=trade_offer, friend_codes=user_friend_codes
trade_offer=trade_offer,
friend_codes=user_friend_codes,
default_friend_code=default_friend_code
)
return context
@ -538,11 +466,38 @@ class TradeAcceptanceCreateView(LoginRequiredMixin, CreateView):
kwargs['friend_codes'] = self.request.user.friend_codes.all()
return kwargs
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
context["trade_offer"] = self.trade_offer
return context
def form_valid(self, form):
form.instance.trade_offer = self.trade_offer
self.object = form.save()
return HttpResponseRedirect(self.get_success_url())
def form_invalid(self, form):
"""
If the form submission includes a 'next' URL (sent as a hidden field from the detail page),
render the trade offer detail template for a better UX. Otherwise, fall back to the default
CreateView behavior.
"""
next_url = self.request.POST.get("next")
if next_url:
friend_codes = self.request.user.friend_codes.all()
is_initiator = self.trade_offer.initiated_by in friend_codes
context = {
"object": self.trade_offer,
"trade_offer": self.trade_offer,
"acceptance_form": form,
"friend_codes": friend_codes,
"is_initiator": is_initiator,
"delete_close_url": reverse_lazy("trade_offer_delete", kwargs={"pk": self.trade_offer.pk}) if is_initiator else None,
}
# Render the detail page with the form errors
return render(self.request, "trades/trade_offer_detail.html", context)
return super().form_invalid(form)
def get_success_url(self):
return reverse_lazy("trade_offer_detail", kwargs={"pk": self.trade_offer.pk})