From 75b7a83dc63f9d6b2ed80d350245f9b435ad7425 Mon Sep 17 00:00:00 2001
From: Serhii Nanai <serhii.nanai@raccoongang.com>
Date: Wed, 11 Jun 2025 19:30:15 +0300
Subject: [PATCH] feat: add redirects to mfe for catalog-related legacy pages

---
 lms/djangoapps/branding/tests/test_views.py   | 84 ++++++++++++++++++-
 lms/djangoapps/branding/views.py              |  7 ++
 lms/djangoapps/courseware/tests/test_views.py | 43 +++++++++-
 lms/djangoapps/courseware/views/views.py      |  6 ++
 .../features/course_experience/url_helpers.py | 22 +++++
 5 files changed, 159 insertions(+), 3 deletions(-)

diff --git a/lms/djangoapps/branding/tests/test_views.py b/lms/djangoapps/branding/tests/test_views.py
index d0ba14c716..69130beff3 100644
--- a/lms/djangoapps/branding/tests/test_views.py
+++ b/lms/djangoapps/branding/tests/test_views.py
@@ -8,11 +8,16 @@ import ddt
 import six
 from django.conf import settings
 from django.contrib.auth.models import User  # lint-amnesty, pylint: disable=imported-auth-user
-from django.test import TestCase
+from django.test import override_settings, TestCase
 from django.urls import reverse
+from edx_toggles.toggles.testutils import override_waffle_flag
 
 from common.djangoapps.student.tests.factories import UserFactory
 from lms.djangoapps.branding.models import BrandingApiConfig
+from lms.djangoapps.branding.toggles import (
+    ENABLE_NEW_CATALOG_PAGE,
+    ENABLE_NEW_INDEX_PAGE,
+)
 from openedx.core.djangoapps.dark_lang.models import DarkLangConfig
 from openedx.core.djangoapps.lang_pref.api import released_languages
 from openedx.core.djangoapps.site_configuration.tests.mixins import SiteMixin
@@ -249,6 +254,7 @@ class TestFooter(CacheIsolationTestCase):
             assert f'<option value="{language.code}">' in content
 
 
+@ddt.ddt
 class TestIndex(SiteMixin, TestCase):
     """ Test the index view """
 
@@ -286,3 +292,79 @@ class TestIndex(SiteMixin, TestCase):
         self.client.login(username=self.user.username, password="password")
         response = self.client.get(reverse("dashboard"))
         assert self.site_configuration_other.site_values['MKTG_URLS']['ROOT'] in response.content.decode('utf-8')
+
+
+    @ddt.data(
+        (True, True, True),
+        (True, False, False),
+        (False, True, False),
+        (False, False, False),
+    )
+    @ddt.unpack
+    def test_index_redirects_to_mfe(self, catalog_mfe_enabled, use_new_index_page, expected_redirect):
+        """Test that index view redirects to MFE when both flags are enabled."""
+        old_features = settings.FEATURES.copy()
+        old_features.update({
+            "ENABLE_CATALOG_MICROFRONTEND": catalog_mfe_enabled,
+            "COURSES_ARE_BROWSABLE": True,
+        })
+        new_settings = {
+            "FEATURES": old_features,
+            "CATALOG_MICROFRONTEND_URL": "http://example.com/catalog",
+        }
+        with override_settings(**new_settings):
+            with override_waffle_flag(ENABLE_NEW_INDEX_PAGE, active=use_new_index_page):
+                response = self.client.get(reverse("root"))
+
+                if expected_redirect:
+                    expected_url = f'{settings.CATALOG_MICROFRONTEND_URL}/'
+                    self.assertRedirects(
+                        response,
+                        expected_url,
+                        status_code=301,
+                        fetch_redirect_response=False
+                    )
+                else:
+                    assert response.status_code in [200, 301, 302]
+
+
+@ddt.ddt
+class TestCourses(SiteMixin, TestCase):
+    """Test the courses view"""
+
+    def setUp(self):
+        super().setUp()
+        self.courses_url = reverse("courses")
+
+    @ddt.data(
+        (True, True, True),
+        (True, False, False),
+        (False, True, False),
+        (False, False, False),
+    )
+    @ddt.unpack
+    def test_courses_redirect_to_mfe(self, catalog_mfe_enabled, use_new_catalog_page, expected_redirect):
+        """Test that courses view redirects to MFE when both flags are enabled"""
+        old_features = settings.FEATURES.copy()
+        old_features.update({
+            "ENABLE_CATALOG_MICROFRONTEND": catalog_mfe_enabled,
+            "COURSES_ARE_BROWSABLE": True,
+        })
+        new_settings = {
+            "FEATURES": old_features,
+            "CATALOG_MICROFRONTEND_URL": "http://example.com/catalog",
+        }
+        with override_settings(**new_settings):
+            with override_waffle_flag(ENABLE_NEW_CATALOG_PAGE, active=use_new_catalog_page):
+                response = self.client.get(self.courses_url)
+
+                if expected_redirect:
+                    expected_url = f'{settings.CATALOG_MICROFRONTEND_URL}/courses'
+                    self.assertRedirects(
+                        response,
+                        expected_url,
+                        status_code=301,
+                        fetch_redirect_response=False
+                    )
+                else:
+                    assert response.status_code in [200, 301, 302]
diff --git a/lms/djangoapps/branding/views.py b/lms/djangoapps/branding/views.py
index 303dfde588..428657b3c8 100644
--- a/lms/djangoapps/branding/views.py
+++ b/lms/djangoapps/branding/views.py
@@ -16,6 +16,7 @@ from django.views.decorators.cache import cache_control
 from django.views.decorators.csrf import ensure_csrf_cookie
 
 import lms.djangoapps.branding.api as branding_api
