diff --git a/lms/djangoapps/mobile_api/users/tests.py b/lms/djangoapps/mobile_api/users/tests.py index 6a0ef0a72f..2cfefaa058 100644 --- a/lms/djangoapps/mobile_api/users/tests.py +++ b/lms/djangoapps/mobile_api/users/tests.py @@ -1422,9 +1422,9 @@ class TestUserEnrollmentsStatus(MobileAPITestCase, MobileAuthUserTestMixin): response = self.api_response(api_version=API_V1) expected_response = [ - {'course_id': str(courses[0].course_id), 'course_name': courses[0].display_name, 'is_active': True}, - {'course_id': str(courses[1].course_id), 'course_name': courses[1].display_name, 'is_active': True}, - {'course_id': str(courses[2].course_id), 'course_name': courses[2].display_name, 'is_active': True}, + {'course_id': str(courses[0].course_id), 'course_name': courses[0].display_name, 'recently_active': True}, + {'course_id': str(courses[1].course_id), 'course_name': courses[1].display_name, 'recently_active': True}, + {'course_id': str(courses[2].course_id), 'course_name': courses[2].display_name, 'recently_active': True}, ] self.assertEqual(response.status_code, status.HTTP_200_OK) @@ -1444,10 +1444,10 @@ class TestUserEnrollmentsStatus(MobileAPITestCase, MobileAuthUserTestMixin): response = self.api_response(api_version=API_V1) expected_response = [ - {'course_id': str(courses[0].course_id), 'course_name': courses[0].display_name, 'is_active': True}, - {'course_id': str(courses[1].course_id), 'course_name': courses[1].display_name, 'is_active': True}, - {'course_id': str(courses[2].course_id), 'course_name': courses[2].display_name, 'is_active': True}, - {'course_id': str(old_course.course_id), 'course_name': old_course.display_name, 'is_active': False} + {'course_id': str(courses[0].course_id), 'course_name': courses[0].display_name, 'recently_active': True}, + {'course_id': str(courses[1].course_id), 'course_name': courses[1].display_name, 'recently_active': True}, + {'course_id': str(courses[2].course_id), 'course_name': courses[2].display_name, 'recently_active': True}, + {'course_id': str(old_course.course_id), 'course_name': old_course.display_name, 'recently_active': False} ] self.assertEqual(response.status_code, status.HTTP_200_OK) @@ -1461,7 +1461,7 @@ class TestUserEnrollmentsStatus(MobileAPITestCase, MobileAuthUserTestMixin): (32, False), ) @ddt.unpack - def test_different_enrollment_dates(self, enrolled_days_ago: int, is_active_status: bool) -> None: + def test_different_enrollment_dates(self, enrolled_days_ago: int, recently_active_status: bool) -> None: self.login() course = CourseFactory.create(org="edx", mobile_available=True, run='1001') self.enroll(course.id) @@ -1472,7 +1472,11 @@ class TestUserEnrollmentsStatus(MobileAPITestCase, MobileAuthUserTestMixin): response = self.api_response(api_version=API_V1) expected_response = [ - {'course_id': str(course.course_id), 'course_name': course.display_name, 'is_active': is_active_status} + { + 'course_id': str(course.course_id), + 'course_name': course.display_name, + 'recently_active': recently_active_status + } ] self.assertEqual(response.status_code, status.HTTP_200_OK) @@ -1486,7 +1490,7 @@ class TestUserEnrollmentsStatus(MobileAPITestCase, MobileAuthUserTestMixin): (32, False), ) @ddt.unpack - def test_different_completion_dates(self, completed_days_ago: int, is_active_status: bool) -> None: + def test_different_completion_dates(self, completed_days_ago: int, recently_active_status: bool) -> None: self.login() course = CourseFactory.create(org="edx", mobile_available=True, run='1010') section = BlockFactory.create( @@ -1511,7 +1515,11 @@ class TestUserEnrollmentsStatus(MobileAPITestCase, MobileAuthUserTestMixin): response = self.api_response(api_version=API_V1) expected_response = [ - {'course_id': str(course.course_id), 'course_name': course.display_name, 'is_active': is_active_status} + { + 'course_id': str(course.course_id), + 'course_name': course.display_name, + 'recently_active': recently_active_status + } ] self.assertEqual(response.status_code, status.HTTP_200_OK) diff --git a/lms/djangoapps/mobile_api/users/views.py b/lms/djangoapps/mobile_api/users/views.py index d634b3072d..b37a797403 100644 --- a/lms/djangoapps/mobile_api/users/views.py +++ b/lms/djangoapps/mobile_api/users/views.py @@ -557,7 +557,7 @@ class UserEnrollmentsStatus(views.APIView): * course_id (str): The course id associated with the user's enrollment. * course_name (str): The course name associated with the user's enrollment. - * is_active (bool): User's course enrolment status. + * recently_active (bool): User's course enrolment status. The HTTP 200 response contains a list of dictionaries that contain info @@ -570,17 +570,17 @@ class UserEnrollmentsStatus(views.APIView): { "course_id": "course-v1:a+a+a", "course_name": "a", - "is_active": true + "recently_active": true }, { "course_id": "course-v1:b+b+b", "course_name": "b", - "is_active": true + "recently_active": true }, { "course_id": "course-v1:c+c+c", "course_name": "c", - "is_active": false + "recently_active": false }, ... ] @@ -625,7 +625,7 @@ class UserEnrollmentsStatus(views.APIView): { 'course_id': course_id, 'course_name': user_enrollment.course_overview.display_name, - 'is_active': bool( + 'recently_active': bool( course_id in course_ids or user_enrollment.created > active_status_date )