refactor: rename OrgLibraryGlobData and OrgCourseGlobData

Author: BryanttV

openedx_authz/api/data.py

@@ -27,9 +27,9 @@
     "ContentLibraryData",
     "CourseOverviewData",
     "GroupingPolicyIndex",
-    "OrgCourseGlobData",
+    "OrgCourseOverviewGlobData",
     "OrgGlobData",
-    "OrgLibraryGlobData",
+    "OrgContentLibraryGlobData",
     "PermissionData",
     "PolicyIndex",
     "RoleAssignmentData",
@@ -177,11 +177,11 @@ def __call__(cls, *args, **kwargs):
             1. external_key: Determines subclass from the key format. The namespace prefix
                before the first ':' is used to look up the appropriate subclass.
                Example: ScopeData(external_key='lib:DemoX:CSPROB') → ContentLibraryData
-               Example: ScopeData(external_key='lib:DemoX:*') → OrgLibraryGlobData
+               Example: ScopeData(external_key='lib:DemoX:*') → OrgContentLibraryGlobData
 
             2. namespaced_key: Determines subclass from the namespace prefix before '^'.
                Example: ScopeData(namespaced_key='lib^lib:DemoX:CSPROB') → ContentLibraryData
-               Example: ScopeData(namespaced_key='lib^lib:DemoX:*') → OrgLibraryGlobData
+               Example: ScopeData(namespaced_key='lib^lib:DemoX:*') → OrgContentLibraryGlobData
 
         Usage patterns:
             - namespaced_key: Used when retrieving objects from the policy store
@@ -194,7 +194,7 @@ def __call__(cls, *args, **kwargs):
             True
             >>> # From glob external key
             >>> scope = ScopeData(external_key='lib:DemoX:*')
-            >>> isinstance(scope, OrgLibraryGlobData)
+            >>> isinstance(scope, OrgContentLibraryGlobData)
             True
             >>> # From namespaced key (e.g., policy store)
             >>> scope = ScopeData(namespaced_key='lib^lib:DemoX:CSPROB')
