forked from openedx/edx-platform
-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: create course home api DRF (#33173) (#33204) #22
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
4 changes: 3 additions & 1 deletion
4
cms/djangoapps/contentstore/rest_api/v1/serializers/__init__.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,12 @@ | ||
""" | ||
Serializers for v1 contentstore API. | ||
""" | ||
from .settings import CourseSettingsSerializer | ||
from .home import CourseHomeSerializer | ||
from .course_details import CourseDetailsSerializer | ||
from .course_rerun import CourseRerunSerializer | ||
from .proctoring import ( | ||
LimitedProctoredExamSettingsSerializer, | ||
ProctoredExamConfigurationSerializer, | ||
ProctoredExamSettingsSerializer, | ||
) | ||
from .settings import CourseSettingsSerializer |
19 changes: 19 additions & 0 deletions
19
cms/djangoapps/contentstore/rest_api/v1/serializers/common.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
""" | ||
Common API Serializers | ||
""" | ||
|
||
from rest_framework import serializers | ||
|
||
from openedx.core.lib.api.serializers import CourseKeyField | ||
|
||
|
||
class CourseCommonSerializer(serializers.Serializer): | ||
"""Serializer for course renders""" | ||
course_key = CourseKeyField() | ||
display_name = serializers.CharField() | ||
lms_link = serializers.CharField() | ||
number = serializers.CharField() | ||
org = serializers.CharField() | ||
rerun_link = serializers.CharField() | ||
run = serializers.CharField() | ||
url = serializers.CharField() |
15 changes: 15 additions & 0 deletions
15
cms/djangoapps/contentstore/rest_api/v1/serializers/course_rerun.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
""" | ||
API Serializers for course rerun | ||
""" | ||
|
||
from rest_framework import serializers | ||
|
||
|
||
class CourseRerunSerializer(serializers.Serializer): | ||
""" Serializer for course rerun """ | ||
allow_unicode_course_id = serializers.BooleanField() | ||
course_creator_status = serializers.CharField() | ||
display_name = serializers.CharField() | ||
number = serializers.CharField() | ||
org = serializers.CharField() | ||
run = serializers.CharField() |
62 changes: 62 additions & 0 deletions
62
cms/djangoapps/contentstore/rest_api/v1/serializers/home.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
""" | ||
API Serializers for course home | ||
""" | ||
|
||
from rest_framework import serializers | ||
|
||
from openedx.core.lib.api.serializers import CourseKeyField | ||
|
||
from .common import CourseCommonSerializer | ||
|
||
|
||
class UnsucceededCourseSerializer(serializers.Serializer): | ||
"""Serializer for unsucceeded course""" | ||
display_name = serializers.CharField() | ||
course_key = CourseKeyField() | ||
org = serializers.CharField() | ||
number = serializers.CharField() | ||
run = serializers.CharField() | ||
is_failed = serializers.BooleanField() | ||
is_in_progress = serializers.BooleanField() | ||
dismiss_link = serializers.CharField() | ||
|
||
|
||
class LibraryViewSerializer(serializers.Serializer): | ||
"""Serializer for library view""" | ||
display_name = serializers.CharField() | ||
library_key = serializers.CharField() | ||
url = serializers.CharField() | ||
org = serializers.CharField() | ||
number = serializers.CharField() | ||
can_edit = serializers.BooleanField() | ||
|
||
|
||
class CourseHomeSerializer(serializers.Serializer): | ||
"""Serializer for course home""" | ||
allow_course_reruns = serializers.BooleanField() | ||
allow_to_create_new_org = serializers.BooleanField() | ||
allow_unicode_course_id = serializers.BooleanField() | ||
allowed_organizations = serializers.ListSerializer( | ||
child=serializers.CharField(), | ||
allow_empty=True | ||
) | ||
archived_courses = CourseCommonSerializer(required=False, many=True) | ||
can_create_organizations = serializers.BooleanField() | ||
course_creator_status = serializers.CharField() | ||
courses = CourseCommonSerializer(required=False, many=True) | ||
in_process_course_actions = UnsucceededCourseSerializer(many=True, required=False, allow_null=True) | ||
libraries = LibraryViewSerializer(many=True, required=False, allow_null=True) | ||
libraries_enabled = serializers.BooleanField() | ||
library_authoring_mfe_url = serializers.CharField() | ||
optimization_enabled = serializers.BooleanField() | ||
redirect_to_library_authoring_mfe = serializers.BooleanField() | ||
request_course_creator_url = serializers.CharField() | ||
rerun_creator_status = serializers.BooleanField() | ||
show_new_library_button = serializers.BooleanField() | ||
split_studio_home = serializers.BooleanField() | ||
studio_name = serializers.CharField() | ||
studio_short_name = serializers.CharField() | ||
studio_request_email = serializers.CharField() | ||
tech_support_email = serializers.CharField() | ||
platform_name = serializers.CharField() | ||
user_is_active = serializers.BooleanField() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 36 additions & 0 deletions
36
cms/djangoapps/contentstore/rest_api/v1/tests/test_course_rerun.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
""" | ||
Unit tests for course rerun. | ||
""" | ||
from django.urls import reverse | ||
from rest_framework import status | ||
|
||
from cms.djangoapps.contentstore.tests.utils import CourseTestCase | ||
from cms.djangoapps.contentstore.rest_api.v1.mixins import PermissionAccessMixin | ||
|
||
|
||
class CourseRerunViewTest(CourseTestCase, PermissionAccessMixin): | ||
""" | ||
Tests for CourseRerunView. | ||
""" | ||
|
||
def setUp(self): | ||
super().setUp() | ||
self.url = reverse( | ||
"cms.djangoapps.contentstore:v1:course_rerun", | ||
kwargs={"course_id": self.course.id}, | ||
) | ||
|
||
def test_course_rerun_response(self): | ||
"""Check successful response content""" | ||
response = self.client.get(self.url) | ||
expected_response = { | ||
"allow_unicode_course_id": False, | ||
"course_creator_status": "granted", | ||
"display_name": self.course.display_name, | ||
"number": self.course.id.course, | ||
"org": self.course.id.org, | ||
"run": self.course.id.run, | ||
} | ||
|
||
self.assertEqual(response.status_code, status.HTTP_200_OK) | ||
self.assertDictEqual(expected_response, response.data) |
92 changes: 92 additions & 0 deletions
92
cms/djangoapps/contentstore/rest_api/v1/tests/test_home.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,92 @@ | ||
""" | ||
Unit tests for home page view. | ||
""" | ||
import ddt | ||
import json | ||
from django.conf import settings | ||
from django.urls import reverse | ||
from edx_toggles.toggles.testutils import override_waffle_switch | ||
from rest_framework import status | ||
|
||
from cms.djangoapps.contentstore.tests.utils import CourseTestCase | ||
from cms.djangoapps.contentstore.views.course import ENABLE_GLOBAL_STAFF_OPTIMIZATION | ||
from openedx.core.djangoapps.content.course_overviews.tests.factories import CourseOverviewFactory | ||
from xmodule.modulestore.tests.django_utils import TEST_DATA_SPLIT_MODULESTORE | ||
from xmodule.modulestore.tests.factories import CourseFactory | ||
|
||
|
||
@ddt.ddt | ||
class HomePageViewTest(CourseTestCase): | ||
""" | ||
Tests for HomePageView. | ||
""" | ||
MODULESTORE = TEST_DATA_SPLIT_MODULESTORE | ||
|
||
def setUp(self): | ||
super().setUp() | ||
self.url = reverse("cms.djangoapps.contentstore:v1:home") | ||
|
||
def test_home_page_response(self): | ||
"""Check successful response content""" | ||
response = self.client.get(self.url) | ||
course_id = str(self.course.id) | ||
|
||
expected_response = { | ||
"allow_course_reruns": True, | ||
"allow_to_create_new_org": False, | ||
"allow_unicode_course_id": False, | ||
"allowed_organizations": [], | ||
"archived_courses": [], | ||
"can_create_organizations": True, | ||
"course_creator_status": "granted", | ||
"courses": [{ | ||
"course_key": course_id, | ||
"display_name": self.course.display_name, | ||
"lms_link": f'//{settings.LMS_BASE}/courses/{course_id}/jump_to/{self.course.location}', | ||
"number": self.course.number, | ||
"org": self.course.org, | ||
"rerun_link": f'/course_rerun/{course_id}', | ||
"run": self.course.id.run, | ||
"url": f'/course/{course_id}', | ||
}], | ||
"in_process_course_actions": [], | ||
"libraries": [], | ||
"libraries_enabled": True, | ||
"library_authoring_mfe_url": settings.LIBRARY_AUTHORING_MICROFRONTEND_URL, | ||
"optimization_enabled": False, | ||
"redirect_to_library_authoring_mfe": False, | ||
"request_course_creator_url": "/request_course_creator", | ||
"rerun_creator_status": True, | ||
"show_new_library_button": True, | ||
"split_studio_home": False, | ||
"studio_name": settings.STUDIO_NAME, | ||
"studio_short_name": settings.STUDIO_SHORT_NAME, | ||
"studio_request_email": "", | ||
"tech_support_email": "[email protected]", | ||
"platform_name": settings.PLATFORM_NAME, | ||
"user_is_active": True, | ||
} | ||
|
||
self.assertEqual(response.status_code, status.HTTP_200_OK) | ||
self.assertDictEqual(expected_response, json.loads(json.dumps(response.data))) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Interesting, I think the There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
|
||
@override_waffle_switch(ENABLE_GLOBAL_STAFF_OPTIMIZATION, True) | ||
def test_org_query_if_passed(self): | ||
"""Test home page when org filter passed as a query param""" | ||
foo_course = self.store.make_course_key('foo-org', 'bar-number', 'baz-run') | ||
test_course = CourseFactory.create( | ||
org=foo_course.org, | ||
number=foo_course.course, | ||
run=foo_course.run | ||
) | ||
CourseOverviewFactory.create(id=test_course.id, org='foo-org') | ||
response = self.client.get(self.url, {"org": "foo-org"}) | ||
self.assertEqual(len(response.data['courses']), 1) | ||
self.assertEqual(response.status_code, status.HTTP_200_OK) | ||
|
||
@override_waffle_switch(ENABLE_GLOBAL_STAFF_OPTIMIZATION, True) | ||
def test_org_query_if_empty(self): | ||
"""Test home page with an empty org query param""" | ||
response = self.client.get(self.url) | ||
self.assertEqual(len(response.data['courses']), 0) | ||
self.assertEqual(response.status_code, status.HTTP_200_OK) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
76 changes: 76 additions & 0 deletions
76
cms/djangoapps/contentstore/rest_api/v1/views/course_rerun.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,76 @@ | ||
""" API Views for course rerun """ | ||
|
||
import edx_api_doc_tools as apidocs | ||
from opaque_keys.edx.keys import CourseKey | ||
from rest_framework.request import Request | ||
from rest_framework.response import Response | ||
from rest_framework.views import APIView | ||
|
||
from cms.djangoapps.contentstore.utils import get_course_rerun_context | ||
from cms.djangoapps.contentstore.rest_api.v1.serializers import CourseRerunSerializer | ||
from common.djangoapps.student.roles import GlobalStaff | ||
from openedx.core.lib.api.view_utils import DeveloperErrorViewMixin, verify_course_exists, view_auth_classes | ||
from xmodule.modulestore.django import modulestore | ||
|
||
|
||
@view_auth_classes(is_authenticated=True) | ||
class CourseRerunView(DeveloperErrorViewMixin, APIView): | ||
""" | ||
View for course rerun. | ||
""" | ||
|
||
@apidocs.schema( | ||
parameters=[ | ||
apidocs.string_parameter("course_id", apidocs.ParameterLocation.PATH, description="Course ID"), | ||
], | ||
responses={ | ||
200: CourseRerunSerializer, | ||
401: "The requester is not authenticated.", | ||
403: "The requester cannot access the specified course.", | ||
404: "The requested course does not exist.", | ||
}, | ||
) | ||
@verify_course_exists() | ||
def get(self, request: Request, course_id: str): | ||
""" | ||
Get an object containing course rerun. | ||
|
||
**Example Request** | ||
|
||
GET /api/contentstore/v1/course_rerun/{course_id} | ||
|
||
**Response Values** | ||
|
||
If the request is successful, an HTTP 200 "OK" response is returned. | ||
|
||
The HTTP 200 response contains a single dict that contains keys that | ||
are the course's rerun. | ||
|
||
**Example Response** | ||
|
||
```json | ||
{ | ||
"allow_unicode_course_id": False, | ||
"course_creator_status": "granted", | ||
"number": "101", | ||
"display_name": "new edx course", | ||
"org": "edx", | ||
"run": "2023", | ||
} | ||
``` | ||
""" | ||
|
||
if not GlobalStaff().has_user(request.user): | ||
self.permission_denied(request) | ||
|
||
course_key = CourseKey.from_string(course_id) | ||
with modulestore().bulk_operations(course_key): | ||
course_block = modulestore().get_course(course_key) | ||
course_rerun_context = get_course_rerun_context(course_key, course_block, request.user) | ||
course_rerun_context.update({ | ||
'org': course_key.org, | ||
'number': course_key.course, | ||
'run': course_key.run, | ||
}) | ||
serializer = CourseRerunSerializer(course_rerun_context) | ||
return Response(serializer.data) |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This add new modulestore, the next commit add the import xD
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My mistake I made a interactive rebase a this line was moved from the other commit