Fixes to trade expansion and trade acceptance appearance

accounts/views.py

@@ -10,27 +10,8 @@ from trades.models import TradeOffer, TradeAcceptance
 from django.core.exceptions import PermissionDenied
 from trades.mixins import FriendCodeRequiredMixin
 from common.mixins import ReusablePaginationMixin
-
-class ListFriendCodesView(LoginRequiredMixin, ListView):
-    """
-    Display the current user's friend codes.
-    """
-    model = FriendCode
-    template_name = "friend_codes/list_friend_codes.html"
-    context_object_name = "friend_codes"
-
-    def get_queryset(self):
-        # Get the default friend code's primary key if it exists.
-        default_pk = getattr(self.request.user.default_friend_code, "pk", None)
-
-        # Annotate each friend code with is_default=True if its pk matches.
-        return self.request.user.friend_codes.all().annotate(
-            is_default=Case(
-                When(pk=default_pk, then=Value(True)),
-                default=Value(False),
-                output_field=BooleanField()
-            )
-        )
+from django.urls import reverse
+from django.utils.http import urlencode
 
 class AddFriendCodeView(LoginRequiredMixin, CreateView):
     """
@@ -40,7 +21,9 @@ class AddFriendCodeView(LoginRequiredMixin, CreateView):
     model = FriendCode
     form_class = FriendCodeForm
     template_name = "friend_codes/add_friend_code.html"
-    success_url = reverse_lazy("list_friend_codes")
+    def get_success_url(self):
+        base_url = reverse("dashboard")
+        return f"{base_url}?{urlencode({'tab': 'friend_codes'})}"
 
     def form_valid(self, form):
         form.instance.user = self.request.user
@@ -57,7 +40,9 @@ class DeleteFriendCodeView(LoginRequiredMixin, DeleteView):
     model = FriendCode
     template_name = "friend_codes/confirm_delete_friend_code.html"
     context_object_name = "friend_code"
-    success_url = reverse_lazy("list_friend_codes")
+    def get_success_url(self):
+        base_url = reverse("dashboard")
+        return f"{base_url}?{urlencode({'tab': 'friend_codes'})}"
 
     def get_queryset(self):
         # Only allow deletion of friend codes owned by the current user.
@@ -90,20 +75,16 @@ class DeleteFriendCodeView(LoginRequiredMixin, DeleteView):
         self.object = self.get_object()
         user = self.object.user
 
-        # Check if the friend code is the only one; prevent deletion.
         if user.friend_codes.count() == 1:
             messages.error(request, "Cannot remove your only friend code.")
-            return redirect(self.success_url)
-
-        # Check if the friend code is set as default; prevent deletion.
+            return redirect(self.get_success_url())
         if user.default_friend_code == self.object:
             messages.error(
                 request,
                 "Cannot delete your default friend code. Please set a different default first."
             )
-            return redirect(self.success_url)
+            return redirect(self.get_success_url())
 
-        # Use the unfiltered manager and filter by the friend code's primary key
         trade_offer_exists = TradeOffer.all_offers.filter(initiated_by_id=self.object.pk).exists()
         trade_acceptance_exists = TradeAcceptance.objects.filter(accepted_by_id=self.object.pk).exists()
 
@@ -112,12 +93,11 @@ class DeleteFriendCodeView(LoginRequiredMixin, DeleteView):
                 request,
                 "Cannot remove this friend code because there are existing trade offers associated with it."
             )
-            return redirect(self.success_url)
+            return redirect(self.get_success_url())
         
-        # Proceed to safe deletion.
         self.object.delete()
         messages.success(request, "Friend code removed successfully.")
-        return redirect(self.success_url)
+        return redirect(self.get_success_url())
 
 class ChangeDefaultFriendCodeView(LoginRequiredMixin, View):
     """
@@ -128,7 +108,9 @@ class ChangeDefaultFriendCodeView(LoginRequiredMixin, View):
         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.")
-        return redirect("list_friend_codes")
+        base_url = reverse("dashboard")
+        query_string = urlencode({"tab": "friend_codes"})
+        return redirect(f"{base_url}?{query_string}")
 
 class EditFriendCodeView(LoginRequiredMixin, UpdateView):
     """
@@ -141,7 +123,9 @@ class EditFriendCodeView(LoginRequiredMixin, UpdateView):
     fields = ['in_game_name']
     template_name = "friend_codes/edit_friend_code.html"
     context_object_name = "friend_code"
-    success_url = reverse_lazy("list_friend_codes")
+    def get_success_url(self):
+        base_url = reverse("dashboard")
+        return f"{base_url}?{urlencode({'tab': 'friend_codes'})}"
 
     def get_queryset(self):
         # Ensure the user can only edit their own friend codes