@@ -241,9 +241,9 @@ def get_subclass_by_namespaced_key(mcs, namespaced_key: str) -> Type["ScopeData"
             >>> ScopeMeta.get_subclass_by_namespaced_key('lib^lib:DemoX:CSPROB')
             <class 'ContentLibraryData'>
             >>> ScopeMeta.get_subclass_by_namespaced_key('course-v1^course-v1:WGU+*')
-            <class 'OrgCourseGlobData'>
+            <class 'OrgCourseOverviewGlobData'>
             >>> ScopeMeta.get_subclass_by_namespaced_key('lib^lib:DemoX:*')
-            <class 'OrgLibraryGlobData'>
+            <class 'OrgContentLibraryGlobData'>
             >>> ScopeMeta.get_subclass_by_namespaced_key('global^generic')
             <class 'ScopeData'>
         """
@@ -289,9 +289,9 @@ def get_subclass_by_external_key(mcs, external_key: str) -> Type["ScopeData"]:
             >>> ScopeMeta.get_subclass_by_external_key('course-v1:OpenedX+CS101+2024')
             <class 'CourseOverviewData'>
             >>> ScopeMeta.get_subclass_by_external_key('lib:DemoX:*')
-            <class 'OrgLibraryGlobData'>
+            <class 'OrgContentLibraryGlobData'>
             >>> ScopeMeta.get_subclass_by_external_key('course-v1:OpenedX+*')
-            <class 'OrgCourseGlobData'>
+            <class 'OrgCourseOverviewGlobData'>
 
         Notes:
             - The external_key format should be 'namespace:some-identifier' (e.g., 'lib:DemoX:CSPROB').
@@ -638,7 +638,7 @@ def exists(self) -> bool:
 
 
 @define
-class OrgLibraryGlobData(OrgGlobData):
+class OrgContentLibraryGlobData(OrgGlobData):
     """Organization-level glob pattern for content libraries.
 
     This class represents glob patterns that match multiple libraries within an organization.
@@ -662,7 +662,7 @@ class OrgLibraryGlobData(OrgGlobData):
         - Cannot have wildcards at slug level (``lib:ORG:SLUG*`` is invalid)
 
     Examples:
-        >>> glob = OrgLibraryGlobData(external_key='lib:DemoX:*')
+        >>> glob = OrgContentLibraryGlobData(external_key='lib:DemoX:*')
         >>> glob.org
         'DemoX'
         >>> glob.get_object()
@@ -782,7 +782,7 @@ def __repr__(self):
 
 
 @define
-class OrgCourseGlobData(OrgGlobData):
+class OrgCourseOverviewGlobData(OrgGlobData):
     """Organization-level glob pattern for courses.
 
     This class represents glob patterns that match multiple courses within an organization.
@@ -806,7 +806,7 @@ class OrgCourseGlobData(OrgGlobData):
         - Cannot have wildcards at course or run level (course-v1:ORG+COURSE* is invalid)
 
     Examples:
-        >>> glob = OrgCourseGlobData(external_key='course-v1:OpenedX+*')
+        >>> glob = OrgCourseOverviewGlobData(external_key='course-v1:OpenedX+*')
         >>> glob.org
         'OpenedX'
         >>> glob.get_object()

openedx_authz/tests/api/test_data.py

@@ -10,8 +10,8 @@
     ActionData,
     ContentLibraryData,
     CourseOverviewData,
-    OrgCourseGlobData,
-    OrgLibraryGlobData,
+    OrgCourseOverviewGlobData,
+    OrgContentLibraryGlobData,
     PermissionData,
     RoleAssignmentData,
     RoleData,
@@ -238,15 +238,15 @@ def test_scope_data_registration(self):
 
         # Glob registries for organization-level scopes
         self.assertIn("lib", ScopeMeta.glob_registry)
-        self.assertIs(ScopeMeta.glob_registry["lib"], OrgLibraryGlobData)
+        self.assertIs(ScopeMeta.glob_registry["lib"], OrgContentLibraryGlobData)
         self.assertIn("course-v1", ScopeMeta.glob_registry)
-        self.assertIs(ScopeMeta.glob_registry["course-v1"], OrgCourseGlobData)
+        self.assertIs(ScopeMeta.glob_registry["course-v1"], OrgCourseOverviewGlobData)
 
     @data(
         ("course-v1^course-v1:WGU+CS002+2025_T1", CourseOverviewData),
         ("lib^lib:DemoX:CSPROB", ContentLibraryData),
-        ("lib^lib:DemoX*", OrgLibraryGlobData),
-        ("course-v1^course-v1:OpenedX*", OrgCourseGlobData),
+        ("lib^lib:DemoX*", OrgContentLibraryGlobData),
+        ("course-v1^course-v1:OpenedX*", OrgCourseOverviewGlobData),
         ("global^generic_scope", ScopeData),
     )
     @unpack
@@ -265,8 +265,8 @@ def test_dynamic_instantiation_via_namespaced_key(self, namespaced_key, expected
     @data(
         ("course-v1^course-v1:WGU+CS002+2025_T1", CourseOverviewData),
         ("lib^lib:DemoX:CSPROB", ContentLibraryData),
-        ("lib^lib:DemoX:*", OrgLibraryGlobData),
-        ("course-v1^course-v1:OpenedX+*", OrgCourseGlobData),
+        ("lib^lib:DemoX:*", OrgContentLibraryGlobData),
+        ("course-v1^course-v1:OpenedX+*", OrgCourseOverviewGlobData),
         ("global^generic", ScopeData),
         ("unknown^something", ScopeData),
     )
@@ -286,8 +286,8 @@ def test_get_subclass_by_namespaced_key(self, namespaced_key, expected_class):
     @data(
         ("course-v1:WGU+CS002+2025_T1", CourseOverviewData),
         ("lib:DemoX:CSPROB", ContentLibraryData),
-        ("lib:DemoX:*", OrgLibraryGlobData),
-        ("course-v1:OpenedX+*", OrgCourseGlobData),
+        ("lib:DemoX:*", OrgContentLibraryGlobData),
+        ("course-v1:OpenedX+*", OrgCourseOverviewGlobData),
         ("lib:edX:Demo", ContentLibraryData),
         ("global:generic_scope", ScopeData),
     )
@@ -718,8 +718,8 @@ def test_exists_returns_false_when_library_does_not_exist(self, mock_content_lib
 
 @ddt
 @override_settings(OPENEDX_AUTHZ_CONTENT_LIBRARY_MODEL="content_libraries.ContentLibrary")
-class TestOrgLibraryGlobData(TestCase):
-    """Tests for the OrgLibraryGlobData scope."""
+class TestOrgContentLibraryGlobData(TestCase):
+    """Tests for the OrgContentLibraryGlobData scope."""
 
     @data(
         ("lib:DemoX:*", True),
@@ -743,7 +743,7 @@ class TestOrgLibraryGlobData(TestCase):
     @unpack
     def test_validate_external_key(self, external_key, expected_valid):
         """Validate organization-level library glob external keys."""
-        self.assertEqual(OrgLibraryGlobData.validate_external_key(external_key), expected_valid)
+        self.assertEqual(OrgContentLibraryGlobData.validate_external_key(external_key), expected_valid)
 
     @data(
         ("lib:DemoX:*", "DemoX"),
@@ -756,38 +756,38 @@ def test_validate_external_key(self, external_key, expected_valid):
     @unpack
     def test_get_org(self, external_key, expected_org):
         """Test organization extraction from library glob pattern."""
-        self.assertEqual(OrgLibraryGlobData.get_org(external_key), expected_org)
+        self.assertEqual(OrgContentLibraryGlobData.get_org(external_key), expected_org)
 
     def test_exists_true_when_org_has_libraries_in_db(self):
         """exists() returns True when at least one library with the org exists in the DB."""
         org_name = "DemoX"
         organization = Organization.objects.create(short_name=org_name)
         ContentLibrary.objects.create(org=organization, slug="testlib", title="Test Library")
 
-        result = OrgLibraryGlobData(external_key=f"lib:{org_name}:*").exists()
+        result = OrgContentLibraryGlobData(external_key=f"lib:{org_name}:*").exists()
 
         self.assertTrue(result)
 
     def test_exists_false_when_org_does_not_exist_in_db(self):
         """exists() returns False when the org does not exist in the DB."""
         org_name = "DemoX"
 
-        result = OrgLibraryGlobData(external_key=f"lib:{org_name}:*").exists()
+        result = OrgContentLibraryGlobData(external_key=f"lib:{org_name}:*").exists()
 
         self.assertFalse(result)
 
     def test_exists_false_when_org_cannot_be_parsed(self):
         """exists() returns False when org property is None (invalid pattern)."""
-        scope = OrgLibraryGlobData(external_key="lib:Invalid+*")
+        scope = OrgContentLibraryGlobData(external_key="lib:Invalid+*")
 
         self.assertIsNone(scope.org)
         self.assertFalse(scope.exists())
 
 
 @ddt
 @override_settings(OPENEDX_AUTHZ_COURSE_OVERVIEW_MODEL="course_overviews.CourseOverview")
-class TestOrgCourseGlobData(TestCase):
-    """Tests for the OrgCourseGlobData scope."""
+class TestOrgCourseOverviewGlobData(TestCase):
+    """Tests for the OrgCourseOverviewGlobData scope."""
 
     @data(
         ("course-v1:OpenedX+*", True),
@@ -812,7 +812,7 @@ class TestOrgCourseGlobData(TestCase):
     @unpack
     def test_validate_external_key(self, external_key, expected_valid):
         """Validate organization-level course glob external keys."""
-        self.assertEqual(OrgCourseGlobData.validate_external_key(external_key), expected_valid)
+        self.assertEqual(OrgCourseOverviewGlobData.validate_external_key(external_key), expected_valid)
 
     @data(
         ("course-v1:OpenedX+*", "OpenedX"),
@@ -823,29 +823,29 @@ def test_validate_external_key(self, external_key, expected_valid):
     @unpack
     def test_get_org(self, external_key, expected_org):
         """Test organization extraction from course glob pattern."""
-        self.assertEqual(OrgCourseGlobData.get_org(external_key), expected_org)
+        self.assertEqual(OrgCourseOverviewGlobData.get_org(external_key), expected_org)
 
     def test_exists_true_when_org_has_courses(self):
         """exists() returns True when at least one course with the org exists."""
         org_name = "OpenedX"
         Organization.objects.create(short_name=org_name)
         CourseOverview.objects.create(org=org_name, display_name="Test Course")
 
-        result = OrgCourseGlobData(external_key=f"course-v1:{org_name}+*").exists()
+        result = OrgCourseOverviewGlobData(external_key=f"course-v1:{org_name}+*").exists()
 
         self.assertTrue(result)
 
     def test_exists_false_when_org_does_not_exist(self):
         """exists() returns False when the org does not exist."""
         org_name = "OpenedX"
 
-        result = OrgCourseGlobData(external_key=f"course-v1:{org_name}+*").exists()
+        result = OrgCourseOverviewGlobData(external_key=f"course-v1:{org_name}+*").exists()
 
         self.assertFalse(result)
 
     def test_exists_false_when_org_cannot_be_parsed(self):
         """exists() returns False when org property is None (invalid pattern)."""
-        scope = OrgCourseGlobData(external_key="course-v1:Invalid:*")
+        scope = OrgCourseOverviewGlobData(external_key="course-v1:Invalid:*")
 
         self.assertIsNone(scope.org)
         self.assertFalse(scope.exists())