test: fixed test cases

Author: rjv31

course_discovery/apps/api/tests/test_utils.py

@@ -197,7 +197,7 @@ def test_generate_data_for_studio_api__external_course_enrollment_dates(self):
         exec_ed_type = CourseTypeFactory(slug=CourseType.EXECUTIVE_EDUCATION_2U)
         run = CourseRunFactory(course=CourseFactory(type=exec_ed_type))
         with mock.patch('course_discovery.apps.api.utils.logger') as mock_logger:
-            expected_data = self.make_studio_data(run, add_pacing=False, add_schedule=False, add_enrollment_dates=True)
+            expected_data = self.make_studio_data(run, add_pacing=False, add_schedule=True, add_enrollment_dates=True)
             output_data = StudioAPI.generate_data_for_studio_api(run, False)
             assert output_data == expected_data
         mock_logger.info.assert_called_with(
@@ -211,14 +211,12 @@ def test_generate_data_for_studio_api__external_course_missing_enrollment_dates(
         exec_ed_type = CourseTypeFactory(slug=CourseType.EXECUTIVE_EDUCATION_2U)
         run = CourseRunFactory(course=CourseFactory(type=exec_ed_type), enrollment_start=None, enrollment_end=None)
         with mock.patch('course_discovery.apps.api.utils.logger') as mock_logger:
-            expected_data = self.make_studio_data(run, add_pacing=False, add_schedule=False)
+            expected_data = self.make_studio_data(run, add_pacing=False, add_schedule=True, add_enrollment_dates=False)
             output_data = StudioAPI.generate_data_for_studio_api(run, False)
             assert output_data == expected_data
 
         with self.assertRaises(AssertionError):
-            mock_logger.info.assert_called_with(
-                f'Enrollment information added to data {output_data} for course run {run.key}'
-            )
+            mock_logger.info.assert_called()
 
     def test_generate_data_for_studio_api__non_external_course_no_start_end_on_update(self):
         """Test that start/end are NOT included when updating a non-external course."""
@@ -235,13 +233,10 @@ def test_generate_data_for_studio_api__external_course_start_end_on_update(self)
         """Test that start/end are included for external course on update."""
         exec_ed_type = CourseTypeFactory(slug=CourseType.EXECUTIVE_EDUCATION_2U)
         run = CourseRunFactory(course=CourseFactory(type=exec_ed_type))
-        
         expected_data = self.make_studio_data(run, add_pacing=False, add_schedule=True, add_enrollment_dates=True)
-        
         with mock.patch('course_discovery.apps.api.utils.logger') as mock_logger:
             output_data = StudioAPI.generate_data_for_studio_api(run, creating=False)
             self.assertEqual(output_data, expected_data)
-        
         mock_logger.info.assert_called_with(
             f'Enrollment information added to data {output_data} for course run {run.key}'
         )

course_discovery/apps/api/utils.py

@@ -255,9 +255,9 @@ def generate_data_for_studio_api(cls, course_run, creating, user=None):
         key = CourseKey.from_string(course_run.key)
         is_external = course_run.course.is_external_course
         # start, end, and pacing are not sent on updates - Studio is where users edit them
-        #Include start and end only if creating or if it's an external course during update
-        start = course_run.start if creating or is_external   else None
-        end = course_run.end if creating or is_external   else None
+        # Include start and end only if creating or if it's an external course during update
+        start = course_run.start if creating or is_external else None
+        end = course_run.end if creating or is_external else None
         pacing = course_run.pacing_type if creating else None
         enrollment_start = course_run.enrollment_start
         enrollment_end = course_run.enrollment_end
@@ -301,7 +301,7 @@ def generate_data_for_studio_api(cls, course_run, creating, user=None):
             # But when the course run is created, in Studio or Discovery, the enrollment dates are not taken as input.
             # It is better to keep the flow consistent across places.
             # Allow sending enrollment start and end dates as part of Update only.
-            # An empty dictionary is created. This prevents overwriting or throwing a KeyError when updating enrollment-related schedule fields.
+            # Using setdefault + update avoids overwriting and prevents KeyErrors.
             data.setdefault('schedule', {})
             data['schedule'].update({
                 'enrollment_start': serialize_datetime(course_run.enrollment_start),

course_discovery/apps/course_metadata/data_loaders/csv_loader.py

@@ -481,8 +481,10 @@ def update_course_run_api_request_data(self, course_run_data, course_run, course
             'prices': self.get_pricing_representation(course_run_data['verified_price'], course_type),
             'staff': staff_uuids,
             'draft': is_draft,
-            'start': self.get_formatted_datetime_string(f"{course_run_data['start_date']} {course_run_data['start_time']}"),
-            'end': self.get_formatted_datetime_string(f"{course_run_data['end_date']} {course_run_data['end_time']}"),
+            'start': self.get_formatted_datetime_string(
+                f"{course_run_data['start_date']} {course_run_data['start_time']}"),
+            'end': self.get_formatted_datetime_string(
+                f"{course_run_data['end_date']} {course_run_data['end_time']}"),
 
             'weeks_to_complete': course_run_data['length'],
             'min_effort': course_run_data['minimum_effort'],