fic

core/apps/orders/views/offer.py

@@ -1,4 +1,5 @@
 from django.shortcuts import get_object_or_404
+from django.db.models import OuterRef, Exists
 
 from rest_framework import generics, views
 from rest_framework.response import Response
@@ -56,22 +57,31 @@ class OfferListApiView(generics.GenericAPIView):
 
 class DeletedOfferListApiView(generics.GenericAPIView):
     permission_classes = [HasRolePermission]
-    queryset = Order.objects.select_related('product', 'unity').prefetch_related('offers').filter(
-        offers__isnull=False, offers__is_deleted=True
-    ).distinct()
+    # queryset = Order.objects.select_related('product', 'unity').prefetch_related('offers').filter(
+    #     offers__isnull=False, offers__is_deleted=True
+    # ).distinct()
     serializer_class = serializers.OrderListForOfferSerializer
     filter_backends = [DjangoFilterBackend]
     filterset_class = OrderFilter
 
+    def get_queryset(self):
+        deleted_offers = Offer.objects.filter(order=OuterRef('pk'), is_deleted=True)
+        return (
+            Order.objects.select_related('product', 'unity')
+            .prefetch_related('offers')
+            .filter(Exists(deleted_offers))
+            .distinct()
+        )
+
     def get(self, request):
-        offer_status = request.query_params.get('status', None)
-        search = request.query_params.get('q', None)
+        offer_status = request.query_params.get('status')
+        search = request.query_params.get('search')
         orders = self.filter_queryset(self.get_queryset())
         page = self.paginate_queryset(orders)
         if page is not None:
             serializer = self.serializer_class(page, many=True, context={'status': offer_status, 'search': search})
             return self.get_paginated_response(serializer.data)
-        serializer = self.serializer_class(offers, many=True)
+        serializer = self.serializer_class(orders, many=True, context={'status': offer_status, 'search': search})
         return Response(serializer.data, status=200)