Skip to content

refactor: move catalog enrollments to new viewset #45

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.

Sign up for GitHub

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

Open
Alec4r wants to merge 1 commit into
base: main.v2
Choose a base branch
from
Open

refactor: move catalog enrollments to new viewset #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions partner_catalog/api/v1/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
CatalogLearnerViewset,
PartnerCatalogViewSet,
PartnerViewset,
CatalogEnrollmentsViewSet
)

router = DefaultRouter()
Expand All @@ -26,6 +27,7 @@
manage_catalogs_router.register(r"learners", CatalogLearnerViewset, basename="catalog-learners")
manage_catalogs_router.register(r"courses", CatalogCourseViewSet, basename="catalog-courses")
manage_catalogs_router.register(r"invitations", CatalogLearnerInvitationViewSet, basename="catalog-learner-invitations")
manage_catalogs_router.register(r"enrollments", CatalogEnrollmentsViewSet, basename="catalog-enrollments")

courses_router = NestedDefaultRouter(manage_catalogs_router, r"courses", lookup="course")
courses_router.register(r"enrollments", CatalogCourseEnrollmentViewSet, basename="catalog-course-enrollments")
Expand Down
35 changes: 20 additions & 15 deletions partner_catalog/api/v1/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,21 +216,6 @@ def available_courses(self, request, **kwargs):
}
return Response(response_data)

@action(detail=True, methods=["get"], url_path="enrollments")
def enrollments(self, request, pk=None):
"""Get all course enrollments for this catalog."""
enrollments = CatalogCourseEnrollment.objects.filter(
catalog_course__catalog_id=pk
).select_related("user", "catalog_course", "catalog_course__course_overview")

page = self.paginate_queryset(enrollments)
if page is not None:
serializer = CatalogCourseEnrollmentSerializer(page, many=True)
return self.get_paginated_response(serializer.data)

serializer = CatalogCourseEnrollmentSerializer(enrollments, many=True)
return Response(serializer.data)


class CatalogLearnerViewset(InjectNestedFKMixin, viewsets.ReadOnlyModelViewSet):
"""
Expand Down Expand Up @@ -504,3 +489,23 @@ def get_queryset(self):
qs = self.queryset
course_pk = self.kwargs.get("course_pk")
return qs.filter(catalog_course_id=course_pk) if course_pk else qs


class CatalogEnrollmentsViewSet(viewsets.ReadOnlyModelViewSet):
serializer_class = CatalogCourseEnrollmentSerializer
permission_classes = [IsPartnerCatalogManager]
filter_backends = [DjangoFilterBackend, filters.SearchFilter, filters.OrderingFilter]

filterset_fields = ["active", "user"]
search_fields = ["user__username", "user__email"]
ordering_fields = ["id"]
ordering = ["-id"]

def get_queryset(self):
catalog_pk = self.kwargs["catalog_pk"]
return (
CatalogCourseEnrollment.objects.filter(
catalog_course__catalog_id=catalog_pk
)
.select_related("user", "catalog_course", "catalog_course__course_overview")
)
Loading