feat: add IS_GLOB attribute in scope classes

Author: BryanttV

openedx_authz/api/data.py

@@ -12,15 +12,10 @@
 from opaque_keys.edx.keys import CourseKey
 from opaque_keys.edx.locator import LibraryLocatorV2
 
-try:
-    from openedx.core.djangoapps.content_libraries.models import ContentLibrary
-except ImportError:
-    ContentLibrary = None
+from openedx_authz.models.scopes import get_content_library_model, get_course_overview_model
 
-try:
-    from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
-except ImportError:
-    CourseOverview = None
+ContentLibrary = get_content_library_model()
+CourseOverview = get_course_overview_model()
 
 __all__ = [
     "UserData",
@@ -381,6 +376,7 @@ class ScopeData(AuthZData, metaclass=ScopeMeta):
     # 2. Custom global scopes that don't map to specific domain objects (e.g., 'global:some_scope')
     # Subclasses like ContentLibraryData ('lib') represent concrete resource types with their own namespaces.
     NAMESPACE: ClassVar[str] = "global"
+    IS_GLOB: ClassVar[bool] = False
 
     @classmethod
     def validate_external_key(cls, _: str) -> bool:
@@ -558,6 +554,8 @@ class OrgLibraryGlobData(ContentLibraryData):
         a library scope with a wildcard is created.
     """
 
+    IS_GLOB: ClassVar[bool] = True
+
     @property
     def org(self) -> str | None:
         """Get the organization identifier from the glob pattern.
@@ -779,6 +777,8 @@ class OrgCourseGlobData(CourseOverviewData):
         a course scope with a wildcard is created.
     """
 
+    IS_GLOB: ClassVar[bool] = True
+
     @property
     def org(self) -> str | None:
         """Get the organization identifier from the glob pattern.

openedx_authz/models/scopes.py

@@ -11,7 +11,6 @@
 from opaque_keys.edx.keys import CourseKey
 from opaque_keys.edx.locator import LibraryLocatorV2
 
-from openedx_authz.api.data import GLOBAL_SCOPE_WILDCARD, ScopeData
 from openedx_authz.models.core import Scope
 
 
@@ -82,7 +81,7 @@ class ContentLibraryScope(Scope):
     )
 
     @classmethod
-    def get_or_create_for_external_key(cls, scope: ScopeData) -> "ContentLibraryScope":
+    def get_or_create_for_external_key(cls, scope) -> "ContentLibraryScope":
         """Get or create a ContentLibraryScope for the given external key.
 
         Args:
@@ -95,7 +94,7 @@ def get_or_create_for_external_key(cls, scope: ScopeData) -> "ContentLibraryScop
         """
         # For glob scopes we don't create a Scope object since
         # they don't represent a specific content library
-        if GLOBAL_SCOPE_WILDCARD in scope.external_key:
+        if scope.IS_GLOB:
             return None
 
         library_key = LibraryLocatorV2.from_string(scope.external_key)
@@ -131,7 +130,7 @@ class CourseScope(Scope):
     )
 
     @classmethod
-    def get_or_create_for_external_key(cls, scope: ScopeData) -> "CourseScope":
+    def get_or_create_for_external_key(cls, scope) -> "CourseScope":
         """Get or create a CourseScope for the given external key.
 
         Args:
@@ -144,7 +143,7 @@ def get_or_create_for_external_key(cls, scope: ScopeData) -> "CourseScope":
         """
         # For glob scopes we don't create a Scope object
         # since they don't represent a specific course
-        if GLOBAL_SCOPE_WILDCARD in scope.external_key:
+        if scope.IS_GLOB:
             return None
 
         course_key = CourseKey.from_string(scope.external_key)