Skip to content
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -220,12 +220,15 @@ def is_active(self, item):
For other content types, always returns True.
"""
if item.content_type == 'course':
active = is_any_course_run_active(
item.json_metadata.get('course_runs', []))
if not active:
logger.debug(f'[get_content_metadata]: Content item {item.content_key} is not active.')
return active
return True
course_runs = item.json_metadata.get('course_runs', []) or []
has_published = any(
(run.get('status') or '').lower() == 'published' for run in course_runs
)
if not has_published:
logger.debug(
f"[get_content_metadata]: Excluding course {item.content_key} because it has no published runs."
)
return has_published

@action(detail=True)
def get_content_metadata(self, request, traverse_pagination, content_keys_filter):
Expand All @@ -241,9 +244,11 @@ def get_content_metadata(self, request, traverse_pagination, content_keys_filter
logger.debug(f'[get_content_metadata]: Original queryset length: {len(queryset)}, {self.enterprise_catalog}')

# Only filter out archived courses if content_keys_filter is not provided,
# to ensure active content is always returned
# to ensure active content is always ret
Comment on lines -244 to +247

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This looks like an accidental deletion of text.

if not content_keys_filter:
queryset = [item for item in queryset if self.is_active(item)]
# queryset = [item for item in queryset if self.is_active(item)]
# NEW: Remove courseruns from final output
queryset = [item for item in queryset if item.content_type == "course"]
filtered_queryset_length = len(queryset)
logger.debug(f'[get_content_metadata]: Filtered queryset length: {filtered_queryset_length}, '
f'{self.enterprise_catalog}')
Expand Down
Loading