style: standardize string formatting and improve readability across multiple files
- Refactored string formatting in various files to use consistent double quotes. - Improved readability by adding newlines in function definitions and method calls. - Cleaned up unnecessary imports and ensured proper spacing for better code clarity. - Updated management commands and context processors for consistent formatting. - Enhanced the overall maintainability of the codebase by adhering to PEP 8 guidelines. - Applied Ruff linting and formatting
This commit is contained in:
parent
4b9e4f651e
commit
39a002e394
43 changed files with 1661 additions and 1159 deletions
|
|
@ -1,9 +1,14 @@
|
|||
from django.contrib import messages
|
||||
from django.contrib.auth.mixins import LoginRequiredMixin
|
||||
from django.urls import reverse_lazy
|
||||
from django.shortcuts import redirect, get_object_or_404, render
|
||||
from django.views.generic import ListView, CreateView, DeleteView, View, TemplateView, UpdateView
|
||||
from pkmntrade_club.accounts.models import FriendCode, CustomUser
|
||||
from django.views.generic import (
|
||||
CreateView,
|
||||
DeleteView,
|
||||
View,
|
||||
TemplateView,
|
||||
UpdateView,
|
||||
)
|
||||
from pkmntrade_club.accounts.models import FriendCode
|
||||
from pkmntrade_club.accounts.forms import FriendCodeForm, UserSettingsForm
|
||||
from django.db.models import Case, When, Value, BooleanField
|
||||
from pkmntrade_club.trades.models import TradeOffer, TradeAcceptance
|
||||
|
|
@ -13,14 +18,17 @@ from pkmntrade_club.common.mixins import ReusablePaginationMixin
|
|||
from django.urls import reverse
|
||||
from django.utils.http import urlencode
|
||||
|
||||
|
||||
class AddFriendCodeView(LoginRequiredMixin, CreateView):
|
||||
"""
|
||||
Add a new friend code for the current user. If the user does not yet have a default,
|
||||
the newly added code will automatically become the default.
|
||||
"""
|
||||
|
||||
model = FriendCode
|
||||
form_class = FriendCodeForm
|
||||
template_name = "friend_codes/add_friend_code.html"
|
||||
|
||||
def get_success_url(self):
|
||||
base_url = reverse("dashboard")
|
||||
return f"{base_url}?{urlencode({'tab': 'friend_codes'})}"
|
||||
|
|
@ -30,6 +38,7 @@ class AddFriendCodeView(LoginRequiredMixin, CreateView):
|
|||
messages.success(self.request, "Friend code added successfully.")
|
||||
return super().form_valid(form)
|
||||
|
||||
|
||||
class DeleteFriendCodeView(LoginRequiredMixin, DeleteView):
|
||||
"""
|
||||
Remove an existing friend code.
|
||||
|
|
@ -37,9 +46,11 @@ class DeleteFriendCodeView(LoginRequiredMixin, DeleteView):
|
|||
Also, prevent deletion if the friend code is either the only one or
|
||||
is set as the default friend code.
|
||||
"""
|
||||
|
||||
model = FriendCode
|
||||
template_name = "friend_codes/confirm_delete_friend_code.html"
|
||||
context_object_name = "friend_code"
|
||||
|
||||
def get_success_url(self):
|
||||
base_url = reverse("dashboard")
|
||||
return f"{base_url}?{urlencode({'tab': 'friend_codes'})}"
|
||||
|
|
@ -81,48 +92,59 @@ class DeleteFriendCodeView(LoginRequiredMixin, DeleteView):
|
|||
if user.default_friend_code == self.object:
|
||||
messages.error(
|
||||
request,
|
||||
"Cannot delete your default friend code. Please set a different default first."
|
||||
"Cannot delete your default friend code. Please set a different default first.",
|
||||
)
|
||||
return redirect(self.get_success_url())
|
||||
|
||||
trade_offer_exists = TradeOffer.objects.filter(initiated_by_id=self.object.pk).exists()
|
||||
trade_acceptance_exists = TradeAcceptance.objects.filter(accepted_by_id=self.object.pk).exists()
|
||||
trade_offer_exists = TradeOffer.objects.filter(
|
||||
initiated_by_id=self.object.pk
|
||||
).exists()
|
||||
trade_acceptance_exists = TradeAcceptance.objects.filter(
|
||||
accepted_by_id=self.object.pk
|
||||
).exists()
|
||||
|
||||
if trade_offer_exists or trade_acceptance_exists:
|
||||
messages.error(
|
||||
request,
|
||||
"Cannot remove this friend code because there are existing trade offers associated with it."
|
||||
"Cannot remove this friend code because there are existing trade offers associated with it.",
|
||||
)
|
||||
return redirect(self.get_success_url())
|
||||
|
||||
|
||||
self.object.delete()
|
||||
messages.success(request, "Friend code removed successfully.")
|
||||
return redirect(self.get_success_url())
|
||||
|
||||
|
||||
class ChangeDefaultFriendCodeView(LoginRequiredMixin, View):
|
||||
"""
|
||||
Change the default friend code for the current user.
|
||||
"""
|
||||
|
||||
def post(self, request, *args, **kwargs):
|
||||
friend_code_id = kwargs.get("pk")
|
||||
friend_code = get_object_or_404(FriendCode, pk=friend_code_id, user=request.user)
|
||||
friend_code = get_object_or_404(
|
||||
FriendCode, pk=friend_code_id, user=request.user
|
||||
)
|
||||
request.user.set_default_friend_code(friend_code)
|
||||
messages.success(request, "Default friend code updated successfully.")
|
||||
base_url = reverse("dashboard")
|
||||
query_string = urlencode({"tab": "friend_codes"})
|
||||
return redirect(f"{base_url}?{query_string}")
|
||||
|
||||
|
||||
class EditFriendCodeView(LoginRequiredMixin, UpdateView):
|
||||
"""
|
||||
Edit the in-game name for a friend code.
|
||||
The friend code itself is displayed as plain text.
|
||||
Also includes "Set Default" and "Delete" buttons in the template.
|
||||
"""
|
||||
|
||||
model = FriendCode
|
||||
# Only the in_game_name field is editable
|
||||
fields = ['in_game_name']
|
||||
fields = ["in_game_name"]
|
||||
template_name = "friend_codes/edit_friend_code.html"
|
||||
context_object_name = "friend_code"
|
||||
|
||||
def get_success_url(self):
|
||||
base_url = reverse("dashboard")
|
||||
return f"{base_url}?{urlencode({'tab': 'friend_codes'})}"
|
||||
|
|
@ -135,12 +157,16 @@ class EditFriendCodeView(LoginRequiredMixin, UpdateView):
|
|||
messages.success(self.request, "Friend code updated successfully.")
|
||||
return super().form_valid(form)
|
||||
|
||||
class DashboardView(LoginRequiredMixin, FriendCodeRequiredMixin, ReusablePaginationMixin, TemplateView):
|
||||
|
||||
class DashboardView(
|
||||
LoginRequiredMixin, FriendCodeRequiredMixin, ReusablePaginationMixin, TemplateView
|
||||
):
|
||||
template_name = "account/dashboard.html"
|
||||
|
||||
def post(self, request, *args, **kwargs):
|
||||
if 'update_settings' in request.POST:
|
||||
if "update_settings" in request.POST:
|
||||
from pkmntrade_club.accounts.forms import UserSettingsForm
|
||||
|
||||
form = UserSettingsForm(request.POST, instance=request.user)
|
||||
if form.is_valid():
|
||||
form.save()
|
||||
|
|
@ -156,21 +182,30 @@ class DashboardView(LoginRequiredMixin, FriendCodeRequiredMixin, ReusablePaginat
|
|||
try:
|
||||
selected_friend_code = friend_codes.get(pk=friend_code_param)
|
||||
except friend_codes.model.DoesNotExist:
|
||||
selected_friend_code = self.request.user.default_friend_code or friend_codes.first()
|
||||
selected_friend_code = (
|
||||
self.request.user.default_friend_code or friend_codes.first()
|
||||
)
|
||||
else:
|
||||
selected_friend_code = self.request.user.default_friend_code or friend_codes.first()
|
||||
selected_friend_code = (
|
||||
self.request.user.default_friend_code or friend_codes.first()
|
||||
)
|
||||
if not selected_friend_code:
|
||||
raise PermissionDenied("You do not have an active friend code associated with your account.")
|
||||
raise PermissionDenied(
|
||||
"You do not have an active friend code associated with your account."
|
||||
)
|
||||
return selected_friend_code
|
||||
|
||||
def get_dashboard_offers_paginated(self, page_param):
|
||||
selected_friend_code = self.get_selected_friend_code()
|
||||
queryset = TradeOffer.objects.filter(initiated_by=selected_friend_code, is_closed=False)
|
||||
queryset = TradeOffer.objects.filter(
|
||||
initiated_by=selected_friend_code, is_closed=False
|
||||
)
|
||||
object_list, pagination_context = self.paginate_data(queryset, int(page_param))
|
||||
return {"object_list": object_list, "page_obj": pagination_context}
|
||||
|
||||
def get_involved_acceptances(self, selected_friend_code):
|
||||
from django.db.models import Q
|
||||
|
||||
terminal_states = [
|
||||
TradeAcceptance.AcceptanceState.THANKED_BY_INITIATOR,
|
||||
TradeAcceptance.AcceptanceState.THANKED_BY_ACCEPTOR,
|
||||
|
|
@ -179,7 +214,8 @@ class DashboardView(LoginRequiredMixin, FriendCodeRequiredMixin, ReusablePaginat
|
|||
TradeAcceptance.AcceptanceState.REJECTED_BY_ACCEPTOR,
|
||||
]
|
||||
involved = TradeAcceptance.objects.filter(
|
||||
Q(trade_offer__initiated_by=selected_friend_code) | Q(accepted_by=selected_friend_code)
|
||||
Q(trade_offer__initiated_by=selected_friend_code)
|
||||
| Q(accepted_by=selected_friend_code)
|
||||
).order_by("-updated_at")
|
||||
return involved.exclude(state__in=terminal_states)
|
||||
|
||||
|
|
@ -187,12 +223,19 @@ class DashboardView(LoginRequiredMixin, FriendCodeRequiredMixin, ReusablePaginat
|
|||
selected_friend_code = self.get_selected_friend_code()
|
||||
involved = self.get_involved_acceptances(selected_friend_code)
|
||||
from django.db.models import Q
|
||||
|
||||
waiting = involved.filter(
|
||||
Q(trade_offer__initiated_by=selected_friend_code, state__in=[
|
||||
TradeAcceptance.AcceptanceState.ACCEPTED,
|
||||
TradeAcceptance.AcceptanceState.RECEIVED,
|
||||
]) |
|
||||
Q(accepted_by=selected_friend_code, state__in=[TradeAcceptance.AcceptanceState.SENT])
|
||||
Q(
|
||||
trade_offer__initiated_by=selected_friend_code,
|
||||
state__in=[
|
||||
TradeAcceptance.AcceptanceState.ACCEPTED,
|
||||
TradeAcceptance.AcceptanceState.RECEIVED,
|
||||
],
|
||||
)
|
||||
| Q(
|
||||
accepted_by=selected_friend_code,
|
||||
state__in=[TradeAcceptance.AcceptanceState.SENT],
|
||||
)
|
||||
)
|
||||
object_list, pagination_context = self.paginate_data(waiting, int(page_param))
|
||||
return {"object_list": object_list, "page_obj": pagination_context}
|
||||
|
|
@ -201,12 +244,19 @@ class DashboardView(LoginRequiredMixin, FriendCodeRequiredMixin, ReusablePaginat
|
|||
selected_friend_code = self.get_selected_friend_code()
|
||||
involved = self.get_involved_acceptances(selected_friend_code)
|
||||
from django.db.models import Q
|
||||
|
||||
waiting = involved.filter(
|
||||
Q(trade_offer__initiated_by=selected_friend_code, state__in=[
|
||||
TradeAcceptance.AcceptanceState.ACCEPTED,
|
||||
TradeAcceptance.AcceptanceState.RECEIVED,
|
||||
]) |
|
||||
Q(accepted_by=selected_friend_code, state__in=[TradeAcceptance.AcceptanceState.SENT])
|
||||
Q(
|
||||
trade_offer__initiated_by=selected_friend_code,
|
||||
state__in=[
|
||||
TradeAcceptance.AcceptanceState.ACCEPTED,
|
||||
TradeAcceptance.AcceptanceState.RECEIVED,
|
||||
],
|
||||
)
|
||||
| Q(
|
||||
accepted_by=selected_friend_code,
|
||||
state__in=[TradeAcceptance.AcceptanceState.SENT],
|
||||
)
|
||||
)
|
||||
others = involved.exclude(pk__in=waiting.values("pk"))
|
||||
object_list, pagination_context = self.paginate_data(others, int(page_param))
|
||||
|
|
@ -214,12 +264,15 @@ class DashboardView(LoginRequiredMixin, FriendCodeRequiredMixin, ReusablePaginat
|
|||
|
||||
def get_closed_offers_paginated(self, page_param):
|
||||
selected_friend_code = self.get_selected_friend_code()
|
||||
queryset = TradeOffer.objects.filter(initiated_by=selected_friend_code, is_closed=True)
|
||||
queryset = TradeOffer.objects.filter(
|
||||
initiated_by=selected_friend_code, is_closed=True
|
||||
)
|
||||
object_list, pagination_context = self.paginate_data(queryset, int(page_param))
|
||||
return {"object_list": object_list, "page_obj": pagination_context}
|
||||
|
||||
def get_closed_acceptances_paginated(self, page_param):
|
||||
from django.db.models import Q
|
||||
|
||||
selected_friend_code = self.get_selected_friend_code()
|
||||
terminal_success_states = [
|
||||
TradeAcceptance.AcceptanceState.THANKED_BY_INITIATOR,
|
||||
|
|
@ -227,28 +280,45 @@ class DashboardView(LoginRequiredMixin, FriendCodeRequiredMixin, ReusablePaginat
|
|||
TradeAcceptance.AcceptanceState.THANKED_BY_BOTH,
|
||||
]
|
||||
acceptance_qs = TradeAcceptance.objects.filter(
|
||||
Q(trade_offer__initiated_by=selected_friend_code) | Q(accepted_by=selected_friend_code),
|
||||
state__in=terminal_success_states
|
||||
Q(trade_offer__initiated_by=selected_friend_code)
|
||||
| Q(accepted_by=selected_friend_code),
|
||||
state__in=terminal_success_states,
|
||||
).order_by("-updated_at")
|
||||
object_list, pagination_context = self.paginate_data(acceptance_qs, int(page_param))
|
||||
object_list, pagination_context = self.paginate_data(
|
||||
acceptance_qs, int(page_param)
|
||||
)
|
||||
return {"object_list": object_list, "page_obj": pagination_context}
|
||||
|
||||
def get_rejected_by_me_paginated(self, page_param):
|
||||
from django.db.models import Q
|
||||
|
||||
selected_friend_code = self.get_selected_friend_code()
|
||||
rejection = TradeAcceptance.objects.filter(
|
||||
Q(trade_offer__initiated_by=selected_friend_code, state=TradeAcceptance.AcceptanceState.REJECTED_BY_INITIATOR) |
|
||||
Q(accepted_by=selected_friend_code, state=TradeAcceptance.AcceptanceState.REJECTED_BY_ACCEPTOR)
|
||||
Q(
|
||||
trade_offer__initiated_by=selected_friend_code,
|
||||
state=TradeAcceptance.AcceptanceState.REJECTED_BY_INITIATOR,
|
||||
)
|
||||
| Q(
|
||||
accepted_by=selected_friend_code,
|
||||
state=TradeAcceptance.AcceptanceState.REJECTED_BY_ACCEPTOR,
|
||||
)
|
||||
).order_by("-updated_at")
|
||||
object_list, pagination_context = self.paginate_data(rejection, int(page_param))
|
||||
return {"object_list": object_list, "page_obj": pagination_context}
|
||||
|
||||
def get_rejected_by_them_paginated(self, page_param):
|
||||
from django.db.models import Q
|
||||
|
||||
selected_friend_code = self.get_selected_friend_code()
|
||||
rejection = TradeAcceptance.objects.filter(
|
||||
Q(trade_offer__initiated_by=selected_friend_code, state=TradeAcceptance.AcceptanceState.REJECTED_BY_ACCEPTOR) |
|
||||
Q(accepted_by=selected_friend_code, state=TradeAcceptance.AcceptanceState.REJECTED_BY_INITIATOR)
|
||||
Q(
|
||||
trade_offer__initiated_by=selected_friend_code,
|
||||
state=TradeAcceptance.AcceptanceState.REJECTED_BY_ACCEPTOR,
|
||||
)
|
||||
| Q(
|
||||
accepted_by=selected_friend_code,
|
||||
state=TradeAcceptance.AcceptanceState.REJECTED_BY_INITIATOR,
|
||||
)
|
||||
).order_by("-updated_at")
|
||||
object_list, pagination_context = self.paginate_data(rejection, int(page_param))
|
||||
return {"object_list": object_list, "page_obj": pagination_context}
|
||||
|
|
@ -258,19 +328,19 @@ class DashboardView(LoginRequiredMixin, FriendCodeRequiredMixin, ReusablePaginat
|
|||
request = self.request
|
||||
selected_friend_code = self.get_selected_friend_code()
|
||||
context["selected_friend_code"] = selected_friend_code
|
||||
|
||||
|
||||
# Get the default friend code's primary key if it exists
|
||||
default_pk = getattr(request.user.default_friend_code, "pk", None)
|
||||
|
||||
|
||||
# Annotate friend codes with is_default flag
|
||||
context["friend_codes"] = request.user.friend_codes.all().annotate(
|
||||
is_default=Case(
|
||||
When(pk=default_pk, then=Value(True)),
|
||||
default=Value(False),
|
||||
output_field=BooleanField()
|
||||
output_field=BooleanField(),
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
ajax_section = request.GET.get("ajax_section")
|
||||
if ajax_section == "dashboard_offers":
|
||||
offers_page = request.GET.get("page", 1)
|
||||
|
|
@ -307,14 +377,28 @@ class DashboardView(LoginRequiredMixin, FriendCodeRequiredMixin, ReusablePaginat
|
|||
else:
|
||||
rejected_by_them_page = request.GET.get("rejected_by_them_page", 1)
|
||||
|
||||
context["dashboard_offers_paginated"] = self.get_dashboard_offers_paginated(offers_page)
|
||||
context["trade_acceptances_waiting_paginated"] = self.get_trade_acceptances_waiting_paginated(waiting_page)
|
||||
context["other_party_trade_acceptances_paginated"] = self.get_other_party_trade_acceptances_paginated(other_page)
|
||||
context["closed_offers_paginated"] = self.get_closed_offers_paginated(closed_offers_page)
|
||||
context["closed_acceptances_paginated"] = self.get_closed_acceptances_paginated(closed_acceptances_page)
|
||||
context["rejected_by_me_paginated"] = self.get_rejected_by_me_paginated(rejected_by_me_page)
|
||||
context["rejected_by_them_paginated"] = self.get_rejected_by_them_paginated(rejected_by_them_page)
|
||||
from pkmntrade_club.accounts.forms import UserSettingsForm
|
||||
context["dashboard_offers_paginated"] = self.get_dashboard_offers_paginated(
|
||||
offers_page
|
||||
)
|
||||
context["trade_acceptances_waiting_paginated"] = (
|
||||
self.get_trade_acceptances_waiting_paginated(waiting_page)
|
||||
)
|
||||
context["other_party_trade_acceptances_paginated"] = (
|
||||
self.get_other_party_trade_acceptances_paginated(other_page)
|
||||
)
|
||||
context["closed_offers_paginated"] = self.get_closed_offers_paginated(
|
||||
closed_offers_page
|
||||
)
|
||||
context["closed_acceptances_paginated"] = self.get_closed_acceptances_paginated(
|
||||
closed_acceptances_page
|
||||
)
|
||||
context["rejected_by_me_paginated"] = self.get_rejected_by_me_paginated(
|
||||
rejected_by_me_page
|
||||
)
|
||||
context["rejected_by_them_paginated"] = self.get_rejected_by_them_paginated(
|
||||
rejected_by_them_page
|
||||
)
|
||||
|
||||
context["settings_form"] = UserSettingsForm(instance=request.user)
|
||||
context["active_tab"] = request.GET.get("tab", "dash")
|
||||
return context
|
||||
|
|
@ -327,9 +411,13 @@ class DashboardView(LoginRequiredMixin, FriendCodeRequiredMixin, ReusablePaginat
|
|||
if ajax_section == "dashboard_offers":
|
||||
fragment_context = context.get("dashboard_offers_paginated", {})
|
||||
elif ajax_section == "waiting_acceptances":
|
||||
fragment_context = context.get("trade_acceptances_waiting_paginated", {})
|
||||
fragment_context = context.get(
|
||||
"trade_acceptances_waiting_paginated", {}
|
||||
)
|
||||
elif ajax_section == "other_party_acceptances":
|
||||
fragment_context = context.get("other_party_trade_acceptances_paginated", {})
|
||||
fragment_context = context.get(
|
||||
"other_party_trade_acceptances_paginated", {}
|
||||
)
|
||||
elif ajax_section == "closed_offers":
|
||||
fragment_context = context.get("closed_offers_paginated", {})
|
||||
elif ajax_section == "closed_acceptances":
|
||||
|
|
@ -342,8 +430,12 @@ class DashboardView(LoginRequiredMixin, FriendCodeRequiredMixin, ReusablePaginat
|
|||
fragment_context = {}
|
||||
|
||||
if fragment_context:
|
||||
return render(request, "trades/_trade_offer_list.html", {
|
||||
"offers": fragment_context.get("object_list", []),
|
||||
"page_obj": fragment_context.get("page_obj")
|
||||
})
|
||||
return super().get(request, *args, **kwargs)
|
||||
return render(
|
||||
request,
|
||||
"trades/_trade_offer_list.html",
|
||||
{
|
||||
"offers": fragment_context.get("object_list", []),
|
||||
"page_obj": fragment_context.get("page_obj"),
|
||||
},
|
||||
)
|
||||
return super().get(request, *args, **kwargs)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue