Should return Dated course runs correctly (#3038)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: annagav

courses/models.py

@@ -80,12 +80,6 @@ def live(self):
         """Applies a filter for Course runs with live=True"""
         return self.filter(live=True, b2b_contract__isnull=True)
 
-    def available(self):
-        """Applies a filter for Course runs with end_date in future"""
-        return self.filter(
-            models.Q(end_date__isnull=True) | models.Q(end_date__gt=now_in_utc())
-        ).filter(b2b_contract__isnull=True)
-
     def enrollable(self, enrollment_end_date=None):
         """
         Applies a filter for Course runs that are open for enrollment.
@@ -130,7 +124,7 @@ def get_enrollable_filter(cls, enrollment_end_date=None):
             enrollment_end_date = now
 
         return (
-            # Check if enrollment period is still open
+            # Check if enrollment has not ended
             (
                 models.Q(enrollment_end__isnull=True)
                 | models.Q(enrollment_end__gt=enrollment_end_date)

courses/utils.py

@@ -156,15 +156,11 @@ def get_archived_courseruns(queryset):
 def get_dated_courseruns(queryset):
     """
     Returns course runs that are dated meaning they are
+    - Enrollable (see get_enrollable_filter for more details)
     - Not self-paced
-    - Have a start date
-    - End date can be dated and greater than now or null
-    - Enrollable (enrollment start is in the past and enrollment end is in the future or null)
     """
     return queryset.filter(
-        CourseRunQuerySet.get_enrollable_filter()
-        & Q(is_self_paced=False)
-        & Q(enrollment_end__isnull=False)
+        CourseRunQuerySet.get_enrollable_filter() & Q(is_self_paced=False)
     )
 
 

courses/utils_test.py

@@ -238,6 +238,7 @@ def test_get_dated_courseruns():
     enrollable_course = CourseFactory.create()
     unenrollable_course = CourseFactory.create()
     self_paced_course = CourseFactory.create()
+    instructor_paced_course = CourseFactory.create()
     enrollable_courserun = CourseRunFactory.create(
         course=enrollable_course,
         live=True,
@@ -260,7 +261,16 @@ def test_get_dated_courseruns():
         enrollment_start=past_date,
         enrollment_end=future_date,
     )
+    # This a "dated" course run, but has missing enrollment end date
+    instructor_paced_course_run = CourseRunFactory.create(
+        course=instructor_paced_course,
+        live=True,
+        start_date=now,
+        enrollment_start=past_date,
+        enrollment_end=None,
+    )
     dated_courseruns = get_dated_courseruns(CourseRun.objects.all())
     assert enrollable_courserun in dated_courseruns
     assert unenrollable_courserun not in dated_courseruns
     assert self_paced_courserun not in dated_courseruns
+    assert instructor_paced_course_run in dated_courseruns