From 0e81db79e379cd431c3f51e7d11cbc919ef505a9 Mon Sep 17 00:00:00 2001
From: Muhammad Anas <muhammad.anas@arbisoft.com>
Date: Fri, 10 Jan 2025 18:53:04 +0500
Subject: [PATCH] fix: date label for instructor paced courses

---
 lms/djangoapps/courseware/date_summary.py     |  2 +-
 .../courseware/tests/test_date_summary.py     | 31 +++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/lms/djangoapps/courseware/date_summary.py b/lms/djangoapps/courseware/date_summary.py
index 4123da5f38b9..e6bd5ef70597 100644
--- a/lms/djangoapps/courseware/date_summary.py
+++ b/lms/djangoapps/courseware/date_summary.py
@@ -268,7 +268,7 @@ def date_type(self):
     @property
     def title(self):
         enrollment = CourseEnrollment.get_enrollment(self.user, self.course_id)
-        if enrollment and self.course.end and enrollment.created > self.course.end:
+        if self.course.self_paced and enrollment and self.course.start and enrollment.created > self.course.start:
             return gettext_lazy('Enrollment Date')
         return gettext_lazy('Course starts')
 
diff --git a/lms/djangoapps/courseware/tests/test_date_summary.py b/lms/djangoapps/courseware/tests/test_date_summary.py
index 27e7f1a3c226..e487af8a1f70 100644
--- a/lms/djangoapps/courseware/tests/test_date_summary.py
+++ b/lms/djangoapps/courseware/tests/test_date_summary.py
@@ -400,6 +400,37 @@ def test_course_start_date(self):
         block = CourseStartDate(course, user)
         assert block.date == course.start
 
+    @ddt.data(
+        # Instructor-paced course: Use course start date
+        (False, datetime(2025, 1, 10, tzinfo=utc), datetime(2025, 1, 12, tzinfo=utc),
+            datetime(2025, 1, 10, tzinfo=utc), 'Course starts'),
+
+        # Self-paced course: Enrollment created later than course start
+        (True, datetime(2025, 1, 10, tzinfo=utc), datetime(2025, 1, 12), datetime(2025, 1, 12, tzinfo=utc),
+            'Enrollment Date'),
+
+        # Self-paced course: Enrollment created earlier than course start
+        (True, datetime(2025, 1, 10, tzinfo=utc), datetime(2025, 1, 8), datetime(2025, 1, 10, tzinfo=utc),
+            'Course starts'),
+
+        # Self-paced course: No enrollment
+        (True, datetime(2025, 1, 10, tzinfo=utc), None, datetime(2025, 1, 10, tzinfo=utc), 'Course starts'),
+    )
+    @ddt.unpack
+    def test_course_start_date_label(self, self_paced, course_start, enrollment_created, expected_date, expected_title):
+        """
+        Test the CourseStartDate class has correct label for course start date
+        """
+        course = CourseFactory(self_paced=self_paced, start=course_start)
+        user = create_user()
+        if enrollment_created:
+            enrollment = CourseEnrollmentFactory(course_id=course.id, user=user, mode=CourseMode.VERIFIED)
+            enrollment.created = enrollment_created
+            enrollment.save()
+        date_summary = CourseStartDate(user=user, course=course)
+        self.assertEqual(date_summary.date, expected_date)
+        self.assertEqual(str(date_summary.title), expected_title)
+
     ## Tests Course End Date Block
     def test_course_end_date_for_certificate_eligible_mode(self):
         course = create_course_run(days_till_start=-1)