+from lms.djangoapps.branding.toggles import catalog_mfe_enabled, use_new_index_page, use_new_catalog_page
 import lms.djangoapps.courseware.views.views as courseware_views
 from common.djangoapps.edxmako.shortcuts import marketing_link, render_to_response
 from common.djangoapps.student import views as student_views
@@ -44,6 +45,9 @@ def index(request):
                 settings.FEATURES.get('ALWAYS_REDIRECT_HOMEPAGE_TO_DASHBOARD_FOR_AUTHENTICATED_USER', True)):
             return redirect('dashboard')
 
+    if catalog_mfe_enabled() and use_new_index_page():
+        return redirect(f'{settings.CATALOG_MICROFRONTEND_URL}/', permanent=True)
+
     enable_mktg_site = configuration_helpers.get_value(
         'ENABLE_MKTG_SITE',
         settings.FEATURES.get('ENABLE_MKTG_SITE', False)
@@ -87,6 +91,9 @@ def courses(request):
     to that. Otherwise, if subdomain branding is on, this is the university
     profile page. Otherwise, it's the edX courseware.views.views.courses page
     """
+    if catalog_mfe_enabled() and use_new_catalog_page():
+        return redirect(f'{settings.CATALOG_MICROFRONTEND_URL}/courses', permanent=True)
+
     enable_mktg_site = configuration_helpers.get_value(
         'ENABLE_MKTG_SITE',
         settings.FEATURES.get('ENABLE_MKTG_SITE', False)
diff --git a/lms/djangoapps/courseware/tests/test_views.py b/lms/djangoapps/courseware/tests/test_views.py
index 4b59bfac24..b4d9449925 100644
--- a/lms/djangoapps/courseware/tests/test_views.py
+++ b/lms/djangoapps/courseware/tests/test_views.py
@@ -19,9 +19,8 @@ from django.conf import settings
 from django.contrib.auth.models import AnonymousUser
 from django.http import Http404, HttpResponse, HttpResponseBadRequest
 from django.http.request import QueryDict
-from django.test import RequestFactory, TestCase
+from django.test import override_settings, RequestFactory, TestCase
 from django.test.client import Client
-from django.test.utils import override_settings
 from django.urls import reverse, reverse_lazy
 from edx_django_utils.cache.utils import RequestCache
 from edx_toggles.toggles.testutils import override_waffle_flag, override_waffle_switch
@@ -57,6 +56,7 @@ from common.djangoapps.student.tests.factories import (
 from common.djangoapps.util.tests.test_date_utils import fake_pgettext, fake_ugettext
 from common.djangoapps.util.url import reload_django_url_config
 from common.djangoapps.util.views import ensure_valid_course_key
+from lms.djangoapps.branding.toggles import ENABLE_NEW_COURSE_ABOUT_PAGE
 from lms.djangoapps.certificates import api as certs_api
 from lms.djangoapps.certificates.models import (
     CertificateGenerationConfiguration,
@@ -3390,3 +3390,42 @@ class TestCoursewareMFENavigationSidebarTogglesAPI(SharedModuleStoreTestCase):
                 "enable_completion_tracking": True,
             },
         )
+
+
+@ddt.ddt
+class CourseAboutViewTests(ModuleStoreTestCase):
+    """
+    Tests for the CourseAboutView.
+    """
+
+    def setUp(self):
+        super().setUp()
+        self.course = CourseFactory.create()
+
+    @ddt.data(
+        (True, True, True),
+        (True, False, False),
+        (False, True, False),
+        (False, False, False),
+    )
+    @ddt.unpack
+    def test_course_about_redirect_to_mfe(self, catalog_mfe_enabled, use_new_course_about_page, expected_redirect):
+        """
+        Test that the CourseAboutView redirects to the MFE when appropriate.
+        """
+        old_features = settings.FEATURES.copy()
+        old_features.update({
+            "ENABLE_CATALOG_MICROFRONTEND": catalog_mfe_enabled,
+        })
+        new_settings = {
+            "FEATURES": old_features,
+            "CATALOG_MICROFRONTEND_URL": "http://example.com/catalog",
+        }
+        with override_settings(**new_settings):
+            with override_waffle_flag(ENABLE_NEW_COURSE_ABOUT_PAGE, active=use_new_course_about_page):
+                response = self.client.get(reverse('about_course', args=[str(self.course.id)]))
+                if expected_redirect:
+                    assert response.status_code == 301
+                    assert response.url == "http://example.com/catalog/courses/{}/about".format(self.course.id)
+                else:
+                    assert response.status_code == 200
diff --git a/lms/djangoapps/courseware/views/views.py b/lms/djangoapps/courseware/views/views.py
index 5b3ed4bb8d..9e07c95e9a 100644
--- a/lms/djangoapps/courseware/views/views.py
+++ b/lms/djangoapps/courseware/views/views.py
@@ -70,6 +70,7 @@ from common.djangoapps.util.course import course_location_from_key
 from common.djangoapps.util.db import outer_atomic
 from common.djangoapps.util.milestones_helpers import get_prerequisite_courses_display
 from common.djangoapps.util.views import ensure_valid_course_key, ensure_valid_usage_key
+from lms.djangoapps.branding import toggles as branding_toggles
 from lms.djangoapps.ccx.custom_exception import CCXLocatorValidationException
 from lms.djangoapps.certificates import api as certs_api
 from lms.djangoapps.certificates.data import CertificateStatuses
@@ -145,6 +146,7 @@ from openedx.core.lib.mobile_utils import is_request_from_mobile_app
 from openedx.features.course_duration_limits.access import generate_course_expired_fragment
 from openedx.features.course_experience import course_home_url
 from openedx.features.course_experience.url_helpers import (
+    get_catalog_mfe_course_about_url,
     get_courseware_url,
     get_learning_mfe_home_url,
     is_request_from_learning_mfe
@@ -817,6 +819,10 @@ def course_about(request, course_id):  # pylint: disable=too-many-statements
     if _course_home_redirect_enabled():
         return redirect(course_home_url(course_key))
 
+    # If the course about page is being rendered in the MFE, redirect to the MFE.
+    if branding_toggles.catalog_mfe_enabled() and branding_toggles.use_new_course_about_page():
+        return redirect(get_catalog_mfe_course_about_url(course_key), permanent=True)
+
     with modulestore().bulk_operations(course_key):
         permission = get_permission_for_course_about()
         course = get_course_with_access(request.user, permission, course_key)
diff --git a/openedx/features/course_experience/url_helpers.py b/openedx/features/course_experience/url_helpers.py
index 44cfdb4aa1..a4ce2d51db 100644
--- a/openedx/features/course_experience/url_helpers.py
+++ b/openedx/features/course_experience/url_helpers.py
@@ -175,6 +175,28 @@ def get_learning_mfe_home_url(
     return mfe_link
 
 
+def get_catalog_mfe_course_about_url(
+        course_key: CourseKey,
+        params: Optional[QueryDict] = None,
+) -> str:
+    """
+    Given a course run key, return the appropriate course about page URL in the Catalog MFE.
+
+    We're building a URL like this:
+
+    http://localhost:2000/course/course-v1:edX+DemoX+Demo_Course/about
+
+    `course_key` can be either an OpaqueKey or a string.
+    `params` is an optional QueryDict object (e.g. request.GET)
+    """
+    mfe_link = f'{settings.CATALOG_MICROFRONTEND_URL}/courses/{course_key}/about'
+
+    if params:
+        mfe_link += f'?{params.urlencode()}'
+
+    return mfe_link
+
+
 def is_request_from_learning_mfe(request: HttpRequest):
     """
     Returns whether the given request was made by the frontend-app-learning MFE.