fix: Refactor URLs and tests to core

Author: brianjbuck-wgu

lms/djangoapps/instructor/views/api_urls.py

@@ -7,7 +7,6 @@
 
 from lms.djangoapps.instructor.views import api, gradebook_api, api_v2
 from openedx.core.constants import COURSE_ID_PATTERN
-from openedx.core.djangoapps.course_groups.rest_api import views as course_groups_views
 
 # These endpoints are exposing existing views in a way that can be used by MFEs
 # or other API clients. They are currently versioned at `v1` since they have
@@ -42,16 +41,6 @@
         api_v2.GradedSubsectionsView.as_view(),
         name='graded_subsections'
     ),
-    re_path(
-        rf'^courses/{COURSE_ID_PATTERN}/group_configurations$',
-        course_groups_views.GroupConfigurationsListView.as_view(),
-        name='group_configurations_list'
-    ),
-    re_path(
-        rf'^courses/{COURSE_ID_PATTERN}/group_configurations/(?P<configuration_id>\d+)$',
-        course_groups_views.GroupConfigurationDetailView.as_view(),
-        name='group_configurations_detail'
-    ),
     re_path(
         rf'^courses/{COURSE_ID_PATTERN}/ora$',
         api_v2.ORAView.as_view(),

…s/instructor-v2-content-groups-spec.yaml …api/docs/content-groups-api-v2-spec.yamllms/djangoapps/instructor/docs/references/instructor-v2-content-groups-spec.yaml renamed to openedx/core/djangoapps/course_groups/rest_api/docs/content-groups-api-v2-spec.yaml lms/djangoapps/instructor/docs/references/instructor-v2-content-groups-spec.yaml renamed to openedx/core/djangoapps/course_groups/rest_api/docs/content-groups-api-v2-spec.yaml

@@ -1,6 +1,6 @@
 swagger: '2.0'
 info:
-  title: Instructor Dashboard Content Groups API v2
+  title: Content Groups API v2
   version: 2.0.0
   description: |
     REST API for managing content group configurations.
@@ -42,7 +42,7 @@ parameters:
     description: The ID of the content group configuration
 
 paths:
-  /api/instructor/v2/courses/{course_id}/group_configurations:
+  /api/cohorts/v2/courses/{course_id}/group_configurations:
     get:
       tags:
         - Content Groups
@@ -69,7 +69,7 @@ paths:
         404:
           description: Course not found
 
-  /api/instructor/v2/courses/{course_id}/group_configurations/{configuration_id}:
+  /api/cohorts/v2/courses/{course_id}/group_configurations/{configuration_id}:
     get:
       tags:
         - Content Groups

openedx/core/djangoapps/course_groups/rest_api/tests/__init__.py

@@ -0,0 +1,3 @@
+"""
+Tests for Content Groups REST API v2.
+"""

…ts/views/test_group_configurations_v2.py …urse_groups/rest_api/tests/test_views.pylms/djangoapps/instructor/tests/views/test_group_configurations_v2.py renamed to openedx/core/djangoapps/course_groups/rest_api/tests/test_views.py lms/djangoapps/instructor/tests/views/test_group_configurations_v2.py renamed to openedx/core/djangoapps/course_groups/rest_api/tests/test_views.py

@@ -1,5 +1,5 @@
 """
-Tests for Content Groups (Group Configurations) V2 API in Instructor Dashboard.
+Tests for Content Groups REST API v2.
 """
 from unittest.mock import patch
 
@@ -11,11 +11,13 @@
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory
 from openedx.core.djangoapps.course_groups.constants import COHORT_SCHEME
+from openedx.core.djangolib.testing.utils import skip_unless_lms
 
 
+@skip_unless_lms
 class GroupConfigurationsListViewTestCase(ModuleStoreTestCase):
     """
-    Tests for GET /api/instructor/v2/courses/{course_id}/group_configurations
+    Tests for GET /api/cohorts/v2/courses/{course_id}/group_configurations
     """
 
     def setUp(self):
@@ -28,14 +30,13 @@ def setUp(self):
     def _get_url(self, course_id=None):
         """Helper to get the list URL"""
         course_id = course_id or str(self.course.id)
-        return f'/api/instructor/v2/courses/{course_id}/group_configurations'
+        return f'/api/cohorts/v2/courses/{course_id}/group_configurations'
 
     @patch('lms.djangoapps.instructor.permissions.InstructorPermission.has_permission')
     def test_list_content_groups_returns_json(self, mock_perm):
         """Verify endpoint returns JSON with correct structure"""
         mock_perm.return_value = True
 
-        # Create content groups
         self.course.user_partitions = [
             UserPartition(
                 id=50,
@@ -50,10 +51,8 @@ def test_list_content_groups_returns_json(self, mock_perm):
         ]
         self.update_course(self.course, self.user.id)
 
-        # Get endpoint
         response = self.api_client.get(self._get_url())
 
-        # Verify response
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(response['Content-Type'], 'application/json')
 
@@ -62,7 +61,6 @@ def test_list_content_groups_returns_json(self, mock_perm):
         self.assertIn('should_show_enrollment_track', data)
         self.assertIn('should_show_experiment_groups', data)
 
-        # Verify content groups
         configs = data['all_group_configurations']
         self.assertEqual(len(configs), 1)
         self.assertEqual(configs[0]['scheme'], COHORT_SCHEME)
@@ -73,7 +71,6 @@ def test_list_content_groups_filters_non_cohort_partitions(self, mock_perm):
         """Verify only cohort-scheme partitions are returned"""
         mock_perm.return_value = True
 
-        # Create mixed partitions
         self.course.user_partitions = [
             UserPartition(
                 id=50,
@@ -87,7 +84,7 @@ def test_list_content_groups_filters_non_cohort_partitions(self, mock_perm):
                 name='Experiment Groups',
                 description='Random experiment groups',
                 groups=[Group(id=1, name='Group B')],
-                scheme_id='random'  # Not cohort scheme
+                scheme_id='random'
             ),
         ]
         self.update_course(self.course, self.user.id)
@@ -97,7 +94,6 @@ def test_list_content_groups_filters_non_cohort_partitions(self, mock_perm):
         data = response.json()
         configs = data['all_group_configurations']
 
-        # Should only return cohort-scheme partition
         self.assertEqual(len(configs), 1)
         self.assertEqual(configs[0]['id'], 50)
         self.assertEqual(configs[0]['scheme'], COHORT_SCHEME)
@@ -107,20 +103,18 @@ def test_list_auto_creates_empty_content_group_if_none_exists(self, mock_perm):
         """Verify empty content group is auto-created when none exists"""
         mock_perm.return_value = True
 
-        # Don't add any partitions
         response = self.api_client.get(self._get_url())
 
         data = response.json()
         configs = data['all_group_configurations']
 
-        # Should have auto-created empty content group
         self.assertEqual(len(configs), 1)
         self.assertEqual(configs[0]['scheme'], COHORT_SCHEME)
         self.assertEqual(len(configs[0]['groups']), 0)
 
     def test_list_requires_authentication(self):
         """Verify endpoint requires authentication"""
-        client = APIClient()  # Unauthenticated
+        client = APIClient()
         response = client.get(self._get_url())
         self.assertIn(response.status_code, [status.HTTP_401_UNAUTHORIZED, status.HTTP_403_FORBIDDEN])
 
@@ -129,14 +123,14 @@ def test_list_invalid_course_key_returns_400(self, mock_perm):
         """Verify invalid course key returns 400"""
         mock_perm.return_value = True
 
-        # Use a course key that matches URL pattern but is invalid when parsed
-        response = self.api_client.get('/api/instructor/v2/courses/course-v1:org/course/run/group_configurations')
-        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
+        response = self.api_client.get('/api/cohorts/v2/courses/course-v1:invalid+course+key/group_configurations')
+        self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
 
 
+@skip_unless_lms
 class GroupConfigurationDetailViewTestCase(ModuleStoreTestCase):
     """
-    Tests for GET /api/instructor/v2/courses/{course_id}/group_configurations/{id}
+    Tests for GET /api/cohorts/v2/courses/{course_id}/group_configurations/{id}
     """
 
     def setUp(self):
@@ -146,7 +140,6 @@ def setUp(self):
         self.course = CourseFactory.create()
         self.api_client.force_authenticate(user=self.user)
 
-        # Create a test configuration
         self.course.user_partitions = [
             UserPartition(
                 id=50,
@@ -163,7 +156,7 @@ def setUp(self):
 
     def _get_url(self, configuration_id=50):
         """Helper to get detail URL"""
-        return f'/api/instructor/v2/courses/{self.course.id}/group_configurations/{configuration_id}'
+        return f'/api/cohorts/v2/courses/{self.course.id}/group_configurations/{configuration_id}'
 
     @patch('lms.djangoapps.instructor.permissions.InstructorPermission.has_permission')
     def test_get_configuration_details(self, mock_perm):
@@ -181,6 +174,7 @@ def test_get_configuration_details(self, mock_perm):
         self.assertEqual(len(data['groups']), 2)
 
 
+@skip_unless_lms
 class ContentGroupsPermissionsTestCase(ModuleStoreTestCase):
     """
     Tests for permission checking
@@ -194,7 +188,7 @@ def setUp(self):
 
     def _get_url(self):
         """Helper to get list URL"""
-        return f'/api/instructor/v2/courses/{self.course.id}/group_configurations'
+        return f'/api/cohorts/v2/courses/{self.course.id}/group_configurations'
 
     @patch('lms.djangoapps.instructor.permissions.InstructorPermission.has_permission')
     def test_staff_user_can_access(self, mock_perm):

openedx/core/djangoapps/course_groups/rest_api/urls.py

@@ -0,0 +1,20 @@
+"""
+Content Groups REST API v2 URLs
+"""
+from django.conf import settings
+from django.urls import re_path
+
+from openedx.core.djangoapps.course_groups.rest_api import views
+
+urlpatterns = [
+    re_path(
+        r'^v2/courses/{}/group_configurations$'.format(settings.COURSE_KEY_PATTERN),
+        views.GroupConfigurationsListView.as_view(),
+        name='group_configurations_list'
+    ),
+    re_path(
+        r'^v2/courses/{}/group_configurations/(?P<configuration_id>\d+)$'.format(settings.COURSE_KEY_PATTERN),
+        views.GroupConfigurationDetailView.as_view(),
+        name='group_configurations_detail'
+    ),
+]

openedx/core/djangoapps/course_groups/rest_api/views.py

@@ -50,23 +50,23 @@ class GroupConfigurationsListView(DeveloperErrorViewMixin, APIView):
             404: "Course not found",
         },
     )
-    def get(self, request, course_id):
+    def get(self, request, course_key_string):
         """
         List all content groups for a course.
         """
         try:
-            course_key = CourseKey.from_string(course_id)
+            course_key = CourseKey.from_string(course_key_string)
         except InvalidKeyError:
             return Response(
-                {"error": f"Invalid course key: {course_id}"},
+                {"error": f"Invalid course key: {course_key_string}"},
                 status=status.HTTP_400_BAD_REQUEST
             )
 
         try:
             course = get_course_by_id(course_key)
         except ItemNotFoundError:
             return Response(
-                {"error": f"Course not found: {course_id}"},
+                {"error": f"Course not found: {course_key_string}"},
                 status=status.HTTP_404_NOT_FOUND
             )
 
@@ -87,8 +87,8 @@ def get(self, request, course_id):
             "should_show_enrollment_track": False,
             "should_show_experiment_groups": True,
             "context_course": None,
-            "group_configuration_url": f"/api/instructor/v2/courses/{course_id}/group_configurations",
-            "course_outline_url": f"/api/contentstore/v1/courses/{course_id}",
+            "group_configuration_url": f"/api/cohorts/v2/courses/{course_key_string}/group_configurations",
+            "course_outline_url": f"/api/contentstore/v1/courses/{course_key_string}",
         }
 
         serializer = ContentGroupsListResponseSerializer(context)
@@ -123,23 +123,23 @@ class GroupConfigurationDetailView(DeveloperErrorViewMixin, APIView):
             404: "Content group configuration not found",
         },
     )
-    def get(self, request, course_id, configuration_id):
+    def get(self, request, course_key_string, configuration_id):
         """
         Retrieve a specific content group configuration.
         """
         try:
-            course_key = CourseKey.from_string(course_id)
+            course_key = CourseKey.from_string(course_key_string)
         except InvalidKeyError:
             return Response(
-                {"error": f"Invalid course key: {course_id}"},
+                {"error": f"Invalid course key: {course_key_string}"},
                 status=status.HTTP_400_BAD_REQUEST
             )
 
         try:
             course = get_course_by_id(course_key)
         except ItemNotFoundError:
             return Response(
-                {"error": f"Course not found: {course_id}"},
+                {"error": f"Course not found: {course_key_string}"},
                 status=status.HTTP_404_NOT_FOUND
             )
 

openedx/core/djangoapps/course_groups/urls.py

@@ -4,7 +4,7 @@
 
 
 from django.conf import settings
-from django.urls import re_path
+from django.urls import include, re_path
 
 import lms.djangoapps.instructor.views.api
 import openedx.core.djangoapps.course_groups.views
@@ -38,4 +38,6 @@
         lms.djangoapps.instructor.views.api.CohortCSV.as_view(),
         name='cohort_users_csv',
     ),
+    # v2 Content Groups API
+    re_path(r'', include('openedx.core.djangoapps.course_groups.rest_api.urls')),
 ]