Optimized performance of the Affiliate Window endpoint (#322)

ECOM-5534

course_discovery/apps/api/v1/tests/test_views/test_affiliate_window.py

@@ -45,7 +45,9 @@ class AffiliateWindowViewSetTests(ElasticsearchTestMixin, SerializationMixin, AP
 
     def test_affiliate_with_supported_seats(self):
         """ Verify that endpoint returns course runs for verified and professional seats only. """
-        response = self.client.get(self.affiliate_url)
+        with self.assertNumQueries(11):
+            response = self.client.get(self.affiliate_url)
+
         self.assertEqual(response.status_code, 200)
         root = ET.fromstring(response.content)
         self.assertEqual(1, len(root.findall('product')))
@@ -126,8 +128,10 @@ class AffiliateWindowViewSetTests(ElasticsearchTestMixin, SerializationMixin, AP
 
         # Superusers can view all catalogs
         self.client.force_authenticate(superuser)
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
+
+        with self.assertNumQueries(8):
+            response = self.client.get(url)
+            self.assertEqual(response.status_code, 200)
 
         # Regular users can only view catalogs belonging to them
         self.client.force_authenticate(self.user)
@@ -135,5 +139,6 @@ class AffiliateWindowViewSetTests(ElasticsearchTestMixin, SerializationMixin, AP
         self.assertEqual(response.status_code, 403)
 
         catalog.viewers = [self.user]
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
+        with self.assertNumQueries(8):
+            response = self.client.get(url)
+            self.assertEqual(response.status_code, 200)

course_discovery/apps/api/v1/views.py

@@ -3,12 +3,10 @@ import logging
 import os
 from io import StringIO
 
-import pytz
 from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.core.management import call_command
 from django.db import transaction
-from django.db.models import Q
 from django.db.models.functions import Lower
 from django.http import HttpResponse
 from django.shortcuts import get_object_or_404
@@ -492,14 +490,10 @@ class AffiliateWindowViewSet(viewsets.ViewSet):
         if not catalog.has_object_read_permission(request):
             raise PermissionDenied
 
-        courses = catalog.courses().active()
-
-        seats = Seat.objects.filter(
-            (Q(course_run__end__gte=datetime.datetime.now(pytz.UTC)) | Q(course_run__end__isnull=True)) &
-            Q(course_run__course__in=courses) & Q(type__in=[Seat.VERIFIED, Seat.PROFESSIONAL]) &
-            (Q(course_run__enrollment_end__isnull=True) |
-             Q(course_run__enrollment_end__gte=datetime.datetime.now(pytz.UTC)))
-        )
+        courses = catalog.courses()
+        course_runs = CourseRun.objects.filter(course__in=courses).active().marketable()
+        seats = Seat.objects.filter(type__in=[Seat.VERIFIED, Seat.PROFESSIONAL]).filter(course_run__in=course_runs)
+        seats = seats.select_related('course_run').prefetch_related('course_run__course', 'course_run__course__partner')
 
         serializer = serializers.AffiliateWindowSerializer(seats, many=True)
         return Response(serializer.data)