Skip to content
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: Enable Wagtail API #3399

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
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
17 changes: 17 additions & 0 deletions cms/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
from wagtail.models import Orderable, Page, PageManager, PageQuerySet
from wagtail.snippets.models import register_snippet
from wagtailmetadata.models import MetadataPageMixin
from wagtail.api import APIField

from blog.api import fetch_blog
from cms.api import filter_and_sort_catalog_pages
Expand Down Expand Up @@ -98,6 +99,8 @@
from mitxpro.features import CATALOG_LANGUAGE_FILTER
from mitxpro.utils import now_in_utc
from mitxpro.views import get_base_context
from courses.serializers import CourseSerializer, ProgramSerializer
from .wagtail_api_serializers import ProductChildPageSerializer


class DisableSitemapURLMixin:
Expand Down Expand Up @@ -1142,6 +1145,10 @@ def save(self, clean=True, user=None, log_action=False, **kwargs): # noqa: FBT0
child_class.objects.filter(featured=True).update(featured=False)
super().save(clean=clean, user=user, log_action=log_action, **kwargs)

api_fields = [
APIField("child_pages", serializer=ProductChildPageSerializer()),
]

Comment on lines +1148 to +1151
Copy link
Contributor

Choose a reason for hiding this comment

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

Current API does not return the custom page fields like: subhead etc. We should return the custom page data + child page fields as well.

@property
def product(self):
"""Returns the courseware object (Course, Program) associated with this page"""
Expand Down Expand Up @@ -1303,6 +1310,11 @@ class Meta:
help_text="The program for this page",
)

api_fields = [
APIField("program", serializer=ProgramSerializer()),
*ProductPage.api_fields,
]

@property
def course_pages(self):
"""
Expand Down Expand Up @@ -1440,6 +1452,11 @@ class Meta:
]
base_form_class = CoursewareForm

api_fields = [
APIField("course", serializer=CourseSerializer()),
*ProductPage.api_fields,
]

@cached_property
def course_with_related_objects(self):
"""
Expand Down
47 changes: 47 additions & 0 deletions cms/wagtail_api.py
Copy link
Contributor

Choose a reason for hiding this comment

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

Please add module, class, and method docs at all places.

Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
from django.db.models import F
from rest_framework.permissions import IsAdminUser
from wagtail.api.v2.router import WagtailAPIRouter
from wagtail.api.v2.views import PagesAPIViewSet
from wagtail.images.api.v2.views import ImagesAPIViewSet
from wagtail.documents.api.v2.views import DocumentsAPIViewSet

from .wagtail_api_filters import ReadableIDFilter


class AdminOnlyViewSetMixin:
permission_classes = (IsAdminUser,)


class CustomPagesAPIViewSet(AdminOnlyViewSetMixin, PagesAPIViewSet):
filter_backends = [ReadableIDFilter] + PagesAPIViewSet.filter_backends
meta_fields = PagesAPIViewSet.meta_fields + ["live", "last_published_at"]
listing_default_fields = PagesAPIViewSet.listing_default_fields + [
"live",
"last_published_at",
]
known_query_parameters = PagesAPIViewSet.known_query_parameters.union(
["readable_id"]
)

def get_queryset(self):
queryset = super().get_queryset()
model_type = self.request.GET.get("type", None)
if model_type == "cms.CoursePage":
queryset = queryset.annotate(readable_id=F("course__readable_id"))
elif model_type == "cms.ProgramPage":
queryset = queryset.annotate(readable_id=F("program__readable_id"))
return queryset


class CustomImagesAPIViewSet(AdminOnlyViewSetMixin, ImagesAPIViewSet):
pass


class CustomDocumentsAPIViewSet(AdminOnlyViewSetMixin, DocumentsAPIViewSet):
pass


api_router = WagtailAPIRouter("wagtailapi")
api_router.register_endpoint("pages", CustomPagesAPIViewSet)
api_router.register_endpoint("images", CustomImagesAPIViewSet)
api_router.register_endpoint("documents", CustomDocumentsAPIViewSet)
Comment on lines +44 to +47
Copy link
Contributor

Choose a reason for hiding this comment

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

We do this in the urls.py.

Comment on lines +45 to +47
Copy link
Contributor

Choose a reason for hiding this comment

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

How about we add a URL above the pages that would look like: api/v2/courses/<READABLE_ID>, Then our custom viewset can handle the readable ID and filter the data for us?
Same goes for the programs, api/v2/programs/<readable_id>

10 changes: 10 additions & 0 deletions cms/wagtail_api_filters.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
from rest_framework.filters import BaseFilterBackend


class ReadableIDFilter(BaseFilterBackend):
def filter_queryset(self, request, queryset, view):
field_name = "readable_id"
if field_name in request.GET:
value = request.GET[field_name].replace(" ", "+")
Copy link
Contributor

Choose a reason for hiding this comment

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

Any specific cases that we are trying to handle here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

readable_id is usually of this form course-v1:edX+DemoX+Demo_Course, when received as query params, it is converted to course-v1:edX DemoX Demo_Course, filtering on which would return nothing

queryset = queryset.filter(**{field_name: value})
return queryset
29 changes: 29 additions & 0 deletions cms/wagtail_api_serializers.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
from rest_framework.fields import Field

from wagtail.models import Page
from wagtail.api.v2.serializers import get_serializer_class
from wagtail.api.v2.views import PagesAPIViewSet


class ProductChildPageSerializer(Field):
def to_representation(self, value):
if hasattr(value, "all"):
base_context = {"view": PagesAPIViewSet()}
context = {**base_context, **getattr(self, "context", {})}
return [self.serialize_page(page, context) for page in value.all()]
return self.serialize_page(value, self.context)

def serialize_page(self, page, context):
if not isinstance(page, Page):
return None

model = page.specific.__class__

serializer = get_serializer_class(
model,
PagesAPIViewSet.body_fields + PagesAPIViewSet.meta_fields,
PagesAPIViewSet.meta_fields,
base=PagesAPIViewSet.base_serializer_class,
)

return serializer(page.specific, context=context).data
3 changes: 1 addition & 2 deletions courses/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
from django.templatetags.static import static
from rest_framework import serializers

from cms.models import ProductPage
from courses import models
from ecommerce.serializers import CompanySerializer

Expand Down Expand Up @@ -120,7 +119,7 @@ class BaseProductSerializer(serializers.ModelSerializer):
language = serializers.SerializerMethodField()

class Meta:
model = ProductPage
model = "cms.ProductPage"
fields = [
"url",
"description",
Expand Down
1 change: 1 addition & 0 deletions mitxpro/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@
"wagtailmetadata",
"modelcluster",
"taggit",
"wagtail.api.v2",
# django-robots
"robots",
# Put our apps after this point
Expand Down
3 changes: 3 additions & 0 deletions mitxpro/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
from wagtail.images.views.serve import ServeView
from wagtail.utils.urlpatterns import decorate_urlpatterns

from cms.wagtail_api import api_router

from mitxpro.views import (
AppContextView,
cms_signin_redirect_to_site_signin,
Expand Down Expand Up @@ -62,6 +64,7 @@
path("", include("sheets.urls")),
path("", include("mail.urls")),
path("api/v1/", include("mitol.digitalcredentials.urls")),
path("api/v2/", api_router.urls),
path("", include("mitol.mail.urls")),
path("boeing/", include(("voucher.urls", "voucher"))),
path("api/app_context", AppContextView.as_view(), name="api-app_context"),
Expand Down
Loading