forked from openedx/openedx-platform
-
Notifications
You must be signed in to change notification settings - Fork 8
feat: add subscriber platform plugin POC with learner dashboard course categorization API. #125
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
Draft
pavanhalesh
wants to merge
1
commit into
release-ulmo
Choose a base branch
from
feature/subscriber-plugin-poc
base: release-ulmo
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
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
This file contains hidden or 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,3 @@ | ||
| include README.rst | ||
| include openedx.yaml | ||
| recursive-include subscriber *.py |
This file contains hidden or 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,5 @@ | ||
| lms: | ||
| django_apps: | ||
| - subscriber | ||
| urls: | ||
| - subscriber.urls |
This file contains hidden or 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,16 @@ | ||
| from setuptools import setup, find_packages | ||
|
|
||
| setup( | ||
| name="platform-plugin-subscriber", | ||
| version="0.1.0", | ||
| packages=find_packages(), | ||
| include_package_data=True, | ||
| package_data={ | ||
| "": ["openedx.yaml"], | ||
| }, | ||
| entry_points={ | ||
| "lms.djangoapp": [ | ||
| "subscriber = subscriber.apps:SubscriberConfig", | ||
| ], | ||
| }, | ||
| ) |
This file contains hidden or 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 @@ | ||
| default_app_config = "subscriber.apps.SubscriberConfig" |
This file contains hidden or 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 @@ | ||
| from django.apps import AppConfig | ||
|
|
||
|
|
||
| class SubscriberConfig(AppConfig): | ||
| name = "subscriber" | ||
|
|
||
| plugin_app = { | ||
| "url_config": { | ||
| "lms.djangoapp": { | ||
| "namespace": "subscriber", | ||
| "regex": "^api/subscriber/", | ||
| "relative_path": "urls", | ||
| } | ||
| } | ||
| } |
This file contains hidden or 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,42 @@ | ||
| from common.djangoapps.student.models import CourseEnrollment | ||
|
|
||
| # POC-only: hardcoded subscription catalog | ||
| SUBSCRIPTION_COURSE_IDS = [ | ||
| "course-v1:edX+DemoX+Demo_Course", | ||
| ] | ||
|
|
||
|
|
||
| def get_categorized_courses(user): | ||
| """ | ||
| Fetch user's enrolled courses and categorize them | ||
| for the Subscriber Learner Dashboard. | ||
| """ | ||
|
|
||
| enrollments = CourseEnrollment.objects.filter( | ||
| user=user, | ||
| is_active=True | ||
| ) | ||
|
|
||
| subscription_courses = [] | ||
| upgradeable_courses = [] | ||
| non_upgradeable_courses = [] | ||
|
|
||
| # POC assumption: user is already a subscriber | ||
| user_is_subscriber = True | ||
|
|
||
| for enrollment in enrollments: | ||
| course_id = str(enrollment.course_id) | ||
|
|
||
| if course_id in SUBSCRIPTION_COURSE_IDS: | ||
| if user_is_subscriber: | ||
| subscription_courses.append(course_id) | ||
| else: | ||
| upgradeable_courses.append(course_id) | ||
| else: | ||
| non_upgradeable_courses.append(course_id) | ||
|
|
||
| return { | ||
| "subscription_courses": subscription_courses, | ||
| "upgradeable_courses": upgradeable_courses, | ||
| "non_upgradeable_courses": non_upgradeable_courses, | ||
| } | ||
This file contains hidden or 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,10 @@ | ||
| from django.urls import path | ||
| from .views import subscriber_courses | ||
|
|
||
| urlpatterns = [ | ||
| path( | ||
| "dashboard/courses/", | ||
| subscriber_courses, | ||
| name="subscriber-dashboard-courses", | ||
| ), | ||
| ] |
This file contains hidden or 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,13 @@ | ||
| from django.http import JsonResponse | ||
| from django.contrib.auth.decorators import login_required | ||
| from .services import get_categorized_courses | ||
|
|
||
|
|
||
| @login_required | ||
| def subscriber_courses(request): | ||
| """ | ||
| API endpoint for Subscriber Learner Dashboard. | ||
| Returns user's enrolled courses grouped into categories. | ||
| """ | ||
| data = get_categorized_courses(request.user) | ||
| return JsonResponse(data) |
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 is the part that we should clarify.
Assume that
SUBSCRIPTION_COURSE_IDSwill eventually be an API call that we make to the Subscription catalog that another team will create.From that payload, we'll need to check for each course enrollment:
a. Did the user fulfill either enrolling in the course after becoming a Subscriber or upgrading their audited course into their Subscription? (This is likely to mean that in the
Enrollmentspayload we will know if the course is upgraded to a full-access.)subscription_courses.upgradeable_coursesnon_upgradeable_courses.There's an additional tricky part that I haven't confirmed with Kelly, which is what happens if prior to being a Subscriber the user fully upgraded a course. Where does that course live in these three categories? If the course technically is part of the Subscription catalog, does it go under
subscription_courses? If it doesn't, does it go undernon_upgradeable_courseseven though it indeed is upgraded already? Maybe that 3rd category would be more accurately callednon_subscription_courses. I don't know yet.