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
9 changes: 9 additions & 0 deletions cms/djangoapps/contentstore/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,15 @@ def get_by_downstream_context(cls, downstream_context_key: CourseKey) -> QuerySe
"upstream_block__learning_package"
)

@classmethod
def get_by_upstream_usage_key(cls, upstream_usage_key: UsageKey) -> QuerySet["PublishableEntityLink"]:
"""
Get all downstream context keys for given upstream usage key
"""
return cls.objects.filter(
upstream_usage_key=upstream_usage_key,
)


class LearningContextLinksStatusChoices(models.TextChoices):
"""
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
"""Module for v2 serializers."""

from cms.djangoapps.contentstore.rest_api.v2.serializers.downstreams import PublishableEntityLinksSerializer
from cms.djangoapps.contentstore.rest_api.v2.serializers.downstreams import (
PublishableEntityLinksSerializer,
PublishableEntityLinksUsageKeySerializer,
)
from cms.djangoapps.contentstore.rest_api.v2.serializers.home import CourseHomeTabSerializerV2
12 changes: 12 additions & 0 deletions cms/djangoapps/contentstore/rest_api/v2/serializers/downstreams.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,15 @@ def get_ready_to_sync(self, obj):
class Meta:
model = PublishableEntityLink
exclude = ['upstream_block', 'uuid']


class PublishableEntityLinksUsageKeySerializer(serializers.ModelSerializer):
"""
Serializer for returning a string list of the usage keys.
"""
def to_representation(self, instance: PublishableEntityLink) -> str:
return str(instance.downstream_usage_key)

class Meta:
model = PublishableEntityLink
fields = ('downstream_usage_key')
5 changes: 5 additions & 0 deletions cms/djangoapps/contentstore/rest_api/v2/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@
downstreams.UpstreamListView.as_view(),
name='upstream-list'
),
re_path(
f'^upstream/{settings.USAGE_KEY_PATTERN}/downstream-links$',
downstreams.DownstreamContextListView.as_view(),
name='downstream-link-list'
),
re_path(
fr'^downstreams/{settings.USAGE_KEY_PATTERN}/sync$',
downstreams.SyncFromUpstreamView.as_view(),
Expand Down
31 changes: 30 additions & 1 deletion cms/djangoapps/contentstore/rest_api/v2/views/downstreams.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@
400: Downstream block is not linked to upstream content.
404: Downstream block not found or user lacks permission to edit it.

/api/contentstore/v2/upstream/{usage_key_string}/downstream-links

GET: List all downstream blocks linked to a library block.
200: A list of downstream usage_keys linked to the library block.

# NOT YET IMPLEMENTED -- Will be needed for full Libraries Relaunch in ~Teak.
/api/contentstore/v2/downstreams
/api/contentstore/v2/downstreams?course_id=course-v1:A+B+C&ready_to_sync=true
Expand Down Expand Up @@ -71,7 +76,10 @@

from cms.djangoapps.contentstore.helpers import import_static_assets_for_library_sync
from cms.djangoapps.contentstore.models import PublishableEntityLink
from cms.djangoapps.contentstore.rest_api.v2.serializers import PublishableEntityLinksSerializer
from cms.djangoapps.contentstore.rest_api.v2.serializers import (
PublishableEntityLinksSerializer,
PublishableEntityLinksUsageKeySerializer,
)
from cms.lib.xblock.upstream_sync import (
BadDownstream,
BadUpstream,
Expand Down Expand Up @@ -138,6 +146,27 @@ def get(self, request: _AuthenticatedRequest, course_key_string: str):
return Response(serializer.data)


@view_auth_classes()
class DownstreamContextListView(DeveloperErrorViewMixin, APIView):
"""
Serves library block->downstream usage keys
"""
def get(self, request: _AuthenticatedRequest, usage_key_string: str) -> Response:
"""
Fetches downstream links for given publishable entity
"""
try:
usage_key = UsageKey.from_string(usage_key_string)
except InvalidKeyError as exc:
raise ValidationError(detail=f"Malformed usage key: {usage_key_string}") from exc

links = PublishableEntityLink.get_by_upstream_usage_key(upstream_usage_key=usage_key)

serializer = PublishableEntityLinksUsageKeySerializer(links, many=True)

return Response(serializer.data)


@view_auth_classes(is_authenticated=True)
class DownstreamView(DeveloperErrorViewMixin, APIView):
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,20 @@ def setUp(self):
self.downstream_html_key = BlockFactory.create(
category='html', parent=unit, upstream=MOCK_HTML_UPSTREAM_REF, upstream_version=1,
).usage_key

self.another_course = CourseFactory.create(display_name="Another Course")
another_chapter = BlockFactory.create(category="chapter", parent=self.another_course)
another_sequential = BlockFactory.create(category="sequential", parent=another_chapter)
another_unit = BlockFactory.create(category="vertical", parent=another_sequential)
self.another_video_keys = []
for _ in range(3):
# Adds 3 videos linked to the same upstream
self.another_video_keys.append(
BlockFactory.create(
category="video", parent=another_unit, upstream=MOCK_UPSTREAM_REF, upstream_version=123,
).usage_key
)

self.fake_video_key = self.course.id.make_usage_key("video", "NoSuchVideo")
self.superuser = UserFactory(username="superuser", password="password", is_staff=True, is_superuser=True)
self.learner = UserFactory(username="learner", password="password")
Expand Down Expand Up @@ -341,3 +355,23 @@ def test_200_all_upstreams(self):
},
]
self.assertListEqual(data, expected)


class GetDownstreamContextsTest(_BaseDownstreamViewTestMixin, SharedModuleStoreTestCase):
"""
Test that `GET /api/v2/contentstore/upstream/:usage_key/downstream-links returns list of
linked blocks usage_keys in given upstream entity (i.e. library block).
"""
def call_api(self, usage_key_string):
return self.client.get(f"/api/contentstore/v2/upstream/{usage_key_string}/downstream-links")

def test_200_downstream_context_list(self):
"""
Returns all downstream courses for given library block
"""
self.client.login(username="superuser", password="password")
response = self.call_api(MOCK_UPSTREAM_REF)
assert response.status_code == 200
data = response.json()
expected = [str(self.downstream_video_key)] + [str(key) for key in self.another_video_keys]
self.assertListEqual(data, expected)
2 changes: 1 addition & 1 deletion cms/djangoapps/contentstore/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -2371,7 +2371,7 @@ def get_xblock_render_context(request, block):
return ""


def create_or_update_xblock_upstream_link(xblock, course_key: str | CourseKey, created: datetime | None = None):
def create_or_update_xblock_upstream_link(xblock, course_key: str | CourseKey, created: datetime | None = None) -> None:
"""
Create or update upstream->downstream link in database for given xblock.
"""
Expand Down
Loading