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
5 changes: 5 additions & 0 deletions RELEASE.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
Release Notes
=============

Version 1.144.1
---------------

- Filter non-live parent programs from v2/courses, v2/programs, similar to v1 (#3436)

Version 1.144.0 (Released March 30, 2026)
---------------

Expand Down
4 changes: 4 additions & 0 deletions courses/serializers/v2/courses.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,10 @@ def get_programs(self, instance):
else:
programs_qs = programs_qs.filter(program__b2b_only=False)

programs_qs = programs_qs.filter(
program__live=True, program__page__live=True
)

programs = [
req.program for req in programs_qs.prefetch_related("program").all()
]
Expand Down
31 changes: 31 additions & 0 deletions courses/serializers/v2/courses_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,37 @@ def test_serialize_course_required_prerequisites(
)


@pytest.mark.parametrize(
("program_live", "page_live", "expected_in_programs"),
[
(True, True, True),
(False, True, False),
(True, False, False),
(False, False, False),
],
)
def test_serialize_course_programs_excludes_non_live(
mock_context,
program_live,
page_live,
expected_in_programs,
):
"""Test that get_programs excludes programs where live=False or page.live=False"""
mock_context["include_programs"] = True
course = CourseFactory.create()
program = ProgramFactory.create(live=program_live)
program.page.live = page_live
program.page.save()
program.add_requirement(course)

data = CourseWithCourseRunsSerializer(instance=course, context=mock_context).data

if expected_in_programs:
assert len(data["programs"]) == 1
else:
assert data["programs"] == []


class TestCourseRunEnrollmentSerializerV2:
"""Test the v2 CourseRunEnrollmentSerializer."""

Expand Down
2 changes: 2 additions & 0 deletions courses/serializers/v2/programs.py
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,8 @@ def get_programs(self, instance):
else:
programs_qs = programs_qs.filter(program__b2b_only=False)

programs_qs = programs_qs.filter(program__live=True, program__page__live=True)

programs = [req.program for req in programs_qs.select_related("program").all()]

return BaseProgramSerializer(programs, many=True).data
Expand Down
33 changes: 33 additions & 0 deletions courses/serializers/v2/programs_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,39 @@ def test_serialize_program(
)


@pytest.mark.parametrize(
("parent_program_live", "parent_page_live", "expected_in_programs"),
[
(True, True, True),
(False, True, False),
(True, False, False),
(False, False, False),
],
)
def test_serialize_program_programs_excludes_non_live(
mock_context,
program_with_empty_requirements, # noqa: F811
parent_program_live,
parent_page_live,
expected_in_programs,
):
"""Test that get_programs excludes parent programs where live=False or page.live=False"""
mock_context["include_programs"] = True
parent_program = ProgramFactory.create(live=parent_program_live)
parent_program.page.live = parent_page_live
parent_program.page.save()
parent_program.add_requirement(program_with_empty_requirements)

data = ProgramSerializer(
instance=program_with_empty_requirements, context=mock_context
).data

if expected_in_programs:
assert len(data["programs"]) == 1
else:
assert data["programs"] == []


@pytest.mark.parametrize(
("has_paid_mode", "expected"),
[
Expand Down
2 changes: 1 addition & 1 deletion main/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
from main.sentry import init_sentry
from openapi.settings_spectacular import open_spectacular_settings

VERSION = "1.144.0"
VERSION = "1.144.1"

log = logging.getLogger()

Expand Down
Loading