Don't strip out B2B courses from the API (#2710)

Author: jkachel

courses/serializers/v2/courses.py

@@ -246,7 +246,7 @@ def get_courseruns(self, instance):
                 b2b_contract__organization_id=self.context["org_id"]
             ).all()
         else:
-            courseruns = instance.courseruns.filter(b2b_contract__isnull=True).all()
+            courseruns = instance.courseruns.all()
 
         return CourseRunSerializer(courseruns, many=True, read_only=True).data
 

courses/views/v2/__init__.py

@@ -3,7 +3,7 @@
 """
 
 import django_filters
-from django.db.models import Count, Exists, F, OuterRef
+from django.db.models import Count, Exists, OuterRef
 from django_filters.rest_framework import DjangoFilterBackend
 from drf_spectacular.utils import extend_schema
 from rest_framework import viewsets
@@ -164,10 +164,8 @@ class Meta:
 
     def filter_org_id(self, queryset, _, value):
         """
-        No-op filter for org_id.
-
-        This gets done in the get_queryset, but the filter needs to know about
-        the field so the API spec is generated correctly.
+        Filter just courses that have course runs that have B2B courses in them
+        that match the specified org_id, if we're in that org.
         """
         user = self.request.user
 
@@ -207,7 +205,7 @@ class CourseViewSet(viewsets.ReadOnlyModelViewSet):
     def get_queryset(self):
         """Get the queryset for the viewset."""
 
-        qs = (
+        return (
             Course.objects.select_related("page")
             .prefetch_related("departments")
             .annotate(count_b2b_courseruns=Count("courseruns__b2b_contract__id"))
@@ -216,11 +214,6 @@ def get_queryset(self):
             .distinct()
         )
 
-        if not self.request.query_params.get("org_id"):
-            return qs.filter(count_courseruns__gt=F("count_b2b_courseruns"))
-
-        return qs
-
     def get_serializer_context(self):
         added_context = {}
         qp = self.request.query_params

courses/views/v2/views_test.py

@@ -33,7 +33,7 @@
     num_queries_from_department,
     num_queries_from_programs,
 )
-from courses.views.v2 import CourseViewSet, Pagination, ProgramFilterSet
+from courses.views.v2 import Pagination, ProgramFilterSet
 from main.test_utils import assert_drf_json_equal, duplicate_queries_check
 from users.factories import UserFactory
 
@@ -328,26 +328,6 @@ def test_filter_without_org_id_authenticated_user(user_drf_client):
     assert course_with_contract.title in titles
 
 
-def test_filter_anonymous_user_sees_no_contracted_runs():
-    course_with_contract = CourseFactory(title="Hidden Course")
-    contract = ContractPageFactory(active=True)
-    CourseRunFactory(course=course_with_contract, b2b_contract=contract)
-
-    course_no_contract = CourseFactory(title="Visible Course")
-    CourseRunFactory(course=course_no_contract)
-
-    rf = RequestFactory()
-    request = rf.get(reverse("v2:courses_api-list"))
-    request.user = AnonymousUser()
-
-    view = CourseViewSet()
-    view.request = Request(request)
-
-    queryset = view.get_queryset()
-    assert course_no_contract in queryset
-    assert course_with_contract not in queryset
-
-
 @pytest.mark.django_db
 def test_filter_by_org_id_with_contracted_user():
     org = OrganizationPageFactory(name="Test Org")