Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 24 additions & 6 deletions lms/djangoapps/instructor/tests/views/test_api_v2.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from rest_framework import status
from rest_framework.test import APIClient

from common.djangoapps.student.tests.factories import InstructorFactory, UserFactory
from common.djangoapps.student.tests.factories import CourseEnrollmentFactory, InstructorFactory, UserFactory
from lms.djangoapps.courseware.models import StudentModule
from lms.djangoapps.instructor_task.models import InstructorTask
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
Expand Down Expand Up @@ -46,12 +46,30 @@ def test_get_learner_by_username(self):
'student_id': self.student.id,
})

self.assertEqual(response.status_code, status.HTTP_200_OK) # noqa: PT009
assert response.status_code == status.HTTP_200_OK
data = response.json()
self.assertEqual(data['username'], 'john_harvard') # noqa: PT009
self.assertEqual(data['email'], 'john@example.com') # noqa: PT009
self.assertEqual(data['full_name'], 'John Harvard') # noqa: PT009
self.assertEqual(data['progress_url'], expected_progress_url) # noqa: PT009
assert data['username'] == 'john_harvard'
assert data['email'] == 'john@example.com'
assert data['full_name'] == 'John Harvard'
assert data['progress_url'] == expected_progress_url
assert not data['is_enrolled']

def test_get_learner_by_username_enrolled(self):
"""Test that is_enrolled is true for users enrolled in the course"""
CourseEnrollmentFactory(
is_active=True,
course_id=self.course.id,
user=self.student
)
url = reverse('instructor_api_v2:learner_detail', kwargs={
'course_id': str(self.course.id),
'email_or_username': self.student.username
})
response = self.client.get(url)

assert response.status_code == status.HTTP_200_OK
data = response.json()
assert data['is_enrolled']
Comment thread
dwong2708 marked this conversation as resolved.

def test_get_learner_by_email(self):
"""Test retrieving learner info by email"""
Expand Down
4 changes: 3 additions & 1 deletion lms/djangoapps/instructor/views/api_v2.py
Original file line number Diff line number Diff line change
Expand Up @@ -1684,7 +1684,8 @@ class LearnerView(DeveloperErrorViewMixin, APIView):
"username": "john_harvard",
"email": "john@example.com",
"full_name": "John Harvard",
"progress_url": "https://example.com/courses/course-v1:edX+DemoX+Demo_Course/progress/john_harvard/"
"progress_url": "https://example.com/courses/course-v1:edX+DemoX+Demo_Course/progress/42/",
"is_enrolled": true
}
```
"""
Expand Down Expand Up @@ -1754,6 +1755,7 @@ def get(self, request, course_id, email_or_username):
'email': student.email,
'full_name': student.profile.name,
'progress_url': progress_url,
'is_enrolled': CourseEnrollment.is_enrolled(student, course_key),
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
'is_enrolled': CourseEnrollment.is_enrolled(student, course_key),
'is_enrolled': is_user_enrolled_in_course(student, course_key),

}

serializer = LearnerSerializer(learner_data)
Expand Down
3 changes: 3 additions & 0 deletions lms/djangoapps/instructor/views/serializers_v2.py
Original file line number Diff line number Diff line change
Expand Up @@ -761,6 +761,9 @@ class LearnerSerializer(serializers.Serializer):
required=False,
help_text="URL to learner's progress page"
)
is_enrolled = serializers.BooleanField(
help_text="Whether the learner has an active enrollment in the course"
)


class GraderSerializer(serializers.Serializer):
Expand Down
Loading