refactor: Use LibraryElementKey instead of LibraryCollectionKey

Author: ChrisChV

openedx/core/djangoapps/content_tagging/api.py

@@ -12,7 +12,7 @@
 import openedx_tagging.core.tagging.api as oel_tagging
 from django.db.models import Exists, OuterRef, Q, QuerySet
 from django.utils.timezone import now
-from opaque_keys.edx.keys import CourseKey, LibraryCollectionKey
+from opaque_keys.edx.keys import CourseKey, LibraryElementKey
 from opaque_keys.edx.locator import LibraryLocatorV2
 from openedx_tagging.core.tagging.models import ObjectTag, Taxonomy
 from openedx_tagging.core.tagging.models.utils import TAGS_CSV_SEPARATOR
@@ -230,7 +230,7 @@ def generate_csv_rows(object_id, buffer) -> Iterator[str]:
     """
     content_key = get_content_key_from_string(object_id)
 
-    if isinstance(content_key, (UsageKey, LibraryCollectionKey)):
+    if isinstance(content_key, (UsageKey, LibraryElementKey)):
         raise ValueError("The object_id must be a CourseKey or a LibraryLocatorV2.")
 
     all_object_tags, taxonomies = get_all_object_tags(content_key)

openedx/core/djangoapps/content_tagging/tests/test_api.py

@@ -5,8 +5,8 @@
 import ddt
 from django.test.testcases import TestCase
 from fs.osfs import OSFS
-from opaque_keys.edx.keys import CourseKey, UsageKey, LibraryCollectionKey
-from opaque_keys.edx.locator import LibraryLocatorV2
+from opaque_keys.edx.keys import CourseKey, UsageKey
+from opaque_keys.edx.locator import LibraryLocatorV2, LibraryCollectionLocator
 from openedx_tagging.core.tagging.models import ObjectTag
 from organizations.models import Organization
 from .test_objecttag_export_helpers import TestGetAllObjectTagsMixin, TaggedCourseMixin
@@ -381,7 +381,7 @@ def test_copy_cross_org_tags(self):
             self._test_copy_object_tags(src_key, dst_key, expected_tags)
 
     def test_tag_collection(self):
-        collection_key = LibraryCollectionKey.from_string("lib-collection:orgA:libX:1")
+        collection_key = LibraryCollectionLocator.from_string("lib-collection:orgA:libX:1")
 
         api.tag_object(
             object_id=str(collection_key),

openedx/core/djangoapps/content_tagging/types.py

@@ -5,11 +5,11 @@
 
 from typing import Dict, List, Union
 
-from opaque_keys.edx.keys import CourseKey, UsageKey, LibraryCollectionKey
+from opaque_keys.edx.keys import CourseKey, UsageKey, LibraryElementKey
 from opaque_keys.edx.locator import LibraryLocatorV2
 from openedx_tagging.core.tagging.models import Taxonomy
 
-ContentKey = Union[LibraryLocatorV2, CourseKey, UsageKey, LibraryCollectionKey]
+ContentKey = Union[LibraryLocatorV2, CourseKey, UsageKey, LibraryElementKey]
 ContextKey = Union[LibraryLocatorV2, CourseKey]
 
 TagValuesByTaxonomyIdDict = Dict[int, List[str]]

openedx/core/djangoapps/content_tagging/utils.py

@@ -5,7 +5,7 @@
 
 from edx_django_utils.cache import RequestCache
 from opaque_keys import InvalidKeyError
-from opaque_keys.edx.keys import CourseKey, UsageKey, LibraryCollectionKey
+from opaque_keys.edx.keys import CourseKey, UsageKey, LibraryElementKey
 from opaque_keys.edx.locator import LibraryLocatorV2
 from openedx_tagging.core.tagging.models import Taxonomy
 from organizations.models import Organization
@@ -28,11 +28,11 @@ def get_content_key_from_string(key_str: str) -> ContentKey:
                 return UsageKey.from_string(key_str)
             except InvalidKeyError:
                 try:
-                    return LibraryCollectionKey.from_string(key_str)
+                    return LibraryElementKey.from_string(key_str)
                 except InvalidKeyError as usage_key_error:
                     raise ValueError(
                         "object_id must be one of the following "
-                        "keys: CourseKey, LibraryLocatorV2, UsageKey or LibCollectionKey"
+                        "keys: CourseKey, LibraryLocatorV2, UsageKey or LibraryElementKey"
                     ) from usage_key_error
 
 
@@ -44,8 +44,8 @@ def get_context_key_from_key(content_key: ContentKey) -> ContextKey:
     if isinstance(content_key, (CourseKey, LibraryLocatorV2)):
         return content_key
 
-    # If the content key is a LibraryCollectionKey, return the LibraryLocatorV2
-    if isinstance(content_key, LibraryCollectionKey):
+    # If the content key is a LibraryElementKey, return the LibraryLocatorV2
+    if isinstance(content_key, LibraryElementKey):
         return content_key.library_key
 
     # If the content key is a UsageKey, return the context key