From 6078bbba19853478ebc7bb69de9c1291dfc03bd8 Mon Sep 17 00:00:00 2001
From: Andrii <andrii.hantkovskyi@raccoongang.com>
Date: Wed, 14 May 2025 22:52:09 +0300
Subject: [PATCH 01/40] feat: redesign import task + api/helpers tests
 adaptation

---
 .../import_from_modulestore/admin.py          |  54 ++
 cms/djangoapps/import_from_modulestore/api.py |  43 ++
 .../import_from_modulestore/data.py           |  69 +++
 .../import_from_modulestore/helpers.py        | 466 ++++++++++++++++++
 ...created_remove_import_modified_and_more.py |  48 ++
 .../import_from_modulestore/models.py         | 154 ++++++
 .../import_from_modulestore/tasks.py          | 146 ++++++
 .../tests/factories.py                        |  26 +
 .../import_from_modulestore/tests/test_api.py |  98 ++++
 .../tests/test_helpers.py                     | 442 +++++++++++++++++
 .../tests/test_tasks.py                       | 176 +++++++
 11 files changed, 1722 insertions(+)
 create mode 100644 cms/djangoapps/import_from_modulestore/admin.py
 create mode 100644 cms/djangoapps/import_from_modulestore/api.py
 create mode 100644 cms/djangoapps/import_from_modulestore/data.py
 create mode 100644 cms/djangoapps/import_from_modulestore/helpers.py
 create mode 100644 cms/djangoapps/import_from_modulestore/migrations/0002_remove_import_created_remove_import_modified_and_more.py
 create mode 100644 cms/djangoapps/import_from_modulestore/models.py
 create mode 100644 cms/djangoapps/import_from_modulestore/tasks.py
 create mode 100644 cms/djangoapps/import_from_modulestore/tests/factories.py
 create mode 100644 cms/djangoapps/import_from_modulestore/tests/test_api.py
 create mode 100644 cms/djangoapps/import_from_modulestore/tests/test_helpers.py
 create mode 100644 cms/djangoapps/import_from_modulestore/tests/test_tasks.py

diff --git a/cms/djangoapps/import_from_modulestore/admin.py b/cms/djangoapps/import_from_modulestore/admin.py
new file mode 100644
index 000000000000..61f90f5f7d48
--- /dev/null
+++ b/cms/djangoapps/import_from_modulestore/admin.py
@@ -0,0 +1,54 @@
+"""
+This module contains the admin configuration for the Import model.
+"""
+from django.contrib import admin
+
+from .models import Import, PublishableEntityImport, PublishableEntityMapping
+
+
+class ImportAdmin(admin.ModelAdmin):
+    """
+    Admin configuration for the Import model.
+    """
+
+    list_display = (
+        'uuid',
+        'created',
+        'status',
+        'source_key',
+        'target_change',
+    )
+    list_filter = (
+        'user_task_status__state',
+    )
+    search_fields = (
+        'source_key',
+        'target_change',
+    )
+
+    raw_id_fields = ('user',)
+    readonly_fields = ('user_task_status',)
+
+    def uuid(self, obj):
+        """
+        Returns the UUID of the import.
+        """
+        return getattr(obj.user_task_status, 'uuid', None)
+    uuid.short_description = 'UUID'
+
+    def created(self, obj):
+        """
+        Returns the creation date of the import.
+        """
+        return getattr(obj.user_task_status, 'created', None)
+
+    def status(self, obj):
+        """
+        Returns the status of the import.
+        """
+        return getattr(obj.user_task_status, 'state', None)
+
+
+admin.site.register(Import, ImportAdmin)
+admin.site.register(PublishableEntityImport)
+admin.site.register(PublishableEntityMapping)
diff --git a/cms/djangoapps/import_from_modulestore/api.py b/cms/djangoapps/import_from_modulestore/api.py
new file mode 100644
index 000000000000..5c9bfc2aaec9
--- /dev/null
+++ b/cms/djangoapps/import_from_modulestore/api.py
@@ -0,0 +1,43 @@
+"""
+API for course to library import.
+"""
+from typing import Sequence
+
+from opaque_keys.edx.keys import LearningContextKey, UsageKey
+
+from .helpers import cancel_incomplete_old_imports
+from .models import Import as _Import
+from .tasks import import_to_library_task
+from .validators import validate_usage_keys_to_import
+
+
+def import_to_library(
+    source_key: LearningContextKey,
+    usage_ids: Sequence[str | UsageKey],
+    target_learning_package_id: int,
+    user_id: int,
+    composition_level: str,
+    override: bool = False,
+) -> _Import:
+    """
+    Import staged content to a library from staged content.
+    """
+    validate_usage_keys_to_import(usage_ids)
+
+    import_from_modulestore = _Import.objects.create(
+        source_key=source_key,
+        user_id=user_id,
+        composition_level=composition_level,
+        override=override,
+    )
+    cancel_incomplete_old_imports(import_from_modulestore)
+
+    import_to_library_task.apply_async(
+        kwargs={
+            'import_pk': import_from_modulestore.pk,
+            'usage_key_strings': usage_ids,
+            'learning_package_id': target_learning_package_id,
+            'user_id': user_id,
+        },
+    )
+    return import_from_modulestore
diff --git a/cms/djangoapps/import_from_modulestore/data.py b/cms/djangoapps/import_from_modulestore/data.py
new file mode 100644
index 000000000000..b7303281a985
--- /dev/null
+++ b/cms/djangoapps/import_from_modulestore/data.py
@@ -0,0 +1,69 @@
+"""
+This module contains the data models for the import_from_modulestore app.
+"""
+from collections import namedtuple
+from enum import Enum
+from openedx.core.djangoapps.content_libraries import api as content_libraries_api
+
+from django.utils.translation import gettext_lazy as _
+
+
+class ImportStatus(Enum):
+    """
+    The status of this modulestore-to-learning-core import.
+    """
+
+    WAITNG_TO_STAGE = _('Waiting to stage content')
+    STAGING = _('Staging content for import')
+    STAGING_FAILED = _('Failed to stage content')
+    STAGED = _('Content is staged and ready for import')
+    IMPORTING = _('Importing staged content')
+    IMPORTING_FAILED = _('Failed to import staged content')
+    IMPORTED = _('Staged content imported successfully')
+    CANCELED = _('Import canceled')
+
+    FAILED_STATUSES = [
+        STAGING_FAILED,
+        IMPORTING_FAILED,
+    ]
+
+
+class CompositionLevel(Enum):
+    """
+    Enumeration of composition levels for course content.
+    Defines the different levels of composition for course content,
+    including chapters, sequentials, verticals, and xblocks.
+    It also categorizes these levels into complicated and flat
+    levels for easier processing.
+    """
+
+    CHAPTER = content_libraries_api.ContainerType.Section
+    SEQUENTIAL = content_libraries_api.ContainerType.Subsection
+    VERTICAL = content_libraries_api.ContainerType.Unit
+    COMPONENT = 'component'
+    OLX_COMPLEX_LEVELS = [
+        VERTICAL.olx_tag,
+        SEQUENTIAL.olx_tag,
+        CHAPTER.olx_tag,
+    ]
+
+    @classmethod
+    def values(cls):
+        """
+        Returns all levels of composition levels.
+        """
+        return [composition_level.value for composition_level in cls]
+
+    @classmethod
+    def choices(cls):
+        """
+        Returns all levels of composition levels as a list of tuples.
+        """
+        return [
+            (composition_level.value, composition_level.name)
+            for composition_level in cls
+            if not isinstance(composition_level.value, list)
+        ]
+
+
+PublishableVersionWithMapping = namedtuple('PublishableVersionWithMapping', ['publishable_version', 'mapping'])
diff --git a/cms/djangoapps/import_from_modulestore/helpers.py b/cms/djangoapps/import_from_modulestore/helpers.py
new file mode 100644
index 000000000000..60b978270c4c
--- /dev/null
+++ b/cms/djangoapps/import_from_modulestore/helpers.py
@@ -0,0 +1,466 @@
+"""
+Helper functions for importing course content into a library.
+"""
+from datetime import datetime, timezone
+from functools import partial
+import logging
+import mimetypes
+import os
+import secrets
+from typing import TYPE_CHECKING
+
+from django.db import transaction
+from django.db.utils import IntegrityError
+from lxml import etree
+
+from opaque_keys.edx.keys import UsageKey
+from opaque_keys.edx.locator import CourseLocator
+from openedx_learning.api import authoring as authoring_api
+from openedx_learning.api.authoring_models import Component, Container, ContainerVersion, PublishableEntity
+
+from openedx.core.djangoapps.content_libraries import api
+from openedx.core.djangoapps.content_staging import api as content_staging_api
+from xmodule.modulestore.django import modulestore
+
+from .data import CompositionLevel, ImportStatus, PublishableVersionWithMapping
+from .models import Import, PublishableEntityMapping
+
+if TYPE_CHECKING:
+    from openedx_learning.apps.authoring_models import LearningPackage
+    from xblock.core import XBlock
+
+    from openedx.core.djangoapps.content_staging.api import _StagedContent as StagedContent
+
+
+log = logging.getLogger(__name__)
+parser = etree.XMLParser(strip_cdata=False)
+
+
+class ImportClient:
+    """
+    Client for importing course content into a library.
+
+    This class handles the import of course content from staged content into a
+    content library, creating the appropriate container hierarchy based on the
+    specified composition level.
+    """
+
+    # The create functions have different kwarg names for the child list,
+    # so we need to use partial to set the child list to empty.
+    CONTAINER_CREATORS_MAP: dict[str, partial] = {
+        api.ContainerType.Section.olx_tag: partial(authoring_api.create_section_and_version, subsections=[]),
+        api.ContainerType.Subsection.olx_tag: partial(authoring_api.create_subsection_and_version, units=[]),
+        api.ContainerType.Unit.olx_tag: partial(authoring_api.create_unit_and_version, components=[]),
+    }
+
+    CONTAINER_OVERRIDERS_MAP: dict[str, partial] = {
+        api.ContainerType.Section.olx_tag: partial(authoring_api.create_next_section_version, subsections=[]),
+        api.ContainerType.Subsection.olx_tag: partial(authoring_api.create_next_subsection_version, units=[]),
+        api.ContainerType.Unit.olx_tag: partial(authoring_api.create_next_unit_version, components=[]),
+    }
+
+    def __init__(
+        self,
+        import_event: Import,
+        block_usage_key_to_import: str,
+        target_learning_package: 'LearningPackage',
+        staged_content: 'StagedContent',
+        composition_level: str,
+        override: bool = False,
+    ):
+        self.import_event = import_event
+        self.block_usage_key_to_import = block_usage_key_to_import
+        self.learning_package = target_learning_package
+        self.staged_content = staged_content
+        self.composition_level = composition_level
+        self.override = override
+
+        self.user_id = import_event.user_id
+        self.content_library = target_learning_package.contentlibrary
+        self.library_key = self.content_library.library_key
+        self.parser = etree.XMLParser(strip_cdata=False)
+
+    def import_from_staged_content(self) -> list[PublishableVersionWithMapping]:
+        """
+        Import staged content into a library.
+        """
+        node = etree.fromstring(self.staged_content.olx, parser=parser)
+        usage_key = UsageKey.from_string(self.block_usage_key_to_import)
+        block_to_import = get_node_for_usage_key(node, usage_key)
+        if block_to_import is None:
+            return []
+
+        return self._import_complicated_child(block_to_import, self.block_usage_key_to_import)
+
+    def _process_import(self, usage_key_string, block_to_import) -> list[PublishableVersionWithMapping]:
+        """
+        Process import of a block from staged content into a library.
+
+        Imports a block and its children into the library based on the
+        composition level. It handles both simple and complicated blocks, creating
+        the necessary container hierarchy.
+        """
+        usage_key = UsageKey.from_string(usage_key_string)
+        result = []
+
+        if block_to_import.tag not in CompositionLevel.OLX_COMPLEX_LEVELS.value:
+            return self._import_simple_block(block_to_import, usage_key)
+
+        for child in block_to_import.getchildren():
+            child_usage_key_string = get_usage_key_string_from_staged_content(
+                self.staged_content, child.get('url_name')
+            )
+            if not child_usage_key_string:
+                continue
+
+            result.extend(self._import_child_block(child, child_usage_key_string))
+
+        if self.composition_level == CompositionLevel.COMPONENT.value:
+            return [
+                publishable_version_with_mapping for publishable_version_with_mapping in result
+                if not isinstance(publishable_version_with_mapping.publishable_version, ContainerVersion)
+            ]
+        return result
+
+    def _import_simple_block(self, block_to_import, usage_key) -> list[PublishableVersionWithMapping]:
+        """
+        Import a simple block into the library.
+
+        Creates a block in the library from the staged content block.
+        It returns a list containing the created component version.
+        """
+        publishable_version_with_mapping = self._create_block_in_library(block_to_import, usage_key)
+        return [publishable_version_with_mapping] if publishable_version_with_mapping else []
+
+    def _import_child_block(self, child, child_usage_key_string):
+        """
+        Import a child block into the library.
+
+        Determines whether the child block is simple or complicated and
+        delegates the import process to the appropriate helper method.
+        """
+        child_usage_key = UsageKey.from_string(child_usage_key_string)
+        if child.tag in CompositionLevel.OLX_COMPLEX_LEVELS.value:
+            return self._import_complicated_child(child, child_usage_key_string)
+        else:
+            return self._import_simple_block(child, child_usage_key)
+
+    def _import_complicated_child(self, child, child_usage_key_string):
+        """
+        Import a complicated child block into the library.
+
+        Handles the import of complicated child blocks, including creating
+        containers and updating components.
+        Returns a list containing the created container version.
+        """
+        if not self._should_create_container(child.tag):
+            return self._process_import(child_usage_key_string, child)
+
+        container_version_with_mapping = self.get_or_create_container(
+            child.tag,
+            child.get('url_name'),
+            child.get('display_name', child.tag),
+            child_usage_key_string,
+        )
+        child_component_versions_with_mapping = self._process_import(child_usage_key_string, child)
+        child_component_versions = [
+            child_component_version.publishable_version for child_component_version
+            in child_component_versions_with_mapping
+        ]
+        self._update_container_components(container_version_with_mapping.publishable_version, child_component_versions)
+        return [container_version_with_mapping] + child_component_versions_with_mapping
+
+    def _should_create_container(self, container_type: str) -> bool:
+        """
+        Determine if a new container should be created.
+
+        Container type should be at a lower level than the current composition level.
+        """
+        composition_hierarchy = CompositionLevel.OLX_COMPLEX_LEVELS.value
+        return (
+            container_type in composition_hierarchy and
+            self.composition_level in composition_hierarchy and
+            composition_hierarchy.index(container_type) <= composition_hierarchy.index(self.composition_level)
+        )
+
+    def get_or_create_container(
+        self,
+        container_type: str,
+        key: str,
+        display_name: str,
+        block_usage_key_string: str
+    ) -> PublishableVersionWithMapping:
+        """
+        Create a container of the specified type.
+
+        Creates a container (e.g., chapter, sequential, vertical) in the
+        content library.
+        """
+        try:
+            container_creator_func = self.CONTAINER_CREATORS_MAP[container_type]
+            container_override_func = self.CONTAINER_OVERRIDERS_MAP[container_type]
+        except KeyError as exc:
+            raise ValueError(f"Unknown container type: {container_type}") from exc
+
+        try:
+            container_version = self.content_library.learning_package.publishable_entities.get(key=key)
+        except PublishableEntity.DoesNotExist:
+            container_version = None
+
+        if container_version and self.override:
+            container_version = container_override_func(
+                container_version.container,
+                title=display_name or f"New {container_type}",
+                created=datetime.now(tz=timezone.utc),
+                created_by=self.import_event.user_id,
+            )
+        elif not container_version:
+            _, container_version = container_creator_func(
+                self.learning_package.id,
+                key=key or secrets.token_hex(16),
+                title=display_name or f"New {container_type}",
+                created=datetime.now(tz=timezone.utc),
+                created_by=self.import_event.user_id,
+            )
+
+        publishable_entity_mapping, _ = get_or_create_publishable_entity_mapping(
+            block_usage_key_string,
+            container_version.container
+        )
+
+        return PublishableVersionWithMapping(container_version, publishable_entity_mapping)
+
+    def _update_container_components(self, container_version, component_versions):
+        """
+        Update components of a container.
+        """
+        entity_rows = [
+            authoring_api.ContainerEntityRow(
+                entity_pk=cv.container.pk if isinstance(cv, ContainerVersion) else cv.component.pk,
+                version_pk=cv.pk,
+            )
+            for cv in component_versions
+        ]
+        return authoring_api.create_next_container_version(
+            container_pk=container_version.container.pk,
+            title=container_version.title,
+            entity_rows=entity_rows,
+            created=datetime.now(tz=timezone.utc),
+            created_by=self.import_event.user_id,
+            container_version_cls=container_version.__class__,
+        )
+
+    def _create_block_in_library(self, block_to_import, usage_key) -> PublishableVersionWithMapping | None:
+        """
+        Create a block in a library from a staged content block.
+        """
+        now = datetime.now(tz=timezone.utc)
+        staged_content_files = content_staging_api.get_staged_content_static_files(self.staged_content.id)
+
+        with transaction.atomic():
+            component_type = authoring_api.get_or_create_component_type("xblock.v1", usage_key.block_type)
+            does_component_exist = authoring_api.get_components(
+                self.learning_package.id
+            ).filter(local_key=usage_key.block_id).exists()
+
+            if does_component_exist:
+                if not self.override:
+                    log.info(f"Component {usage_key.block_id} already exists in library {self.library_key}, skipping.")
+                    return None
+                else:
+                    component_version = self._handle_component_override(usage_key, etree.tostring(block_to_import))
+            else:
+                try:
+                    _, library_usage_key = api.validate_can_add_block_to_library(
+                        self.library_key,
+                        block_to_import.tag,
+                        usage_key.block_id,
+                    )
+                except api.IncompatibleTypesError as e:
+                    log.error(f"Error validating block {usage_key} for library {self.library_key}: {e}")
+                    return None
+
+                authoring_api.create_component(
+                    self.learning_package.id,
+                    component_type=component_type,
+                    local_key=usage_key.block_id,
+                    created=now,
+                    created_by=self.import_event.user_id,
+                )
+                component_version = api.set_library_block_olx(library_usage_key, etree.tostring(block_to_import))
+
+            self._process_staged_content_files(
+                component_version,
+                staged_content_files,
+                usage_key,
+                block_to_import,
+                now,
+            )
+            publishable_entity_mapping, _ = get_or_create_publishable_entity_mapping(
+                usage_key,
+                component_version.component
+            )
+            return PublishableVersionWithMapping(component_version, publishable_entity_mapping)
+
+    def _handle_component_override(self, usage_key, new_content):
+        """
+        Create new ComponentVersion for overridden component.
+        """
+        component_version = None
+        try:
+            component = authoring_api.get_components(self.learning_package.id).get(local_key=usage_key.block_id)
+        except Component.DoesNotExist:
+            return component_version
+        library_usage_key = api.library_component_usage_key(self.library_key, component)
+
+        component_version = api.set_library_block_olx(library_usage_key, new_content)
+
+        return component_version
+
+    def _process_staged_content_files(
+        self,
+        component_version,
+        staged_content_files,
+        usage_key,
+        block_to_import,
+        created_at,
+    ):
+        """
+        Process staged content files for a component.
+
+        Processes the staged content files for a component, creating the
+        necessary file content and associating it with the component version.
+        """
+        block_olx = etree.tostring(block_to_import).decode('utf-8')
+
+        for staged_content_file_data in staged_content_files:
+            original_filename = staged_content_file_data.filename
+            file_basename = os.path.basename(original_filename)
+            file_basename_no_ext, _ = os.path.splitext(file_basename)
+
+            # Skip files not referenced in the block
+            if file_basename not in block_olx and file_basename_no_ext not in block_olx:
+                log.info(f"Skipping file {original_filename} as it is not referenced in block {usage_key}")
+                continue
+
+            file_data = content_staging_api.get_staged_content_static_file_data(
+                self.staged_content.id,
+                original_filename,
+            )
+            if not file_data:
+                log.error(
+                    f"Staged content {self.staged_content.id} included referenced "
+                    f"file {original_filename}, but no file data was found."
+                )
+                continue
+
+            filename = f"static/{file_basename}"
+            media_type_str, _ = mimetypes.guess_type(filename)
+            if not media_type_str:
+                media_type_str = "application/octet-stream"
+
+            media_type = authoring_api.get_or_create_media_type(media_type_str)
+            content = authoring_api.get_or_create_file_content(
+                self.learning_package.id,
+                media_type.id,
+                data=file_data,
+                created=created_at,
+            )
+
+            try:
+                authoring_api.create_component_version_content(component_version.pk, content.id, key=filename)
+            except IntegrityError:
+                pass  # Content already exists
+
+
+def import_from_staged_content(
+    import_event: Import,
+    usage_key_string: str,
+    target_learning_package: 'LearningPackage',
+    staged_content: 'StagedContent',
+    composition_level: str,
+    override: bool = False,
+) -> list[PublishableVersionWithMapping]:
+    """
+    Import staged content to a library from staged content.
+
+    Returns a list of PublishableVersionWithMappings created during the import.
+    """
+    import_client = ImportClient(
+        import_event,
+        usage_key_string,
+        target_learning_package,
+        staged_content,
+        composition_level,
+        override,
+    )
+    return import_client.import_from_staged_content()
+
+
+def get_or_create_publishable_entity_mapping(usage_key, component) -> tuple[PublishableEntityMapping, bool]:
+    """
+    Creates a mapping between the source usage key and the target publishable entity.
+    """
+    if isinstance(component, Container):
+        target_package = component.publishable_entity.learning_package
+    else:
+        target_package = component.learning_package
+    return PublishableEntityMapping.objects.get_or_create(
+        source_usage_key=usage_key,
+        target_entity=component.publishable_entity,
+        target_package=target_package,
+    )
+
+
+def get_usage_key_string_from_staged_content(staged_content: 'StagedContent', block_id: str) -> str | None:
+    """
+    Get the usage ID from a staged content by block ID.
+    """
+    if staged_content.tags is None:
+        return None
+    return next((block_usage_id for block_usage_id in staged_content.tags if block_usage_id.endswith(block_id)), None)
+
+
+def get_node_for_usage_key(node: etree._Element, usage_key: UsageKey) -> etree._Element:
+    """
+    Get the node in an XML tree which matches to the usage key.
+    """
+    if node.tag == usage_key.block_type and node.get('url_name') == usage_key.block_id:
+        return node
+
+    for child in node.getchildren():
+        found = get_node_for_usage_key(child, usage_key)
+        if found is not None:
+            return found
+
+
+def get_items_to_import(import_event: Import) -> list['XBlock']:
+    """
+    Collect items to import from a course.
+    """
+    items_to_import: list['XBlock'] = []
+    if isinstance(import_event.source_key, CourseLocator):
+        items_to_import.extend(
+            modulestore().get_items(import_event.source_key, qualifiers={"category": "chapter"}) or []
+        )
+        items_to_import.extend(
+            modulestore().get_items(import_event.source_key, qualifiers={"category": "static_tab"}) or []
+        )
+
+    return items_to_import
+
+
+def cancel_incomplete_old_imports(import_event: Import) -> None:
+    """
+    Cancel any incomplete imports that have the same target as the current import.
+
+    When a new import is created, we want to cancel any other incomplete user imports that have the same target.
+    """
+    incomplete_user_imports_with_same_target = Import.objects.filter(
+        user=import_event.user,
+        target_change=import_event.target_change,
+        source_key=import_event.source_key,
+        staged_content_for_import__isnull=False
+    ).exclude(pk=import_event.pk)
+    for incomplete_import in incomplete_user_imports_with_same_target:
+        incomplete_import.set_status(ImportStatus.CANCELED)
diff --git a/cms/djangoapps/import_from_modulestore/migrations/0002_remove_import_created_remove_import_modified_and_more.py b/cms/djangoapps/import_from_modulestore/migrations/0002_remove_import_created_remove_import_modified_and_more.py
new file mode 100644
index 000000000000..96b2d6ff69e6
--- /dev/null
+++ b/cms/djangoapps/import_from_modulestore/migrations/0002_remove_import_created_remove_import_modified_and_more.py
@@ -0,0 +1,48 @@
+# Generated by Django 4.2.20 on 2025-05-14 17:31
+
+from django.db import migrations, models
+import django.db.models.deletion
+from openedx.core.djangoapps.content_libraries.api import ContainerType
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('user_tasks', '0004_url_textfield'),
+        ('import_from_modulestore', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='import',
+            name='created',
+        ),
+        migrations.RemoveField(
+            model_name='import',
+            name='modified',
+        ),
+        migrations.RemoveField(
+            model_name='import',
+            name='status',
+        ),
+        migrations.RemoveField(
+            model_name='import',
+            name='uuid',
+        ),
+        migrations.AddField(
+            model_name='import',
+            name='composition_level',
+            field=models.CharField(choices=[(ContainerType['Section'], 'CHAPTER'), (ContainerType['Subsection'], 'SEQUENTIAL'), (ContainerType['Unit'], 'VERTICAL'), ('component', 'COMPONENT')], default='component', help_text='The composition level of the target learning package', max_length=255),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='import',
+            name='override',
+            field=models.BooleanField(default=False, help_text='If true, the import will override any existing content in the target learning package.'),
+        ),
+        migrations.AddField(
+            model_name='import',
+            name='user_task_status',
+            field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='user_tasks.usertaskstatus'),
+        ),
+    ]
diff --git a/cms/djangoapps/import_from_modulestore/models.py b/cms/djangoapps/import_from_modulestore/models.py
new file mode 100644
index 000000000000..e8e9fa4e3f96
--- /dev/null
+++ b/cms/djangoapps/import_from_modulestore/models.py
@@ -0,0 +1,154 @@
+"""
+Models for the course to library import app.
+"""
+
+from django.contrib.auth import get_user_model
+from django.db import models
+from django.utils.translation import gettext_lazy as _
+
+from model_utils.models import TimeStampedModel
+from opaque_keys.edx.django.models import (
+    LearningContextKeyField,
+    UsageKeyField,
+)
+from openedx_learning.api.authoring_models import LearningPackage, PublishableEntity
+
+from .data import CompositionLevel, ImportStatus
+
+User = get_user_model()
+
+
+class Import(models.Model):
+    """
+    Represents the action of a user importing a modulestore-based course or legacy
+    library into a learning-core based learning package (today, that is always a content library).
+    """
+
+    user_task_status = models.OneToOneField(
+        'user_tasks.UserTaskStatus',
+        on_delete=models.SET_NULL,
+        null=True,
+        blank=True,
+        related_name='import_event',
+    )
+    user = models.ForeignKey(User, on_delete=models.CASCADE)
+
+    # Note: For now, this will always be a course key. In the future, it may be a legacy library key.
+    source_key = LearningContextKeyField(help_text=_('The modulestore course'), max_length=255, db_index=True)
+    target_change = models.ForeignKey(to='oel_publishing.DraftChangeLog', on_delete=models.SET_NULL, null=True)
+    composition_level = models.CharField(
+        max_length=255,
+        choices=CompositionLevel.choices(),
+        help_text=_('The composition level of the target learning package'),
+    )
+    override = models.BooleanField(
+        default=False,
+        help_text=_(
+            'If true, the import will override any existing content in the target learning package.'
+        ),
+    )
+
+    class Meta:
+        verbose_name = _('Import from modulestore')
+        verbose_name_plural = _('Imports from modulestore')
+
+    def __str__(self):
+        return f'{self.source_key} → {self.target_change}'
+
+    def set_status(self, status: ImportStatus):
+        """
+        Set import status.
+        """
+        if status in ImportStatus.FAILED_STATUSES.value:
+            self.user_task_status.fail(status)
+        elif status == ImportStatus.CANCELED:
+            self.user_task_status.cancel()
+        else:
+            self.user_task_status.set_state(status)
+        self.user_task_status.save()
+        if status in [ImportStatus.IMPORTED, ImportStatus.CANCELED]:
+            self.clean_related_staged_content()
+
+    def clean_related_staged_content(self) -> None:
+        """
+        Clean related staged content.
+        """
+        for staged_content_for_import in self.staged_content_for_import.all():
+            staged_content_for_import.staged_content.delete()
+
+
+class PublishableEntityMapping(TimeStampedModel):
+    """
+    Represents a mapping between a source usage key and a target publishable entity.
+    """
+
+    source_usage_key = UsageKeyField(
+        max_length=255,
+        help_text=_('Original usage key/ID of the thing that has been imported.'),
+    )
+    target_package = models.ForeignKey(LearningPackage, on_delete=models.CASCADE)
+    target_entity = models.ForeignKey(PublishableEntity, on_delete=models.CASCADE)
+
+    class Meta:
+        unique_together = ('source_usage_key', 'target_package')
+
+    def __str__(self):
+        return f'{self.source_usage_key} → {self.target_entity}'
+
+
+class PublishableEntityImport(TimeStampedModel):
+    """
+    Represents a publishableentity version that has been imported into a learning package (e.g. content library)
+
+    This is a many-to-many relationship between a container version and a course to library import.
+    """
+
+    import_event = models.ForeignKey(Import, on_delete=models.CASCADE)
+    resulting_mapping = models.ForeignKey(PublishableEntityMapping, on_delete=models.SET_NULL, null=True, blank=True)
+    resulting_change = models.OneToOneField(
+        to='oel_publishing.DraftChangeLogRecord',
+        # a changelog record can be pruned, which would set this to NULL, but not delete the
+        # entire import record
+        null=True,
+        on_delete=models.SET_NULL,
+    )
+
+    class Meta:
+        unique_together = (
+            ('import_event', 'resulting_mapping'),
+        )
+
+    def __str__(self):
+        return f'{self.import_event} → {self.resulting_mapping}'
+
+
+class StagedContentForImport(TimeStampedModel):
+    """
+    Represents m2m relationship between an import and staged content created for that import.
+    """
+
+    import_event = models.ForeignKey(
+        Import,
+        on_delete=models.CASCADE,
+        related_name='staged_content_for_import',
+    )
+    staged_content = models.OneToOneField(
+        to='content_staging.StagedContent',
+        on_delete=models.CASCADE,
+        related_name='staged_content_for_import',
+    )
+    # Since StagedContent stores all the keys of the saved blocks, this field was added to optimize search.
+    source_usage_key = UsageKeyField(
+        max_length=255,
+        help_text=_(
+            'The original Usage key of the highest-level component that was saved in StagedContent.'
+        ),
+    )
+
+    class Meta:
+        unique_together = (
+            ('import_event', 'staged_content'),
+        )
+
+    def __str__(self):
+        return f'{self.import_event} → {self.staged_content}'
diff --git a/cms/djangoapps/import_from_modulestore/tasks.py b/cms/djangoapps/import_from_modulestore/tasks.py
new file mode 100644
index 000000000000..34a377d5e384
--- /dev/null
+++ b/cms/djangoapps/import_from_modulestore/tasks.py
@@ -0,0 +1,146 @@
+"""
+Tasks for course to library import.
+"""
+from typing import Sequence
+
+from celery import shared_task
+from celery.utils.log import get_task_logger
+from django.db import transaction
+from edx_django_utils.monitoring import set_code_owner_attribute_from_module
+from opaque_keys.edx.keys import UsageKey
+
+from openedx_learning.api import authoring as authoring_api
+from openedx_learning.api.authoring_models import LearningPackage
+from openedx.core.djangoapps.content_staging import api as content_staging_api
+from user_tasks.tasks import UserTask
+
+from .constants import IMPORT_FROM_MODULESTORE_STAGING_PURPOSE
+from .data import ImportStatus
+from .helpers import get_items_to_import, import_from_staged_content
+from .models import Import, PublishableEntityImport, StagedContentForImport
+
+log = get_task_logger(__name__)
+
+
+class ImportToLibraryTask(UserTask):
+    """
+    Base class for import to library tasks.
+    """
+
+    @staticmethod
+    def calculate_total_steps(arguments_dict):
+        """
+        Get number of in-progress steps in importing process, as shown in the UI.
+
+        For reference, these are:
+
+        1. Staging content
+        2. Importing staged content into library
+        """
+        return 2
+
+    @classmethod
+    def generate_name(cls, arguments_dict):
+        """
+        Create a name for this particular import task instance.
+
+        Arguments:
+            arguments_dict (dict): The arguments given to the task function
+
+        Returns:
+            str: The generated name
+        """
+        library_id = arguments_dict.get('learning_package_id')
+        import_id = arguments_dict.get('import_pk')
+        return f'Import course to library (library_id={library_id}, import_id={import_id})'
+
+
+@shared_task(base=ImportToLibraryTask, bind=True)
+# Note: The decorator @set_code_owner_attribute cannot be used here because the UserTaskMixin
+#   does stack inspection and can't handle additional decorators.
+def import_to_library_task(
+    self,
+    import_pk: int,
+    usage_key_strings: Sequence[str | UsageKey],
+    learning_package_id: int,
+    user_id: int,
+) -> None:
+    """
+    Import to library task.
+
+    1. Save course (for now) to staged content task by sections/chapters.
+    2. Import staged content to library task.
+    """
+    set_code_owner_attribute_from_module(__name__)
+
+    # Step 1: Save course to staged content task by sections/chapters.
+    try:
+        import_event = Import.objects.get(pk=import_pk)
+        import_event.user_task_status = self.status
+        import_event.save(update_fields=['user_task_status'])
+    except Import.DoesNotExist:
+        log.info('Import event not found for pk %s', import_pk)
+        return
+
+    import_event.set_status(ImportStatus.WAITNG_TO_STAGE)
+    import_event.clean_related_staged_content()
+
+    import_event.set_status(ImportStatus.STAGING)
+    try:
+        with transaction.atomic():
+            items_to_import = get_items_to_import(import_event)
+            for item in items_to_import:
+                staged_content = content_staging_api.stage_xblock_temporarily(
+                    item,
+                    user_id,
+                    purpose=IMPORT_FROM_MODULESTORE_STAGING_PURPOSE,
+                )
+                StagedContentForImport.objects.create(
+                    staged_content=staged_content,
+                    import_event=import_event,
+                    source_usage_key=item.location
+                )
+
+            if items_to_import:
+                import_event.set_status(ImportStatus.STAGED)
+            else:
+                import_event.set_status(ImportStatus.STAGING_FAILED)
+    except Exception as exc:  # pylint: disable=broad-except
+        import_event.set_status(ImportStatus.STAGING_FAILED)
+        raise exc
+
+    # Step 2: Import staged content to library task.
+    self.status.increment_completed_steps()
+
+    target_learning_package = LearningPackage.objects.get(id=learning_package_id)
+
+    imported_publishable_versions = []
+    import_event.set_status(ImportStatus.IMPORTING)
+    with authoring_api.bulk_draft_changes_for(learning_package_id=learning_package_id) as change_log:
+        try:
+            for usage_key_string in usage_key_strings:
+                staged_content_for_import = import_event.staged_content_for_import.get(
+                    source_usage_key=usage_key_string
+                )
+                publishable_versions = import_from_staged_content(
+                    import_event,
+                    usage_key_string,
+                    target_learning_package,
+                    staged_content_for_import.staged_content,
+                    import_event.composition_level,
+                    import_event.override,
+                )
+                imported_publishable_versions.extend(publishable_versions)
+        except Exception as exc:  # pylint: disable=broad-except
+            import_event.set_status(ImportStatus.IMPORTING_FAILED)
+            raise exc
+        else:
+            import_event.set_status(ImportStatus.IMPORTED)
+            for imported_component_version in imported_publishable_versions:
+                PublishableEntityImport.objects.create(
+                    import_event=import_event,
+                    resulting_mapping=imported_component_version.mapping,
+                    resulting_change=change_log.records.get(entity=imported_component_version.mapping.target_entity),
+                )
+        finally:
+            import_event.clean_related_staged_content()
diff --git a/cms/djangoapps/import_from_modulestore/tests/factories.py b/cms/djangoapps/import_from_modulestore/tests/factories.py
new file mode 100644
index 000000000000..e8423b3a84b5
--- /dev/null
+++ b/cms/djangoapps/import_from_modulestore/tests/factories.py
@@ -0,0 +1,26 @@
+"""
+Factories for Import model.
+"""
+import uuid
+
+import factory
+from factory.django import DjangoModelFactory
+from opaque_keys.edx.keys import CourseKey
+
+from common.djangoapps.student.tests.factories import UserFactory
+from cms.djangoapps.import_from_modulestore.models import Import
+
+
+class ImportFactory(DjangoModelFactory):
+    """
+    Factory for Import model.
+    """
+
+    class Meta:
+        model = Import
+
+    @factory.lazy_attribute
+    def source_key(self):
+        return CourseKey.from_string(f'course-v1:edX+DemoX+{uuid.uuid4()}')
+
+    user = factory.SubFactory(UserFactory)
diff --git a/cms/djangoapps/import_from_modulestore/tests/test_api.py b/cms/djangoapps/import_from_modulestore/tests/test_api.py
new file mode 100644
index 000000000000..72497200a7f9
--- /dev/null
+++ b/cms/djangoapps/import_from_modulestore/tests/test_api.py
@@ -0,0 +1,98 @@
+"""
+Test cases for import_from_modulestore.api module.
+"""
+from unittest.mock import patch
+
+import pytest
+from opaque_keys.edx.keys import CourseKey
+from organizations.models import Organization
+
+from common.djangoapps.student.tests.factories import UserFactory
+from cms.djangoapps.import_from_modulestore.api import import_to_library
+from cms.djangoapps.import_from_modulestore.models import Import
+from openedx.core.djangoapps.content_libraries import api as content_libraries_api
+from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
+from .factories import ImportFactory
+
+
+@pytest.mark.django_db
+class TestCourseToLibraryImportAPI(ModuleStoreTestCase):
+    """
+    Test cases for Import API.
+    """
+
+    def setUp(self):
+        super().setUp()
+
+        _library_metadata = content_libraries_api.create_library(
+            org=Organization.objects.create(name='Organization 1', short_name='org1'),
+            slug='lib_1',
+            title='Library Org 1',
+            description='This is a library from Org 1',
+        )
+        self.library = content_libraries_api.ContentLibrary.objects.get_by_key(_library_metadata.key)
+
+    def test_import_staged_content_to_library(self):
+        """
+        Test import_staged_content_to_library function with different override values.
+        """
+        user = UserFactory()
+        source_key = "course-v1:edX+DemoX+Demo_Course"
+        usage_ids = [
+            "block-v1:edX+DemoX+Demo_Course+type@chapter+block@123",
+            "block-v1:edX+DemoX+Demo_Course+type@chapter+block@456",
+        ]
+        override = False
+
+        with patch(
+            "cms.djangoapps.import_from_modulestore.api.import_to_library_task"
+        ) as import_to_library_task_mock:
+            import_to_library(
+                source_key=source_key,
+                usage_ids=usage_ids,
+                target_learning_package_id=self.library.learning_package.id,
+                user_id=user.id,
+                composition_level="component",
+                override=override,
+            )
+
+        import_event = Import.objects.get()
+        assert str(import_event.source_key) == source_key
+        assert import_event.composition_level == "component"
+        assert import_event.override == override
+        assert import_event.user_id == user.id
+
+        import_to_library_task_mock.apply_async.assert_called_once_with(
+            kwargs={
+                "import_pk": Import.objects.get().pk,
+                "usage_key_strings": usage_ids,
+                "learning_package_id": self.library.learning_package.id,
+                "user_id": user.id,
+            },
+        )
+
+    def test_import_to_library_invalid_usage_key(self):
+        """
+        Test import_staged_content_to_library function with not chapter usage keys.
+        """
+        import_event = ImportFactory(
+            source_key=CourseKey.from_string("course-v1:edX+DemoX+Demo_Course"),
+        )
+        usage_ids = [
+            "block-v1:edX+DemoX+Demo_Course+type@problem+block@123",
+            "block-v1:edX+DemoX+Demo_Course+type@vertical+block@456",
+        ]
+
+        with patch(
+            "cms.djangoapps.import_from_modulestore.api.import_to_library_task"
+        ) as import_to_library_task_mock:
+            with self.assertRaises(ValueError):
+                import_to_library(
+                    source_key=import_event.source_key,
+                    usage_ids=usage_ids,
+                    target_learning_package_id=self.library.learning_package.id,
+                    user_id=import_event.user.id,
+                    composition_level="component",
+                    override=False,
+                )
+        import_to_library_task_mock.apply_async.assert_not_called()
diff --git a/cms/djangoapps/import_from_modulestore/tests/test_helpers.py b/cms/djangoapps/import_from_modulestore/tests/test_helpers.py
new file mode 100644
index 000000000000..5e5aad1b1c84
--- /dev/null
+++ b/cms/djangoapps/import_from_modulestore/tests/test_helpers.py
@@ -0,0 +1,442 @@
+"""
+Tests for the import_from_modulestore helper functions.
+"""
+import uuid
+
+import ddt
+from organizations.models import Organization
+from unittest import mock
+from unittest.mock import patch
+
+from lxml import etree
+from openedx_learning.api.authoring_models import LearningPackage
+from user_tasks.models import UserTaskStatus
+
+from cms.djangoapps.import_from_modulestore import api, constants
+from cms.djangoapps.import_from_modulestore.helpers import ImportClient
+from cms.djangoapps.import_from_modulestore.models import StagedContentForImport
+from cms.djangoapps.import_from_modulestore.tests.factories import ImportFactory
+from common.djangoapps.student.tests.factories import UserFactory
+
+from openedx.core.djangoapps.content_libraries import api as content_libraries_api
+from openedx.core.djangoapps.content_staging import api as content_staging_api
+from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
+from xmodule.modulestore.tests.factories import CourseFactory, BlockFactory
+from xmodule.modulestore.django import modulestore
+
+
+@ddt.ddt
+class TestImportClient(ModuleStoreTestCase):
+    """
+    Functional tests for the ImportClient class.
+    """
+
+    def setUp(self):
+        super().setUp()
+        self.library = content_libraries_api.create_library(
+            org=Organization.objects.create(name='Organization 1', short_name='org1'),
+            slug='lib_1',
+            title='Library Org 1',
+            description='This is a library from Org 1',
+        )
+        self.learning_package = LearningPackage.objects.get(id=self.library.learning_package_id)
+        self.user = UserFactory()
+        self.course = CourseFactory.create()
+        self.chapter = BlockFactory.create(category='chapter', parent=self.course, display_name='Chapter')
+        self.sequential = BlockFactory.create(category='sequential', parent=self.chapter, display_name='Sequential')
+        self.vertical = BlockFactory.create(category='vertical', parent=self.sequential, display_name='Vertical')
+        self.problem = BlockFactory.create(
+            category='problem',
+            parent=self.vertical,
+            display_name='Problem',
+            data="""<problem url_name="" display_name="DisplayName"><optionresponse></optionresponse></problem>""",
+        )
+        self.video = BlockFactory.create(
+            category='video',
+            parent=self.vertical,
+            display_name='Video',
+            data="""<video youtube="1.00:3_yD_cEKoCk" url_name="SampleProblem"/>""",
+        )
+        self.import_event = ImportFactory(
+            user=self.user,
+            source_key=self.course.id,
+        )
+        # get blocks to update their children
+        self.chapter = modulestore().get_item(self.chapter.location)
+        self.sequential = modulestore().get_item(self.sequential.location)
+        self.vertical = modulestore().get_item(self.vertical.location)
+        # mock staged content
+        staged_content = content_staging_api.stage_xblock_temporarily(
+            self.chapter,
+            self.user.id,
+            purpose=constants.IMPORT_FROM_MODULESTORE_STAGING_PURPOSE,
+        )
+        StagedContentForImport.objects.create(
+            import_event=self.import_event,
+            staged_content=staged_content,
+            source_usage_key=self.chapter.location,
+        )
+        #mock user task status
+        self.import_event.user_task_status = UserTaskStatus.objects.create(
+            user=self.user,
+            task_id=uuid.uuid4(),
+            task_class='cms.djangoapps.import_from_modulestore.tasks.ImportToLibraryTask',
+            name='Test',
+            total_steps=2
+        )
+        self.import_event.save()
+
+        self.parser = etree.XMLParser(strip_cdata=False)
+
+    def test_import_from_staged_content(self):
+        expected_imported_xblocks = [self.video, self.problem]
+        staged_content_for_import = self.import_event.staged_content_for_import.get(
+            source_usage_key=self.chapter.location
+        )
+        staged_content = staged_content_for_import.staged_content
+        import_client = ImportClient(
+            import_event=self.import_event,
+            staged_content=staged_content,
+            target_learning_package=self.learning_package,
+            block_usage_key_to_import=str(self.vertical.location),
+            composition_level='component',
+            override=False
+        )
+
+        import_client.import_from_staged_content()
+
+        self.assertEqual(self.learning_package.content_set.count(), len(expected_imported_xblocks))
+
+    @patch('cms.djangoapps.import_from_modulestore.helpers.ImportClient._process_import')
+    def test_import_from_staged_content_block_not_found(self, mocked_process_import):
+        staged_content_for_import = self.import_event.staged_content_for_import.get(
+            source_usage_key=self.chapter.location
+        )
+        staged_content = staged_content_for_import.staged_content
+        import_client = ImportClient(
+            import_event=self.import_event,
+            staged_content=staged_content,
+            target_learning_package=self.learning_package,
+            block_usage_key_to_import='block-v1:edX+Demo+2025+type@chapter+block@12345',
+            composition_level='component',
+            override=False
+        )
+
+        import_client.import_from_staged_content()
+
+        self.assertTrue(not self.learning_package.content_set.count())
+        mocked_process_import.assert_not_called()
+
+    @ddt.data(
+        'chapter',
+        'sequential',
+        'vertical'
+    )
+    def test_create_container(self, block_lvl):
+        container_to_import = getattr(self, block_lvl)
+        block_usage_key_to_import = str(container_to_import.location)
+        staged_content_for_import = self.import_event.staged_content_for_import.get(
+            source_usage_key=self.chapter.location
+        )
+        import_client = ImportClient(
+            import_event=self.import_event,
+            staged_content=staged_content_for_import.staged_content,
+            target_learning_package=self.learning_package,
+            block_usage_key_to_import=block_usage_key_to_import,
+            composition_level='component',
+            override=False
+        )
+        import_client.get_or_create_container(
+            container_to_import.category,
+            container_to_import.location.block_id,
+            container_to_import.display_name,
+            str(container_to_import.location)
+        )
+
+        self.assertEqual(self.learning_package.publishable_entities.count(), 1)
+
+    def test_create_container_with_xblock(self):
+        block_usage_key_to_import = str(self.problem.location)
+        staged_content_for_import = self.import_event.staged_content_for_import.get(
+            source_usage_key=self.chapter.location
+        )
+        import_client = ImportClient(
+            import_event=self.import_event,
+            staged_content=staged_content_for_import.staged_content,
+            target_learning_package=self.learning_package,
+            block_usage_key_to_import=block_usage_key_to_import,
+            composition_level='component',
+            override=False
+        )
+        with self.assertRaises(ValueError):
+            import_client.get_or_create_container(
+                self.problem.category,
+                self.problem.location.block_id,
+                self.problem.display_name,
+                str(self.problem.location),
+            )
+
+    @ddt.data('chapter', 'sequential', 'vertical')
+    def test_process_import_with_complicated_blocks(self, block_lvl):
+        container_to_import = getattr(self, block_lvl)
+        block_usage_key_to_import = str(container_to_import.location)
+        staged_content_for_import = self.import_event.staged_content_for_import.get(
+            source_usage_key=self.chapter.location
+        )
+        staged_content = staged_content_for_import.staged_content
+        expected_imported_xblocks = [self.problem, self.video]
+
+        import_client = ImportClient(
+            import_event=self.import_event,
+            staged_content=staged_content,
+            block_usage_key_to_import=block_usage_key_to_import,
+            target_learning_package=self.learning_package,
+            composition_level='component',
+            override=False
+        )
+        # pylint: disable=protected-access
+        result = import_client.import_from_staged_content()
+
+        self.assertEqual(self.learning_package.content_set.count(), len(expected_imported_xblocks))
+        self.assertEqual(len(result), len(expected_imported_xblocks))
+
+    @ddt.data('problem', 'video')
+    def test_process_import_with_simple_blocks(self, block_type_to_import):
+        block_to_import = getattr(self, block_type_to_import)
+        block_usage_key_to_import = str(block_to_import.location)
+        staged_content_for_import = self.import_event.staged_content_for_import.get(
+            source_usage_key=self.chapter.location
+        )
+        expected_imported_xblocks = [block_to_import]
+        import_client = ImportClient(
+            import_event=self.import_event,
+            staged_content=staged_content_for_import.staged_content,
+            target_learning_package=self.learning_package,
+            block_usage_key_to_import=block_usage_key_to_import,
+            composition_level='component',
+            override=False
+        )
+
+        block_to_import = etree.fromstring(block_to_import.data, parser=self.parser)
+        # pylint: disable=protected-access
+        result = import_client._process_import(block_usage_key_to_import, block_to_import)
+
+        self.assertEqual(self.learning_package.content_set.count(), len(expected_imported_xblocks))
+        self.assertEqual(len(result), len(expected_imported_xblocks))
+
+    @ddt.data(True, False)
+    def test_process_import_with_override(self, override):
+        block_to_import = self.problem
+        block_usage_key_to_import = str(block_to_import.location)
+        staged_content_for_import = self.import_event.staged_content_for_import.get(
+            source_usage_key=self.chapter.location
+        )
+
+        import_client = ImportClient(
+            import_event=self.import_event,
+            staged_content=staged_content_for_import.staged_content,
+            target_learning_package=self.learning_package,
+            block_usage_key_to_import=block_usage_key_to_import,
+            composition_level='component',
+            override=False
+        )
+
+        block_xml = etree.fromstring(block_to_import.data, parser=self.parser)
+        # pylint: disable=protected-access
+        result1 = import_client._process_import(block_usage_key_to_import, block_xml)
+        self.assertEqual(len(result1), 1)
+
+        new_import_event = api.import_to_library(
+            source_key=self.course.id,
+            usage_ids=[str(self.chapter.location)],
+            target_learning_package_id=self.learning_package.id,
+            user_id=self.user.id,
+            composition_level='component',
+            override=override,
+        )
+        # mock staged content
+        new_staged_content = content_staging_api.stage_xblock_temporarily(
+            self.vertical,
+            self.user.id,
+            purpose=constants.IMPORT_FROM_MODULESTORE_STAGING_PURPOSE,
+        )
+        staged_content_for_import = StagedContentForImport.objects.create(
+            import_event=new_import_event,
+            staged_content=new_staged_content,
+            source_usage_key=self.chapter.location,
+        )
+
+        import_client = ImportClient(
+            import_event=new_import_event,
+            staged_content=new_staged_content,
+            target_learning_package=self.learning_package,
+            block_usage_key_to_import=block_usage_key_to_import,
+            composition_level='component',
+            override=override
+        )
+
+        if override:
+            modified_data = block_to_import.data.replace('DisplayName', 'ModifiedName')
+            modified_block = BlockFactory.create(
+                category='problem',
+                parent=self.vertical,
+                display_name='Modified Problem',
+                data=modified_data,
+            )
+            block_xml = etree.fromstring(modified_block.data, parser=self.parser)
+
+            # pylint: disable=protected-access
+            result2 = import_client._process_import(block_usage_key_to_import, block_xml)
+            self.assertEqual(len(result2), 1)
+
+            assert result2[0].publishable_version.title == 'ModifiedName'
+        else:
+            # pylint: disable=protected-access
+            result2 = import_client._process_import(block_usage_key_to_import, block_xml)
+            self.assertEqual(result2, [])
+
+    @patch('cms.djangoapps.import_from_modulestore.helpers.authoring_api')
+    def test_container_override(self, mock_authoring_api):
+        container_to_import = self.vertical
+        block_usage_key_to_import = str(container_to_import.location)
+        staged_content_for_import = self.import_event.staged_content_for_import.get(
+            source_usage_key=self.chapter.location
+        )
+        staged_content = staged_content_for_import.staged_content
+
+        import_client = ImportClient(
+            import_event=self.import_event,
+            staged_content=staged_content,
+            target_learning_package=self.learning_package,
+            block_usage_key_to_import=block_usage_key_to_import,
+            composition_level='vertical',
+            override=False
+        )
+
+        container_version_with_mapping = import_client.get_or_create_container(
+            'vertical',
+            container_to_import.location.block_id,
+            container_to_import.display_name,
+            str(container_to_import.location),
+        )
+        assert container_version_with_mapping is not None
+        assert container_version_with_mapping.publishable_version.title == container_to_import.display_name
+
+        import_client = ImportClient(
+            import_event=self.import_event,
+            staged_content=staged_content,
+            target_learning_package=self.learning_package,
+            block_usage_key_to_import=block_usage_key_to_import,
+            composition_level='vertical',
+            override=True
+        )
+        container_version_with_mapping = import_client.get_or_create_container(
+            'vertical',
+            container_to_import.location.block_id,
+            'New Display Name',
+            str(container_to_import.location),
+        )
+        overrided_container_version = container_version_with_mapping.publishable_version
+        assert overrided_container_version is not None
+        assert overrided_container_version.title == 'New Display Name'
+
+    @ddt.data('component', 'vertical')
+    def test_composition_levels(self, composition_level):
+        if composition_level == 'component':
+            expected_imported_blocks = [self.problem, self.video]
+        else:
+            # The vertical block is expected to be imported as a container
+            # with the same location as the original vertical block.
+            expected_imported_blocks = [self.vertical, self.problem, self.video]
+
+        container_to_import = self.vertical
+        block_usage_key_to_import = str(container_to_import.location)
+        staged_content_for_import = self.import_event.staged_content_for_import.get(
+            source_usage_key=self.chapter.location
+        )
+        staged_content = staged_content_for_import.staged_content
+
+        import_client = ImportClient(
+            import_event=self.import_event,
+            staged_content=staged_content,
+            target_learning_package=self.learning_package,
+            block_usage_key_to_import=block_usage_key_to_import,
+            composition_level=composition_level,
+            override=False
+        )
+
+        block_xml = etree.fromstring(staged_content.olx, parser=self.parser)
+        # pylint: disable=protected-access
+        result = import_client._import_complicated_child(block_xml, block_usage_key_to_import)
+
+        self.assertEqual(len(result), len(expected_imported_blocks))
+
+    @patch('cms.djangoapps.import_from_modulestore.helpers.content_staging_api')
+    def test_process_staged_content_files(self, mock_content_staging_api):
+        block_to_import = self.problem
+        block_usage_key_to_import = str(block_to_import.location)
+        staged_content_for_import = self.import_event.staged_content_for_import.get(
+            source_usage_key=self.chapter.location
+        )
+        staged_content = staged_content_for_import.staged_content
+
+        import_client = ImportClient(
+            import_event=self.import_event,
+            staged_content=staged_content,
+            target_learning_package=self.learning_package,
+            block_usage_key_to_import=block_usage_key_to_import,
+            composition_level='component',
+            override=False
+        )
+
+        mock_file_data = b'file content'
+        mock_file = mock.MagicMock()
+        mock_file.filename = 'test.png'
+        mock_content_staging_api.get_staged_content_static_files.return_value = [mock_file]
+        mock_content_staging_api.get_staged_content_static_file_data.return_value = mock_file_data
+
+        modified_data = '<problem url_name="" display_name="ProblemWithImage"><img src="test.png"/></problem>'
+        modified_block = BlockFactory.create(
+            category='problem',
+            parent=self.vertical,
+            display_name='Problem With Image',
+            data=modified_data,
+        )
+        block_xml = etree.fromstring(modified_data, parser=self.parser)
+
+        # pylint: disable=protected-access
+        import_client._create_block_in_library(block_xml, modified_block.location)
+        mock_content_staging_api.get_staged_content_static_file_data.assert_called_once_with(
+            staged_content.id, 'test.png'
+        )
+
+    def test_update_container_components(self):
+        container_to_import = self.vertical
+        block_usage_key_to_import = str(container_to_import.location)
+        staged_content_for_import = self.import_event.staged_content_for_import.get(
+            source_usage_key=self.chapter.location
+        )
+
+        import_client = ImportClient(
+            import_event=self.import_event,
+            staged_content=staged_content_for_import.staged_content,
+            target_learning_package=self.learning_package,
+            block_usage_key_to_import=block_usage_key_to_import,
+            composition_level='container',
+            override=False
+        )
+
+        with patch('cms.djangoapps.import_from_modulestore.helpers.authoring_api') as mock_authoring_api:
+            mock_container_version = mock.MagicMock()
+            mock_component_version1 = mock.MagicMock()
+            mock_component_version2 = mock.MagicMock()
+            mock_component_versions = [mock_component_version1, mock_component_version2]
+
+            # pylint: disable=protected-access
+            import_client._update_container_components(mock_container_version, mock_component_versions)
+
+            mock_authoring_api.create_next_container_version.assert_called_once()
+            call_args = mock_authoring_api.create_next_container_version.call_args[1]
+            self.assertEqual(call_args['container_pk'], mock_container_version.container.pk)
+            self.assertEqual(call_args['title'], mock_container_version.title)
+            self.assertEqual(call_args['created_by'], self.user.id)
diff --git a/cms/djangoapps/import_from_modulestore/tests/test_tasks.py b/cms/djangoapps/import_from_modulestore/tests/test_tasks.py
new file mode 100644
index 000000000000..8eca87b7bef7
--- /dev/null
+++ b/cms/djangoapps/import_from_modulestore/tests/test_tasks.py
@@ -0,0 +1,176 @@
+"""
+Tests for tasks in import_from_modulestore app.
+"""
+from django.core.exceptions import ObjectDoesNotExist
+from organizations.models import Organization
+from openedx_learning.api.authoring_models import LearningPackage
+from unittest.mock import patch
+import uuid
+from user_tasks.models import UserTaskStatus
+
+from cms.djangoapps.import_from_modulestore.data import ImportStatus
+from cms.djangoapps.import_from_modulestore.tasks import import_to_library_task
+from openedx.core.djangoapps.content_libraries import api as content_libraries_api
+from openedx.core.djangoapps.content_libraries.api import ContentLibrary
+from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
+from xmodule.modulestore.tests.factories import CourseFactory, BlockFactory
+
+from .factories import ImportFactory
+
+
+class ImportCourseToLibraryMixin(ModuleStoreTestCase):
+    """
+    Mixin for setting up data for tests.
+    """
+
+    def setUp(self):
+        super().setUp()
+
+        self.library = content_libraries_api.create_library(
+            org=Organization.objects.create(name='Organization 1', short_name='org1'),
+            slug='lib_1',
+            title='Library Org 1',
+            description='This is a library from Org 1',
+        )
+        self.content_library = ContentLibrary.objects.get_by_key(self.library.key)
+
+        self.course = CourseFactory.create()
+        self.chapter = BlockFactory.create(category='chapter', parent=self.course, display_name='Chapter 1')
+        self.sequential = BlockFactory.create(category='sequential', parent=self.chapter, display_name='Sequential 1')
+        self.vertical = BlockFactory.create(category='vertical', parent=self.sequential, display_name='Vertical 1')
+        self.video = BlockFactory.create(category='video', parent=self.vertical, display_name='Video 1')
+        self.problem = BlockFactory.create(category='problem', parent=self.vertical, display_name='Problem 1')
+
+        # self.course2 = CourseFactory.create()
+        # self.chapter2 = BlockFactory.create(category='chapter', parent=self.course, display_name='Chapter 2')
+        self.chapter2 = BlockFactory.create(category='chapter', parent=self.course, display_name='Chapter 2')
+        self.sequential2 = BlockFactory.create(category='sequential', parent=self.chapter2, display_name='Sequential 2')
+        self.vertical2 = BlockFactory.create(category='vertical', parent=self.sequential2, display_name='Vertical 2')
+        self.video2 = BlockFactory.create(category='video', parent=self.vertical2, display_name='Video 2')
+        self.problem2 = BlockFactory.create(category='problem', parent=self.vertical2, display_name='Problem 2')
+
+        self.import_event = ImportFactory(source_key=self.course.id)
+        self.user = self.import_event.user
+
+
+class TestSaveCourseSectionsToStagedContentTask(ImportCourseToLibraryMixin):
+    """
+    Test cases for save_course_sections_to_staged_content_task.
+    """
+
+    @patch('cms.djangoapps.import_from_modulestore.models.Import.set_status')
+    def test_save_legacy_content_to_staged_content_task(self, mock_set_status):
+        """
+        End-to-end test for save_legacy_content_to_staged_content_task.
+        """
+        course_chapters_to_import = [self.chapter, self.chapter2]
+        import_to_library_task(
+            self.import_event.pk,
+            course_chapters_to_import,
+            self.content_library.learning_package.id,
+            self.user.id,
+        )
+
+        self.import_event.refresh_from_db()
+        self.assertEqual(self.import_event.staged_content_for_import.count(), len(course_chapters_to_import))
+        mock_set_status.assert_called_once_with(ImportStatus.STAGED)
+
+    @patch('cms.djangoapps.import_from_modulestore.models.Import.clean_related_staged_content')
+    def test_old_staged_content_deletion_before_save_new(self, mock_clean_related_staged_content):
+        """ Checking that repeated saving of the same content does not create duplicates. """
+        course_chapters_to_import = [self.chapter, self.chapter2]
+
+        import_to_library_task(
+            self.import_event.pk,
+            course_chapters_to_import,
+            self.content_library.learning_package.id,
+            self.user.id,
+        )
+
+        mock_clean_related_staged_content.assert_called_once()
+        self.import_event.refresh_from_db()
+
+        self.assertEqual(self.import_event.staged_content_for_import.count(), len(course_chapters_to_import))
+
+
+class TestImportLibraryFromStagedContentTask(ImportCourseToLibraryMixin):
+    """
+    Test cases for import_staged_content_to_library_task.
+    """
+
+    def _is_imported(self, library, xblock):
+        library_learning_package = LearningPackage.objects.get(id=library.learning_package_id)
+        self.assertTrue(library_learning_package.content_set.filter(text__icontains=xblock.display_name).exists())
+
+    def test_import_staged_content_to_library_task(self):
+        """ End-to-end test for import_staged_content_to_library_task. """
+        library_learning_package = LearningPackage.objects.get(id=self.library.learning_package_id)
+        self.assertEqual(library_learning_package.content_set.count(), 0)
+        expected_imported_xblocks = [self.problem, self.problem2, self.video, self.video2]
+
+        import_to_library_task(
+            self.import_event.pk,
+            [str(self.chapter.location), str(self.chapter2.location)],
+            self.content_library.learning_package.id,
+            self.user.id,
+        )
+
+        self.import_event.refresh_from_db()
+        self.assertEqual(self.import_event.status, ImportStatus.IMPORTED)
+
+        for xblock in expected_imported_xblocks:
+            self._is_imported(self.library, xblock)
+
+        library_learning_package.refresh_from_db()
+        self.assertEqual(library_learning_package.content_set.count(), len(expected_imported_xblocks))
+        self.assertEqual(self.import_event.publishableentityimport_set.count(), len(expected_imported_xblocks))
+
+    @patch('cms.djangoapps.import_from_modulestore.tasks.import_from_staged_content')
+    def test_import_library_block_not_found(self, mock_import_from_staged_content):
+        """ Test that if a block is not found in the staged content, it is not imported. """
+        non_existent_usage_ids = ['block-v1:edX+Demo+2023+type@vertical+block@12345']
+        with self.allow_transaction_exception():
+            with self.assertRaises(ObjectDoesNotExist):
+                import_to_library_task(
+                    self.import_event.pk,
+                    non_existent_usage_ids,
+                    self.content_library.learning_package.id,
+                    self.user.id,
+                )
+                mock_import_from_staged_content.assert_not_called()
+
+    def test_cannot_import_staged_content_twice(self):
+        """
+        Tests if after importing staged content into the library,
+        the staged content is deleted and cannot be imported again.
+        """
+        chapters_to_import = [self.chapter, self.chapter2]
+        expected_imported_xblocks = [self.problem, self.video]
+
+        import_to_library_task(
+            self.import_event.pk,
+            [str(self.chapter.location)],
+            self.content_library.learning_package.id,
+            self.user.id,
+        )
+        self.import_event.refresh_from_db()
+        self.assertEqual(self.import_event.staged_content_for_import.count(), len(chapters_to_import))
+        self.assertEqual(self.import_event.status, ImportStatus.STAGED)
+
+        import_to_library_task(
+            self.import_event.pk,
+            [str(self.chapter.location)],
+            self.content_library.learning_package.id,
+            self.user.id,
+        )
+
+        for xblock in expected_imported_xblocks:
+            self._is_imported(self.library, xblock)
+
+        library_learning_package = LearningPackage.objects.get(id=self.library.learning_package_id)
+        self.assertEqual(library_learning_package.content_set.count(), len(expected_imported_xblocks))
+
+        self.import_event.refresh_from_db()
+        self.assertEqual(self.import_event.status, ImportStatus.IMPORTED)
+        self.assertTrue(not self.import_event.staged_content_for_import.exists())
+        self.assertEqual(self.import_event.publishableentityimport_set.count(), len(expected_imported_xblocks))

From 3ebf29bf0926d165ce7133ffd908a92b1e0a6f66 Mon Sep 17 00:00:00 2001
From: Andrii <andrii.hantkovskyi@raccoongang.com>
Date: Thu, 15 May 2025 00:36:00 +0300
Subject: [PATCH 02/40] feat: add simple REST API

---
 cms/djangoapps/import_from_modulestore/api.py | 17 ++--
 .../import_from_modulestore/views/__init__.py |  0
 .../import_from_modulestore/views/urls.py     | 13 +++
 .../views/v0/__init__.py                      |  0
 .../views/v0/serializers.py                   | 97 +++++++++++++++++++
 .../import_from_modulestore/views/v0/urls.py  | 11 +++
 .../import_from_modulestore/views/v0/views.py | 59 +++++++++++
 cms/urls.py                                   |  2 +
 8 files changed, 190 insertions(+), 9 deletions(-)
 create mode 100644 cms/djangoapps/import_from_modulestore/views/__init__.py
 create mode 100644 cms/djangoapps/import_from_modulestore/views/urls.py
 create mode 100644 cms/djangoapps/import_from_modulestore/views/v0/__init__.py
 create mode 100644 cms/djangoapps/import_from_modulestore/views/v0/serializers.py
 create mode 100644 cms/djangoapps/import_from_modulestore/views/v0/urls.py
 create mode 100644 cms/djangoapps/import_from_modulestore/views/v0/views.py

diff --git a/cms/djangoapps/import_from_modulestore/api.py b/cms/djangoapps/import_from_modulestore/api.py
index 5c9bfc2aaec9..f4f0bdd0124f 100644
--- a/cms/djangoapps/import_from_modulestore/api.py
+++ b/cms/djangoapps/import_from_modulestore/api.py
@@ -4,6 +4,7 @@
 from typing import Sequence
 
 from opaque_keys.edx.keys import LearningContextKey, UsageKey
+from user_tasks.tasks import UserTask
 
 from .helpers import cancel_incomplete_old_imports
 from .models import Import as _Import
@@ -18,7 +19,7 @@ def import_to_library(
     user_id: int,
     composition_level: str,
     override: bool = False,
-) -> _Import:
+) -> tuple[_Import, UserTask]:
     """
     Import staged content to a library from staged content.
     """
@@ -32,12 +33,10 @@ def import_to_library(
     )
     cancel_incomplete_old_imports(import_from_modulestore)
 
-    import_to_library_task.apply_async(
-        kwargs={
-            'import_pk': import_from_modulestore.pk,
-            'usage_key_strings': usage_ids,
-            'learning_package_id': target_learning_package_id,
-            'user_id': user_id,
-        },
+    task = import_to_library_task.delay(
+        import_pk=import_from_modulestore.pk,
+        usage_key_strings=usage_ids,
+        learning_package_id=target_learning_package_id,
+        user_id=user_id,
     )
-    return import_from_modulestore
+    return import_from_modulestore, task
diff --git a/cms/djangoapps/import_from_modulestore/views/__init__.py b/cms/djangoapps/import_from_modulestore/views/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/cms/djangoapps/import_from_modulestore/views/urls.py b/cms/djangoapps/import_from_modulestore/views/urls.py
new file mode 100644
index 000000000000..1ec1fa4dde18
--- /dev/null
+++ b/cms/djangoapps/import_from_modulestore/views/urls.py
@@ -0,0 +1,13 @@
+"""
+Course to Library Import API URLs.
+"""
+
+from django.urls import include, path
+
+from .v0 import urls as v0_urls
+
+app_name = 'import_from_modulestore'
+
+urlpatterns = [
+    path('v0/', include(v0_urls)),
+]
diff --git a/cms/djangoapps/import_from_modulestore/views/v0/__init__.py b/cms/djangoapps/import_from_modulestore/views/v0/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/cms/djangoapps/import_from_modulestore/views/v0/serializers.py b/cms/djangoapps/import_from_modulestore/views/v0/serializers.py
new file mode 100644
index 000000000000..18fb2b124bea
--- /dev/null
+++ b/cms/djangoapps/import_from_modulestore/views/v0/serializers.py
@@ -0,0 +1,97 @@
+"""
+Serializers for the Course to Library Import API.
+"""
+
+from opaque_keys import InvalidKeyError
+from opaque_keys.edx.keys import LearningContextKey
+from opaque_keys.edx.locator import LibraryLocatorV2
+from rest_framework import serializers
+from user_tasks.serializers import StatusSerializer
+
+from cms.djangoapps.import_from_modulestore.models import Import
+from cms.djangoapps.import_from_modulestore.validators import validate_composition_level, validate_usage_keys_to_import
+
+
+class ImportSerializer(serializers.ModelSerializer):
+    """
+    Serializer for the course to library import creation API.
+    """
+
+    target = serializers.CharField(
+        help_text="The target library key to import into.",
+        required=True,
+    )
+    usage_keys_string = serializers.CharField(
+        help_text="Comma separated list of usage keys to import.",
+        required=True,
+    )
+
+    def get_fields(self):
+        fields = super().get_fields()
+        request = self.context.get('request')
+        if request and request.method != 'POST':
+            fields.pop('target', None)
+            fields.pop('usage_keys_string', None)
+        return fields
+
+    class Meta:
+        model = Import
+        fields = [
+            'source_key',
+            'target',
+            'usage_keys_string',
+            'composition_level',
+            'override',
+        ]
+
+    def validate_source_key(self, value):
+        """
+        Validate the source key format.
+        """
+        try:
+            LearningContextKey.from_string(value)
+        except InvalidKeyError as exc:
+            raise serializers.ValidationError(f"Invalid source key: {str(exc)}") from exc
+        return value
+
+    def validate_target(self, value):
+        """
+        Validate the target library key format.
+        """
+        try:
+            LibraryLocatorV2.from_string(value)
+        except InvalidKeyError as exc:
+            raise serializers.ValidationError(f"Invalid target library key: {str(exc)}") from exc
+        return value
+
+    def validate_usage_keys_string(self, value):
+        """
+        Validate the usage keys string format and split into a list.
+        """
+        try:
+            validate_usage_keys_to_import(value.split(','))
+        except InvalidKeyError as exc:
+            raise serializers.ValidationError(f"Invalid usage keys: {str(exc)}") from exc
+        return value.split(',')
+
+    def validate_composition_level(self, value):
+        """
+        Validate the composition level.
+        """
+        try:
+            validate_composition_level(value)
+        except ValueError as exc:
+            raise serializers.ValidationError(f"Invalid composition level: {str(exc)}") from exc
+        return value
+
+
+class StatusWithImportSerializer(StatusSerializer):
+    """
+    Serializer for the import task status.
+    """
+
+    import_event = ImportSerializer()
+
+    class Meta:
+        model = StatusSerializer.Meta.model
+        fields = [*StatusSerializer.Meta.fields, 'import_event']
diff --git a/cms/djangoapps/import_from_modulestore/views/v0/urls.py b/cms/djangoapps/import_from_modulestore/views/v0/urls.py
new file mode 100644
index 000000000000..9f50f2a27e96
--- /dev/null
+++ b/cms/djangoapps/import_from_modulestore/views/v0/urls.py
@@ -0,0 +1,11 @@
+"""
+Course to Library Import API v0 URLs.
+"""
+
+from rest_framework.routers import SimpleRouter
+from .views import ImportViewSet
+
+ROUTER = SimpleRouter()
+ROUTER.register(r'imports', ImportViewSet)
+
+urlpatterns = ROUTER.urls
diff --git a/cms/djangoapps/import_from_modulestore/views/v0/views.py b/cms/djangoapps/import_from_modulestore/views/v0/views.py
new file mode 100644
index 000000000000..abd0c6b05e8e
--- /dev/null
+++ b/cms/djangoapps/import_from_modulestore/views/v0/views.py
@@ -0,0 +1,59 @@
+"""
+API v0 views.
+"""
+
+from edx_rest_framework_extensions.auth.jwt.authentication import JwtAuthentication
+from edx_rest_framework_extensions.auth.session.authentication import SessionAuthenticationAllowInactiveUser
+from opaque_keys.edx.locator import LibraryLocatorV2
+from rest_framework.permissions import IsAdminUser
+from user_tasks.models import UserTaskStatus
+from user_tasks.views import StatusViewSet
+
+from cms.djangoapps.import_from_modulestore.api import import_to_library
+from cms.djangoapps.import_from_modulestore.views.v0.serializers import ImportSerializer, StatusWithImportSerializer
+from openedx.core.djangoapps.content_libraries.api import ContentLibrary
+from openedx.core.lib.api.authentication import BearerAuthenticationAllowInactiveUser
+
+
+class ImportViewSet(StatusViewSet):
+    """
+    Import course content from modulestore into a content library.
+    """
+
+    permission_classes = (IsAdminUser,)
+    authentication_classes = (
+        JwtAuthentication,
+        BearerAuthenticationAllowInactiveUser,
+        SessionAuthenticationAllowInactiveUser,
+    )
+    serializer_class = StatusWithImportSerializer
+
+    def get_queryset(self):
+        """
+        Override the default queryset to filter by the import event and user.
+        """
+        return StatusViewSet.queryset.filter(import_event__isnull=False, user_id=self.request.user.pk)
+
+    def create(self, request, *args, **kwargs):
+        """
+        Handle the import task creation.
+        """
+
+        serializer_data = ImportSerializer(data=request.data)
+        serializer_data.is_valid(raise_exception=True)
+        validated_data = serializer_data.validated_data
+
+        library_key = LibraryLocatorV2.from_string(validated_data['target'])
+        learning_package_id = ContentLibrary.objects.get(
+            org__short_name=library_key.org, slug=library_key.slug
+        ).learning_package_id
+
+        _, task = import_to_library(
+            source_key=validated_data['source_key'],
+            usage_ids=validated_data['usage_keys_string'],
+            target_learning_package_id=learning_package_id,
+            user_id=request.user.pk,
+            composition_level=validated_data['composition_level'],
+            override=validated_data['override'],
+        )
+        return UserTaskStatus.objects.get(uuid=task.id)
diff --git a/cms/urls.py b/cms/urls.py
index 50ea7b3add62..805a38744a56 100644
--- a/cms/urls.py
+++ b/cms/urls.py
@@ -141,6 +141,8 @@
     # rest api for course import/export
     path('api/courses/', include('cms.djangoapps.contentstore.api.urls', namespace='courses_api')
          ),
+    path('api/import_from_modulestore/',
+         include('cms.djangoapps.import_from_modulestore.views.urls', namespace='import_from_modulestore_api')),
     re_path(fr'^export/{COURSELIKE_KEY_PATTERN}$', contentstore_views.export_handler,
             name='export_handler'),
     re_path(fr'^export_output/{COURSELIKE_KEY_PATTERN}$', contentstore_views.export_output_handler,

From 34d43223ab921a89036854b19666a218aab1154c Mon Sep 17 00:00:00 2001
From: Andrii <andrii.hantkovskyi@raccoongang.com>
Date: Thu, 15 May 2025 13:56:48 +0300
Subject: [PATCH 03/40] refactor: add API endpoint secs to view docs, updated
 tests & fix various lint errors

---
 .../import_from_modulestore/admin.py          |  1 -
 cms/djangoapps/import_from_modulestore/api.py |  4 +-
 .../import_from_modulestore/helpers.py        | 10 +-
 ...created_remove_import_modified_and_more.py |  2 +-
 .../import_from_modulestore/models.py         | 18 ++--
 .../import_from_modulestore/tasks.py          | 34 ++++---
 .../tests/factories.py                        |  3 +
 .../import_from_modulestore/tests/test_api.py | 12 +--
 .../tests/test_helpers.py                     | 35 ++-----
 .../tests/test_tasks.py                       | 93 +++++++++----------
 .../views/v0/serializers.py                   | 16 ++--
 .../import_from_modulestore/views/v0/views.py | 65 +++++++++++++
 12 files changed, 175 insertions(+), 118 deletions(-)

diff --git a/cms/djangoapps/import_from_modulestore/admin.py b/cms/djangoapps/import_from_modulestore/admin.py
index 61f90f5f7d48..6deea9d2d2c8 100644
--- a/cms/djangoapps/import_from_modulestore/admin.py
+++ b/cms/djangoapps/import_from_modulestore/admin.py
@@ -34,7 +34,6 @@ def uuid(self, obj):
         Returns the UUID of the import.
         """
         return getattr(obj.user_task_status, 'uuid', None)
-    uuid.short_description = 'UUID'
 
     def created(self, obj):
         """
diff --git a/cms/djangoapps/import_from_modulestore/api.py b/cms/djangoapps/import_from_modulestore/api.py
index f4f0bdd0124f..17d04af49f7b 100644
--- a/cms/djangoapps/import_from_modulestore/api.py
+++ b/cms/djangoapps/import_from_modulestore/api.py
@@ -3,7 +3,7 @@
 """
 from typing import Sequence
 
-from opaque_keys.edx.keys import LearningContextKey, UsageKey
+from opaque_keys.edx.keys import LearningContextKey
 from user_tasks.tasks import UserTask
 
 from .helpers import cancel_incomplete_old_imports
@@ -14,7 +14,7 @@
 
 def import_to_library(
     source_key: LearningContextKey,
-    usage_ids: Sequence[str | UsageKey],
+    usage_ids: Sequence[str],
     target_learning_package_id: int,
     user_id: int,
     composition_level: str,
diff --git a/cms/djangoapps/import_from_modulestore/helpers.py b/cms/djangoapps/import_from_modulestore/helpers.py
index 60b978270c4c..90ac5e2669bb 100644
--- a/cms/djangoapps/import_from_modulestore/helpers.py
+++ b/cms/djangoapps/import_from_modulestore/helpers.py
@@ -65,15 +65,13 @@ def __init__(
         block_usage_key_to_import: str,
         target_learning_package: 'LearningPackage',
         staged_content: 'StagedContent',
-        composition_level: str,
-        override: bool = False,
     ):
         self.import_event = import_event
         self.block_usage_key_to_import = block_usage_key_to_import
         self.learning_package = target_learning_package
         self.staged_content = staged_content
-        self.composition_level = composition_level
-        self.override = override
+        self.composition_level = self.import_event.composition_level
+        self.override = self.import_event.override
 
         self.user_id = import_event.user_id
         self.content_library = target_learning_package.contentlibrary
@@ -378,8 +376,6 @@ def import_from_staged_content(
     usage_key_string: str,
     target_learning_package: 'LearningPackage',
     staged_content: 'StagedContent',
-    composition_level: str,
-    override: bool = False,
 ) -> list[PublishableVersionWithMapping]:
     """
     Import staged content to a library from staged content.
@@ -391,8 +387,6 @@ def import_from_staged_content(
         usage_key_string,
         target_learning_package,
         staged_content,
-        composition_level,
-        override,
     )
     return import_client.import_from_staged_content()
 
diff --git a/cms/djangoapps/import_from_modulestore/migrations/0002_remove_import_created_remove_import_modified_and_more.py b/cms/djangoapps/import_from_modulestore/migrations/0002_remove_import_created_remove_import_modified_and_more.py
index 96b2d6ff69e6..95385f78b92b 100644
--- a/cms/djangoapps/import_from_modulestore/migrations/0002_remove_import_created_remove_import_modified_and_more.py
+++ b/cms/djangoapps/import_from_modulestore/migrations/0002_remove_import_created_remove_import_modified_and_more.py
@@ -43,6 +43,6 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='import',
             name='user_task_status',
-            field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='user_tasks.usertaskstatus'),
+            field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='import_event', to='user_tasks.usertaskstatus'),
         ),
     ]
diff --git a/cms/djangoapps/import_from_modulestore/models.py b/cms/djangoapps/import_from_modulestore/models.py
index e8e9fa4e3f96..db917024b912 100644
--- a/cms/djangoapps/import_from_modulestore/models.py
+++ b/cms/djangoapps/import_from_modulestore/models.py
@@ -1,10 +1,12 @@
 """
 Models for the course to library import app.
 """
+from typing import Self
 
 from django.contrib.auth import get_user_model
 from django.db import models
 from django.utils.translation import gettext_lazy as _
+from user_tasks.models import UserTaskStatus
 
 from model_utils.models import TimeStampedModel
 from opaque_keys.edx.django.models import (
@@ -25,7 +27,7 @@ class Import(models.Model):
     """
 
     user_task_status = models.OneToOneField(
-        'user_tasks.UserTaskStatus',
+        UserTaskStatus,
         on_delete=models.SET_NULL,
         null=True,
         blank=True,
@@ -55,17 +57,21 @@ class Meta:
     def __str__(self):
         return f'{self.source_key} → {self.target_change}'
 
-    def set_status(self, status: ImportStatus):
+    def set_status(self: Self, status: ImportStatus):
         """
         Set import status.
         """
+        user_task_status: UserTaskStatus = self.user_task_status
+
         if status in ImportStatus.FAILED_STATUSES.value:
-            self.user_task_status.fail(status)
+            user_task_status.fail(status.value)
         elif status == ImportStatus.CANCELED:
-            self.user_task_status.cancel()
+            user_task_status.cancel()
         else:
-            self.user_task_status.set_state(status)
-        self.user_task_status.save()
+            user_task_status.set_state(status.value)
+
+        user_task_status.save()
+
         if status in [ImportStatus.IMPORTED, ImportStatus.CANCELED]:
             self.clean_related_staged_content()
 
diff --git a/cms/djangoapps/import_from_modulestore/tasks.py b/cms/djangoapps/import_from_modulestore/tasks.py
index 34a377d5e384..87fa06f881a8 100644
--- a/cms/djangoapps/import_from_modulestore/tasks.py
+++ b/cms/djangoapps/import_from_modulestore/tasks.py
@@ -7,7 +7,6 @@
 from celery.utils.log import get_task_logger
 from django.db import transaction
 from edx_django_utils.monitoring import set_code_owner_attribute_from_module
-from opaque_keys.edx.keys import UsageKey
 
 from openedx_learning.api import authoring as authoring_api
 from openedx_learning.api.authoring_models import LearningPackage
@@ -61,9 +60,9 @@ def generate_name(cls, arguments_dict):
 def import_to_library_task(
     self,
     import_pk: int,
-    usage_key_strings: Sequence[str | UsageKey],
+    usage_key_strings: Sequence[str],
     learning_package_id: int,
-    user_id: int,
+    user_id: int,  # pylint: disable=unused-argument
 ) -> None:
     """
     Import to library task.
@@ -73,7 +72,6 @@ def import_to_library_task(
     """
     set_code_owner_attribute_from_module(__name__)
 
-    # Step 1: Save course to staged content task by sections/chapters.
     try:
         import_event = Import.objects.get(pk=import_pk)
         import_event.user_task_status = self.status
@@ -82,6 +80,19 @@ def import_to_library_task(
         log.info('Import event not found for pk %s', import_pk)
         return
 
+    # Step 1: Save course to staged content task by sections/chapters.
+    save_leagacy_content_to_staged_content(import_event)
+
+    self.status.increment_completed_steps()
+
+    # Step 2: Import staged content to library task.
+    import_staged_content_to_library(import_event, learning_package_id, usage_key_strings)
+
+
+def save_leagacy_content_to_staged_content(import_event: Import) -> None:
+    """
+    Save course to staged content task by sections/chapters.
+    """
     import_event.set_status(ImportStatus.WAITNG_TO_STAGE)
     import_event.clean_related_staged_content()
 
@@ -92,7 +103,7 @@ def import_to_library_task(
             for item in items_to_import:
                 staged_content = content_staging_api.stage_xblock_temporarily(
                     item,
-                    user_id,
+                    import_event.user.pk,
                     purpose=IMPORT_FROM_MODULESTORE_STAGING_PURPOSE,
                 )
                 StagedContentForImport.objects.create(
@@ -109,9 +120,13 @@ def import_to_library_task(
         import_event.set_status(ImportStatus.STAGING_FAILED)
         raise exc
 
-    # Step 2: Import staged content to library task.
-    self.status.increment_completed_steps()
 
+def import_staged_content_to_library(
+    import_event: Import, learning_package_id: int, usage_key_strings: Sequence[str]
+) -> None:
+    """
+    Import staged content to library task.
+    """
     target_learning_package = LearningPackage.objects.get(id=learning_package_id)
 
     imported_publishable_versions = []
@@ -127,13 +142,10 @@ def import_to_library_task(
                     usage_key_string,
                     target_learning_package,
                     staged_content_for_import.staged_content,
-                    import_event.composition_level,
-                    import_event.override,
                 )
                 imported_publishable_versions.extend(publishable_versions)
-        except Exception as exc:  # pylint: disable=broad-except
+        except Exception:  # pylint: disable=broad-except
             import_event.set_status(ImportStatus.IMPORTING_FAILED)
-            raise exc
         else:
             import_event.set_status(ImportStatus.IMPORTED)
             for imported_component_version in imported_publishable_versions:
diff --git a/cms/djangoapps/import_from_modulestore/tests/factories.py b/cms/djangoapps/import_from_modulestore/tests/factories.py
index e8423b3a84b5..1ab7cc6327f8 100644
--- a/cms/djangoapps/import_from_modulestore/tests/factories.py
+++ b/cms/djangoapps/import_from_modulestore/tests/factories.py
@@ -8,6 +8,7 @@
 from opaque_keys.edx.keys import CourseKey
 
 from common.djangoapps.student.tests.factories import UserFactory
+from cms.djangoapps.import_from_modulestore.data import CompositionLevel
 from cms.djangoapps.import_from_modulestore.models import Import
 
 
@@ -24,3 +25,5 @@ def source_key(self):
         return CourseKey.from_string(f'course-v1:edX+DemoX+{uuid.uuid4()}')
 
     user = factory.SubFactory(UserFactory)
+    composition_level = CompositionLevel.COMPONENT.value
+    override = False
diff --git a/cms/djangoapps/import_from_modulestore/tests/test_api.py b/cms/djangoapps/import_from_modulestore/tests/test_api.py
index 72497200a7f9..262dce1d7233 100644
--- a/cms/djangoapps/import_from_modulestore/tests/test_api.py
+++ b/cms/djangoapps/import_from_modulestore/tests/test_api.py
@@ -62,13 +62,11 @@ def test_import_staged_content_to_library(self):
         assert import_event.override == override
         assert import_event.user_id == user.id
 
-        import_to_library_task_mock.apply_async.assert_called_once_with(
-            kwargs={
-                "import_pk": Import.objects.get().pk,
-                "usage_key_strings": usage_ids,
-                "learning_package_id": self.library.learning_package.id,
-                "user_id": user.id,
-            },
+        import_to_library_task_mock.delay.assert_called_once_with(
+            import_pk=import_event.pk,
+            usage_key_strings=usage_ids,
+            learning_package_id=self.library.learning_package.id,
+            user_id=user.id,
         )
 
     def test_import_to_library_invalid_usage_key(self):
diff --git a/cms/djangoapps/import_from_modulestore/tests/test_helpers.py b/cms/djangoapps/import_from_modulestore/tests/test_helpers.py
index 5e5aad1b1c84..ed61e3f79327 100644
--- a/cms/djangoapps/import_from_modulestore/tests/test_helpers.py
+++ b/cms/djangoapps/import_from_modulestore/tests/test_helpers.py
@@ -99,8 +99,6 @@ def test_import_from_staged_content(self):
             staged_content=staged_content,
             target_learning_package=self.learning_package,
             block_usage_key_to_import=str(self.vertical.location),
-            composition_level='component',
-            override=False
         )
 
         import_client.import_from_staged_content()
@@ -118,8 +116,6 @@ def test_import_from_staged_content_block_not_found(self, mocked_process_import)
             staged_content=staged_content,
             target_learning_package=self.learning_package,
             block_usage_key_to_import='block-v1:edX+Demo+2025+type@chapter+block@12345',
-            composition_level='component',
-            override=False
         )
 
         import_client.import_from_staged_content()
@@ -143,8 +139,6 @@ def test_create_container(self, block_lvl):
             staged_content=staged_content_for_import.staged_content,
             target_learning_package=self.learning_package,
             block_usage_key_to_import=block_usage_key_to_import,
-            composition_level='component',
-            override=False
         )
         import_client.get_or_create_container(
             container_to_import.category,
@@ -165,8 +159,6 @@ def test_create_container_with_xblock(self):
             staged_content=staged_content_for_import.staged_content,
             target_learning_package=self.learning_package,
             block_usage_key_to_import=block_usage_key_to_import,
-            composition_level='component',
-            override=False
         )
         with self.assertRaises(ValueError):
             import_client.get_or_create_container(
@@ -191,8 +183,6 @@ def test_process_import_with_complicated_blocks(self, block_lvl):
             staged_content=staged_content,
             block_usage_key_to_import=block_usage_key_to_import,
             target_learning_package=self.learning_package,
-            composition_level='component',
-            override=False
         )
         # pylint: disable=protected-access
         result = import_client.import_from_staged_content()
@@ -213,8 +203,6 @@ def test_process_import_with_simple_blocks(self, block_type_to_import):
             staged_content=staged_content_for_import.staged_content,
             target_learning_package=self.learning_package,
             block_usage_key_to_import=block_usage_key_to_import,
-            composition_level='component',
-            override=False
         )
 
         block_to_import = etree.fromstring(block_to_import.data, parser=self.parser)
@@ -237,8 +225,6 @@ def test_process_import_with_override(self, override):
             staged_content=staged_content_for_import.staged_content,
             target_learning_package=self.learning_package,
             block_usage_key_to_import=block_usage_key_to_import,
-            composition_level='component',
-            override=False
         )
 
         block_xml = etree.fromstring(block_to_import.data, parser=self.parser)
@@ -246,7 +232,7 @@ def test_process_import_with_override(self, override):
         result1 = import_client._process_import(block_usage_key_to_import, block_xml)
         self.assertEqual(len(result1), 1)
 
-        new_import_event = api.import_to_library(
+        new_import_event, _ = api.import_to_library(
             source_key=self.course.id,
             usage_ids=[str(self.chapter.location)],
             target_learning_package_id=self.learning_package.id,
@@ -271,8 +257,6 @@ def test_process_import_with_override(self, override):
             staged_content=new_staged_content,
             target_learning_package=self.learning_package,
             block_usage_key_to_import=block_usage_key_to_import,
-            composition_level='component',
-            override=override
         )
 
         if override:
@@ -304,13 +288,13 @@ def test_container_override(self, mock_authoring_api):
         )
         staged_content = staged_content_for_import.staged_content
 
+        self.import_event.composition_level = "vertical"
+        self.import_event.save()
         import_client = ImportClient(
             import_event=self.import_event,
             staged_content=staged_content,
             target_learning_package=self.learning_package,
             block_usage_key_to_import=block_usage_key_to_import,
-            composition_level='vertical',
-            override=False
         )
 
         container_version_with_mapping = import_client.get_or_create_container(
@@ -322,13 +306,13 @@ def test_container_override(self, mock_authoring_api):
         assert container_version_with_mapping is not None
         assert container_version_with_mapping.publishable_version.title == container_to_import.display_name
 
+        self.import_event.override = True
+        self.import_event.save()
         import_client = ImportClient(
             import_event=self.import_event,
             staged_content=staged_content,
             target_learning_package=self.learning_package,
             block_usage_key_to_import=block_usage_key_to_import,
-            composition_level='vertical',
-            override=True
         )
         container_version_with_mapping = import_client.get_or_create_container(
             'vertical',
@@ -356,13 +340,13 @@ def test_composition_levels(self, composition_level):
         )
         staged_content = staged_content_for_import.staged_content
 
+        self.import_event.composition_level = composition_level
+        self.import_event.save()
         import_client = ImportClient(
             import_event=self.import_event,
             staged_content=staged_content,
             target_learning_package=self.learning_package,
             block_usage_key_to_import=block_usage_key_to_import,
-            composition_level=composition_level,
-            override=False
         )
 
         block_xml = etree.fromstring(staged_content.olx, parser=self.parser)
@@ -385,8 +369,6 @@ def test_process_staged_content_files(self, mock_content_staging_api):
             staged_content=staged_content,
             target_learning_package=self.learning_package,
             block_usage_key_to_import=block_usage_key_to_import,
-            composition_level='component',
-            override=False
         )
 
         mock_file_data = b'file content'
@@ -417,13 +399,12 @@ def test_update_container_components(self):
             source_usage_key=self.chapter.location
         )
 
+        self.import_event.composition_level = "container"
         import_client = ImportClient(
             import_event=self.import_event,
             staged_content=staged_content_for_import.staged_content,
             target_learning_package=self.learning_package,
             block_usage_key_to_import=block_usage_key_to_import,
-            composition_level='container',
-            override=False
         )
 
         with patch('cms.djangoapps.import_from_modulestore.helpers.authoring_api') as mock_authoring_api:
diff --git a/cms/djangoapps/import_from_modulestore/tests/test_tasks.py b/cms/djangoapps/import_from_modulestore/tests/test_tasks.py
index 8eca87b7bef7..236ca6a01931 100644
--- a/cms/djangoapps/import_from_modulestore/tests/test_tasks.py
+++ b/cms/djangoapps/import_from_modulestore/tests/test_tasks.py
@@ -1,15 +1,17 @@
 """
 Tests for tasks in import_from_modulestore app.
 """
-from django.core.exceptions import ObjectDoesNotExist
 from organizations.models import Organization
 from openedx_learning.api.authoring_models import LearningPackage
-from unittest.mock import patch
+from unittest.mock import patch, call
 import uuid
 from user_tasks.models import UserTaskStatus
 
 from cms.djangoapps.import_from_modulestore.data import ImportStatus
-from cms.djangoapps.import_from_modulestore.tasks import import_to_library_task
+from cms.djangoapps.import_from_modulestore.tasks import (
+    save_leagacy_content_to_staged_content,
+    import_staged_content_to_library,
+)
 from openedx.core.djangoapps.content_libraries import api as content_libraries_api
 from openedx.core.djangoapps.content_libraries.api import ContentLibrary
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
@@ -51,6 +53,14 @@ def setUp(self):
 
         self.import_event = ImportFactory(source_key=self.course.id)
         self.user = self.import_event.user
+        self.import_event.user_task_status = UserTaskStatus.objects.create(
+            user=self.user,
+            task_id=uuid.uuid4(),
+            task_class='cms.djangoapps.import_from_modulestore.import_from_modulestore.tasks.import_to_library_task',
+            name='Test',
+            total_steps=2,
+        )
+        self.import_event.save()
 
 
 class TestSaveCourseSectionsToStagedContentTask(ImportCourseToLibraryMixin):
@@ -64,28 +74,24 @@ def test_save_legacy_content_to_staged_content_task(self, mock_set_status):
         End-to-end test for save_legacy_content_to_staged_content_task.
         """
         course_chapters_to_import = [self.chapter, self.chapter2]
-        import_to_library_task(
-            self.import_event.pk,
-            course_chapters_to_import,
-            self.content_library.learning_package.id,
-            self.user.id,
-        )
+        save_leagacy_content_to_staged_content(self.import_event)
 
         self.import_event.refresh_from_db()
         self.assertEqual(self.import_event.staged_content_for_import.count(), len(course_chapters_to_import))
-        mock_set_status.assert_called_once_with(ImportStatus.STAGED)
+        staging_calls = [
+            call(ImportStatus.WAITNG_TO_STAGE),
+            call(ImportStatus.STAGING),
+            call(ImportStatus.STAGED),
+        ]
+        self.assertEqual(mock_set_status.call_count, len(staging_calls))
+        mock_set_status.assert_has_calls(staging_calls)
 
     @patch('cms.djangoapps.import_from_modulestore.models.Import.clean_related_staged_content')
     def test_old_staged_content_deletion_before_save_new(self, mock_clean_related_staged_content):
         """ Checking that repeated saving of the same content does not create duplicates. """
         course_chapters_to_import = [self.chapter, self.chapter2]
 
-        import_to_library_task(
-            self.import_event.pk,
-            course_chapters_to_import,
-            self.content_library.learning_package.id,
-            self.user.id,
-        )
+        save_leagacy_content_to_staged_content(self.import_event)
 
         mock_clean_related_staged_content.assert_called_once()
         self.import_event.refresh_from_db()
@@ -108,15 +114,15 @@ def test_import_staged_content_to_library_task(self):
         self.assertEqual(library_learning_package.content_set.count(), 0)
         expected_imported_xblocks = [self.problem, self.problem2, self.video, self.video2]
 
-        import_to_library_task(
-            self.import_event.pk,
-            [str(self.chapter.location), str(self.chapter2.location)],
+        save_leagacy_content_to_staged_content(self.import_event)
+        import_staged_content_to_library(
+            self.import_event,
             self.content_library.learning_package.id,
-            self.user.id,
+            [str(self.chapter.location), str(self.chapter2.location)],
         )
 
         self.import_event.refresh_from_db()
-        self.assertEqual(self.import_event.status, ImportStatus.IMPORTED)
+        self.assertEqual(self.import_event.user_task_status.state, ImportStatus.IMPORTED.value)
 
         for xblock in expected_imported_xblocks:
             self._is_imported(self.library, xblock)
@@ -130,14 +136,12 @@ def test_import_library_block_not_found(self, mock_import_from_staged_content):
         """ Test that if a block is not found in the staged content, it is not imported. """
         non_existent_usage_ids = ['block-v1:edX+Demo+2023+type@vertical+block@12345']
         with self.allow_transaction_exception():
-            with self.assertRaises(ObjectDoesNotExist):
-                import_to_library_task(
-                    self.import_event.pk,
-                    non_existent_usage_ids,
-                    self.content_library.learning_package.id,
-                    self.user.id,
-                )
-                mock_import_from_staged_content.assert_not_called()
+            import_staged_content_to_library(
+                self.import_event,
+                self.content_library.learning_package.id,
+                non_existent_usage_ids,
+            )
+            mock_import_from_staged_content.assert_not_called()
 
     def test_cannot_import_staged_content_twice(self):
         """
@@ -147,30 +151,25 @@ def test_cannot_import_staged_content_twice(self):
         chapters_to_import = [self.chapter, self.chapter2]
         expected_imported_xblocks = [self.problem, self.video]
 
-        import_to_library_task(
-            self.import_event.pk,
-            [str(self.chapter.location)],
-            self.content_library.learning_package.id,
-            self.user.id,
-        )
+        save_leagacy_content_to_staged_content(self.import_event)
         self.import_event.refresh_from_db()
         self.assertEqual(self.import_event.staged_content_for_import.count(), len(chapters_to_import))
-        self.assertEqual(self.import_event.status, ImportStatus.STAGED)
+        self.assertEqual(self.import_event.user_task_status.state, ImportStatus.STAGED.value)
 
-        import_to_library_task(
-            self.import_event.pk,
-            [str(self.chapter.location)],
+        import_staged_content_to_library(
+            self.import_event,
             self.content_library.learning_package.id,
-            self.user.id,
+            [str(self.chapter.location)],
         )
-
         for xblock in expected_imported_xblocks:
             self._is_imported(self.library, xblock)
 
-        library_learning_package = LearningPackage.objects.get(id=self.library.learning_package_id)
-        self.assertEqual(library_learning_package.content_set.count(), len(expected_imported_xblocks))
-
+        # try importing again, should not be possible
         self.import_event.refresh_from_db()
-        self.assertEqual(self.import_event.status, ImportStatus.IMPORTED)
-        self.assertTrue(not self.import_event.staged_content_for_import.exists())
-        self.assertEqual(self.import_event.publishableentityimport_set.count(), len(expected_imported_xblocks))
+        import_staged_content_to_library(
+            self.import_event,
+            self.content_library.learning_package.id,
+            [str(self.chapter.location)],
+        )
+        self.import_event.refresh_from_db()
+        self.assertEqual(self.import_event.user_task_status.state, ImportStatus.IMPORTING_FAILED.value)
diff --git a/cms/djangoapps/import_from_modulestore/views/v0/serializers.py b/cms/djangoapps/import_from_modulestore/views/v0/serializers.py
index 18fb2b124bea..b3e1e66dc655 100644
--- a/cms/djangoapps/import_from_modulestore/views/v0/serializers.py
+++ b/cms/djangoapps/import_from_modulestore/views/v0/serializers.py
@@ -26,14 +26,6 @@ class ImportSerializer(serializers.ModelSerializer):
         required=True,
     )
 
-    def get_fields(self):
-        fields = super().get_fields()
-        request = self.context.get('request')
-        if request and request.method != 'POST':
-            fields.pop('target', None)
-            fields.pop('usage_keys_string', None)
-        return fields
-
     class Meta:
         model = Import
         fields = [
@@ -44,6 +36,14 @@ class Meta:
             'override',
         ]
 
+    def get_fields(self):
+        fields = super().get_fields()
+        request = self.context.get('request')
+        if request and request.method != 'POST':
+            fields.pop('target', None)
+            fields.pop('usage_keys_string', None)
+        return fields
+
     def validate_source_key(self, value):
         """
         Validate the source key format.
diff --git a/cms/djangoapps/import_from_modulestore/views/v0/views.py b/cms/djangoapps/import_from_modulestore/views/v0/views.py
index abd0c6b05e8e..079ec11ba0de 100644
--- a/cms/djangoapps/import_from_modulestore/views/v0/views.py
+++ b/cms/djangoapps/import_from_modulestore/views/v0/views.py
@@ -18,6 +18,71 @@
 class ImportViewSet(StatusViewSet):
     """
     Import course content from modulestore into a content library.
+
+    This viewset handles the import process, including creating the import task and
+    retrieving the status of the import task. Meant to be used by admin users only.
+
+    API Endpoints
+    ------------
+    POST /api/import_from_modulestore/v0/imports/
+        Start the import process.
+
+        Request body:
+            {
+                "source_key": "<source_course_key>",
+                "target": "<target_library>",
+                "usage_keys_string": "<comma_separated_usage_keys>",
+                "composition_level": "<composition_level>",
+                "override": "<boolean>"
+            }
+
+        Example request:
+            {
+                "source_key": "course-v1:edX+DemoX+2014_T1",
+                "target": "library-v1:org1+lib_1",
+                "usage_keys_string": "block-v1:edX+DemoX+2014_T1+type@sequential+block@chapter_1",
+                "composition_level": "component",
+                "override": true
+            }
+
+        Example response:
+            {
+                "name": "Import course to library (library_id=6, import_id=50)",
+                "state": "Succeeded",
+                "state_text": "Succeeded",
+                "completed_steps": 2,
+                "total_steps": 2,
+                "attempts": 1,
+                "created": "2025-05-14T22:24:37.048539Z",
+                "modified": "2025-05-14T22:24:59.128068Z",
+                "artifacts": [],
+                "import_event": {
+                    "source_key": "course-v1:OpenedX+DemoX+DemoCourse",
+                    "composition_level": "component",
+                    "override": true
+                }
+            }
+
+    GET /api/import_from_modulestore/v0/imports/<uuid>/
+        Get the status of the import task.
+
+        Example response:
+            {
+                "name": "Import course to library (library_id=4, import_id=69)",
+                "state": "Importing staged content",
+                "state_text": "Importing staged content",
+                "completed_steps": 1,
+                "total_steps": 2,
+                "attempts": 1,
+                "created": "2025-05-14T22:24:37.048539Z",
+                "modified": "2025-05-14T22:24:59.128068Z",
+                "artifacts": [],
+                "import_event": {
+                    "source_key": "course-v1:OpenedX+DemoX+DemoCourse2",
+                    "composition_level": "component",
+                    "override": false
+                }
+            }
     """
 
     permission_classes = (IsAdminUser,)

From 71199bbaeed0a92df0f6f60a287e25d2bcb953cf Mon Sep 17 00:00:00 2001
From: Andrii <andrii.hantkovskyi@raccoongang.com>
Date: Thu, 15 May 2025 16:53:18 +0300
Subject: [PATCH 04/40] refactor: simplify staged content in helpers tests &
 fix import order in tasks.py

---
 .../tests/test_helpers.py                      | 18 ++----------------
 .../tests/test_tasks.py                        |  7 ++++---
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/cms/djangoapps/import_from_modulestore/tests/test_helpers.py b/cms/djangoapps/import_from_modulestore/tests/test_helpers.py
index ed61e3f79327..14531dee326d 100644
--- a/cms/djangoapps/import_from_modulestore/tests/test_helpers.py
+++ b/cms/djangoapps/import_from_modulestore/tests/test_helpers.py
@@ -15,6 +15,7 @@
 from cms.djangoapps.import_from_modulestore import api, constants
 from cms.djangoapps.import_from_modulestore.helpers import ImportClient
 from cms.djangoapps.import_from_modulestore.models import StagedContentForImport
+from cms.djangoapps.import_from_modulestore.tasks import save_leagacy_content_to_staged_content
 from cms.djangoapps.import_from_modulestore.tests.factories import ImportFactory
 from common.djangoapps.student.tests.factories import UserFactory
 
@@ -22,7 +23,6 @@
 from openedx.core.djangoapps.content_staging import api as content_staging_api
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory, BlockFactory
-from xmodule.modulestore.django import modulestore
 
 
 @ddt.ddt
@@ -61,21 +61,6 @@ def setUp(self):
             user=self.user,
             source_key=self.course.id,
         )
-        # get blocks to update their children
-        self.chapter = modulestore().get_item(self.chapter.location)
-        self.sequential = modulestore().get_item(self.sequential.location)
-        self.vertical = modulestore().get_item(self.vertical.location)
-        # mock staged content
-        staged_content = content_staging_api.stage_xblock_temporarily(
-            self.chapter,
-            self.user.id,
-            purpose=constants.IMPORT_FROM_MODULESTORE_STAGING_PURPOSE,
-        )
-        StagedContentForImport.objects.create(
-            import_event=self.import_event,
-            staged_content=staged_content,
-            source_usage_key=self.chapter.location,
-        )
         #mock user task status
         self.import_event.user_task_status = UserTaskStatus.objects.create(
             user=self.user,
@@ -85,6 +70,7 @@ def setUp(self):
             total_steps=2
         )
         self.import_event.save()
+        save_leagacy_content_to_staged_content(self.import_event)
 
         self.parser = etree.XMLParser(strip_cdata=False)
 
diff --git a/cms/djangoapps/import_from_modulestore/tests/test_tasks.py b/cms/djangoapps/import_from_modulestore/tests/test_tasks.py
index 236ca6a01931..ad4787f6bd47 100644
--- a/cms/djangoapps/import_from_modulestore/tests/test_tasks.py
+++ b/cms/djangoapps/import_from_modulestore/tests/test_tasks.py
@@ -1,16 +1,17 @@
 """
 Tests for tasks in import_from_modulestore app.
 """
-from organizations.models import Organization
-from openedx_learning.api.authoring_models import LearningPackage
 from unittest.mock import patch, call
 import uuid
+
+from openedx_learning.api.authoring_models import LearningPackage
+from organizations.models import Organization
 from user_tasks.models import UserTaskStatus
 
 from cms.djangoapps.import_from_modulestore.data import ImportStatus
 from cms.djangoapps.import_from_modulestore.tasks import (
-    save_leagacy_content_to_staged_content,
     import_staged_content_to_library,
+    save_leagacy_content_to_staged_content,
 )
 from openedx.core.djangoapps.content_libraries import api as content_libraries_api
 from openedx.core.djangoapps.content_libraries.api import ContentLibrary

From 0ae07fd53563e75a06036a64081f73d219fe478c Mon Sep 17 00:00:00 2001
From: Andrii <andrii.hantkovskyi@raccoongang.com>
Date: Thu, 15 May 2025 18:11:34 +0300
Subject: [PATCH 05/40] fix: add default value for composition_level to not
 break old instances

---
 ...0002_remove_import_created_remove_import_modified_and_more.py | 1 -
 cms/djangoapps/import_from_modulestore/models.py                 | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/cms/djangoapps/import_from_modulestore/migrations/0002_remove_import_created_remove_import_modified_and_more.py b/cms/djangoapps/import_from_modulestore/migrations/0002_remove_import_created_remove_import_modified_and_more.py
index 95385f78b92b..80085ff36133 100644
--- a/cms/djangoapps/import_from_modulestore/migrations/0002_remove_import_created_remove_import_modified_and_more.py
+++ b/cms/djangoapps/import_from_modulestore/migrations/0002_remove_import_created_remove_import_modified_and_more.py
@@ -33,7 +33,6 @@ class Migration(migrations.Migration):
             model_name='import',
             name='composition_level',
             field=models.CharField(choices=[(ContainerType['Section'], 'CHAPTER'), (ContainerType['Subsection'], 'SEQUENTIAL'), (ContainerType['Unit'], 'VERTICAL'), ('component', 'COMPONENT')], default='component', help_text='The composition level of the target learning package', max_length=255),
-            preserve_default=False,
         ),
         migrations.AddField(
             model_name='import',
diff --git a/cms/djangoapps/import_from_modulestore/models.py b/cms/djangoapps/import_from_modulestore/models.py
index db917024b912..19f44dae40c2 100644
--- a/cms/djangoapps/import_from_modulestore/models.py
+++ b/cms/djangoapps/import_from_modulestore/models.py
@@ -42,6 +42,7 @@ class Import(models.Model):
         max_length=255,
         choices=CompositionLevel.choices(),
         help_text=_('The composition level of the target learning package'),
+        default=CompositionLevel.COMPONENT.value,
     )
     override = models.BooleanField(
         default=False,

From 2beecd00a5699676ed4944ccdf827c949d02fd0e Mon Sep 17 00:00:00 2001
From: Kyle McCormick <kyle@axim.org>
Date: Tue, 20 May 2025 17:55:24 -0400
Subject: [PATCH 06/40] feat!: modulestore_migrator (WIP)

---
 .github/workflows/unit-test-shards.json       |   1 +
 .../import_from_modulestore/admin.py          |  53 --
 cms/djangoapps/import_from_modulestore/api.py |  42 --
 .../import_from_modulestore/data.py           |  69 ---
 .../import_from_modulestore/helpers.py        | 460 ---------------
 ...created_remove_import_modified_and_more.py |  47 --
 .../import_from_modulestore/models.py         | 161 ------
 .../import_from_modulestore/tasks.py          | 158 -----
 .../tests/factories.py                        |  29 -
 .../import_from_modulestore/tests/test_api.py |  96 ---
 .../tests/test_helpers.py                     | 409 -------------
 .../tests/test_tasks.py                       | 176 ------
 .../views/v0/serializers.py                   |  97 ----
 .../import_from_modulestore/views/v0/views.py | 124 ----
 .../__init__.py                               |   0
 cms/djangoapps/modulestore_migrator/api.py    |  52 ++
 cms/djangoapps/modulestore_migrator/apps.py   |  13 +
 .../modulestore_migrator/constants.py         |   6 +
 cms/djangoapps/modulestore_migrator/data.py   |  45 ++
 .../migrations/0001_initial.py                | 106 ++++
 .../migrations}/__init__.py                   |   0
 cms/djangoapps/modulestore_migrator/models.py | 179 ++++++
 .../modulestore_migrator/rest_api/__init__.py |   0
 .../rest_api}/urls.py                         |   2 +-
 .../rest_api/v0/__init__.py                   |   0
 .../rest_api}/v0/urls.py                      |   4 +-
 cms/djangoapps/modulestore_migrator/tasks.py  | 546 ++++++++++++++++++
 cms/envs/common.py                            |   1 +
 cms/urls.py                                   |   4 +-
 mypy.ini                                      |   1 +
 openedx/core/types/user.py                    |   1 +
 31 files changed, 956 insertions(+), 1926 deletions(-)
 delete mode 100644 cms/djangoapps/import_from_modulestore/admin.py
 delete mode 100644 cms/djangoapps/import_from_modulestore/api.py
 delete mode 100644 cms/djangoapps/import_from_modulestore/data.py
 delete mode 100644 cms/djangoapps/import_from_modulestore/helpers.py
 delete mode 100644 cms/djangoapps/import_from_modulestore/migrations/0002_remove_import_created_remove_import_modified_and_more.py
 delete mode 100644 cms/djangoapps/import_from_modulestore/models.py
 delete mode 100644 cms/djangoapps/import_from_modulestore/tasks.py
 delete mode 100644 cms/djangoapps/import_from_modulestore/tests/factories.py
 delete mode 100644 cms/djangoapps/import_from_modulestore/tests/test_api.py
 delete mode 100644 cms/djangoapps/import_from_modulestore/tests/test_helpers.py
 delete mode 100644 cms/djangoapps/import_from_modulestore/tests/test_tasks.py
 delete mode 100644 cms/djangoapps/import_from_modulestore/views/v0/serializers.py
 delete mode 100644 cms/djangoapps/import_from_modulestore/views/v0/views.py
 rename cms/djangoapps/{import_from_modulestore/views => modulestore_migrator}/__init__.py (100%)
 create mode 100644 cms/djangoapps/modulestore_migrator/api.py
 create mode 100644 cms/djangoapps/modulestore_migrator/apps.py
 create mode 100644 cms/djangoapps/modulestore_migrator/constants.py
 create mode 100644 cms/djangoapps/modulestore_migrator/data.py
 create mode 100644 cms/djangoapps/modulestore_migrator/migrations/0001_initial.py
 rename cms/djangoapps/{import_from_modulestore/views/v0 => modulestore_migrator/migrations}/__init__.py (100%)
 create mode 100644 cms/djangoapps/modulestore_migrator/models.py
 create mode 100644 cms/djangoapps/modulestore_migrator/rest_api/__init__.py
 rename cms/djangoapps/{import_from_modulestore/views => modulestore_migrator/rest_api}/urls.py (82%)
 create mode 100644 cms/djangoapps/modulestore_migrator/rest_api/v0/__init__.py
 rename cms/djangoapps/{import_from_modulestore/views => modulestore_migrator/rest_api}/v0/urls.py (54%)
 create mode 100644 cms/djangoapps/modulestore_migrator/tasks.py

diff --git a/.github/workflows/unit-test-shards.json b/.github/workflows/unit-test-shards.json
index 784f607f06ba..827366365fa8 100644
--- a/.github/workflows/unit-test-shards.json
+++ b/.github/workflows/unit-test-shards.json
@@ -238,6 +238,7 @@
       "cms/djangoapps/cms_user_tasks/",
       "cms/djangoapps/course_creators/",
       "cms/djangoapps/export_course_metadata/",
+      "cms/djangoapps/modulestore_migrator/",
       "cms/djangoapps/maintenance/",
       "cms/djangoapps/models/",
       "cms/djangoapps/pipeline_js/",
diff --git a/cms/djangoapps/import_from_modulestore/admin.py b/cms/djangoapps/import_from_modulestore/admin.py
deleted file mode 100644
index 6deea9d2d2c8..000000000000
--- a/cms/djangoapps/import_from_modulestore/admin.py
+++ /dev/null
@@ -1,53 +0,0 @@
-"""
-This module contains the admin configuration for the Import model.
-"""
-from django.contrib import admin
-
-from .models import Import, PublishableEntityImport, PublishableEntityMapping
-
-
-class ImportAdmin(admin.ModelAdmin):
-    """
-    Admin configuration for the Import model.
-    """
-
-    list_display = (
-        'uuid',
-        'created',
-        'status',
-        'source_key',
-        'target_change',
-    )
-    list_filter = (
-        'user_task_status__state',
-    )
-    search_fields = (
-        'source_key',
-        'target_change',
-    )
-
-    raw_id_fields = ('user',)
-    readonly_fields = ('user_task_status',)
-
-    def uuid(self, obj):
-        """
-        Returns the UUID of the import.
-        """
-        return getattr(obj.user_task_status, 'uuid', None)
-
-    def created(self, obj):
-        """
-        Returns the creation date of the import.
-        """
-        return getattr(obj.user_task_status, 'created', None)
-
-    def status(self, obj):
-        """
-        Returns the status of the import.
-        """
-        return getattr(obj.user_task_status, 'state', None)
-
-
-admin.site.register(Import, ImportAdmin)
-admin.site.register(PublishableEntityImport)
-admin.site.register(PublishableEntityMapping)
diff --git a/cms/djangoapps/import_from_modulestore/api.py b/cms/djangoapps/import_from_modulestore/api.py
deleted file mode 100644
index 17d04af49f7b..000000000000
--- a/cms/djangoapps/import_from_modulestore/api.py
+++ /dev/null
@@ -1,42 +0,0 @@
-"""
-API for course to library import.
-"""
-from typing import Sequence
-
-from opaque_keys.edx.keys import LearningContextKey
-from user_tasks.tasks import UserTask
-
-from .helpers import cancel_incomplete_old_imports
-from .models import Import as _Import
-from .tasks import import_to_library_task
-from .validators import validate_usage_keys_to_import
-
-
-def import_to_library(
-    source_key: LearningContextKey,
-    usage_ids: Sequence[str],
-    target_learning_package_id: int,
-    user_id: int,
-    composition_level: str,
-    override: bool = False,
-) -> tuple[_Import, UserTask]:
-    """
-    Import staged content to a library from staged content.
-    """
-    validate_usage_keys_to_import(usage_ids)
-
-    import_from_modulestore = _Import.objects.create(
-        source_key=source_key,
-        user_id=user_id,
-        composition_level=composition_level,
-        override=override,
-    )
-    cancel_incomplete_old_imports(import_from_modulestore)
-
-    task = import_to_library_task.delay(
-        import_pk=import_from_modulestore.pk,
-        usage_key_strings=usage_ids,
-        learning_package_id=target_learning_package_id,
-        user_id=user_id,
-    )
-    return import_from_modulestore, task
diff --git a/cms/djangoapps/import_from_modulestore/data.py b/cms/djangoapps/import_from_modulestore/data.py
deleted file mode 100644
index b7303281a985..000000000000
--- a/cms/djangoapps/import_from_modulestore/data.py
+++ /dev/null
@@ -1,69 +0,0 @@
-"""
-This module contains the data models for the import_from_modulestore app.
-"""
-from collections import namedtuple
-from enum import Enum
-from openedx.core.djangoapps.content_libraries import api as content_libraries_api
-
-from django.utils.translation import gettext_lazy as _
-
-
-class ImportStatus(Enum):
-    """
-    The status of this modulestore-to-learning-core import.
-    """
-
-    WAITNG_TO_STAGE = _('Waiting to stage content')
-    STAGING = _('Staging content for import')
-    STAGING_FAILED = _('Failed to stage content')
-    STAGED = _('Content is staged and ready for import')
-    IMPORTING = _('Importing staged content')
-    IMPORTING_FAILED = _('Failed to import staged content')
-    IMPORTED = _('Staged content imported successfully')
-    CANCELED = _('Import canceled')
-
-    FAILED_STATUSES = [
-        STAGING_FAILED,
-        IMPORTING_FAILED,
-    ]
-
-
-class CompositionLevel(Enum):
-    """
-    Enumeration of composition levels for course content.
-    Defines the different levels of composition for course content,
-    including chapters, sequentials, verticals, and xblocks.
-    It also categorizes these levels into complicated and flat
-    levels for easier processing.
-    """
-
-    CHAPTER = content_libraries_api.ContainerType.Section
-    SEQUENTIAL = content_libraries_api.ContainerType.Subsection
-    VERTICAL = content_libraries_api.ContainerType.Unit
-    COMPONENT = 'component'
-    OLX_COMPLEX_LEVELS = [
-        VERTICAL.olx_tag,
-        SEQUENTIAL.olx_tag,
-        CHAPTER.olx_tag,
-    ]
-
-    @classmethod
-    def values(cls):
-        """
-        Returns all levels of composition levels.
-        """
-        return [composition_level.value for composition_level in cls]
-
-    @classmethod
-    def choices(cls):
-        """
-        Returns all levels of composition levels as a list of tuples.
-        """
-        return [
-            (composition_level.value, composition_level.name)
-            for composition_level in cls
-            if not isinstance(composition_level.value, list)
-        ]
-
-
-PublishableVersionWithMapping = namedtuple('PublishableVersionWithMapping', ['publishable_version', 'mapping'])
diff --git a/cms/djangoapps/import_from_modulestore/helpers.py b/cms/djangoapps/import_from_modulestore/helpers.py
deleted file mode 100644
index 90ac5e2669bb..000000000000
--- a/cms/djangoapps/import_from_modulestore/helpers.py
+++ /dev/null
@@ -1,460 +0,0 @@
-"""
-Helper functions for importing course content into a library.
-"""
-from datetime import datetime, timezone
-from functools import partial
-import logging
-import mimetypes
-import os
-import secrets
-from typing import TYPE_CHECKING
-
-from django.db import transaction
-from django.db.utils import IntegrityError
-from lxml import etree
-
-from opaque_keys.edx.keys import UsageKey
-from opaque_keys.edx.locator import CourseLocator
-from openedx_learning.api import authoring as authoring_api
-from openedx_learning.api.authoring_models import Component, Container, ContainerVersion, PublishableEntity
-
-from openedx.core.djangoapps.content_libraries import api
-from openedx.core.djangoapps.content_staging import api as content_staging_api
-from xmodule.modulestore.django import modulestore
-
-from .data import CompositionLevel, ImportStatus, PublishableVersionWithMapping
-from .models import Import, PublishableEntityMapping
-
-if TYPE_CHECKING:
-    from openedx_learning.apps.authoring_models import LearningPackage
-    from xblock.core import XBlock
-
-    from openedx.core.djangoapps.content_staging.api import _StagedContent as StagedContent
-
-
-log = logging.getLogger(__name__)
-parser = etree.XMLParser(strip_cdata=False)
-
-
-class ImportClient:
-    """
-    Client for importing course content into a library.
-
-    This class handles the import of course content from staged content into a
-    content library, creating the appropriate container hierarchy based on the
-    specified composition level.
-    """
-
-    # The create functions have different kwarg names for the child list,
-    # so we need to use partial to set the child list to empty.
-    CONTAINER_CREATORS_MAP: dict[str, partial] = {
-        api.ContainerType.Section.olx_tag: partial(authoring_api.create_section_and_version, subsections=[]),
-        api.ContainerType.Subsection.olx_tag: partial(authoring_api.create_subsection_and_version, units=[]),
-        api.ContainerType.Unit.olx_tag: partial(authoring_api.create_unit_and_version, components=[]),
-    }
-
-    CONTAINER_OVERRIDERS_MAP: dict[str, partial] = {
-        api.ContainerType.Section.olx_tag: partial(authoring_api.create_next_section_version, subsections=[]),
-        api.ContainerType.Subsection.olx_tag: partial(authoring_api.create_next_subsection_version, units=[]),
-        api.ContainerType.Unit.olx_tag: partial(authoring_api.create_next_unit_version, components=[]),
-    }
-
-    def __init__(
-        self,
-        import_event: Import,
-        block_usage_key_to_import: str,
-        target_learning_package: 'LearningPackage',
-        staged_content: 'StagedContent',
-    ):
-        self.import_event = import_event
-        self.block_usage_key_to_import = block_usage_key_to_import
-        self.learning_package = target_learning_package
-        self.staged_content = staged_content
-        self.composition_level = self.import_event.composition_level
-        self.override = self.import_event.override
-
-        self.user_id = import_event.user_id
-        self.content_library = target_learning_package.contentlibrary
-        self.library_key = self.content_library.library_key
-        self.parser = etree.XMLParser(strip_cdata=False)
-
-    def import_from_staged_content(self) -> list[PublishableVersionWithMapping]:
-        """
-        Import staged content into a library.
-        """
-        node = etree.fromstring(self.staged_content.olx, parser=parser)
-        usage_key = UsageKey.from_string(self.block_usage_key_to_import)
-        block_to_import = get_node_for_usage_key(node, usage_key)
-        if block_to_import is None:
-            return []
-
-        return self._import_complicated_child(block_to_import, self.block_usage_key_to_import)
-
-    def _process_import(self, usage_key_string, block_to_import) -> list[PublishableVersionWithMapping]:
-        """
-        Process import of a block from staged content into a library.
-
-        Imports a block and its children into the library based on the
-        composition level. It handles both simple and complicated blocks, creating
-        the necessary container hierarchy.
-        """
-        usage_key = UsageKey.from_string(usage_key_string)
-        result = []
-
-        if block_to_import.tag not in CompositionLevel.OLX_COMPLEX_LEVELS.value:
-            return self._import_simple_block(block_to_import, usage_key)
-
-        for child in block_to_import.getchildren():
-            child_usage_key_string = get_usage_key_string_from_staged_content(
-                self.staged_content, child.get('url_name')
-            )
-            if not child_usage_key_string:
-                continue
-
-            result.extend(self._import_child_block(child, child_usage_key_string))
-
-        if self.composition_level == CompositionLevel.COMPONENT.value:
-            return [
-                publishable_version_with_mapping for publishable_version_with_mapping in result
-                if not isinstance(publishable_version_with_mapping.publishable_version, ContainerVersion)
-            ]
-        return result
-
-    def _import_simple_block(self, block_to_import, usage_key) -> list[PublishableVersionWithMapping]:
-        """
-        Import a simple block into the library.
-
-        Creates a block in the library from the staged content block.
-        It returns a list containing the created component version.
-        """
-        publishable_version_with_mapping = self._create_block_in_library(block_to_import, usage_key)
-        return [publishable_version_with_mapping] if publishable_version_with_mapping else []
-
-    def _import_child_block(self, child, child_usage_key_string):
-        """
-        Import a child block into the library.
-
-        Determines whether the child block is simple or complicated and
-        delegates the import process to the appropriate helper method.
-        """
-        child_usage_key = UsageKey.from_string(child_usage_key_string)
-        if child.tag in CompositionLevel.OLX_COMPLEX_LEVELS.value:
-            return self._import_complicated_child(child, child_usage_key_string)
-        else:
-            return self._import_simple_block(child, child_usage_key)
-
-    def _import_complicated_child(self, child, child_usage_key_string):
-        """
-        Import a complicated child block into the library.
-
-        Handles the import of complicated child blocks, including creating
-        containers and updating components.
-        Returns a list containing the created container version.
-        """
-        if not self._should_create_container(child.tag):
-            return self._process_import(child_usage_key_string, child)
-
-        container_version_with_mapping = self.get_or_create_container(
-            child.tag,
-            child.get('url_name'),
-            child.get('display_name', child.tag),
-            child_usage_key_string,
-        )
-        child_component_versions_with_mapping = self._process_import(child_usage_key_string, child)
-        child_component_versions = [
-            child_component_version.publishable_version for child_component_version
-            in child_component_versions_with_mapping
-        ]
-        self._update_container_components(container_version_with_mapping.publishable_version, child_component_versions)
-        return [container_version_with_mapping] + child_component_versions_with_mapping
-
-    def _should_create_container(self, container_type: str) -> bool:
-        """
-        Determine if a new container should be created.
-
-        Container type should be at a lower level than the current composition level.
-        """
-        composition_hierarchy = CompositionLevel.OLX_COMPLEX_LEVELS.value
-        return (
-            container_type in composition_hierarchy and
-            self.composition_level in composition_hierarchy and
-            composition_hierarchy.index(container_type) <= composition_hierarchy.index(self.composition_level)
-        )
-
-    def get_or_create_container(
-        self,
-        container_type: str,
-        key: str,
-        display_name: str,
-        block_usage_key_string: str
-    ) -> PublishableVersionWithMapping:
-        """
-        Create a container of the specified type.
-
-        Creates a container (e.g., chapter, sequential, vertical) in the
-        content library.
-        """
-        try:
-            container_creator_func = self.CONTAINER_CREATORS_MAP[container_type]
-            container_override_func = self.CONTAINER_OVERRIDERS_MAP[container_type]
-        except KeyError as exc:
-            raise ValueError(f"Unknown container type: {container_type}") from exc
-
-        try:
-            container_version = self.content_library.learning_package.publishable_entities.get(key=key)
-        except PublishableEntity.DoesNotExist:
-            container_version = None
-
-        if container_version and self.override:
-            container_version = container_override_func(
-                container_version.container,
-                title=display_name or f"New {container_type}",
-                created=datetime.now(tz=timezone.utc),
-                created_by=self.import_event.user_id,
-            )
-        elif not container_version:
-            _, container_version = container_creator_func(
-                self.learning_package.id,
-                key=key or secrets.token_hex(16),
-                title=display_name or f"New {container_type}",
-                created=datetime.now(tz=timezone.utc),
-                created_by=self.import_event.user_id,
-            )
-
-        publishable_entity_mapping, _ = get_or_create_publishable_entity_mapping(
-            block_usage_key_string,
-            container_version.container
-        )
-
-        return PublishableVersionWithMapping(container_version, publishable_entity_mapping)
-
-    def _update_container_components(self, container_version, component_versions):
-        """
-        Update components of a container.
-        """
-        entity_rows = [
-            authoring_api.ContainerEntityRow(
-                entity_pk=cv.container.pk if isinstance(cv, ContainerVersion) else cv.component.pk,
-                version_pk=cv.pk,
-            )
-            for cv in component_versions
-        ]
-        return authoring_api.create_next_container_version(
-            container_pk=container_version.container.pk,
-            title=container_version.title,
-            entity_rows=entity_rows,
-            created=datetime.now(tz=timezone.utc),
-            created_by=self.import_event.user_id,
-            container_version_cls=container_version.__class__,
-        )
-
-    def _create_block_in_library(self, block_to_import, usage_key) -> PublishableVersionWithMapping | None:
-        """
-        Create a block in a library from a staged content block.
-        """
-        now = datetime.now(tz=timezone.utc)
-        staged_content_files = content_staging_api.get_staged_content_static_files(self.staged_content.id)
-
-        with transaction.atomic():
-            component_type = authoring_api.get_or_create_component_type("xblock.v1", usage_key.block_type)
-            does_component_exist = authoring_api.get_components(
-                self.learning_package.id
-            ).filter(local_key=usage_key.block_id).exists()
-
-            if does_component_exist:
-                if not self.override:
-                    log.info(f"Component {usage_key.block_id} already exists in library {self.library_key}, skipping.")
-                    return None
-                else:
-                    component_version = self._handle_component_override(usage_key, etree.tostring(block_to_import))
-            else:
-                try:
-                    _, library_usage_key = api.validate_can_add_block_to_library(
-                        self.library_key,
-                        block_to_import.tag,
-                        usage_key.block_id,
-                    )
-                except api.IncompatibleTypesError as e:
-                    log.error(f"Error validating block {usage_key} for library {self.library_key}: {e}")
-                    return None
-
-                authoring_api.create_component(
-                    self.learning_package.id,
-                    component_type=component_type,
-                    local_key=usage_key.block_id,
-                    created=now,
-                    created_by=self.import_event.user_id,
-                )
-                component_version = api.set_library_block_olx(library_usage_key, etree.tostring(block_to_import))
-
-            self._process_staged_content_files(
-                component_version,
-                staged_content_files,
-                usage_key,
-                block_to_import,
-                now,
-            )
-            publishable_entity_mapping, _ = get_or_create_publishable_entity_mapping(
-                usage_key,
-                component_version.component
-            )
-            return PublishableVersionWithMapping(component_version, publishable_entity_mapping)
-
-    def _handle_component_override(self, usage_key, new_content):
-        """
-        Create new ComponentVersion for overridden component.
-        """
-        component_version = None
-        try:
-            component = authoring_api.get_components(self.learning_package.id).get(local_key=usage_key.block_id)
-        except Component.DoesNotExist:
-            return component_version
-        library_usage_key = api.library_component_usage_key(self.library_key, component)
-
-        component_version = api.set_library_block_olx(library_usage_key, new_content)
-
-        return component_version
-
-    def _process_staged_content_files(
-        self,
-        component_version,
-        staged_content_files,
-        usage_key,
-        block_to_import,
-        created_at,
-    ):
-        """
-        Process staged content files for a component.
-
-        Processes the staged content files for a component, creating the
-        necessary file content and associating it with the component version.
-        """
-        block_olx = etree.tostring(block_to_import).decode('utf-8')
-
-        for staged_content_file_data in staged_content_files:
-            original_filename = staged_content_file_data.filename
-            file_basename = os.path.basename(original_filename)
-            file_basename_no_ext, _ = os.path.splitext(file_basename)
-
-            # Skip files not referenced in the block
-            if file_basename not in block_olx and file_basename_no_ext not in block_olx:
-                log.info(f"Skipping file {original_filename} as it is not referenced in block {usage_key}")
-                continue
-
-            file_data = content_staging_api.get_staged_content_static_file_data(
-                self.staged_content.id,
-                original_filename,
-            )
-            if not file_data:
-                log.error(
-                    f"Staged content {self.staged_content.id} included referenced "
-                    f"file {original_filename}, but no file data was found."
-                )
-                continue
-
-            filename = f"static/{file_basename}"
-            media_type_str, _ = mimetypes.guess_type(filename)
-            if not media_type_str:
-                media_type_str = "application/octet-stream"
-
-            media_type = authoring_api.get_or_create_media_type(media_type_str)
-            content = authoring_api.get_or_create_file_content(
-                self.learning_package.id,
-                media_type.id,
-                data=file_data,
-                created=created_at,
-            )
-
-            try:
-                authoring_api.create_component_version_content(component_version.pk, content.id, key=filename)
-            except IntegrityError:
-                pass  # Content already exists
-
-
-def import_from_staged_content(
-    import_event: Import,
-    usage_key_string: str,
-    target_learning_package: 'LearningPackage',
-    staged_content: 'StagedContent',
-) -> list[PublishableVersionWithMapping]:
-    """
-    Import staged content to a library from staged content.
-
-    Returns a list of PublishableVersionWithMappings created during the import.
-    """
-    import_client = ImportClient(
-        import_event,
-        usage_key_string,
-        target_learning_package,
-        staged_content,
-    )
-    return import_client.import_from_staged_content()
-
-
-def get_or_create_publishable_entity_mapping(usage_key, component) -> tuple[PublishableEntityMapping, bool]:
-    """
-    Creates a mapping between the source usage key and the target publishable entity.
-    """
-    if isinstance(component, Container):
-        target_package = component.publishable_entity.learning_package
-    else:
-        target_package = component.learning_package
-    return PublishableEntityMapping.objects.get_or_create(
-        source_usage_key=usage_key,
-        target_entity=component.publishable_entity,
-        target_package=target_package,
-    )
-
-
-def get_usage_key_string_from_staged_content(staged_content: 'StagedContent', block_id: str) -> str | None:
-    """
-    Get the usage ID from a staged content by block ID.
-    """
-    if staged_content.tags is None:
-        return None
-    return next((block_usage_id for block_usage_id in staged_content.tags if block_usage_id.endswith(block_id)), None)
-
-
-def get_node_for_usage_key(node: etree._Element, usage_key: UsageKey) -> etree._Element:
-    """
-    Get the node in an XML tree which matches to the usage key.
-    """
-    if node.tag == usage_key.block_type and node.get('url_name') == usage_key.block_id:
-        return node
-
-    for child in node.getchildren():
-        found = get_node_for_usage_key(child, usage_key)
-        if found is not None:
-            return found
-
-
-def get_items_to_import(import_event: Import) -> list['XBlock']:
-    """
-    Collect items to import from a course.
-    """
-    items_to_import: list['XBlock'] = []
-    if isinstance(import_event.source_key, CourseLocator):
-        items_to_import.extend(
-            modulestore().get_items(import_event.source_key, qualifiers={"category": "chapter"}) or []
-        )
-        items_to_import.extend(
-            modulestore().get_items(import_event.source_key, qualifiers={"category": "static_tab"}) or []
-        )
-
-    return items_to_import
-
-
-def cancel_incomplete_old_imports(import_event: Import) -> None:
-    """
-    Cancel any incomplete imports that have the same target as the current import.
-
-    When a new import is created, we want to cancel any other incomplete user imports that have the same target.
-    """
-    incomplete_user_imports_with_same_target = Import.objects.filter(
-        user=import_event.user,
-        target_change=import_event.target_change,
-        source_key=import_event.source_key,
-        staged_content_for_import__isnull=False
-    ).exclude(pk=import_event.pk)
-    for incomplete_import in incomplete_user_imports_with_same_target:
-        incomplete_import.set_status(ImportStatus.CANCELED)
diff --git a/cms/djangoapps/import_from_modulestore/migrations/0002_remove_import_created_remove_import_modified_and_more.py b/cms/djangoapps/import_from_modulestore/migrations/0002_remove_import_created_remove_import_modified_and_more.py
deleted file mode 100644
index 80085ff36133..000000000000
--- a/cms/djangoapps/import_from_modulestore/migrations/0002_remove_import_created_remove_import_modified_and_more.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# Generated by Django 4.2.20 on 2025-05-14 17:31
-
-from django.db import migrations, models
-import django.db.models.deletion
-from openedx.core.djangoapps.content_libraries.api import ContainerType
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('user_tasks', '0004_url_textfield'),
-        ('import_from_modulestore', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='import',
-            name='created',
-        ),
-        migrations.RemoveField(
-            model_name='import',
-            name='modified',
-        ),
-        migrations.RemoveField(
-            model_name='import',
-            name='status',
-        ),
-        migrations.RemoveField(
-            model_name='import',
-            name='uuid',
-        ),
-        migrations.AddField(
-            model_name='import',
-            name='composition_level',
-            field=models.CharField(choices=[(ContainerType['Section'], 'CHAPTER'), (ContainerType['Subsection'], 'SEQUENTIAL'), (ContainerType['Unit'], 'VERTICAL'), ('component', 'COMPONENT')], default='component', help_text='The composition level of the target learning package', max_length=255),
-        ),
-        migrations.AddField(
-            model_name='import',
-            name='override',
-            field=models.BooleanField(default=False, help_text='If true, the import will override any existing content in the target learning package.'),
-        ),
-        migrations.AddField(
-            model_name='import',
-            name='user_task_status',
-            field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='import_event', to='user_tasks.usertaskstatus'),
-        ),
-    ]
diff --git a/cms/djangoapps/import_from_modulestore/models.py b/cms/djangoapps/import_from_modulestore/models.py
deleted file mode 100644
index 19f44dae40c2..000000000000
--- a/cms/djangoapps/import_from_modulestore/models.py
+++ /dev/null
@@ -1,161 +0,0 @@
-"""
-Models for the course to library import app.
-"""
-from typing import Self
-
-from django.contrib.auth import get_user_model
-from django.db import models
-from django.utils.translation import gettext_lazy as _
-from user_tasks.models import UserTaskStatus
-
-from model_utils.models import TimeStampedModel
-from opaque_keys.edx.django.models import (
-    LearningContextKeyField,
-    UsageKeyField,
-)
-from openedx_learning.api.authoring_models import LearningPackage, PublishableEntity
-
-from .data import CompositionLevel, ImportStatus
-
-User = get_user_model()
-
-
-class Import(models.Model):
-    """
-    Represents the action of a user importing a modulestore-based course or legacy
-    library into a learning-core based learning package (today, that is always a content library).
-    """
-
-    user_task_status = models.OneToOneField(
-        UserTaskStatus,
-        on_delete=models.SET_NULL,
-        null=True,
-        blank=True,
-        related_name='import_event',
-    )
-    user = models.ForeignKey(User, on_delete=models.CASCADE)
-
-    # Note: For now, this will always be a course key. In the future, it may be a legacy library key.
-    source_key = LearningContextKeyField(help_text=_('The modulestore course'), max_length=255, db_index=True)
-    target_change = models.ForeignKey(to='oel_publishing.DraftChangeLog', on_delete=models.SET_NULL, null=True)
-    composition_level = models.CharField(
-        max_length=255,
-        choices=CompositionLevel.choices(),
-        help_text=_('The composition level of the target learning package'),
-        default=CompositionLevel.COMPONENT.value,
-    )
-    override = models.BooleanField(
-        default=False,
-        help_text=_(
-            'If true, the import will override any existing content in the target learning package.'
-        ),
-    )
-
-    class Meta:
-        verbose_name = _('Import from modulestore')
-        verbose_name_plural = _('Imports from modulestore')
-
-    def __str__(self):
-        return f'{self.source_key} → {self.target_change}'
-
-    def set_status(self: Self, status: ImportStatus):
-        """
-        Set import status.
-        """
-        user_task_status: UserTaskStatus = self.user_task_status
-
-        if status in ImportStatus.FAILED_STATUSES.value:
-            user_task_status.fail(status.value)
-        elif status == ImportStatus.CANCELED:
-            user_task_status.cancel()
-        else:
-            user_task_status.set_state(status.value)
-
-        user_task_status.save()
-
-        if status in [ImportStatus.IMPORTED, ImportStatus.CANCELED]:
-            self.clean_related_staged_content()
-
-    def clean_related_staged_content(self) -> None:
-        """
-        Clean related staged content.
-        """
-        for staged_content_for_import in self.staged_content_for_import.all():
-            staged_content_for_import.staged_content.delete()
-
-
-class PublishableEntityMapping(TimeStampedModel):
-    """
-    Represents a mapping between a source usage key and a target publishable entity.
-    """
-
-    source_usage_key = UsageKeyField(
-        max_length=255,
-        help_text=_('Original usage key/ID of the thing that has been imported.'),
-    )
-    target_package = models.ForeignKey(LearningPackage, on_delete=models.CASCADE)
-    target_entity = models.ForeignKey(PublishableEntity, on_delete=models.CASCADE)
-
-    class Meta:
-        unique_together = ('source_usage_key', 'target_package')
-
-    def __str__(self):
-        return f'{self.source_usage_key} → {self.target_entity}'
-
-
-class PublishableEntityImport(TimeStampedModel):
-    """
-    Represents a publishableentity version that has been imported into a learning package (e.g. content library)
-
-    This is a many-to-many relationship between a container version and a course to library import.
-    """
-
-    import_event = models.ForeignKey(Import, on_delete=models.CASCADE)
-    resulting_mapping = models.ForeignKey(PublishableEntityMapping, on_delete=models.SET_NULL, null=True, blank=True)
-    resulting_change = models.OneToOneField(
-        to='oel_publishing.DraftChangeLogRecord',
-        # a changelog record can be pruned, which would set this to NULL, but not delete the
-        # entire import record
-        null=True,
-        on_delete=models.SET_NULL,
-    )
-
-    class Meta:
-        unique_together = (
-            ('import_event', 'resulting_mapping'),
-        )
-
-    def __str__(self):
-        return f'{self.import_event} → {self.resulting_mapping}'
-
-
-class StagedContentForImport(TimeStampedModel):
-    """
-    Represents m2m relationship between an import and staged content created for that import.
-    """
-
-    import_event = models.ForeignKey(
-        Import,
-        on_delete=models.CASCADE,
-        related_name='staged_content_for_import',
-    )
-    staged_content = models.OneToOneField(
-        to='content_staging.StagedContent',
-        on_delete=models.CASCADE,
-        related_name='staged_content_for_import',
-    )
-    # Since StagedContent stores all the keys of the saved blocks, this field was added to optimize search.
-    source_usage_key = UsageKeyField(
-        max_length=255,
-        help_text=_(
-            'The original Usage key of the highest-level component that was saved in StagedContent.'
-        ),
-    )
-
-    class Meta:
-        unique_together = (
-            ('import_event', 'staged_content'),
-        )
-
-    def __str__(self):
-        return f'{self.import_event} → {self.staged_content}'
diff --git a/cms/djangoapps/import_from_modulestore/tasks.py b/cms/djangoapps/import_from_modulestore/tasks.py
deleted file mode 100644
index 87fa06f881a8..000000000000
--- a/cms/djangoapps/import_from_modulestore/tasks.py
+++ /dev/null
@@ -1,158 +0,0 @@
-"""
-Tasks for course to library import.
-"""
-from typing import Sequence
-
-from celery import shared_task
-from celery.utils.log import get_task_logger
-from django.db import transaction
-from edx_django_utils.monitoring import set_code_owner_attribute_from_module
-
-from openedx_learning.api import authoring as authoring_api
-from openedx_learning.api.authoring_models import LearningPackage
-from openedx.core.djangoapps.content_staging import api as content_staging_api
-from user_tasks.tasks import UserTask
-
-from .constants import IMPORT_FROM_MODULESTORE_STAGING_PURPOSE
-from .data import ImportStatus
-from .helpers import get_items_to_import, import_from_staged_content
-from .models import Import, PublishableEntityImport, StagedContentForImport
-
-log = get_task_logger(__name__)
-
-
-class ImportToLibraryTask(UserTask):
-    """
-    Base class for import to library tasks.
-    """
-
-    @staticmethod
-    def calculate_total_steps(arguments_dict):
-        """
-        Get number of in-progress steps in importing process, as shown in the UI.
-
-        For reference, these are:
-
-        1. Staging content
-        2. Importing staged content into library
-        """
-        return 2
-
-    @classmethod
-    def generate_name(cls, arguments_dict):
-        """
-        Create a name for this particular import task instance.
-
-        Arguments:
-            arguments_dict (dict): The arguments given to the task function
-
-        Returns:
-            str: The generated name
-        """
-        library_id = arguments_dict.get('learning_package_id')
-        import_id = arguments_dict.get('import_pk')
-        return f'Import course to library (library_id={library_id}, import_id={import_id})'
-
-
-@shared_task(base=ImportToLibraryTask, bind=True)
-# Note: The decorator @set_code_owner_attribute cannot be used here because the UserTaskMixin
-#   does stack inspection and can't handle additional decorators.
-def import_to_library_task(
-    self,
-    import_pk: int,
-    usage_key_strings: Sequence[str],
-    learning_package_id: int,
-    user_id: int,  # pylint: disable=unused-argument
-) -> None:
-    """
-    Import to library task.
-
-    1. Save course (for now) to staged content task by sections/chapters.
-    2. Import staged content to library task.
-    """
-    set_code_owner_attribute_from_module(__name__)
-
-    try:
-        import_event = Import.objects.get(pk=import_pk)
-        import_event.user_task_status = self.status
-        import_event.save(update_fields=['user_task_status'])
-    except Import.DoesNotExist:
-        log.info('Import event not found for pk %s', import_pk)
-        return
-
-    # Step 1: Save course to staged content task by sections/chapters.
-    save_leagacy_content_to_staged_content(import_event)
-
-    self.status.increment_completed_steps()
-
-    # Step 2: Import staged content to library task.
-    import_staged_content_to_library(import_event, learning_package_id, usage_key_strings)
-
-
-def save_leagacy_content_to_staged_content(import_event: Import) -> None:
-    """
-    Save course to staged content task by sections/chapters.
-    """
-    import_event.set_status(ImportStatus.WAITNG_TO_STAGE)
-    import_event.clean_related_staged_content()
-
-    import_event.set_status(ImportStatus.STAGING)
-    try:
-        with transaction.atomic():
-            items_to_import = get_items_to_import(import_event)
-            for item in items_to_import:
-                staged_content = content_staging_api.stage_xblock_temporarily(
-                    item,
-                    import_event.user.pk,
-                    purpose=IMPORT_FROM_MODULESTORE_STAGING_PURPOSE,
-                )
-                StagedContentForImport.objects.create(
-                    staged_content=staged_content,
-                    import_event=import_event,
-                    source_usage_key=item.location
-                )
-
-            if items_to_import:
-                import_event.set_status(ImportStatus.STAGED)
-            else:
-                import_event.set_status(ImportStatus.STAGING_FAILED)
-    except Exception as exc:  # pylint: disable=broad-except
-        import_event.set_status(ImportStatus.STAGING_FAILED)
-        raise exc
-
-
-def import_staged_content_to_library(
-    import_event: Import, learning_package_id: int, usage_key_strings: Sequence[str]
-) -> None:
-    """
-    Import staged content to library task.
-    """
-    target_learning_package = LearningPackage.objects.get(id=learning_package_id)
-
-    imported_publishable_versions = []
-    import_event.set_status(ImportStatus.IMPORTING)
-    with authoring_api.bulk_draft_changes_for(learning_package_id=learning_package_id) as change_log:
-        try:
-            for usage_key_string in usage_key_strings:
-                staged_content_for_import = import_event.staged_content_for_import.get(
-                    source_usage_key=usage_key_string
-                )
-                publishable_versions = import_from_staged_content(
-                    import_event,
-                    usage_key_string,
-                    target_learning_package,
-                    staged_content_for_import.staged_content,
-                )
-                imported_publishable_versions.extend(publishable_versions)
-        except Exception:  # pylint: disable=broad-except
-            import_event.set_status(ImportStatus.IMPORTING_FAILED)
-        else:
-            import_event.set_status(ImportStatus.IMPORTED)
-            for imported_component_version in imported_publishable_versions:
-                PublishableEntityImport.objects.create(
-                    import_event=import_event,
-                    resulting_mapping=imported_component_version.mapping,
-                    resulting_change=change_log.records.get(entity=imported_component_version.mapping.target_entity),
-                )
-        finally:
-            import_event.clean_related_staged_content()
diff --git a/cms/djangoapps/import_from_modulestore/tests/factories.py b/cms/djangoapps/import_from_modulestore/tests/factories.py
deleted file mode 100644
index 1ab7cc6327f8..000000000000
--- a/cms/djangoapps/import_from_modulestore/tests/factories.py
+++ /dev/null
@@ -1,29 +0,0 @@
-"""
-Factories for Import model.
-"""
-import uuid
-
-import factory
-from factory.django import DjangoModelFactory
-from opaque_keys.edx.keys import CourseKey
-
-from common.djangoapps.student.tests.factories import UserFactory
-from cms.djangoapps.import_from_modulestore.data import CompositionLevel
-from cms.djangoapps.import_from_modulestore.models import Import
-
-
-class ImportFactory(DjangoModelFactory):
-    """
-    Factory for Import model.
-    """
-
-    class Meta:
-        model = Import
-
-    @factory.lazy_attribute
-    def source_key(self):
-        return CourseKey.from_string(f'course-v1:edX+DemoX+{uuid.uuid4()}')
-
-    user = factory.SubFactory(UserFactory)
-    composition_level = CompositionLevel.COMPONENT.value
-    override = False
diff --git a/cms/djangoapps/import_from_modulestore/tests/test_api.py b/cms/djangoapps/import_from_modulestore/tests/test_api.py
deleted file mode 100644
index 262dce1d7233..000000000000
--- a/cms/djangoapps/import_from_modulestore/tests/test_api.py
+++ /dev/null
@@ -1,96 +0,0 @@
-"""
-Test cases for import_from_modulestore.api module.
-"""
-from unittest.mock import patch
-
-import pytest
-from opaque_keys.edx.keys import CourseKey
-from organizations.models import Organization
-
-from common.djangoapps.student.tests.factories import UserFactory
-from cms.djangoapps.import_from_modulestore.api import import_to_library
-from cms.djangoapps.import_from_modulestore.models import Import
-from openedx.core.djangoapps.content_libraries import api as content_libraries_api
-from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
-from .factories import ImportFactory
-
-
-@pytest.mark.django_db
-class TestCourseToLibraryImportAPI(ModuleStoreTestCase):
-    """
-    Test cases for Import API.
-    """
-
-    def setUp(self):
-        super().setUp()
-
-        _library_metadata = content_libraries_api.create_library(
-            org=Organization.objects.create(name='Organization 1', short_name='org1'),
-            slug='lib_1',
-            title='Library Org 1',
-            description='This is a library from Org 1',
-        )
-        self.library = content_libraries_api.ContentLibrary.objects.get_by_key(_library_metadata.key)
-
-    def test_import_staged_content_to_library(self):
-        """
-        Test import_staged_content_to_library function with different override values.
-        """
-        user = UserFactory()
-        source_key = "course-v1:edX+DemoX+Demo_Course"
-        usage_ids = [
-            "block-v1:edX+DemoX+Demo_Course+type@chapter+block@123",
-            "block-v1:edX+DemoX+Demo_Course+type@chapter+block@456",
-        ]
-        override = False
-
-        with patch(
-            "cms.djangoapps.import_from_modulestore.api.import_to_library_task"
-        ) as import_to_library_task_mock:
-            import_to_library(
-                source_key=source_key,
-                usage_ids=usage_ids,
-                target_learning_package_id=self.library.learning_package.id,
-                user_id=user.id,
-                composition_level="component",
-                override=override,
-            )
-
-        import_event = Import.objects.get()
-        assert str(import_event.source_key) == source_key
-        assert import_event.composition_level == "component"
-        assert import_event.override == override
-        assert import_event.user_id == user.id
-
-        import_to_library_task_mock.delay.assert_called_once_with(
-            import_pk=import_event.pk,
-            usage_key_strings=usage_ids,
-            learning_package_id=self.library.learning_package.id,
-            user_id=user.id,
-        )
-
-    def test_import_to_library_invalid_usage_key(self):
-        """
-        Test import_staged_content_to_library function with not chapter usage keys.
-        """
-        import_event = ImportFactory(
-            source_key=CourseKey.from_string("course-v1:edX+DemoX+Demo_Course"),
-        )
-        usage_ids = [
-            "block-v1:edX+DemoX+Demo_Course+type@problem+block@123",
-            "block-v1:edX+DemoX+Demo_Course+type@vertical+block@456",
-        ]
-
-        with patch(
-            "cms.djangoapps.import_from_modulestore.api.import_to_library_task"
-        ) as import_to_library_task_mock:
-            with self.assertRaises(ValueError):
-                import_to_library(
-                    source_key=import_event.source_key,
-                    usage_ids=usage_ids,
-                    target_learning_package_id=self.library.learning_package.id,
-                    user_id=import_event.user.id,
-                    composition_level="component",
-                    override=False,
-                )
-        import_to_library_task_mock.apply_async.assert_not_called()
diff --git a/cms/djangoapps/import_from_modulestore/tests/test_helpers.py b/cms/djangoapps/import_from_modulestore/tests/test_helpers.py
deleted file mode 100644
index 14531dee326d..000000000000
--- a/cms/djangoapps/import_from_modulestore/tests/test_helpers.py
+++ /dev/null
@@ -1,409 +0,0 @@
-"""
-Tests for the import_from_modulestore helper functions.
-"""
-import uuid
-
-import ddt
-from organizations.models import Organization
-from unittest import mock
-from unittest.mock import patch
-
-from lxml import etree
-from openedx_learning.api.authoring_models import LearningPackage
-from user_tasks.models import UserTaskStatus
-
-from cms.djangoapps.import_from_modulestore import api, constants
-from cms.djangoapps.import_from_modulestore.helpers import ImportClient
-from cms.djangoapps.import_from_modulestore.models import StagedContentForImport
-from cms.djangoapps.import_from_modulestore.tasks import save_leagacy_content_to_staged_content
-from cms.djangoapps.import_from_modulestore.tests.factories import ImportFactory
-from common.djangoapps.student.tests.factories import UserFactory
-
-from openedx.core.djangoapps.content_libraries import api as content_libraries_api
-from openedx.core.djangoapps.content_staging import api as content_staging_api
-from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
-from xmodule.modulestore.tests.factories import CourseFactory, BlockFactory
-
-
-@ddt.ddt
-class TestImportClient(ModuleStoreTestCase):
-    """
-    Functional tests for the ImportClient class.
-    """
-
-    def setUp(self):
-        super().setUp()
-        self.library = content_libraries_api.create_library(
-            org=Organization.objects.create(name='Organization 1', short_name='org1'),
-            slug='lib_1',
-            title='Library Org 1',
-            description='This is a library from Org 1',
-        )
-        self.learning_package = LearningPackage.objects.get(id=self.library.learning_package_id)
-        self.user = UserFactory()
-        self.course = CourseFactory.create()
-        self.chapter = BlockFactory.create(category='chapter', parent=self.course, display_name='Chapter')
-        self.sequential = BlockFactory.create(category='sequential', parent=self.chapter, display_name='Sequential')
-        self.vertical = BlockFactory.create(category='vertical', parent=self.sequential, display_name='Vertical')
-        self.problem = BlockFactory.create(
-            category='problem',
-            parent=self.vertical,
-            display_name='Problem',
-            data="""<problem url_name="" display_name="DisplayName"><optionresponse></optionresponse></problem>""",
-        )
-        self.video = BlockFactory.create(
-            category='video',
-            parent=self.vertical,
-            display_name='Video',
-            data="""<video youtube="1.00:3_yD_cEKoCk" url_name="SampleProblem"/>""",
-        )
-        self.import_event = ImportFactory(
-            user=self.user,
-            source_key=self.course.id,
-        )
-        #mock user task status
-        self.import_event.user_task_status = UserTaskStatus.objects.create(
-            user=self.user,
-            task_id=uuid.uuid4(),
-            task_class='cms.djangoapps.import_from_modulestore.tasks.ImportToLibraryTask',
-            name='Test',
-            total_steps=2
-        )
-        self.import_event.save()
-        save_leagacy_content_to_staged_content(self.import_event)
-
-        self.parser = etree.XMLParser(strip_cdata=False)
-
-    def test_import_from_staged_content(self):
-        expected_imported_xblocks = [self.video, self.problem]
-        staged_content_for_import = self.import_event.staged_content_for_import.get(
-            source_usage_key=self.chapter.location
-        )
-        staged_content = staged_content_for_import.staged_content
-        import_client = ImportClient(
-            import_event=self.import_event,
-            staged_content=staged_content,
-            target_learning_package=self.learning_package,
-            block_usage_key_to_import=str(self.vertical.location),
-        )
-
-        import_client.import_from_staged_content()
-
-        self.assertEqual(self.learning_package.content_set.count(), len(expected_imported_xblocks))
-
-    @patch('cms.djangoapps.import_from_modulestore.helpers.ImportClient._process_import')
-    def test_import_from_staged_content_block_not_found(self, mocked_process_import):
-        staged_content_for_import = self.import_event.staged_content_for_import.get(
-            source_usage_key=self.chapter.location
-        )
-        staged_content = staged_content_for_import.staged_content
-        import_client = ImportClient(
-            import_event=self.import_event,
-            staged_content=staged_content,
-            target_learning_package=self.learning_package,
-            block_usage_key_to_import='block-v1:edX+Demo+2025+type@chapter+block@12345',
-        )
-
-        import_client.import_from_staged_content()
-
-        self.assertTrue(not self.learning_package.content_set.count())
-        mocked_process_import.assert_not_called()
-
-    @ddt.data(
-        'chapter',
-        'sequential',
-        'vertical'
-    )
-    def test_create_container(self, block_lvl):
-        container_to_import = getattr(self, block_lvl)
-        block_usage_key_to_import = str(container_to_import.location)
-        staged_content_for_import = self.import_event.staged_content_for_import.get(
-            source_usage_key=self.chapter.location
-        )
-        import_client = ImportClient(
-            import_event=self.import_event,
-            staged_content=staged_content_for_import.staged_content,
-            target_learning_package=self.learning_package,
-            block_usage_key_to_import=block_usage_key_to_import,
-        )
-        import_client.get_or_create_container(
-            container_to_import.category,
-            container_to_import.location.block_id,
-            container_to_import.display_name,
-            str(container_to_import.location)
-        )
-
-        self.assertEqual(self.learning_package.publishable_entities.count(), 1)
-
-    def test_create_container_with_xblock(self):
-        block_usage_key_to_import = str(self.problem.location)
-        staged_content_for_import = self.import_event.staged_content_for_import.get(
-            source_usage_key=self.chapter.location
-        )
-        import_client = ImportClient(
-            import_event=self.import_event,
-            staged_content=staged_content_for_import.staged_content,
-            target_learning_package=self.learning_package,
-            block_usage_key_to_import=block_usage_key_to_import,
-        )
-        with self.assertRaises(ValueError):
-            import_client.get_or_create_container(
-                self.problem.category,
-                self.problem.location.block_id,
-                self.problem.display_name,
-                str(self.problem.location),
-            )
-
-    @ddt.data('chapter', 'sequential', 'vertical')
-    def test_process_import_with_complicated_blocks(self, block_lvl):
-        container_to_import = getattr(self, block_lvl)
-        block_usage_key_to_import = str(container_to_import.location)
-        staged_content_for_import = self.import_event.staged_content_for_import.get(
-            source_usage_key=self.chapter.location
-        )
-        staged_content = staged_content_for_import.staged_content
-        expected_imported_xblocks = [self.problem, self.video]
-
-        import_client = ImportClient(
-            import_event=self.import_event,
-            staged_content=staged_content,
-            block_usage_key_to_import=block_usage_key_to_import,
-            target_learning_package=self.learning_package,
-        )
-        # pylint: disable=protected-access
-        result = import_client.import_from_staged_content()
-
-        self.assertEqual(self.learning_package.content_set.count(), len(expected_imported_xblocks))
-        self.assertEqual(len(result), len(expected_imported_xblocks))
-
-    @ddt.data('problem', 'video')
-    def test_process_import_with_simple_blocks(self, block_type_to_import):
-        block_to_import = getattr(self, block_type_to_import)
-        block_usage_key_to_import = str(block_to_import.location)
-        staged_content_for_import = self.import_event.staged_content_for_import.get(
-            source_usage_key=self.chapter.location
-        )
-        expected_imported_xblocks = [block_to_import]
-        import_client = ImportClient(
-            import_event=self.import_event,
-            staged_content=staged_content_for_import.staged_content,
-            target_learning_package=self.learning_package,
-            block_usage_key_to_import=block_usage_key_to_import,
-        )
-
-        block_to_import = etree.fromstring(block_to_import.data, parser=self.parser)
-        # pylint: disable=protected-access
-        result = import_client._process_import(block_usage_key_to_import, block_to_import)
-
-        self.assertEqual(self.learning_package.content_set.count(), len(expected_imported_xblocks))
-        self.assertEqual(len(result), len(expected_imported_xblocks))
-
-    @ddt.data(True, False)
-    def test_process_import_with_override(self, override):
-        block_to_import = self.problem
-        block_usage_key_to_import = str(block_to_import.location)
-        staged_content_for_import = self.import_event.staged_content_for_import.get(
-            source_usage_key=self.chapter.location
-        )
-
-        import_client = ImportClient(
-            import_event=self.import_event,
-            staged_content=staged_content_for_import.staged_content,
-            target_learning_package=self.learning_package,
-            block_usage_key_to_import=block_usage_key_to_import,
-        )
-
-        block_xml = etree.fromstring(block_to_import.data, parser=self.parser)
-        # pylint: disable=protected-access
-        result1 = import_client._process_import(block_usage_key_to_import, block_xml)
-        self.assertEqual(len(result1), 1)
-
-        new_import_event, _ = api.import_to_library(
-            source_key=self.course.id,
-            usage_ids=[str(self.chapter.location)],
-            target_learning_package_id=self.learning_package.id,
-            user_id=self.user.id,
-            composition_level='component',
-            override=override,
-        )
-        # mock staged content
-        new_staged_content = content_staging_api.stage_xblock_temporarily(
-            self.vertical,
-            self.user.id,
-            purpose=constants.IMPORT_FROM_MODULESTORE_STAGING_PURPOSE,
-        )
-        staged_content_for_import = StagedContentForImport.objects.create(
-            import_event=new_import_event,
-            staged_content=new_staged_content,
-            source_usage_key=self.chapter.location,
-        )
-
-        import_client = ImportClient(
-            import_event=new_import_event,
-            staged_content=new_staged_content,
-            target_learning_package=self.learning_package,
-            block_usage_key_to_import=block_usage_key_to_import,
-        )
-
-        if override:
-            modified_data = block_to_import.data.replace('DisplayName', 'ModifiedName')
-            modified_block = BlockFactory.create(
-                category='problem',
-                parent=self.vertical,
-                display_name='Modified Problem',
-                data=modified_data,
-            )
-            block_xml = etree.fromstring(modified_block.data, parser=self.parser)
-
-            # pylint: disable=protected-access
-            result2 = import_client._process_import(block_usage_key_to_import, block_xml)
-            self.assertEqual(len(result2), 1)
-
-            assert result2[0].publishable_version.title == 'ModifiedName'
-        else:
-            # pylint: disable=protected-access
-            result2 = import_client._process_import(block_usage_key_to_import, block_xml)
-            self.assertEqual(result2, [])
-
-    @patch('cms.djangoapps.import_from_modulestore.helpers.authoring_api')
-    def test_container_override(self, mock_authoring_api):
-        container_to_import = self.vertical
-        block_usage_key_to_import = str(container_to_import.location)
-        staged_content_for_import = self.import_event.staged_content_for_import.get(
-            source_usage_key=self.chapter.location
-        )
-        staged_content = staged_content_for_import.staged_content
-
-        self.import_event.composition_level = "vertical"
-        self.import_event.save()
-        import_client = ImportClient(
-            import_event=self.import_event,
-            staged_content=staged_content,
-            target_learning_package=self.learning_package,
-            block_usage_key_to_import=block_usage_key_to_import,
-        )
-
-        container_version_with_mapping = import_client.get_or_create_container(
-            'vertical',
-            container_to_import.location.block_id,
-            container_to_import.display_name,
-            str(container_to_import.location),
-        )
-        assert container_version_with_mapping is not None
-        assert container_version_with_mapping.publishable_version.title == container_to_import.display_name
-
-        self.import_event.override = True
-        self.import_event.save()
-        import_client = ImportClient(
-            import_event=self.import_event,
-            staged_content=staged_content,
-            target_learning_package=self.learning_package,
-            block_usage_key_to_import=block_usage_key_to_import,
-        )
-        container_version_with_mapping = import_client.get_or_create_container(
-            'vertical',
-            container_to_import.location.block_id,
-            'New Display Name',
-            str(container_to_import.location),
-        )
-        overrided_container_version = container_version_with_mapping.publishable_version
-        assert overrided_container_version is not None
-        assert overrided_container_version.title == 'New Display Name'
-
-    @ddt.data('component', 'vertical')
-    def test_composition_levels(self, composition_level):
-        if composition_level == 'component':
-            expected_imported_blocks = [self.problem, self.video]
-        else:
-            # The vertical block is expected to be imported as a container
-            # with the same location as the original vertical block.
-            expected_imported_blocks = [self.vertical, self.problem, self.video]
-
-        container_to_import = self.vertical
-        block_usage_key_to_import = str(container_to_import.location)
-        staged_content_for_import = self.import_event.staged_content_for_import.get(
-            source_usage_key=self.chapter.location
-        )
-        staged_content = staged_content_for_import.staged_content
-
-        self.import_event.composition_level = composition_level
-        self.import_event.save()
-        import_client = ImportClient(
-            import_event=self.import_event,
-            staged_content=staged_content,
-            target_learning_package=self.learning_package,
-            block_usage_key_to_import=block_usage_key_to_import,
-        )
-
-        block_xml = etree.fromstring(staged_content.olx, parser=self.parser)
-        # pylint: disable=protected-access
-        result = import_client._import_complicated_child(block_xml, block_usage_key_to_import)
-
-        self.assertEqual(len(result), len(expected_imported_blocks))
-
-    @patch('cms.djangoapps.import_from_modulestore.helpers.content_staging_api')
-    def test_process_staged_content_files(self, mock_content_staging_api):
-        block_to_import = self.problem
-        block_usage_key_to_import = str(block_to_import.location)
-        staged_content_for_import = self.import_event.staged_content_for_import.get(
-            source_usage_key=self.chapter.location
-        )
-        staged_content = staged_content_for_import.staged_content
-
-        import_client = ImportClient(
-            import_event=self.import_event,
-            staged_content=staged_content,
-            target_learning_package=self.learning_package,
-            block_usage_key_to_import=block_usage_key_to_import,
-        )
-
-        mock_file_data = b'file content'
-        mock_file = mock.MagicMock()
-        mock_file.filename = 'test.png'
-        mock_content_staging_api.get_staged_content_static_files.return_value = [mock_file]
-        mock_content_staging_api.get_staged_content_static_file_data.return_value = mock_file_data
-
-        modified_data = '<problem url_name="" display_name="ProblemWithImage"><img src="test.png"/></problem>'
-        modified_block = BlockFactory.create(
-            category='problem',
-            parent=self.vertical,
-            display_name='Problem With Image',
-            data=modified_data,
-        )
-        block_xml = etree.fromstring(modified_data, parser=self.parser)
-
-        # pylint: disable=protected-access
-        import_client._create_block_in_library(block_xml, modified_block.location)
-        mock_content_staging_api.get_staged_content_static_file_data.assert_called_once_with(
-            staged_content.id, 'test.png'
-        )
-
-    def test_update_container_components(self):
-        container_to_import = self.vertical
-        block_usage_key_to_import = str(container_to_import.location)
-        staged_content_for_import = self.import_event.staged_content_for_import.get(
-            source_usage_key=self.chapter.location
-        )
-
-        self.import_event.composition_level = "container"
-        import_client = ImportClient(
-            import_event=self.import_event,
-            staged_content=staged_content_for_import.staged_content,
-            target_learning_package=self.learning_package,
-            block_usage_key_to_import=block_usage_key_to_import,
-        )
-
-        with patch('cms.djangoapps.import_from_modulestore.helpers.authoring_api') as mock_authoring_api:
-            mock_container_version = mock.MagicMock()
-            mock_component_version1 = mock.MagicMock()
-            mock_component_version2 = mock.MagicMock()
-            mock_component_versions = [mock_component_version1, mock_component_version2]
-
-            # pylint: disable=protected-access
-            import_client._update_container_components(mock_container_version, mock_component_versions)
-
-            mock_authoring_api.create_next_container_version.assert_called_once()
-            call_args = mock_authoring_api.create_next_container_version.call_args[1]
-            self.assertEqual(call_args['container_pk'], mock_container_version.container.pk)
-            self.assertEqual(call_args['title'], mock_container_version.title)
-            self.assertEqual(call_args['created_by'], self.user.id)
diff --git a/cms/djangoapps/import_from_modulestore/tests/test_tasks.py b/cms/djangoapps/import_from_modulestore/tests/test_tasks.py
deleted file mode 100644
index ad4787f6bd47..000000000000
--- a/cms/djangoapps/import_from_modulestore/tests/test_tasks.py
+++ /dev/null
@@ -1,176 +0,0 @@
-"""
-Tests for tasks in import_from_modulestore app.
-"""
-from unittest.mock import patch, call
-import uuid
-
-from openedx_learning.api.authoring_models import LearningPackage
-from organizations.models import Organization
-from user_tasks.models import UserTaskStatus
-
-from cms.djangoapps.import_from_modulestore.data import ImportStatus
-from cms.djangoapps.import_from_modulestore.tasks import (
-    import_staged_content_to_library,
-    save_leagacy_content_to_staged_content,
-)
-from openedx.core.djangoapps.content_libraries import api as content_libraries_api
-from openedx.core.djangoapps.content_libraries.api import ContentLibrary
-from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
-from xmodule.modulestore.tests.factories import CourseFactory, BlockFactory
-
-from .factories import ImportFactory
-
-
-class ImportCourseToLibraryMixin(ModuleStoreTestCase):
-    """
-    Mixin for setting up data for tests.
-    """
-
-    def setUp(self):
-        super().setUp()
-
-        self.library = content_libraries_api.create_library(
-            org=Organization.objects.create(name='Organization 1', short_name='org1'),
-            slug='lib_1',
-            title='Library Org 1',
-            description='This is a library from Org 1',
-        )
-        self.content_library = ContentLibrary.objects.get_by_key(self.library.key)
-
-        self.course = CourseFactory.create()
-        self.chapter = BlockFactory.create(category='chapter', parent=self.course, display_name='Chapter 1')
-        self.sequential = BlockFactory.create(category='sequential', parent=self.chapter, display_name='Sequential 1')
-        self.vertical = BlockFactory.create(category='vertical', parent=self.sequential, display_name='Vertical 1')
-        self.video = BlockFactory.create(category='video', parent=self.vertical, display_name='Video 1')
-        self.problem = BlockFactory.create(category='problem', parent=self.vertical, display_name='Problem 1')
-
-        # self.course2 = CourseFactory.create()
-        # self.chapter2 = BlockFactory.create(category='chapter', parent=self.course, display_name='Chapter 2')
-        self.chapter2 = BlockFactory.create(category='chapter', parent=self.course, display_name='Chapter 2')
-        self.sequential2 = BlockFactory.create(category='sequential', parent=self.chapter2, display_name='Sequential 2')
-        self.vertical2 = BlockFactory.create(category='vertical', parent=self.sequential2, display_name='Vertical 2')
-        self.video2 = BlockFactory.create(category='video', parent=self.vertical2, display_name='Video 2')
-        self.problem2 = BlockFactory.create(category='problem', parent=self.vertical2, display_name='Problem 2')
-
-        self.import_event = ImportFactory(source_key=self.course.id)
-        self.user = self.import_event.user
-        self.import_event.user_task_status = UserTaskStatus.objects.create(
-            user=self.user,
-            task_id=uuid.uuid4(),
-            task_class='cms.djangoapps.import_from_modulestore.import_from_modulestore.tasks.import_to_library_task',
-            name='Test',
-            total_steps=2,
-        )
-        self.import_event.save()
-
-
-class TestSaveCourseSectionsToStagedContentTask(ImportCourseToLibraryMixin):
-    """
-    Test cases for save_course_sections_to_staged_content_task.
-    """
-
-    @patch('cms.djangoapps.import_from_modulestore.models.Import.set_status')
-    def test_save_legacy_content_to_staged_content_task(self, mock_set_status):
-        """
-        End-to-end test for save_legacy_content_to_staged_content_task.
-        """
-        course_chapters_to_import = [self.chapter, self.chapter2]
-        save_leagacy_content_to_staged_content(self.import_event)
-
-        self.import_event.refresh_from_db()
-        self.assertEqual(self.import_event.staged_content_for_import.count(), len(course_chapters_to_import))
-        staging_calls = [
-            call(ImportStatus.WAITNG_TO_STAGE),
-            call(ImportStatus.STAGING),
-            call(ImportStatus.STAGED),
-        ]
-        self.assertEqual(mock_set_status.call_count, len(staging_calls))
-        mock_set_status.assert_has_calls(staging_calls)
-
-    @patch('cms.djangoapps.import_from_modulestore.models.Import.clean_related_staged_content')
-    def test_old_staged_content_deletion_before_save_new(self, mock_clean_related_staged_content):
-        """ Checking that repeated saving of the same content does not create duplicates. """
-        course_chapters_to_import = [self.chapter, self.chapter2]
-
-        save_leagacy_content_to_staged_content(self.import_event)
-
-        mock_clean_related_staged_content.assert_called_once()
-        self.import_event.refresh_from_db()
-
-        self.assertEqual(self.import_event.staged_content_for_import.count(), len(course_chapters_to_import))
-
-
-class TestImportLibraryFromStagedContentTask(ImportCourseToLibraryMixin):
-    """
-    Test cases for import_staged_content_to_library_task.
-    """
-
-    def _is_imported(self, library, xblock):
-        library_learning_package = LearningPackage.objects.get(id=library.learning_package_id)
-        self.assertTrue(library_learning_package.content_set.filter(text__icontains=xblock.display_name).exists())
-
-    def test_import_staged_content_to_library_task(self):
-        """ End-to-end test for import_staged_content_to_library_task. """
-        library_learning_package = LearningPackage.objects.get(id=self.library.learning_package_id)
-        self.assertEqual(library_learning_package.content_set.count(), 0)
-        expected_imported_xblocks = [self.problem, self.problem2, self.video, self.video2]
-
-        save_leagacy_content_to_staged_content(self.import_event)
-        import_staged_content_to_library(
-            self.import_event,
-            self.content_library.learning_package.id,
-            [str(self.chapter.location), str(self.chapter2.location)],
-        )
-
-        self.import_event.refresh_from_db()
-        self.assertEqual(self.import_event.user_task_status.state, ImportStatus.IMPORTED.value)
-
-        for xblock in expected_imported_xblocks:
-            self._is_imported(self.library, xblock)
-
-        library_learning_package.refresh_from_db()
-        self.assertEqual(library_learning_package.content_set.count(), len(expected_imported_xblocks))
-        self.assertEqual(self.import_event.publishableentityimport_set.count(), len(expected_imported_xblocks))
-
-    @patch('cms.djangoapps.import_from_modulestore.tasks.import_from_staged_content')
-    def test_import_library_block_not_found(self, mock_import_from_staged_content):
-        """ Test that if a block is not found in the staged content, it is not imported. """
-        non_existent_usage_ids = ['block-v1:edX+Demo+2023+type@vertical+block@12345']
-        with self.allow_transaction_exception():
-            import_staged_content_to_library(
-                self.import_event,
-                self.content_library.learning_package.id,
-                non_existent_usage_ids,
-            )
-            mock_import_from_staged_content.assert_not_called()
-
-    def test_cannot_import_staged_content_twice(self):
-        """
-        Tests if after importing staged content into the library,
-        the staged content is deleted and cannot be imported again.
-        """
-        chapters_to_import = [self.chapter, self.chapter2]
-        expected_imported_xblocks = [self.problem, self.video]
-
-        save_leagacy_content_to_staged_content(self.import_event)
-        self.import_event.refresh_from_db()
-        self.assertEqual(self.import_event.staged_content_for_import.count(), len(chapters_to_import))
-        self.assertEqual(self.import_event.user_task_status.state, ImportStatus.STAGED.value)
-
-        import_staged_content_to_library(
-            self.import_event,
-            self.content_library.learning_package.id,
-            [str(self.chapter.location)],
-        )
-        for xblock in expected_imported_xblocks:
-            self._is_imported(self.library, xblock)
-
-        # try importing again, should not be possible
-        self.import_event.refresh_from_db()
-        import_staged_content_to_library(
-            self.import_event,
-            self.content_library.learning_package.id,
-            [str(self.chapter.location)],
-        )
-        self.import_event.refresh_from_db()
-        self.assertEqual(self.import_event.user_task_status.state, ImportStatus.IMPORTING_FAILED.value)
diff --git a/cms/djangoapps/import_from_modulestore/views/v0/serializers.py b/cms/djangoapps/import_from_modulestore/views/v0/serializers.py
deleted file mode 100644
index b3e1e66dc655..000000000000
--- a/cms/djangoapps/import_from_modulestore/views/v0/serializers.py
+++ /dev/null
@@ -1,97 +0,0 @@
-"""
-Serializers for the Course to Library Import API.
-"""
-
-from opaque_keys import InvalidKeyError
-from opaque_keys.edx.keys import LearningContextKey
-from opaque_keys.edx.locator import LibraryLocatorV2
-from rest_framework import serializers
-from user_tasks.serializers import StatusSerializer
-
-from cms.djangoapps.import_from_modulestore.models import Import
-from cms.djangoapps.import_from_modulestore.validators import validate_composition_level, validate_usage_keys_to_import
-
-
-class ImportSerializer(serializers.ModelSerializer):
-    """
-    Serializer for the course to library import creation API.
-    """
-
-    target = serializers.CharField(
-        help_text="The target library key to import into.",
-        required=True,
-    )
-    usage_keys_string = serializers.CharField(
-        help_text="Comma separated list of usage keys to import.",
-        required=True,
-    )
-
-    class Meta:
-        model = Import
-        fields = [
-            'source_key',
-            'target',
-            'usage_keys_string',
-            'composition_level',
-            'override',
-        ]
-
-    def get_fields(self):
-        fields = super().get_fields()
-        request = self.context.get('request')
-        if request and request.method != 'POST':
-            fields.pop('target', None)
-            fields.pop('usage_keys_string', None)
-        return fields
-
-    def validate_source_key(self, value):
-        """
-        Validate the source key format.
-        """
-        try:
-            LearningContextKey.from_string(value)
-        except InvalidKeyError as exc:
-            raise serializers.ValidationError(f"Invalid source key: {str(exc)}") from exc
-        return value
-
-    def validate_target(self, value):
-        """
-        Validate the target library key format.
-        """
-        try:
-            LibraryLocatorV2.from_string(value)
-        except InvalidKeyError as exc:
-            raise serializers.ValidationError(f"Invalid target library key: {str(exc)}") from exc
-        return value
-
-    def validate_usage_keys_string(self, value):
-        """
-        Validate the usage keys string format and split into a list.
-        """
-        try:
-            validate_usage_keys_to_import(value.split(','))
-        except InvalidKeyError as exc:
-            raise serializers.ValidationError(f"Invalid usage keys: {str(exc)}") from exc
-        return value.split(',')
-
-    def validate_composition_level(self, value):
-        """
-        Validate the composition level.
-        """
-        try:
-            validate_composition_level(value)
-        except ValueError as exc:
-            raise serializers.ValidationError(f"Invalid composition level: {str(exc)}") from exc
-        return value
-
-
-class StatusWithImportSerializer(StatusSerializer):
-    """
-    Serializer for the import task status.
-    """
-
-    import_event = ImportSerializer()
-
-    class Meta:
-        model = StatusSerializer.Meta.model
-        fields = [*StatusSerializer.Meta.fields, 'import_event']
diff --git a/cms/djangoapps/import_from_modulestore/views/v0/views.py b/cms/djangoapps/import_from_modulestore/views/v0/views.py
deleted file mode 100644
index 079ec11ba0de..000000000000
--- a/cms/djangoapps/import_from_modulestore/views/v0/views.py
+++ /dev/null
@@ -1,124 +0,0 @@
-"""
-API v0 views.
-"""
-
-from edx_rest_framework_extensions.auth.jwt.authentication import JwtAuthentication
-from edx_rest_framework_extensions.auth.session.authentication import SessionAuthenticationAllowInactiveUser
-from opaque_keys.edx.locator import LibraryLocatorV2
-from rest_framework.permissions import IsAdminUser
-from user_tasks.models import UserTaskStatus
-from user_tasks.views import StatusViewSet
-
-from cms.djangoapps.import_from_modulestore.api import import_to_library
-from cms.djangoapps.import_from_modulestore.views.v0.serializers import ImportSerializer, StatusWithImportSerializer
-from openedx.core.djangoapps.content_libraries.api import ContentLibrary
-from openedx.core.lib.api.authentication import BearerAuthenticationAllowInactiveUser
-
-
-class ImportViewSet(StatusViewSet):
-    """
-    Import course content from modulestore into a content library.
-
-    This viewset handles the import process, including creating the import task and
-    retrieving the status of the import task. Meant to be used by admin users only.
-
-    API Endpoints
-    ------------
-    POST /api/import_from_modulestore/v0/imports/
-        Start the import process.
-
-        Request body:
-            {
-                "source_key": "<source_course_key>",
-                "target": "<target_library>",
-                "usage_keys_string": "<comma_separated_usage_keys>",
-                "composition_level": "<composition_level>",
-                "override": "<boolean>"
-            }
-
-        Example request:
-            {
-                "source_key": "course-v1:edX+DemoX+2014_T1",
-                "target": "library-v1:org1+lib_1",
-                "usage_keys_string": "block-v1:edX+DemoX+2014_T1+type@sequential+block@chapter_1",
-                "composition_level": "component",
-                "override": true
-            }
-
-        Example response:
-            {
-                "name": "Import course to library (library_id=6, import_id=50)",
-                "state": "Succeeded",
-                "state_text": "Succeeded",
-                "completed_steps": 2,
-                "total_steps": 2,
-                "attempts": 1,
-                "created": "2025-05-14T22:24:37.048539Z",
-                "modified": "2025-05-14T22:24:59.128068Z",
-                "artifacts": [],
-                "import_event": {
-                    "source_key": "course-v1:OpenedX+DemoX+DemoCourse",
-                    "composition_level": "component",
-                    "override": true
-                }
-            }
-
-    GET /api/import_from_modulestore/v0/imports/<uuid>/
-        Get the status of the import task.
-
-        Example response:
-            {
-                "name": "Import course to library (library_id=4, import_id=69)",
-                "state": "Importing staged content",
-                "state_text": "Importing staged content",
-                "completed_steps": 1,
-                "total_steps": 2,
-                "attempts": 1,
-                "created": "2025-05-14T22:24:37.048539Z",
-                "modified": "2025-05-14T22:24:59.128068Z",
-                "artifacts": [],
-                "import_event": {
-                    "source_key": "course-v1:OpenedX+DemoX+DemoCourse2",
-                    "composition_level": "component",
-                    "override": false
-                }
-            }
-    """
-
-    permission_classes = (IsAdminUser,)
-    authentication_classes = (
-        JwtAuthentication,
-        BearerAuthenticationAllowInactiveUser,
-        SessionAuthenticationAllowInactiveUser,
-    )
-    serializer_class = StatusWithImportSerializer
-
-    def get_queryset(self):
-        """
-        Override the default queryset to filter by the import event and user.
-        """
-        return StatusViewSet.queryset.filter(import_event__isnull=False, user_id=self.request.user.pk)
-
-    def create(self, request, *args, **kwargs):
-        """
-        Handle the import task creation.
-        """
-
-        serializer_data = ImportSerializer(data=request.data)
-        serializer_data.is_valid(raise_exception=True)
-        validated_data = serializer_data.validated_data
-
-        library_key = LibraryLocatorV2.from_string(validated_data['target'])
-        learning_package_id = ContentLibrary.objects.get(
-            org__short_name=library_key.org, slug=library_key.slug
-        ).learning_package_id
-
-        _, task = import_to_library(
-            source_key=validated_data['source_key'],
-            usage_ids=validated_data['usage_keys_string'],
-            target_learning_package_id=learning_package_id,
-            user_id=request.user.pk,
-            composition_level=validated_data['composition_level'],
-            override=validated_data['override'],
-        )
-        return UserTaskStatus.objects.get(uuid=task.id)
diff --git a/cms/djangoapps/import_from_modulestore/views/__init__.py b/cms/djangoapps/modulestore_migrator/__init__.py
similarity index 100%
rename from cms/djangoapps/import_from_modulestore/views/__init__.py
rename to cms/djangoapps/modulestore_migrator/__init__.py
diff --git a/cms/djangoapps/modulestore_migrator/api.py b/cms/djangoapps/modulestore_migrator/api.py
new file mode 100644
index 000000000000..ba13706bda11
--- /dev/null
+++ b/cms/djangoapps/modulestore_migrator/api.py
@@ -0,0 +1,52 @@
+"""
+API for migration from modulestore to learning core
+"""
+from opaque_keys.edx.locator import LibraryLocatorV2, LibraryCollectionLocator
+from opaque_keys.edx.keys import LearningContextKey
+from openedx_learning.api.authoring import get_collection
+
+from openedx.core.djangoapps.content_libraries.api import get_library
+from openedx.core.types.user import AuthUser
+
+from . import tasks
+from .data import CompositionLevel
+from .models import ModulestoreSource
+
+
+__all__ = (
+    "start_migration_to_library",
+)
+
+
+def start_migration_to_library(
+    *
+    source_key: LearningContextKey,
+    target_key: LibraryLocatorV2 | LibraryCollectionLocator,
+    user: AuthUser,
+    composition_level: CompositionLevel,
+    replace_existing: bool,
+    forward_source_to_target: bool,  # @@TODO - Set to False for now. Explain this better.
+) -> None:
+    """
+    Import a course or legacy library into a V2 library (or, a collection within a V2 library).
+    """
+    source, _ = ModulestoreSource.objects.get_or_create(key=source_key)
+    target_library = get_library(
+        target_key.lib_key if isinstance(target_key, LibraryCollectionLocator) else target_key
+    )
+    if not (target_package_id := target_library.learning_package_id):
+        raise ValueError(
+            f"Cannot import {source_key} into library at {target_key} because the "
+            "library is not connected to a learning package"
+        )
+    if isinstance(target_key, LibraryCollectionLocator):
+        target_collection_id = get_collection(target_package_id, target_key.collection_id).id
+    tasks.migrate_from_modulestore.delay(
+        user_id=user.id,
+        source_pk=source.id,
+        target_package_pk=target_package_id,
+        target_collection_pk=target_collection_id,
+        composition_level=composition_level,
+        replace_existing=replace_existing,
+        forward_source_to_target=forward_source_to_target,
+    )
diff --git a/cms/djangoapps/modulestore_migrator/apps.py b/cms/djangoapps/modulestore_migrator/apps.py
new file mode 100644
index 000000000000..37c2b66d6f27
--- /dev/null
+++ b/cms/djangoapps/modulestore_migrator/apps.py
@@ -0,0 +1,13 @@
+"""
+App configurations
+"""
+
+from django.apps import AppConfig
+
+
+class ModulestoreMigratorConfig(AppConfig):
+    """
+    App for importing legacy content from the modulestore.
+    """
+
+    name = 'cms.djangoapps.modulestore_migrator'
diff --git a/cms/djangoapps/modulestore_migrator/constants.py b/cms/djangoapps/modulestore_migrator/constants.py
new file mode 100644
index 000000000000..ec7740ef1938
--- /dev/null
+++ b/cms/djangoapps/modulestore_migrator/constants.py
@@ -0,0 +1,6 @@
+"""
+Constants
+"""
+
+CONTENT_STAGING_PURPOSE_PREFIX = "modulestore_migrator"
+CONTENT_STAGING_PURPOSE_TEMPLATE = CONTENT_STAGING_PURPOSE_PREFIX + "({source_key})"
diff --git a/cms/djangoapps/modulestore_migrator/data.py b/cms/djangoapps/modulestore_migrator/data.py
new file mode 100644
index 000000000000..3112a0f57f57
--- /dev/null
+++ b/cms/djangoapps/modulestore_migrator/data.py
@@ -0,0 +1,45 @@
+"""
+Value objects
+"""
+from __future__ import annotations
+
+from enum import Enum
+
+from openedx.core.djangoapps.content_libraries.api import ContainerType
+
+
+class CompositionLevel(Enum):
+    """
+    Enumeration of composition levels for legacy content.
+
+    Defined in increasing order of complexity so that `is_higher_than` works correctly.
+    """
+    # Components are individual XBlocks, e.g. Problem
+    Component = 'component'
+
+    # Container types currently supported by Content Libraries
+    Unit = ContainerType.Unit.value
+    Subsection = ContainerType.Subsection.value
+    Section = ContainerType.Section.value
+
+    @property
+    def is_container(self) -> bool:
+        return self is not self.Component
+
+    def is_higher_than(self, other: 'CompositionLevel') -> bool:
+        """
+        Is this composition level 'above' (more complex than) the other?
+        """
+        levels: list[CompositionLevel] = list(self.__class__)
+        return levels.index(self) > levels.index(other)
+
+    @classmethod
+    def supported_choices(cls) -> list[tuple[str, str]]:
+        """
+        Returns all supported composition levels as a list of tuples,
+        for use in a Django Models ChoiceField.
+        """
+        return [
+            (composition_level.value, composition_level.name)
+            for composition_level in cls
+        ]
diff --git a/cms/djangoapps/modulestore_migrator/migrations/0001_initial.py b/cms/djangoapps/modulestore_migrator/migrations/0001_initial.py
new file mode 100644
index 000000000000..4d9bc62de01b
--- /dev/null
+++ b/cms/djangoapps/modulestore_migrator/migrations/0001_initial.py
@@ -0,0 +1,106 @@
+# Generated by Django 4.2.22 on 2025-06-10 04:27
+
+from django.db import migrations, models
+import django.db.models.deletion
+import django.utils.timezone
+import model_utils.fields
+import opaque_keys.edx.django.models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('oel_collections', '0005_alter_collection_options_alter_collection_enabled'),
+        ('oel_publishing', '0008_alter_draftchangelogrecord_options_and_more'),
+        ('content_staging', '0005_stagedcontent_version_num'),
+        ('user_tasks', '0004_url_textfield'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ModulestoreBlockMigration',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False, verbose_name='created')),
+                ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False, verbose_name='modified')),
+                ('change_log_record', models.OneToOneField(null=True, on_delete=django.db.models.deletion.SET_NULL, to='oel_publishing.draftchangelogrecord')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='ModulestoreMigration',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('composition_level', models.CharField(choices=[('component', 'Component'), ('unit', 'Unit'), ('subsection', 'Subsection'), ('section', 'Section')], default='component', help_text='Maximum hierachy level at which content should be aggregated in target library', max_length=255)),
+                ('replace_existing', models.BooleanField(default=False, help_text='If a piece of content already exists in the content library, should the import process replace it?')),
+                ('change_log', models.ForeignKey(help_text='Changelog entry in the target learning package which records this migration', null=True, on_delete=django.db.models.deletion.SET_NULL, to='oel_publishing.draftchangelog')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='ModulestoreSource',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('key', opaque_keys.edx.django.models.LearningContextKeyField(help_text='Key of the content source (a course or a legacy library)', max_length=255, unique=True)),
+                ('forwarded_by', models.ForeignKey(help_text='If set, the system will forward references of this source over to the target of this migration', null=True, on_delete=django.db.models.deletion.SET_NULL, to='modulestore_migrator.modulestoremigration')),
+            ],
+        ),
+        migrations.AddField(
+            model_name='modulestoremigration',
+            name='source',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='migrations', to='modulestore_migrator.modulestoresource'),
+        ),
+        migrations.AddField(
+            model_name='modulestoremigration',
+            name='staged_content',
+            field=models.OneToOneField(help_text='Modulestore content is processed and staged before importing it to a learning packge. We temporarily save the staged content to allow for troubleshooting of failed migrations.', null=True, on_delete=django.db.models.deletion.SET_NULL, to='content_staging.stagedcontent'),
+        ),
+        migrations.AddField(
+            model_name='modulestoremigration',
+            name='target',
+            field=models.ForeignKey(help_text='Content will be imported into this library', on_delete=django.db.models.deletion.CASCADE, to='oel_publishing.learningpackage'),
+        ),
+        migrations.AddField(
+            model_name='modulestoremigration',
+            name='target_collection',
+            field=models.ForeignKey(blank=True, help_text='Optional - Collection (within the target library) into which imported content will be grouped', null=True, on_delete=django.db.models.deletion.SET_NULL, to='oel_collections.collection'),
+        ),
+        migrations.AddField(
+            model_name='modulestoremigration',
+            name='task_status',
+            field=models.OneToOneField(help_text='Tracks the status of the task which is executing this migration', on_delete=django.db.models.deletion.RESTRICT, to='user_tasks.usertaskstatus'),
+        ),
+        migrations.CreateModel(
+            name='ModulestoreBlockSource',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False, verbose_name='created')),
+                ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False, verbose_name='modified')),
+                ('key', opaque_keys.edx.django.models.UsageKeyField(help_text='Original usage key of the XBlock that has been imported.', max_length=255)),
+                ('forwarded_by', models.ForeignKey(help_text='If set, the system will forward references of this block source over to the target of this block migration', null=True, on_delete=django.db.models.deletion.SET_NULL, to='modulestore_migrator.modulestoreblockmigration')),
+                ('overall_source', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='blocks', to='modulestore_migrator.modulestoresource')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.AddField(
+            model_name='modulestoreblockmigration',
+            name='overall_migration',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='block_migrations', to='modulestore_migrator.modulestoremigration'),
+        ),
+        migrations.AddField(
+            model_name='modulestoreblockmigration',
+            name='source',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='modulestore_migrator.modulestoreblocksource'),
+        ),
+        migrations.AddField(
+            model_name='modulestoreblockmigration',
+            name='target',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='oel_publishing.publishableentity'),
+        ),
+        migrations.AlterUniqueTogether(
+            name='modulestoreblockmigration',
+            unique_together={('overall_migration', 'target'), ('overall_migration', 'source')},
+        ),
+    ]
diff --git a/cms/djangoapps/import_from_modulestore/views/v0/__init__.py b/cms/djangoapps/modulestore_migrator/migrations/__init__.py
similarity index 100%
rename from cms/djangoapps/import_from_modulestore/views/v0/__init__.py
rename to cms/djangoapps/modulestore_migrator/migrations/__init__.py
diff --git a/cms/djangoapps/modulestore_migrator/models.py b/cms/djangoapps/modulestore_migrator/models.py
new file mode 100644
index 000000000000..24f1c358d60d
--- /dev/null
+++ b/cms/djangoapps/modulestore_migrator/models.py
@@ -0,0 +1,179 @@
+"""
+Models for the modulestore migration tool.
+"""
+from __future__ import annotations
+
+from django.contrib.auth import get_user_model
+from django.db import models
+from django.utils.translation import gettext_lazy as _
+from user_tasks.models import UserTaskStatus
+
+from model_utils.models import TimeStampedModel
+from opaque_keys.edx.django.models import (
+    LearningContextKeyField,
+    UsageKeyField,
+)
+from openedx_learning.api.authoring_models import (
+    LearningPackage, PublishableEntity, Collection, DraftChangeLog, DraftChangeLogRecord
+)
+
+from openedx.core.djangoapps.content_staging.models import StagedContent
+from .data import CompositionLevel
+
+User = get_user_model()
+
+
+class ModulestoreSource(models.Model):
+    """
+    A legacy learning context (course or library) which can be a source of a migration.
+    """
+    key = LearningContextKeyField(
+        max_length=255,
+        unique=True,
+        help_text=_('Key of the content source (a course or a legacy library)')
+    )
+    forwarded_by = models.ForeignKey(
+        'modulestore_migrator.ModulestoreMigration',
+        null=True,
+        on_delete=models.SET_NULL,
+        help_text=_('If set, the system will forward references of this source over to the target of this migration')
+    )
+
+
+class ModulestoreMigration(models.Model):
+    """
+    Tracks the action of a user importing a Modulestore-based course or legacy library into a
+    learning-core based learning package
+
+    Notes:
+    * As of Ulmo, a learning package is always associated with a v2 content library, but we
+      will not bake that assumption into this model)
+    * Each Migration is tied to a single UserTaskStatus, which connects it to a user and
+      contains the progress of the import.
+    * A single ModulestoreSource may very well have multiple ModulestoreMigrations; however,
+      at most one of them with be the "authoritative" migration, as indicated by `forwarded_by`.
+    """
+
+    ## MIGRATION SPECIFICATION
+    source = models.ForeignKey(
+        ModulestoreSource,
+        on_delete=models.CASCADE,
+        related_name="migrations",
+    )
+    composition_level = models.CharField(
+        max_length=255,
+        choices=CompositionLevel.supported_choices(),
+        default=CompositionLevel.Component.value,
+        help_text=_('Maximum hierachy level at which content should be aggregated in target library'),
+    )
+    replace_existing = models.BooleanField(
+        default=False,
+        help_text=_(
+            "If a piece of content already exists in the content library, should the import process replace it?"
+        ),
+    )
+    target = models.ForeignKey(
+        LearningPackage,
+        on_delete=models.CASCADE,
+        help_text=_('Content will be imported into this library'),
+    )
+    target_collection = models.ForeignKey(
+        Collection,
+        on_delete=models.SET_NULL,
+        null=True,
+        blank=True,
+        help_text=_('Optional - Collection (within the target library) into which imported content will be grouped'),
+    )
+
+    ## MIGRATION ARTIFACTS
+    task_status = models.OneToOneField(
+        UserTaskStatus,
+        on_delete=models.RESTRICT,
+        help_text=_("Tracks the status of the task which is executing this migration"),
+    )
+    change_log = models.ForeignKey(
+        DraftChangeLog,
+        on_delete=models.SET_NULL,
+        null=True,
+        help_text=_("Changelog entry in the target learning package which records this migration"),
+    )
+    staged_content = models.OneToOneField(
+        StagedContent,
+        null=True,
+        on_delete=models.SET_NULL,  # Staged content is liable to be deleted in order to save space
+        help_text=_(
+            "Modulestore content is processed and staged before importing it to a learning packge. "
+            "We temporarily save the staged content to allow for troubleshooting of failed migrations."
+        )
+    )
+
+    def __str__(self):
+        return f'{self.__class__.__name__} #{self.pk}: {self.source_key} → {self.target}'
+
+    def __repr__(self):
+        return f"{self.__class__.__name__}(pk={self.pk}, source_key='{self.source_key}', target='{self.target}')"
+
+
+class ModulestoreBlockSource(TimeStampedModel):
+    """
+    A legacy block usage (in a course or library) which can be a source of a block migration.
+    """
+    overall_source = models.ForeignKey(
+        ModulestoreSource,
+        on_delete=models.CASCADE,
+        related_name="blocks",
+    )
+    key = UsageKeyField(
+        max_length=255,
+        help_text=_('Original usage key of the XBlock that has been imported.'),
+    )
+    forwarded_by = models.ForeignKey(
+        'modulestore_migrator.ModulestoreBlockMigration',
+        null=True,
+        on_delete=models.SET_NULL,
+        help_text=_(
+            'If set, the system will forward references of this block source over to the target of this block migration'
+        ),
+    )
+
+
+class ModulestoreBlockMigration(TimeStampedModel):
+    """
+    The migration of a single legacy block into a learning package.
+
+    Is always tied to a greater overall ModulestoreMigration.
+
+    Note:
+    * A single ModulestoreBlockSource may very well have multiple ModulestoreBlockMigrations; however,
+      at most one of them with be the "authoritative" migration, as indicated by `forwarded_by`.
+      This will coincide with the `overall_migration` being pointed to by `forwarded_by` as well.
+    """
+    overall_migration = models.ForeignKey(
+        ModulestoreMigration,
+        on_delete=models.CASCADE,
+        related_name="block_migrations",
+    )
+    source = models.ForeignKey(
+        ModulestoreBlockSource,
+        on_delete=models.CASCADE,
+    )
+    target = models.ForeignKey(
+        PublishableEntity,
+        on_delete=models.CASCADE,
+    )
+    change_log_record = models.OneToOneField(
+        DraftChangeLogRecord,
+        # a changelog record can be pruned, which would set this to NULL, but not delete the
+        # entire import record
+        null=True,
+        on_delete=models.SET_NULL,
+    )
+
+    class Meta:
+        unique_together = [
+            ('overall_migration', 'source'),
+            ('overall_migration', 'target'),
+        ]
+
+    def __str__(self):
+        return f'{self.source.source_key} → {self.target}'
diff --git a/cms/djangoapps/modulestore_migrator/rest_api/__init__.py b/cms/djangoapps/modulestore_migrator/rest_api/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/cms/djangoapps/import_from_modulestore/views/urls.py b/cms/djangoapps/modulestore_migrator/rest_api/urls.py
similarity index 82%
rename from cms/djangoapps/import_from_modulestore/views/urls.py
rename to cms/djangoapps/modulestore_migrator/rest_api/urls.py
index 1ec1fa4dde18..b993a5952ce0 100644
--- a/cms/djangoapps/import_from_modulestore/views/urls.py
+++ b/cms/djangoapps/modulestore_migrator/rest_api/urls.py
@@ -6,7 +6,7 @@
 
 from .v0 import urls as v0_urls
 
-app_name = 'import_from_modulestore'
+app_name = 'modulestore_migrator'
 
 urlpatterns = [
     path('v0/', include(v0_urls)),
diff --git a/cms/djangoapps/modulestore_migrator/rest_api/v0/__init__.py b/cms/djangoapps/modulestore_migrator/rest_api/v0/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/cms/djangoapps/import_from_modulestore/views/v0/urls.py b/cms/djangoapps/modulestore_migrator/rest_api/v0/urls.py
similarity index 54%
rename from cms/djangoapps/import_from_modulestore/views/v0/urls.py
rename to cms/djangoapps/modulestore_migrator/rest_api/v0/urls.py
index 9f50f2a27e96..eda8e0e3d43e 100644
--- a/cms/djangoapps/import_from_modulestore/views/v0/urls.py
+++ b/cms/djangoapps/modulestore_migrator/rest_api/v0/urls.py
@@ -3,9 +3,9 @@
 """
 
 from rest_framework.routers import SimpleRouter
-from .views import ImportViewSet
+# from .views import ImportViewSet  # @@TODO - re-anble this once API is fixed
 
 ROUTER = SimpleRouter()
-ROUTER.register(r'imports', ImportViewSet)
+# ROUTER.register(r'imports', ImportViewSet)
 
 urlpatterns = ROUTER.urls
diff --git a/cms/djangoapps/modulestore_migrator/tasks.py b/cms/djangoapps/modulestore_migrator/tasks.py
new file mode 100644
index 000000000000..487701635b83
--- /dev/null
+++ b/cms/djangoapps/modulestore_migrator/tasks.py
@@ -0,0 +1,546 @@
+"""
+Tasks for the modulestore_migrator
+"""
+from __future__ import annotations
+
+import mimetypes
+import os
+import typing as t
+from dataclasses import dataclass
+from datetime import datetime, timezone
+from enum import Enum
+
+from celery import shared_task
+from celery.utils.log import get_task_logger
+from django.db import IntegrityError
+from django.core.exceptions import ObjectDoesNotExist
+from edx_django_utils.monitoring import set_code_owner_attribute_from_module
+from lxml import etree
+from lxml.etree import _ElementTree as XmlTree
+from opaque_keys.edx.keys import CourseKey, UsageKey
+from opaque_keys.edx.locator import (
+    CourseLocator, BlockUsageLocator,
+    LibraryLocator, LibraryUsageLocator,
+    LibraryLocatorV2, LibraryUsageLocatorV2, LibraryContainerLocator
+)
+from openedx_learning.api import authoring as authoring_api
+from openedx_learning.api.authoring_models import (
+    Collection,
+    Component,
+    ContainerVersion,
+    LearningPackage,
+    PublishableEntity,
+    PublishableEntityVersion,
+)
+from user_tasks.tasks import UserTask, UserTaskStatus
+
+from openedx.core.djangoapps.content_libraries.api import ContainerType
+from openedx.core.djangoapps.content_libraries import api as libraries_api
+from openedx.core.djangoapps.content_libraries.models import ContentLibrary
+from openedx.core.djangoapps.content_staging import api as staging_api
+from xmodule.modulestore import exceptions as modulestore_exceptions
+from xmodule.modulestore.django import modulestore
+
+from .constants import CONTENT_STAGING_PURPOSE_TEMPLATE
+from .data import CompositionLevel
+from .models import ModulestoreSource, ModulestoreMigration, ModulestoreBlockSource, ModulestoreBlockMigration
+
+
+log = get_task_logger(__name__)
+
+
+class MigrationStep(Enum):
+    """
+    Strings representation the state of an in-progress modulestore-to-learning-core import.
+
+    We use these values to set UserTaskStatus.state.
+    The other possible UserTaskStatus.state values are the built-in ones:
+    UserTaskStatus.{PENDING,FAILED,CANCELED,SUCCEEDED}.
+    """
+    VALIDATING_INPUT = 'Validating migration parameters'
+    CANCELLING_OLD = 'Cancelling any redundant migration tasks'
+    LOADING = 'Loading legacy content from ModulesStore'
+    STAGING = 'Staging legacy content for import'
+    PARSING = 'Parsing staged OLX'
+    IMPORTING_ASSETS = 'Importing staged files and resources'
+    IMPORTING_STRUCTURE = 'Importing staged content structure'
+    UNSTAGING = 'Cleaning staged content'
+    MAPPING_OLD_TO_NEW = 'Saving map of legacy content to migrated content'
+    FORWARDING = 'Forwarding legacy content to migrated content'
+    POPULATING_COLLECTION = 'Assigning imported items to the specified collection'
+
+
+class _MigrationTask(UserTask):
+    """
+    Base class for migrate_to_modulestore
+    """
+
+    @staticmethod
+    def calculate_total_steps(arguments_dict):
+        """
+        Get number of in-progress steps in importing process, as shown in the UI.
+        """
+        return len(list(MigrationStep))
+
+
+@shared_task(base=_MigrationTask, bind=True)
+# Note: The decorator @set_code_owner_attribute cannot be used here because the UserTaskMixin
+#   does stack inspection and can't handle additional decorators.
+def migrate_from_modulestore(
+    self: _MigrationTask,
+    *,
+    user_id: int,
+    source_pk: int,
+    target_package_pk: int,
+    target_collection_pk: int,
+    replace_existing: bool,
+    composition_level: str,
+    forward_source_to_target: bool,
+) -> None:
+    """
+    Import a course or legacy library into a learning package.
+
+    Currently, the target learning package must be associated with a V2 content library, but that
+    restriction may be loosened in the future as more types of learning packages are developed.
+    """
+    # pylint: disable=too-many-statements
+    # This is a large function, but breaking it up futher would probably not
+    # make it any easier to understand.
+
+    set_code_owner_attribute_from_module(__name__)
+
+    status: UserTaskStatus = self.status
+    status.set_state(MigrationStep.VALIDATING_INPUT)
+    try:
+        source = ModulestoreSource.objects.get(pk=source_pk)
+        target_package = LearningPackage.objects.get(pk=target_package_pk)
+        target_library = ContentLibrary.objects.get(learning_package_id=target_package_pk)
+        target_collection = Collection.objects.get(pk=target_collection_pk) if target_collection_pk else None
+    except ObjectDoesNotExist as exc:
+        status.fail(str(exc))
+        return
+    if isinstance(source.key, CourseLocator):
+        source_root_usage_key = source.key.make_usage_key('course', 'course')
+    elif isinstance(source.key, LibraryLocator):
+        source_root_usage_key = source.key.make_usage_key('library', 'library')
+    else:
+        status.fail(
+            f"Not a valid source context key: {source.key}. "
+            "Source key must reference a course or a legacy library."
+        )
+        return
+    migration = ModulestoreMigration.objects.create(
+        source=source,
+        composition_level=composition_level,
+        replace_existing=replace_existing,
+        target=target_package,
+        target_collection=target_collection,
+        task_status=status,
+    )
+    status.increment_completed_steps()
+
+    status.set_state(MigrationStep.CANCELLING_OLD)
+    # In order to prevent a user from accidentally starting a bunch of identical import tasks...
+    migrations_to_cancel = ModulestoreMigration.objects.filter(
+        # get all Migration tasks by this user with the same source and target
+        task_status__user=status.user,
+        source=source,
+        target=target_package,
+    ).select_related('task_status').exclude(
+        # (excluding that aren't running)
+        task_status__state__in=(UserTaskStatus.CANCELED, UserTaskStatus.FAILED, UserTaskStatus.SUCCEEDED)
+    ).exclude(
+        # (excluding this migration itself)
+        id=migration.id
+    )
+    # ... and cancel their tasks and clean away their staged content.
+    for migration_to_cancel in migrations_to_cancel:
+        if migration_to_cancel.task_status:
+            migration_to_cancel.task_status.cancel()
+        if migration_to_cancel.staged_content:
+            migration_to_cancel.staged_content.delete()
+    status.increment_completed_steps()
+
+    status.set_state(MigrationStep.LOADING)
+    try:
+        legacy_root = modulestore().get_item(source_root_usage_key)
+    except modulestore_exceptions.ItemNotFoundError as exc:
+        status.fail(f"Failed to load source item '{source_root_usage_key}' from ModuleStore: {exc}")
+        return
+    if not legacy_root:
+        status.fail(f"Could not find source item '{source_root_usage_key}' in ModuleStore")
+        return
+    status.increment_completed_steps()
+
+    status.set_state(MigrationStep.STAGING)
+    staged_content = staging_api.stage_xblock_temporarily(
+        block=legacy_root,
+        user_id=status.user.pk,
+        purpose=CONTENT_STAGING_PURPOSE_TEMPLATE.format(source_key=source.key),
+    )
+    migration.staged_content = staged_content
+    status.increment_completed_steps()
+
+    status.set_state(MigrationStep.PARSING)
+    parser = etree.XMLParser(strip_cdata=False)
+    try:
+        root_node = etree.fromstring(staged_content.olx, parser=parser)
+    except etree.ParseError as exc:
+        status.fail(f"Failed to parse source OLX (from staged content with id = {staged_content.id}): {exc}")
+    status.increment_completed_steps()
+
+    status.set_state(MigrationStep.IMPORTING_ASSETS)
+    content_by_filename: dict[str, int] = {}
+    now = datetime.now(tz=timezone.utc)
+    for staged_content_file_data in staging_api.get_staged_content_static_files(staged_content.id):
+        old_path = staged_content_file_data.filename
+        file_data = staging_api.get_staged_content_static_file_data(staged_content.id, old_path)
+        if not file_data:
+            log.error(
+                f"Staged content {staged_content.id} included referenced file {old_path}, "
+                "but no file data was found."
+            )
+            continue
+        filename = os.path.basename(old_path)
+        media_type_str = mimetypes.guess_type(filename)[0] or "application/octet-stream"
+        media_type = authoring_api.get_or_create_media_type(media_type_str)
+        content_by_filename[filename] = authoring_api.get_or_create_file_content(
+            migration.target_id,
+            media_type.id,
+            data=file_data,
+            created=now,
+        ).id
+    status.increment_completed_steps()
+
+    status.set_state(MigrationStep.IMPORTING_STRUCTURE)
+    with authoring_api.bulk_draft_changes_for(migration.target.id) as change_log:
+        root_migrated_node = _migrate_node(
+            content_by_filename=content_by_filename,
+            source_context_key=source_root_usage_key.course_key,
+            source_node=root_node,
+            target_library_key=target_library.library_key,
+            target_package_id=target_package_pk,
+            replace_existing=replace_existing,
+            composition_level=CompositionLevel(composition_level),
+            created_at=datetime.now(timezone.utc),
+            created_by=status.user_id,
+        )
+    migration.change_log = change_log
+    status.increment_completed_steps()
+
+    status.set_state(MigrationStep.UNSTAGING)
+    staged_content.delete()
+    status.increment_completed_steps()
+
+    status.set_state(MigrationStep.MAPPING_OLD_TO_NEW)
+    block_source_keys_to_target_vers = dict(root_migrated_node.all_source_to_target_pairs())
+    ModulestoreBlockSource.objects.bulk_create(
+        [
+            ModulestoreBlockSource(overall_source=source, key=source_usage_key)
+            for source_usage_key in block_source_keys_to_target_vers.keys()
+        ],
+        # Note: bulk_create will *not* return the primary keys of ModulestoreBlockSource
+        # objects that already exist (and thus were skipped by ignore_conflicts), so, in
+        # order to use ModulestoreBlockSource instances, we must re-load them in the next step.
+        ignore_conflicts=True
+    )
+    block_source_keys_to_sources: dict[UsageKey, ModulestoreBlockSource] = {
+        block_source.key: block_source for block_source in source.blocks.all()
+    }
+    block_target_pks_to_change_log_record_pks: dict[int, int] = dict(
+        change_log.records.values_list("target_entity_id", "id")
+    )
+    block_migrations = ModulestoreBlockMigration.objects.bulk_create(
+        [
+            ModulestoreBlockMigration(
+                overall_migration=migration,
+                source=block_source_keys_to_sources[block_source_key],
+                target_id=block_target_ver.entity_id,
+                change_log_record_id=block_target_pks_to_change_log_record_pks[block_target_ver.entity_id],
+            )
+            for block_source_key, block_target_ver in block_source_keys_to_target_vers.items()
+        ],
+    )
+    status.increment_completed_steps()
+
+    status.set_state(MigrationStep.FORWARDING)
+    if forward_source_to_target:
+        block_sources_to_block_migrations = {
+            block_migration.source: block_migration for block_migration in block_migrations
+        }
+        for block_source, block_migration in block_sources_to_block_migrations.items():
+            block_source.forwarded_by = block_migration
+        ModulestoreBlockSource.objects.bulk_update(block_sources_to_block_migrations.keys(), ["forwarded_by"])
+        source.forwarded_by = migration
+    status.increment_completed_steps()
+
+    status.set_state(MigrationStep.POPULATING_COLLECTION)
+    if target_collection:
+        block_target_pks = list(block_target_pks_to_change_log_record_pks.keys())
+        authoring_api.add_to_collection(
+            learning_package_id=target_package_pk,
+            key=target_collection.key,
+            entities_qset=PublishableEntity.objects.filter(id__in=block_target_pks),
+            created_by=user_id,
+        )
+    status.increment_completed_steps()
+
+
+@dataclass(frozen=True)
+class _MigratedNode:
+    """
+    A node in the source tree, its target (if migrated), and any migrated children.
+
+    Note that target_version can equal None even when there migrated children.
+    This happens, particularly, if the node is above the requested composition level
+    but has descendents which are at or below said level.
+    """
+    source_to_target: tuple[UsageKey, PublishableEntityVersion] | None
+    children: list[_MigratedNode]
+
+    def all_source_to_target_pairs(self) -> t.Iterable[tuple[UsageKey, PublishableEntityVersion]]:
+        """
+        Get all source_key->target_ver pairs via a pre-order traversal.
+        """
+        if self.source_to_target:
+            yield self.source_to_target
+        for child in self.children:
+            yield from child.all_source_to_target_pairs()
+
+
+def _migrate_node(
+    *,
+    content_by_filename: dict[str, int],
+    source_context_key: CourseKey,  # Note: This includes legacy LibraryLocators, which are sneakily CourseKeys.
+    source_node: XmlTree,
+    target_package_id: int,
+    target_library_key: LibraryLocatorV2,
+    composition_level: CompositionLevel,
+    replace_existing: bool,
+    created_at: datetime,
+    created_by: int,
+) -> _MigratedNode:
+    """
+    Migration an OLX node (source_node) from a legacy course or library (source_context_key) to a
+    learning package (target_library). If the node is a container, create it in the target iff
+    it is at or above the requested composition_level; otherwise, just import its contents.
+    Recursively apply the same logic to all children.
+    """
+    # The OLX tag will map to one of the following...
+    #   * A wiki tag                  --> Ignore
+    #   * A recognized container type --> Migration children, and import container if requested.
+    #   * A legacy library root       --> Migration children, but NOT the root itself.
+    #   * A course root               --> Migration children, but NOT the root itself (for Teak, at least. Future
+    #                                     releases may support treating the Course as an importable container).
+    #   * Something else              --> Try to import it as a component. If that fails, then it's either an un-
+    #                                     supported component type, or it's an XBlock with dynamic children, which we
+    #                                     do not support in libraries as of Teak.
+    should_migrate_node: bool
+    should_migrate_children: bool
+    container_type: ContainerType | None  # if None, it's a Component
+    if source_node.tag == "wiki":
+        return _MigratedNode(None, [])
+    try:
+        container_type = ContainerType.from_source_olx_tag(source_node.tag)
+    except ValueError:
+        container_type = None
+        if source_node.tag in {"course", "library"}:
+            should_migrate_node = False
+            should_migrate_children = True
+        else:
+            should_migrate_node = True
+            should_migrate_children = False
+    else:
+        node_level = CompositionLevel(container_type.value)
+        should_migrate_node = not node_level.is_higher_than(composition_level)
+        should_migrate_children = True
+    migrated_children: list[_MigratedNode] = []
+    if should_migrate_children:
+        migrated_children = [
+            _migrate_node(
+                content_by_filename=content_by_filename,
+                source_context_key=source_context_key,
+                source_node=source_node_child,
+                target_package_id=target_package_id,
+                target_library_key=target_library_key,
+                composition_level=composition_level,
+                replace_existing=replace_existing,
+                created_by=created_by,
+                created_at=created_at,
+            )
+            for source_node_child in source_node.getchildren()
+        ]
+    source_to_target: tuple[UsageKey, PublishableEntityVersion] | None = None
+    if should_migrate_node:
+        source_olx = etree.tostring(source_node).decode('utf-8')
+        if source_block_id := source_node.get('url_name'):
+            source_key: UsageKey = source_context_key.make_usage_key(source_node.tag, source_block_id)
+            target_entity_version = (
+                _migrate_container(
+                    source_key=source_key,
+                    container_type=container_type,
+                    title=source_node.get('display_name', source_block_id),
+                    children=[
+                        migrated_child.source_to_target[1]
+                        for migrated_child in migrated_children if
+                        migrated_child.source_to_target
+                    ],
+                    target_library_key=target_library_key,
+                    replace_existing=replace_existing,
+                    created_by=created_by,
+                    created_at=created_at,
+                )
+                if container_type else
+                _migrate_component(
+                    content_by_filename=content_by_filename,
+                    source_key=source_key,
+                    olx=source_olx,
+                    target_package_id=target_package_id,
+                    target_library_key=target_library_key,
+                    replace_existing=replace_existing,
+                    created_by=created_by,
+                    created_at=created_at,
+                )
+            )
+            if target_entity_version:
+                source_to_target = (source_key, target_entity_version)
+        else:
+            log.warning(
+                f"Cannot migrate node from {source_context_key} to {target_library_key} "
+                f"because it lacks an url_name and thus has no identity: {source_olx}"
+            )
+    return _MigratedNode(source_to_target=source_to_target, children=migrated_children)
+
+
+def _migrate_container(
+    *,
+    source_key: UsageKey,
+    container_type: ContainerType,
+    title: str,
+    children: list[PublishableEntityVersion],
+    target_library_key: LibraryLocatorV2,
+    replace_existing: bool,
+    created_by: int,
+    created_at: datetime,
+) -> PublishableEntityVersion:
+    """
+    Create, update, or replace a container in a library based on a source key and children.
+
+    (We assume that the destination is a library rather than some other future kind of learning
+     package, but let's keep than an internal assumption.)
+    """
+    target_key = LibraryContainerLocator(
+        target_library_key, container_type.value, _slugify_source_usage_key(source_key)
+    )
+    try:
+        container = libraries_api.get_container(target_key)
+        container_exists = True
+    except libraries_api.ContentLibraryContainerNotFound:
+        container_exists = False
+        container = libraries_api.create_container(
+            library_key=target_library_key,
+            container_type=container_type,
+            slug=target_key.container_id,
+            title=title,
+            created=created_at,
+            user_id=created_by,
+        )
+    if container_exists and not replace_existing:
+        return PublishableEntityVersion.objects.get(
+            entity_id=container.container_pk,
+            version_num=container.draft_version_num,
+        )
+    return authoring_api.create_next_container_version(
+        container.container_pk,
+        title=title,
+        entity_rows=[
+            authoring_api.ContainerEntityRow(entity_pk=child.entity_id, version_pk=None)
+            for child in children
+        ],
+        created=created_at,
+        created_by=created_by,
+        container_version_cls=ContainerVersion,
+    ).publishable_entity_version
+
+
+def _migrate_component(
+    *,
+    content_by_filename: dict[str, int],
+    source_key: UsageKey,
+    olx: str,
+    target_package_id: int,
+    target_library_key: LibraryLocatorV2,
+    replace_existing: bool,
+    created_by: int,
+    created_at: datetime,
+) -> PublishableEntityVersion | None:
+    """
+    Create, update, or replace a component in a library based on a source key and OLX.
+
+    (We assume that the destination is a library rather than some other future kind of learning
+     package, but let's keep than an internal assumption.)
+    """
+    component_type = authoring_api.get_or_create_component_type("xblock.v1", source_key.block_type)
+    # mypy thinks LibraryUsageLocatorV2 is abstract. It's not.
+    target_key = LibraryUsageLocatorV2(  # type: ignore[abstract]
+        target_library_key, source_key.block_type, _slugify_source_usage_key(source_key)
+    )
+    try:
+        component = authoring_api.get_components(target_package_id).get(
+            component_type=component_type,
+            local_key=source_key.block_id,
+        )
+        component_existed = True
+    except Component.DoesNotExist:
+        component_existed = False
+        try:
+            libraries_api.validate_can_add_block_to_library(
+                target_library_key, target_key.block_type, target_key.block_id
+            )
+        except libraries_api.IncompatibleTypesError as e:
+            log.error(f"Error validating block for library {target_library_key}: {e}")
+            return None
+        component = authoring_api.create_component(
+            target_package_id,
+            component_type=component_type,
+            local_key=target_key.block_id,
+            created=created_at,
+            created_by=created_by,
+        )
+    if component_existed and not replace_existing:
+        return component.versioning.draft.publishable_entity_version
+    component_version = libraries_api.set_library_block_olx(target_key, new_olx_str=olx)
+    for filename, content_pk in content_by_filename.items():
+        filename_no_ext, _ = os.path.splitext(filename)
+        if filename_no_ext not in olx:
+            continue
+        new_path = f"static/{filename}"
+        try:
+            authoring_api.create_component_version_content(component_version.pk, content_pk, key=filename)
+        except IntegrityError:
+            pass  # Content already exists
+    return component_version.publishable_entity_version
+
+
+def _slugify_source_usage_key(key: UsageKey) -> str:
+    """
+    Return an appropriate slug (aka block_id, aka container_id) for the target entity.
+
+    Mix the legacy source context (course/library) information with the source block_id,
+    thus ensuring that migrations of two blocks with the same id from different source
+    contexts will not collide.
+
+    Note: We don't need to factor in block_type, because the target keys already do that.
+    Note: Slugs can't have plus signs, which are normally how legacy keys are delimted.
+
+    @@TODO -- Is this good enough? Conflicts are technically possible if a user has manually
+    formatted the key this way, but that seems super unlikely to happen by accident, right ... ?
+    """
+    if isinstance(key, LibraryUsageLocator):
+        return f"{key.org}.{key.library_key}.{key.block_id}"
+    elif isinstance(key, BlockUsageLocator):
+        return f"{key.org}.{key.course}.{key.run}.{key.block_id}"
+    else:
+        raise ValueError(
+            f"Unexpected source usage key: {key}. Expected legacy course or library usage locator."
+        )
diff --git a/cms/envs/common.py b/cms/envs/common.py
index 13811d2a1321..86982b08585c 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -1496,6 +1496,7 @@
     'openedx.core.djangoapps.course_groups',  # not used in cms (yet), but tests run
     'cms.djangoapps.xblock_config.apps.XBlockConfig',
     'cms.djangoapps.export_course_metadata.apps.ExportCourseMetadataConfig',
+    'cms.djangoapps.modulestore_migrator',
 
     # New (Learning-Core-based) XBlock runtime
     'openedx.core.djangoapps.xblock.apps.StudioXBlockAppConfig',
diff --git a/cms/urls.py b/cms/urls.py
index 805a38744a56..c60b56c3bd49 100644
--- a/cms/urls.py
+++ b/cms/urls.py
@@ -141,8 +141,8 @@
     # rest api for course import/export
     path('api/courses/', include('cms.djangoapps.contentstore.api.urls', namespace='courses_api')
          ),
-    path('api/import_from_modulestore/',
-         include('cms.djangoapps.import_from_modulestore.views.urls', namespace='import_from_modulestore_api')),
+    path('api/modulestore_migrator/',
+         include('cms.djangoapps.modulestore_migrator.rest_api.urls', namespace='modulestore_migrator_api')),
     re_path(fr'^export/{COURSELIKE_KEY_PATTERN}$', contentstore_views.export_handler,
             name='export_handler'),
     re_path(fr'^export_output/{COURSELIKE_KEY_PATTERN}$', contentstore_views.export_output_handler,
diff --git a/mypy.ini b/mypy.ini
index 72937e1034c4..982e500b3a93 100644
--- a/mypy.ini
+++ b/mypy.ini
@@ -9,6 +9,7 @@ files =
     cms/lib/xblock/upstream_sync.py,
     cms/lib/xblock/upstream_sync_container.py,
     cms/djangoapps/contentstore/rest_api/v2/views/downstreams.py,
+    cms/djangoapps/modulestore_migrator,
     openedx/core/djangoapps/content/learning_sequences,
     # FIXME: need to solve type issues and add 'search' app here:
     # openedx/core/djangoapps/content/search,
diff --git a/openedx/core/types/user.py b/openedx/core/types/user.py
index 9eb63edba358..e680a33b42ae 100644
--- a/openedx/core/types/user.py
+++ b/openedx/core/types/user.py
@@ -7,4 +7,5 @@
 
 import django.contrib.auth.models
 
+AuthUser: t.TypeAlias = django.contrib.auth.models.User
 User: t.TypeAlias = django.contrib.auth.models.User | django.contrib.auth.models.AnonymousUser

From f61df276637e154b5f2d69a7e689361c640d1529 Mon Sep 17 00:00:00 2001
From: Kyle McCormick <kyle@axim.org>
Date: Wed, 11 Jun 2025 13:30:56 -0400
Subject: [PATCH 07/40] feat: add admin interface

---
 cms/djangoapps/modulestore_migrator/admin.py  | 187 ++++++++++++++++++
 cms/djangoapps/modulestore_migrator/api.py    |  20 +-
 .../0002_source_forwardedby_blank.py          |  19 ++
 cms/djangoapps/modulestore_migrator/models.py |  34 +++-
 4 files changed, 247 insertions(+), 13 deletions(-)
 create mode 100644 cms/djangoapps/modulestore_migrator/admin.py
 create mode 100644 cms/djangoapps/modulestore_migrator/migrations/0002_source_forwardedby_blank.py

diff --git a/cms/djangoapps/modulestore_migrator/admin.py b/cms/djangoapps/modulestore_migrator/admin.py
new file mode 100644
index 000000000000..fb61ecce8819
--- /dev/null
+++ b/cms/djangoapps/modulestore_migrator/admin.py
@@ -0,0 +1,187 @@
+"""
+A nice little admin interface for migrating courses and libraries from modulstore to Learning Core.
+"""
+import logging
+
+from django import forms
+from django.contrib import admin, messages
+from django.contrib.admin.helpers import ActionForm
+from django.db import models
+
+
+from opaque_keys import InvalidKeyError
+from opaque_keys.edx.locator import LibraryCollectionLocator, LibraryLocatorV2
+
+from openedx.core.types.http import AuthenticatedHttpRequest
+
+from . import api
+from .data import CompositionLevel
+from .models import ModulestoreSource, ModulestoreMigration, ModulestoreBlockSource, ModulestoreBlockMigration
+
+
+log = logging.getLogger(__name__)
+
+
+class StartMigrationTaskForm(ActionForm):
+    """
+    Params for start_migration_task admin adtion, displayed next the "Go" button.
+    """
+    target_key = forms.CharField(label="Target library or collection key:", required=False)
+    replace_existing = forms.BooleanField(label="Replace existing content", required=False)
+    composition_level = forms.ChoiceField(
+        label="Aggregate up to:", choices=CompositionLevel.supported_choices, required=False
+    )
+
+
+class ModulestoreMigrationInline(admin.TabularInline):
+    """
+    Readonly table within the ModulestoreSource; each row is a Migration from this Source
+    """
+    model = ModulestoreMigration
+    fk_name = "source"
+    readonly_fields = (
+        "target",
+        "target_collection",
+        "task_status",
+        "composition_level",
+        "replace_existing",
+        "change_log",
+        "staged_content",
+    )
+    list_display = (
+        "id",
+        "target",
+        "target_collection",
+        "task_status",
+        "task_status__state",
+        "composition_level",
+        "replace_existing",
+        "change_log",
+        "staged_content",
+    )
+
+
+class ModulestoreBlockSourceInline(admin.TabularInline):
+    model = ModulestoreBlockSource
+    fk_name = "overall_source"
+    readonly_fields = (
+        "key",
+        "forwarded_by"
+    )
+
+
+@admin.register(ModulestoreSource)
+class ModulestoreSourceAdmin(admin.ModelAdmin):
+    """
+    Admin interface for source legacy libraries and courses.
+    """
+    readonly_fields = ("forwarded_by",)
+    list_display = ("id", "key", "forwarded_by")
+    actions = ["start_migration_task"]
+    action_form = StartMigrationTaskForm
+    inlines = [ModulestoreMigrationInline, ModulestoreBlockSourceInline]
+
+    @admin.action(description="Start migration for selected sources")
+    def start_migration_task(
+        self,
+        request: AuthenticatedHttpRequest,
+        queryset: models.QuerySet[ModulestoreSource],
+    ) -> None:
+        """
+        Start a migration for each selected source
+        """
+        form = StartMigrationTaskForm(request.POST)
+        if not form.is_valid():
+            # @@TODO Better messaging of form errors
+            messages.add_message(request, messages.ERROR, f"Invalid action params: {form.errors}")
+        target_key_string = form.cleaned_data['target_key']
+        if not target_key_string:
+            messages.add_message(request, messages.ERROR, "Target key is required")
+            return
+        try:
+            target_library_key = LibraryLocatorV2.from_string(target_key_string)
+            target_collection_slug = None
+        except InvalidKeyError:
+            try:
+                target_collection_key = LibraryCollectionLocator.from_string(target_key_string)
+                target_library_key = target_collection_key.lib_key
+                target_collection_slug = target_collection_key.collection_id
+            except InvalidKeyError:
+                messages.add_message(request, messages.ERROR, f"Invalid target key: {target_key_string}")
+                return
+        started = 0
+        total = 0
+        for source in queryset:
+            total += 1
+            try:
+                api.start_migration_to_library(
+                    user=request.user,
+                    source_key=source.key,
+                    target_library_key=target_library_key,
+                    target_collection_slug=target_collection_slug,
+                    composition_level=form.cleaned_data['composition_level'],
+                    replace_existing=form.cleaned_data['replace_existing'],
+                    forward_source_to_target=False,
+                )
+            except Exception as exc:  # pylint: disable=broad-except
+                message = f"Failed to start migration {source.key} -> {target_key_string}"
+                messages.add_message(request, messages.ERROR, f"{message}: {exc}")
+                log.exception(message)
+                continue
+            started += 1
+        click_in = "Click into the source objects to see migration details."
+
+        if not started:
+            messages.add_message(request, messages.WARNING, f"Failed to start {total} migration(s).")
+        if started < total:
+            messages.add_message(request, messages.WARNING, f"Started {started} of {total} migration(s). {click_in}")
+        else:
+            messages.add_message(request, messages.INFO, f"Started {started} migration(s). {click_in}")
+
+
+class ModulestoreBlockMigrationInline(admin.TabularInline):
+    """
+    Readonly table witin the Migration admin; each row is a block
+    """
+    model = ModulestoreBlockMigration
+    fk_name = "overall_migration"
+    readonly_fields = (
+        "source",
+        "target",
+        "change_log_record",
+    )
+    list_display = ("id", *readonly_fields)
+
+
+@admin.register(ModulestoreMigration)
+class ModulestoreMigrationAdmin(admin.ModelAdmin):
+    """
+    Readonly admin page for viewing Migrations
+    """
+    readonly_fields = (
+        "source",
+        "target",
+        "target_collection",
+        "task_status",
+        "task_state",
+        "composition_level",
+        "replace_existing",
+        "change_log",
+        "staged_content",
+    )
+    list_display = (
+        "id",
+        "source",
+        "target",
+        "target_collection",
+        "task_status",
+        "task_state",
+        "composition_level",
+        "replace_existing",
+        "change_log",
+        "staged_content",
+    )
+    inlines = [ModulestoreBlockMigrationInline]
+
+    def task_state(self, obj: ModulestoreMigration):
+        return obj.task_status.state if obj.task_status else "(No status)"
diff --git a/cms/djangoapps/modulestore_migrator/api.py b/cms/djangoapps/modulestore_migrator/api.py
index ba13706bda11..cada06824887 100644
--- a/cms/djangoapps/modulestore_migrator/api.py
+++ b/cms/djangoapps/modulestore_migrator/api.py
@@ -1,7 +1,7 @@
 """
 API for migration from modulestore to learning core
 """
-from opaque_keys.edx.locator import LibraryLocatorV2, LibraryCollectionLocator
+from opaque_keys.edx.locator import LibraryLocatorV2
 from opaque_keys.edx.keys import LearningContextKey
 from openedx_learning.api.authoring import get_collection
 
@@ -19,10 +19,11 @@
 
 
 def start_migration_to_library(
-    *
-    source_key: LearningContextKey,
-    target_key: LibraryLocatorV2 | LibraryCollectionLocator,
+    *,
     user: AuthUser,
+    source_key: LearningContextKey,
+    target_library_key: LibraryLocatorV2,
+    target_collection_slug: str | None = None,
     composition_level: CompositionLevel,
     replace_existing: bool,
     forward_source_to_target: bool,  # @@TODO - Set to False for now. Explain this better.
@@ -31,16 +32,15 @@ def start_migration_to_library(
     Import a course or legacy library into a V2 library (or, a collection within a V2 library).
     """
     source, _ = ModulestoreSource.objects.get_or_create(key=source_key)
-    target_library = get_library(
-        target_key.lib_key if isinstance(target_key, LibraryCollectionLocator) else target_key
-    )
+    target_library = get_library(target_library_key)
     if not (target_package_id := target_library.learning_package_id):
         raise ValueError(
-            f"Cannot import {source_key} into library at {target_key} because the "
+            f"Cannot import {source_key} into library at {target_library_key} because the "
             "library is not connected to a learning package"
         )
-    if isinstance(target_key, LibraryCollectionLocator):
-        target_collection_id = get_collection(target_package_id, target_key.collection_id).id
+    target_collection_id = None
+    if target_collection_slug:
+        target_collection_id = get_collection(target_package_id, target_collection_slug).id
     tasks.migrate_from_modulestore.delay(
         user_id=user.id,
         source_pk=source.id,
diff --git a/cms/djangoapps/modulestore_migrator/migrations/0002_source_forwardedby_blank.py b/cms/djangoapps/modulestore_migrator/migrations/0002_source_forwardedby_blank.py
new file mode 100644
index 000000000000..4d2d802ca788
--- /dev/null
+++ b/cms/djangoapps/modulestore_migrator/migrations/0002_source_forwardedby_blank.py
@@ -0,0 +1,19 @@
+# Generated by Django 4.2.22 on 2025-06-11 15:12
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('modulestore_migrator', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='modulestoresource',
+            name='forwarded_by',
+            field=models.ForeignKey(blank=True, help_text='If set, the system will forward references of this source over to the target of this migration', null=True, on_delete=django.db.models.deletion.SET_NULL, to='modulestore_migrator.modulestoremigration'),
+        ),
+    ]
diff --git a/cms/djangoapps/modulestore_migrator/models.py b/cms/djangoapps/modulestore_migrator/models.py
index 24f1c358d60d..029c54ed449d 100644
--- a/cms/djangoapps/modulestore_migrator/models.py
+++ b/cms/djangoapps/modulestore_migrator/models.py
@@ -35,10 +35,16 @@ class ModulestoreSource(models.Model):
     forwarded_by = models.ForeignKey(
         'modulestore_migrator.ModulestoreMigration',
         null=True,
+        blank=True,
         on_delete=models.SET_NULL,
         help_text=_('If set, the system will forward references of this source over to the target of this migration')
     )
 
+    def __str__(self):
+        return f"{self.__class__.__name__}('{self.key}')"
+
+    __repr__ = __str__
+
 
 class ModulestoreMigration(models.Model):
     """
@@ -108,10 +114,17 @@ class ModulestoreMigration(models.Model):
     )
 
     def __str__(self):
-        return f'{self.__class__.__name__} #{self.pk}: {self.source_key} → {self.target}'
+        return (
+            f"{self.__class__.__name__} #{self.pk}: "
+            f"{self.source.key} → {self.target_collection or self.target}"
+        )
 
     def __repr__(self):
-        return f"{self.__class__.__name__}(pk={self.pk}, source_key='{self.source_key}', target='{self.target}')"
+        return (
+            f"{self.__class__.__name__}("
+            f"id={self.id}, source='{self.source}',"
+            f"target='{self.target_collection or self.target}')"
+        )
 
 
 class ModulestoreBlockSource(TimeStampedModel):
@@ -136,6 +149,11 @@ class ModulestoreBlockSource(TimeStampedModel):
         ),
     )
 
+    def __str__(self):
+        return f"{self.__class__.__name__}('{self.key}')"
+
+    __repr__ = __str__
+
 
 class ModulestoreBlockMigration(TimeStampedModel):
     """
@@ -176,4 +194,14 @@ class Meta:
         ]
 
     def __str__(self):
-        return f'{self.source.source_key} → {self.target}'
+        return (
+            f"{self.__class__.__name__} #{self.pk}: "
+            f"{self.source_key} → {self.target}"
+        )
+
+    def __repr__(self):
+        return (
+            f"{self.__class__.__name__}("
+            f"id={self.id}, source='{self.source}',"
+            f"target='{self.target}')"
+        )

From e843b100f7c98e02ad29e62bf6a141b1c2ade4eb Mon Sep 17 00:00:00 2001
From: Kyle McCormick <kyle@axim.org>
Date: Wed, 11 Jun 2025 15:43:23 -0400
Subject: [PATCH 08/40] feat: better task debug info on the admin interface

---
 cms/djangoapps/modulestore_migrator/admin.py | 93 ++++++++++----------
 1 file changed, 45 insertions(+), 48 deletions(-)

diff --git a/cms/djangoapps/modulestore_migrator/admin.py b/cms/djangoapps/modulestore_migrator/admin.py
index fb61ecce8819..97120af1ac10 100644
--- a/cms/djangoapps/modulestore_migrator/admin.py
+++ b/cms/djangoapps/modulestore_migrator/admin.py
@@ -11,6 +11,7 @@
 
 from opaque_keys import InvalidKeyError
 from opaque_keys.edx.locator import LibraryCollectionLocator, LibraryLocatorV2
+from user_tasks.models import UserTaskStatus
 
 from openedx.core.types.http import AuthenticatedHttpRequest
 
@@ -33,35 +34,52 @@ class StartMigrationTaskForm(ActionForm):
     )
 
 
+def task_status_details(obj: ModulestoreMigration) -> str:
+    """
+    Return details about the status of the migration, falling back to `task_status.state` if no details.
+    """
+    if obj.task_status.state == UserTaskStatus.FAILED:
+        # Calling fail(msg) from a task should automatically generates an "Error" artifact with that msg.
+        # https://django-user-tasks.readthedocs.io/en/latest/user_tasks.html#user_tasks.models.UserTaskStatus.fail
+        if error_artifacts := obj.task_status.artifacts.filter(name="Error"):
+            if error_text := error_artifacts.order_by("-created").first().text:
+                return error_text
+    elif obj.task_status.state == UserTaskStatus.SUCCEEDED:
+        return f"Successfully migrated {obj.block_migrations.count()} blocks"
+    return obj.task_status.state
+
+
+migration_admin_fields = (
+    "target",
+    "target_collection",
+    "task_status",
+    # The next line works, but django-stubs incorrectly thinks that these should all be strings,
+    # so we will need to use type:ignore below.
+    task_status_details,
+    "composition_level",
+    "replace_existing",
+    "change_log",
+    "staged_content",
+)
+
+
 class ModulestoreMigrationInline(admin.TabularInline):
     """
-    Readonly table within the ModulestoreSource; each row is a Migration from this Source
+    Readonly table within the ModulestoreSource page; each row is a Migration from this Source.
     """
     model = ModulestoreMigration
     fk_name = "source"
-    readonly_fields = (
-        "target",
-        "target_collection",
-        "task_status",
-        "composition_level",
-        "replace_existing",
-        "change_log",
-        "staged_content",
-    )
-    list_display = (
-        "id",
-        "target",
-        "target_collection",
-        "task_status",
-        "task_status__state",
-        "composition_level",
-        "replace_existing",
-        "change_log",
-        "staged_content",
-    )
+    show_change_link = True
+    readonly_fields = migration_admin_fields  # type: ignore[assignment]
+
+    def has_add_permission(self, _request, _obj):
+        return False
 
 
 class ModulestoreBlockSourceInline(admin.TabularInline):
+    """
+    Readonly table within the ModulestoreSource page; each row is a BlockSource.
+    """
     model = ModulestoreBlockSource
     fk_name = "overall_source"
     readonly_fields = (
@@ -69,6 +87,9 @@ class ModulestoreBlockSourceInline(admin.TabularInline):
         "forwarded_by"
     )
 
+    def has_add_permission(self, _request, _obj):
+        return False
+
 
 @admin.register(ModulestoreSource)
 class ModulestoreSourceAdmin(admin.ModelAdmin):
@@ -158,30 +179,6 @@ class ModulestoreMigrationAdmin(admin.ModelAdmin):
     """
     Readonly admin page for viewing Migrations
     """
-    readonly_fields = (
-        "source",
-        "target",
-        "target_collection",
-        "task_status",
-        "task_state",
-        "composition_level",
-        "replace_existing",
-        "change_log",
-        "staged_content",
-    )
-    list_display = (
-        "id",
-        "source",
-        "target",
-        "target_collection",
-        "task_status",
-        "task_state",
-        "composition_level",
-        "replace_existing",
-        "change_log",
-        "staged_content",
-    )
-    inlines = [ModulestoreBlockMigrationInline]
-
-    def task_state(self, obj: ModulestoreMigration):
-        return obj.task_status.state if obj.task_status else "(No status)"
+    readonly_fields = ("source", *migration_admin_fields)  # type: ignore[assignment]
+    list_display = ("id", "source", *migration_admin_fields)  # type: ignore[assignment]
+    inlines = [ModulestoreBlockMigrationInline]
\ No newline at end of file

From f5549fe3b41b29155ba025a768c90915ad887d9d Mon Sep 17 00:00:00 2001
From: Kyle McCormick <kyle@axim.org>
Date: Wed, 11 Jun 2025 17:53:17 -0400
Subject: [PATCH 09/40] fix: fixes to tasks and admin -- happy path works now

---
 cms/djangoapps/modulestore_migrator/admin.py  | 16 ++---
 cms/djangoapps/modulestore_migrator/models.py |  2 +-
 cms/djangoapps/modulestore_migrator/tasks.py  | 66 ++++++++++++-------
 3 files changed, 51 insertions(+), 33 deletions(-)

diff --git a/cms/djangoapps/modulestore_migrator/admin.py b/cms/djangoapps/modulestore_migrator/admin.py
index 97120af1ac10..ffc99efc3f90 100644
--- a/cms/djangoapps/modulestore_migrator/admin.py
+++ b/cms/djangoapps/modulestore_migrator/admin.py
@@ -36,17 +36,18 @@ class StartMigrationTaskForm(ActionForm):
 
 def task_status_details(obj: ModulestoreMigration) -> str:
     """
-    Return details about the status of the migration, falling back to `task_status.state` if no details.
+    Return the state and, if available, details of the status of the migration.
     """
+    details: str | None = None
     if obj.task_status.state == UserTaskStatus.FAILED:
         # Calling fail(msg) from a task should automatically generates an "Error" artifact with that msg.
         # https://django-user-tasks.readthedocs.io/en/latest/user_tasks.html#user_tasks.models.UserTaskStatus.fail
         if error_artifacts := obj.task_status.artifacts.filter(name="Error"):
             if error_text := error_artifacts.order_by("-created").first().text:
-                return error_text
+                details = error_text
     elif obj.task_status.state == UserTaskStatus.SUCCEEDED:
-        return f"Successfully migrated {obj.block_migrations.count()} blocks"
-    return obj.task_status.state
+        details = f"Migrated {obj.block_migrations.count()} blocks"
+    return f"{obj.task_status.state}: {details}" if details else obj.task_status.state
 
 
 migration_admin_fields = (
@@ -71,6 +72,7 @@ class ModulestoreMigrationInline(admin.TabularInline):
     fk_name = "source"
     show_change_link = True
     readonly_fields = migration_admin_fields  # type: ignore[assignment]
+    ordering = ("-task_status__created",)
 
     def has_add_permission(self, _request, _obj):
         return False
@@ -112,9 +114,7 @@ def start_migration_task(
         Start a migration for each selected source
         """
         form = StartMigrationTaskForm(request.POST)
-        if not form.is_valid():
-            # @@TODO Better messaging of form errors
-            messages.add_message(request, messages.ERROR, f"Invalid action params: {form.errors}")
+        form.is_valid()
         target_key_string = form.cleaned_data['target_key']
         if not target_key_string:
             messages.add_message(request, messages.ERROR, "Target key is required")
@@ -181,4 +181,4 @@ class ModulestoreMigrationAdmin(admin.ModelAdmin):
     """
     readonly_fields = ("source", *migration_admin_fields)  # type: ignore[assignment]
     list_display = ("id", "source", *migration_admin_fields)  # type: ignore[assignment]
-    inlines = [ModulestoreBlockMigrationInline]
\ No newline at end of file
+    inlines = [ModulestoreBlockMigrationInline]
diff --git a/cms/djangoapps/modulestore_migrator/models.py b/cms/djangoapps/modulestore_migrator/models.py
index 029c54ed449d..5a07c2e2e562 100644
--- a/cms/djangoapps/modulestore_migrator/models.py
+++ b/cms/djangoapps/modulestore_migrator/models.py
@@ -196,7 +196,7 @@ class Meta:
     def __str__(self):
         return (
             f"{self.__class__.__name__} #{self.pk}: "
-            f"{self.source_key} → {self.target}"
+            f"{self.source.key} → {self.target}"
         )
 
     def __repr__(self):
diff --git a/cms/djangoapps/modulestore_migrator/tasks.py b/cms/djangoapps/modulestore_migrator/tasks.py
index 487701635b83..e8577ead6526 100644
--- a/cms/djangoapps/modulestore_migrator/tasks.py
+++ b/cms/djangoapps/modulestore_migrator/tasks.py
@@ -19,8 +19,7 @@
 from lxml.etree import _ElementTree as XmlTree
 from opaque_keys.edx.keys import CourseKey, UsageKey
 from opaque_keys.edx.locator import (
-    CourseLocator, BlockUsageLocator,
-    LibraryLocator, LibraryUsageLocator,
+    CourseLocator, LibraryLocator,
     LibraryLocatorV2, LibraryUsageLocatorV2, LibraryContainerLocator
 )
 from openedx_learning.api import authoring as authoring_api
@@ -110,7 +109,7 @@ def migrate_from_modulestore(
     set_code_owner_attribute_from_module(__name__)
 
     status: UserTaskStatus = self.status
-    status.set_state(MigrationStep.VALIDATING_INPUT)
+    status.set_state(MigrationStep.VALIDATING_INPUT.value)
     try:
         source = ModulestoreSource.objects.get(pk=source_pk)
         target_package = LearningPackage.objects.get(pk=target_package_pk)
@@ -139,7 +138,7 @@ def migrate_from_modulestore(
     )
     status.increment_completed_steps()
 
-    status.set_state(MigrationStep.CANCELLING_OLD)
+    status.set_state(MigrationStep.CANCELLING_OLD.value)
     # In order to prevent a user from accidentally starting a bunch of identical import tasks...
     migrations_to_cancel = ModulestoreMigration.objects.filter(
         # get all Migration tasks by this user with the same source and target
@@ -172,7 +171,7 @@ def migrate_from_modulestore(
         return
     status.increment_completed_steps()
 
-    status.set_state(MigrationStep.STAGING)
+    status.set_state(MigrationStep.STAGING.value)
     staged_content = staging_api.stage_xblock_temporarily(
         block=legacy_root,
         user_id=status.user.pk,
@@ -181,7 +180,7 @@ def migrate_from_modulestore(
     migration.staged_content = staged_content
     status.increment_completed_steps()
 
-    status.set_state(MigrationStep.PARSING)
+    status.set_state(MigrationStep.PARSING.value)
     parser = etree.XMLParser(strip_cdata=False)
     try:
         root_node = etree.fromstring(staged_content.olx, parser=parser)
@@ -189,7 +188,7 @@ def migrate_from_modulestore(
         status.fail(f"Failed to parse source OLX (from staged content with id = {staged_content.id}): {exc}")
     status.increment_completed_steps()
 
-    status.set_state(MigrationStep.IMPORTING_ASSETS)
+    status.set_state(MigrationStep.IMPORTING_ASSETS.value)
     content_by_filename: dict[str, int] = {}
     now = datetime.now(tz=timezone.utc)
     for staged_content_file_data in staging_api.get_staged_content_static_files(staged_content.id):
@@ -212,7 +211,7 @@ def migrate_from_modulestore(
         ).id
     status.increment_completed_steps()
 
-    status.set_state(MigrationStep.IMPORTING_STRUCTURE)
+    status.set_state(MigrationStep.IMPORTING_STRUCTURE.value)
     with authoring_api.bulk_draft_changes_for(migration.target.id) as change_log:
         root_migrated_node = _migrate_node(
             content_by_filename=content_by_filename,
@@ -228,11 +227,19 @@ def migrate_from_modulestore(
     migration.change_log = change_log
     status.increment_completed_steps()
 
-    status.set_state(MigrationStep.UNSTAGING)
+    status.set_state(MigrationStep.UNSTAGING.value)
     staged_content.delete()
     status.increment_completed_steps()
 
-    status.set_state(MigrationStep.MAPPING_OLD_TO_NEW)
+    # @@TODO We currently do the mapping in bulk in order to reduce the number of DB queries.
+    #        But, as a user, it means that there are no artifacts (ModulestoreBlockMigrations)
+    #        to be shown as the structure is being imported, which takes can take several minutes.
+    #        Would be better to, instead, create each ModulestoreBlockSource and
+    #        ModulestoreBlockMigration as we create its PublisahbleEntity(Version)? If
+    #        we did this, we'd want to make sure that the objects are actually visible
+    #        to the user mid-import (via django admin, or the library interface, or even just as
+    #        as a "progress bar" field in the REST API), otherwise this would be pointless.
+    status.set_state(MigrationStep.MAPPING_OLD_TO_NEW.value)
     block_source_keys_to_target_vers = dict(root_migrated_node.all_source_to_target_pairs())
     ModulestoreBlockSource.objects.bulk_create(
         [
@@ -247,23 +254,27 @@ def migrate_from_modulestore(
     block_source_keys_to_sources: dict[UsageKey, ModulestoreBlockSource] = {
         block_source.key: block_source for block_source in source.blocks.all()
     }
-    block_target_pks_to_change_log_record_pks: dict[int, int] = dict(
-        change_log.records.values_list("target_entity_id", "id")
-    )
+    # @@TODO We get an error when we try to use the change_log, because it hasn't
+    #        been saved yet. Until we fix this, we won't be able to set
+    #        ModuleBlockMigration.change_log_record.
+    # block_target_pks_to_change_log_record_pks: dict[int, int] = dict(
+    #     change_log.records.values_list("target_entity_id", "id")
+    # )
     block_migrations = ModulestoreBlockMigration.objects.bulk_create(
         [
             ModulestoreBlockMigration(
                 overall_migration=migration,
                 source=block_source_keys_to_sources[block_source_key],
                 target_id=block_target_ver.entity_id,
-                change_log_record_id=block_target_pks_to_change_log_record_pks[block_target_ver.entity_id],
+                # @@TODO See above
+                # change_log_record_id=block_target_pks_to_change_log_record_pks[block_target_ver.entity_id],
             )
             for block_source_key, block_target_ver in block_source_keys_to_target_vers.items()
         ],
     )
     status.increment_completed_steps()
 
-    status.set_state(MigrationStep.FORWARDING)
+    status.set_state(MigrationStep.FORWARDING.value)
     if forward_source_to_target:
         block_sources_to_block_migrations = {
             block_migration.source: block_migration for block_migration in block_migrations
@@ -274,9 +285,12 @@ def migrate_from_modulestore(
         source.forwarded_by = migration
     status.increment_completed_steps()
 
-    status.set_state(MigrationStep.POPULATING_COLLECTION)
+    status.set_state(MigrationStep.POPULATING_COLLECTION.value)
     if target_collection:
-        block_target_pks = list(block_target_pks_to_change_log_record_pks.keys())
+        # @@TODO This dict (block_target_pks_to_change_log_record_pks) was based on the change_log calculation
+        #        above which is commented out. In order to add to target_collection, we either need to fix the
+        #        change_log query above, or we need to calculate these target_pks some other way
+        block_target_pks: list[int] = []  # list(block_target_pks_to_change_log_record_pks.keys())
         authoring_api.add_to_collection(
             learning_package_id=target_package_pk,
             key=target_collection.key,
@@ -293,7 +307,7 @@ class _MigratedNode:
 
     Note that target_version can equal None even when there migrated children.
     This happens, particularly, if the node is above the requested composition level
-    but has descendents which are at or below said level.
+    but has descendents which are at or below sad level.
     """
     source_to_target: tuple[UsageKey, PublishableEntityVersion] | None
     children: list[_MigratedNode]
@@ -488,7 +502,7 @@ def _migrate_component(
     try:
         component = authoring_api.get_components(target_package_id).get(
             component_type=component_type,
-            local_key=source_key.block_id,
+            local_key=target_key.block_id,
         )
         component_existed = True
     except Component.DoesNotExist:
@@ -516,7 +530,9 @@ def _migrate_component(
             continue
         new_path = f"static/{filename}"
         try:
-            authoring_api.create_component_version_content(component_version.pk, content_pk, key=filename)
+            authoring_api.create_component_version_content(component_version.pk, content_pk, key=new_path)
+        # @@TODO is there a way to determine content already exists that doesn't run the risk
+        #        of swallowing other, unexpected IntegrityErrors?
         except IntegrityError:
             pass  # Content already exists
     return component_version.publishable_entity_version
@@ -535,11 +551,13 @@ def _slugify_source_usage_key(key: UsageKey) -> str:
 
     @@TODO -- Is this good enough? Conflicts are technically possible if a user has manually
     formatted the key this way, but that seems super unlikely to happen by accident, right ... ?
+    Conflicts are also technically posssible for
     """
-    if isinstance(key, LibraryUsageLocator):
-        return f"{key.org}.{key.library_key}.{key.block_id}"
-    elif isinstance(key, BlockUsageLocator):
-        return f"{key.org}.{key.course}.{key.run}.{key.block_id}"
+    context_key = key.course_key
+    if isinstance(context_key, LibraryLocator):
+        return f"{context_key.org}__{context_key.library}__{key.block_id}"
+    elif isinstance(context_key, CourseKey):
+        return f"{context_key.org}__{context_key.course}__{context_key.run}__{key.block_id}"
     else:
         raise ValueError(
             f"Unexpected source usage key: {key}. Expected legacy course or library usage locator."

From f12f22bdfe0c997b17361a5dfc7a1f76bf1b9573 Mon Sep 17 00:00:00 2001
From: Kyle McCormick <kyle@axim.org>
Date: Tue, 17 Jun 2025 10:24:49 -0400
Subject: [PATCH 10/40] fix: Create ContainerVersion subclassses too

This commit stops this error:

   ContainerVersion.unitversion.RelatedObjectDoesNotExist: ContainerVersion has no unitversion.

from happening when accessing migrated content.

You will have to re-migrate the content to fix. You may even have to discard the
original broken migrated content.
---
 cms/djangoapps/modulestore_migrator/tasks.py  |  2 +-
 .../api/container_metadata.py                 | 19 +++++++++++++++++++
 .../content_libraries/api/containers.py       | 13 ++++++++++++-
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/cms/djangoapps/modulestore_migrator/tasks.py b/cms/djangoapps/modulestore_migrator/tasks.py
index e8577ead6526..f8ae790f019f 100644
--- a/cms/djangoapps/modulestore_migrator/tasks.py
+++ b/cms/djangoapps/modulestore_migrator/tasks.py
@@ -473,7 +473,7 @@ def _migrate_container(
         ],
         created=created_at,
         created_by=created_by,
-        container_version_cls=ContainerVersion,
+        container_version_cls=container_type.container_model_classes[1],
     ).publishable_entity_version
 
 
diff --git a/openedx/core/djangoapps/content_libraries/api/container_metadata.py b/openedx/core/djangoapps/content_libraries/api/container_metadata.py
index 65779fafb42b..6a73ea699b78 100644
--- a/openedx/core/djangoapps/content_libraries/api/container_metadata.py
+++ b/openedx/core/djangoapps/content_libraries/api/container_metadata.py
@@ -36,6 +36,25 @@ class ContainerType(Enum):
     Subsection = "subsection"
     Section = "section"
 
+    @property
+    def container_model_classes(self) -> tuple[type[Container], type[ContainerVersion]]:
+        """
+        Get the container, containerversion subclasses associated with this type.
+        @@TODO Is this what we want, a hard mapping between container_types and Container classes?
+          * If so, then expand on this pattern, so that all ContainerType logic is contained within
+            this class, and get rid of the match-case statements that are all over the content_libraries
+            app.
+          * If not, then figure out what to do instead.
+        """
+        match self:
+            case self.Unit:
+                return (Unit, UnitVersion)
+            case self.Subsection:
+                return (Subsection, SubsectionVersion)
+            case self.Section:
+                return (Section, SectionVersion)
+        raise TypeError(f"unexpected ContainerType: {self!r}")
+
     @property
     def olx_tag(self) -> str:
         """
diff --git a/openedx/core/djangoapps/content_libraries/api/containers.py b/openedx/core/djangoapps/content_libraries/api/containers.py
index 28f05a05723a..9417a886c293 100644
--- a/openedx/core/djangoapps/content_libraries/api/containers.py
+++ b/openedx/core/djangoapps/content_libraries/api/containers.py
@@ -23,7 +23,18 @@
     LIBRARY_CONTAINER_UPDATED,
 )
 from openedx_learning.api import authoring as authoring_api
-from openedx_learning.api.authoring_models import Container, ContainerVersion, Component
+from openedx_learning.api.authoring_models import (
+    Component,
+    ComponentVersion,
+    Container,
+    ContainerVersion,
+    Unit,
+    UnitVersion,
+    Subsection,
+    SubsectionVersion,
+    Section,
+    SectionVersion,
+)
 from openedx.core.djangoapps.content_libraries.api.collections import library_collection_locator
 
 from openedx.core.djangoapps.xblock.api import get_component_from_usage_key

From 1a4429bf46e1889ab3517c188f5475545786a6a2 Mon Sep 17 00:00:00 2001
From: Andrii <andrii.hantkovskyi@raccoongang.com>
Date: Fri, 13 Jun 2025 18:34:36 +0300
Subject: [PATCH 11/40] feat: add REST API for task creation & status retrieve

---
 cms/djangoapps/modulestore_migrator/api.py    |   2 +-
 .../rest_api/v0/serializers.py                |  92 ++++++++++++++
 .../modulestore_migrator/rest_api/v0/urls.py  |   4 +-
 .../modulestore_migrator/rest_api/v0/views.py | 118 ++++++++++++++++++
 4 files changed, 213 insertions(+), 3 deletions(-)
 create mode 100644 cms/djangoapps/modulestore_migrator/rest_api/v0/serializers.py
 create mode 100644 cms/djangoapps/modulestore_migrator/rest_api/v0/views.py

diff --git a/cms/djangoapps/modulestore_migrator/api.py b/cms/djangoapps/modulestore_migrator/api.py
index cada06824887..c11a1031d3bf 100644
--- a/cms/djangoapps/modulestore_migrator/api.py
+++ b/cms/djangoapps/modulestore_migrator/api.py
@@ -41,7 +41,7 @@ def start_migration_to_library(
     target_collection_id = None
     if target_collection_slug:
         target_collection_id = get_collection(target_package_id, target_collection_slug).id
-    tasks.migrate_from_modulestore.delay(
+    return tasks.migrate_from_modulestore.delay(
         user_id=user.id,
         source_pk=source.id,
         target_package_pk=target_package_id,
diff --git a/cms/djangoapps/modulestore_migrator/rest_api/v0/serializers.py b/cms/djangoapps/modulestore_migrator/rest_api/v0/serializers.py
new file mode 100644
index 000000000000..2d959411b01f
--- /dev/null
+++ b/cms/djangoapps/modulestore_migrator/rest_api/v0/serializers.py
@@ -0,0 +1,92 @@
+"""
+Serializers for the Course to Library Import API.
+"""
+
+from opaque_keys import InvalidKeyError
+from opaque_keys.edx.keys import LearningContextKey
+from opaque_keys.edx.locator import LibraryLocatorV2
+from rest_framework import serializers
+from user_tasks.serializers import StatusSerializer
+
+from cms.djangoapps.modulestore_migrator.data import CompositionLevel
+from cms.djangoapps.modulestore_migrator.models import ModulestoreMigration
+
+
+class ModulestoreMigrationSerializer(serializers.ModelSerializer):
+    """
+    Serializer for the course to library import creation API.
+    """
+
+    source = serializers.CharField(
+        help_text="The source course or legacy library key to import from.",
+        required=True,
+        source='source.key',
+    )
+    target = serializers.CharField(
+        help_text="The target library key to import into.",
+        required=True,
+    )
+    composition_level = serializers.ChoiceField(
+        help_text="The composition level to import the content at.",
+        choices=CompositionLevel.supported_choices(),
+        required=False,
+        default=CompositionLevel.Component.value,
+    )
+    replace_existing = serializers.BooleanField(
+        help_text="If true, replace existing content in the target library.",
+        required=False,
+        default=False,
+    )
+    target_collection_slug = serializers.CharField(
+        help_text="The target collection slug within the library to import into. Optional.",
+        required=False,
+        allow_blank=True,
+    )
+
+    class Meta:
+        model = ModulestoreMigration
+        fields = [
+            'source',
+            'target',
+            'target_collection_slug',
+            'composition_level',
+            'replace_existing',
+        ]
+
+    def get_fields(self):
+        fields = super().get_fields()
+        request = self.context.get('request')
+        if request and request.method != 'POST':
+            fields.pop('target', None)
+            fields.pop('target_collection_slug', None)
+        return fields
+
+    def validate_source(self, value):
+        """
+        Validate the source key format.
+        """
+        try:
+            return LearningContextKey.from_string(value)
+        except InvalidKeyError as exc:
+            raise serializers.ValidationError(f"Invalid source key: {str(exc)}") from exc
+
+    def validate_target(self, value):
+        """
+        Validate the target library key format.
+        """
+        try:
+            return LibraryLocatorV2.from_string(value)
+        except InvalidKeyError as exc:
+            raise serializers.ValidationError(f"Invalid target library key: {str(exc)}") from exc
+
+
+class StatusWithModulestoreMigrationSerializer(StatusSerializer):
+    """
+    Serializer for the import task status.
+    """
+
+    modulestoremigration = ModulestoreMigrationSerializer()
+
+    class Meta:
+        model = StatusSerializer.Meta.model
+        fields = [*StatusSerializer.Meta.fields, 'modulestoremigration']
diff --git a/cms/djangoapps/modulestore_migrator/rest_api/v0/urls.py b/cms/djangoapps/modulestore_migrator/rest_api/v0/urls.py
index eda8e0e3d43e..9f50f2a27e96 100644
--- a/cms/djangoapps/modulestore_migrator/rest_api/v0/urls.py
+++ b/cms/djangoapps/modulestore_migrator/rest_api/v0/urls.py
@@ -3,9 +3,9 @@
 """
 
 from rest_framework.routers import SimpleRouter
-# from .views import ImportViewSet  # @@TODO - re-anble this once API is fixed
+from .views import ImportViewSet
 
 ROUTER = SimpleRouter()
-# ROUTER.register(r'imports', ImportViewSet)
+ROUTER.register(r'imports', ImportViewSet)
 
 urlpatterns = ROUTER.urls
diff --git a/cms/djangoapps/modulestore_migrator/rest_api/v0/views.py b/cms/djangoapps/modulestore_migrator/rest_api/v0/views.py
new file mode 100644
index 000000000000..1c5cfdd89f3d
--- /dev/null
+++ b/cms/djangoapps/modulestore_migrator/rest_api/v0/views.py
@@ -0,0 +1,118 @@
+"""
+API v0 views.
+"""
+
+from edx_rest_framework_extensions.auth.jwt.authentication import JwtAuthentication
+from edx_rest_framework_extensions.auth.session.authentication import SessionAuthenticationAllowInactiveUser
+from rest_framework.permissions import IsAdminUser
+from user_tasks.models import UserTaskStatus
+from user_tasks.views import StatusViewSet
+
+from cms.djangoapps.modulestore_migrator.api import start_migration_to_library
+from openedx.core.lib.api.authentication import BearerAuthenticationAllowInactiveUser
+
+from .serializers import ModulestoreMigrationSerializer, StatusWithModulestoreMigrationSerializer
+
+
+class ImportViewSet(StatusViewSet):
+    """
+    Import course content from modulestore into a content library.
+
+    This viewset handles the import process, including creating the import task and
+    retrieving the status of the import task. Meant to be used by admin users only.
+
+    API Endpoints
+    ------------
+    POST /api/modulestore_migrator/v0/imports/
+        Start the import process.
+
+        Request body:
+            {
+                "source": "<source_course_key>",
+                "target": "<target_library>",
+                "composition_level": "<composition_level>",  # Optional, defaults to "component"
+                "target_collection_slug": "<target_collection_slug>",  # Optional
+                "replace_existing": "<boolean>"  # Optional, defaults to false
+            }
+
+        Example request:
+            {
+                "source": "course-v1:edX+DemoX+2014_T1",
+                "target": "library-v1:org1+lib_1",
+                "composition_level": "unit",
+                "replace_existing": true
+            }
+
+        Example response:
+            {
+                "name": migrate_from_modulestore",
+                "state": "Succeeded",
+                "state_text": "Succeeded",
+                "completed_steps": 11,
+                "total_steps": 11,
+                "attempts": 1,
+                "created": "2025-05-14T22:24:37.048539Z",
+                "modified": "2025-05-14T22:24:59.128068Z",
+                "artifacts": [],
+                "modulestoremigration": {
+                    "source": "course-v1:OpenedX+DemoX+DemoCourse",
+                    "composition_level": "unit",
+                    "replace_existing": true
+                }
+            }
+
+    GET /api/modulestore_migrator/v0/imports/<uuid>/
+        Get the status of the import task.
+
+        Example response:
+            {
+                "name": "migrate_from_modulestore",
+                "state": "Importing staged files and resources",
+                "state_text": "Importing staged content structure",
+                "completed_steps": 6,
+                "total_steps": 11,
+                "attempts": 1,
+                "created": "2025-05-14T22:24:37.048539Z",
+                "modified": "2025-05-14T22:24:59.128068Z",
+                "artifacts": [],
+                "modulestoremigration": {
+                    "source": "course-v1:OpenedX+DemoX+DemoCourse2",
+                    "composition_level": "component",
+                    "replace_existing": false
+                }
+            }
+    """
+
+    permission_classes = (IsAdminUser,)
+    authentication_classes = (
+        BearerAuthenticationAllowInactiveUser,
+        JwtAuthentication,
+        SessionAuthenticationAllowInactiveUser,
+    )
+    serializer_class = StatusWithModulestoreMigrationSerializer
+
+    def get_queryset(self):
+        """
+        Override the default queryset to filter by the import event and user.
+        """
+        return StatusViewSet.queryset.filter(modulestoremigration__isnull=False, user=self.request.user)
+
+    def create(self, request, *args, **kwargs):
+        """
+        Handle the import task creation.
+        """
+
+        serializer_data = ModulestoreMigrationSerializer(data=request.data)
+        serializer_data.is_valid(raise_exception=True)
+        validated_data = serializer_data.validated_data
+
+        task = start_migration_to_library(
+            user=request.user,
+            source_key=validated_data['source'],
+            target_library_key=validated_data['target'],
+            target_collection_slug=validated_data.get('target_collection_slug'),
+            composition_level=validated_data['composition_level'],
+            replace_existing=validated_data['replace_existing'],
+            forward_source_to_target=False,  # @@TODO - Set to False for now. Explain this better.
+        )
+        return UserTaskStatus.objects.get(task_id=task.id)

From 4a748e5936d26565b963198c37e2b3d573af9641 Mon Sep 17 00:00:00 2001
From: Kyle McCormick <kyle@axim.org>
Date: Thu, 19 Jun 2025 14:45:45 -0400
Subject: [PATCH 12/40] fix: drop all the models to un-bork
 modulestoreblocksource

---
 .../migrations/0003_remove_everything.py      | 61 +++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 cms/djangoapps/modulestore_migrator/migrations/0003_remove_everything.py

diff --git a/cms/djangoapps/modulestore_migrator/migrations/0003_remove_everything.py b/cms/djangoapps/modulestore_migrator/migrations/0003_remove_everything.py
new file mode 100644
index 000000000000..3cbeed703ae5
--- /dev/null
+++ b/cms/djangoapps/modulestore_migrator/migrations/0003_remove_everything.py
@@ -0,0 +1,61 @@
+# Generated by Django 4.2.22 on 2025-06-19 18:40
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('modulestore_migrator', '0002_source_forwardedby_blank'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='modulestoreblocksource',
+            name='forwarded_by',
+        ),
+        migrations.RemoveField(
+            model_name='modulestoreblocksource',
+            name='overall_source',
+        ),
+        migrations.RemoveField(
+            model_name='modulestoremigration',
+            name='change_log',
+        ),
+        migrations.RemoveField(
+            model_name='modulestoremigration',
+            name='source',
+        ),
+        migrations.RemoveField(
+            model_name='modulestoremigration',
+            name='staged_content',
+        ),
+        migrations.RemoveField(
+            model_name='modulestoremigration',
+            name='target',
+        ),
+        migrations.RemoveField(
+            model_name='modulestoremigration',
+            name='target_collection',
+        ),
+        migrations.RemoveField(
+            model_name='modulestoremigration',
+            name='task_status',
+        ),
+        migrations.RemoveField(
+            model_name='modulestoresource',
+            name='forwarded_by',
+        ),
+        migrations.DeleteModel(
+            name='ModulestoreBlockMigration',
+        ),
+        migrations.DeleteModel(
+            name='ModulestoreBlockSource',
+        ),
+        migrations.DeleteModel(
+            name='ModulestoreMigration',
+        ),
+        migrations.DeleteModel(
+            name='ModulestoreSource',
+        ),
+    ]

From ff00943a86d54a792aa9856996d9ad4b82131009 Mon Sep 17 00:00:00 2001
From: Kyle McCormick <kyle@axim.org>
Date: Thu, 19 Jun 2025 14:47:24 -0400
Subject: [PATCH 13/40] fix: recreate models with missing db constraint

we were missing the unique_together on modulestoreblocksource,
meaning we had multiple modulestoreblocksources for the
same legacy usage key.

also, replace bulk_create with a series of saves to un-bork
forwarding for now.

also, this renames forwarded_by -> forwarded
---
 cms/djangoapps/modulestore_migrator/admin.py  |  15 +--
 cms/djangoapps/modulestore_migrator/api.py    |   2 +-
 .../migrations/0004_initial.py                | 107 ++++++++++++++++++
 cms/djangoapps/modulestore_migrator/models.py |  17 +--
 cms/djangoapps/modulestore_migrator/tasks.py  |  12 +-
 5 files changed, 134 insertions(+), 19 deletions(-)
 create mode 100644 cms/djangoapps/modulestore_migrator/migrations/0004_initial.py

diff --git a/cms/djangoapps/modulestore_migrator/admin.py b/cms/djangoapps/modulestore_migrator/admin.py
index ffc99efc3f90..36e2acca4e83 100644
--- a/cms/djangoapps/modulestore_migrator/admin.py
+++ b/cms/djangoapps/modulestore_migrator/admin.py
@@ -27,10 +27,11 @@ class StartMigrationTaskForm(ActionForm):
     """
     Params for start_migration_task admin adtion, displayed next the "Go" button.
     """
-    target_key = forms.CharField(label="Target library or collection key:", required=False)
-    replace_existing = forms.BooleanField(label="Replace existing content", required=False)
+    target_key = forms.CharField(label="Target library or collection key →", required=False)
+    replace_existing = forms.BooleanField(label="Replace existing content? →", required=False)
+    forward_to_target = forms.BooleanField(label="Forward references? →", required=False)
     composition_level = forms.ChoiceField(
-        label="Aggregate up to:", choices=CompositionLevel.supported_choices, required=False
+        label="Aggregate up to →", choices=CompositionLevel.supported_choices, required=False
     )
 
 
@@ -86,7 +87,7 @@ class ModulestoreBlockSourceInline(admin.TabularInline):
     fk_name = "overall_source"
     readonly_fields = (
         "key",
-        "forwarded_by"
+        "forwarded"
     )
 
     def has_add_permission(self, _request, _obj):
@@ -98,8 +99,8 @@ class ModulestoreSourceAdmin(admin.ModelAdmin):
     """
     Admin interface for source legacy libraries and courses.
     """
-    readonly_fields = ("forwarded_by",)
-    list_display = ("id", "key", "forwarded_by")
+    readonly_fields = ("forwarded",)
+    list_display = ("id", "key", "forwarded")
     actions = ["start_migration_task"]
     action_form = StartMigrationTaskForm
     inlines = [ModulestoreMigrationInline, ModulestoreBlockSourceInline]
@@ -142,7 +143,7 @@ def start_migration_task(
                     target_collection_slug=target_collection_slug,
                     composition_level=form.cleaned_data['composition_level'],
                     replace_existing=form.cleaned_data['replace_existing'],
-                    forward_source_to_target=False,
+                    forward_source_to_target=form.cleaned_data['forward_to_target'],
                 )
             except Exception as exc:  # pylint: disable=broad-except
                 message = f"Failed to start migration {source.key} -> {target_key_string}"
diff --git a/cms/djangoapps/modulestore_migrator/api.py b/cms/djangoapps/modulestore_migrator/api.py
index c11a1031d3bf..403c5706238a 100644
--- a/cms/djangoapps/modulestore_migrator/api.py
+++ b/cms/djangoapps/modulestore_migrator/api.py
@@ -26,7 +26,7 @@ def start_migration_to_library(
     target_collection_slug: str | None = None,
     composition_level: CompositionLevel,
     replace_existing: bool,
-    forward_source_to_target: bool,  # @@TODO - Set to False for now. Explain this better.
+    forward_source_to_target: bool,
 ) -> None:
     """
     Import a course or legacy library into a V2 library (or, a collection within a V2 library).
diff --git a/cms/djangoapps/modulestore_migrator/migrations/0004_initial.py b/cms/djangoapps/modulestore_migrator/migrations/0004_initial.py
new file mode 100644
index 000000000000..fb1537bf8016
--- /dev/null
+++ b/cms/djangoapps/modulestore_migrator/migrations/0004_initial.py
@@ -0,0 +1,107 @@
+# Generated by Django 4.2.22 on 2025-06-19 18:46
+
+from django.db import migrations, models
+import django.db.models.deletion
+import django.utils.timezone
+import model_utils.fields
+import opaque_keys.edx.django.models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('oel_collections', '0005_alter_collection_options_alter_collection_enabled'),
+        ('content_staging', '0005_stagedcontent_version_num'),
+        ('oel_publishing', '0008_alter_draftchangelogrecord_options_and_more'),
+        ('user_tasks', '0004_url_textfield'),
+        ('modulestore_migrator', '0003_remove_everything'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ModulestoreBlockMigration',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False, verbose_name='created')),
+                ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False, verbose_name='modified')),
+                ('change_log_record', models.OneToOneField(null=True, on_delete=django.db.models.deletion.SET_NULL, to='oel_publishing.draftchangelogrecord')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='ModulestoreMigration',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('composition_level', models.CharField(choices=[('component', 'Component'), ('unit', 'Unit'), ('subsection', 'Subsection'), ('section', 'Section'), ('outline_root', 'OutlineRoot')], default='component', help_text='Maximum hierachy level at which content should be aggregated in target library', max_length=255)),
+                ('replace_existing', models.BooleanField(default=False, help_text='If a piece of content already exists in the content library, should the import process replace it?')),
+                ('change_log', models.ForeignKey(help_text='Changelog entry in the target learning package which records this migration', null=True, on_delete=django.db.models.deletion.SET_NULL, to='oel_publishing.draftchangelog')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='ModulestoreSource',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('key', opaque_keys.edx.django.models.LearningContextKeyField(help_text='Key of the content source (a course or a legacy library)', max_length=255, unique=True)),
+                ('forwarded', models.OneToOneField(blank=True, help_text='If set, the system will forward references of this source over to the target of this migration', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='forwards', to='modulestore_migrator.modulestoremigration')),
+            ],
+        ),
+        migrations.AddField(
+            model_name='modulestoremigration',
+            name='source',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='migrations', to='modulestore_migrator.modulestoresource'),
+        ),
+        migrations.AddField(
+            model_name='modulestoremigration',
+            name='staged_content',
+            field=models.OneToOneField(help_text='Modulestore content is processed and staged before importing it to a learning packge. We temporarily save the staged content to allow for troubleshooting of failed migrations.', null=True, on_delete=django.db.models.deletion.SET_NULL, to='content_staging.stagedcontent'),
+        ),
+        migrations.AddField(
+            model_name='modulestoremigration',
+            name='target',
+            field=models.ForeignKey(help_text='Content will be imported into this library', on_delete=django.db.models.deletion.CASCADE, to='oel_publishing.learningpackage'),
+        ),
+        migrations.AddField(
+            model_name='modulestoremigration',
+            name='target_collection',
+            field=models.ForeignKey(blank=True, help_text='Optional - Collection (within the target library) into which imported content will be grouped', null=True, on_delete=django.db.models.deletion.SET_NULL, to='oel_collections.collection'),
+        ),
+        migrations.AddField(
+            model_name='modulestoremigration',
+            name='task_status',
+            field=models.OneToOneField(help_text='Tracks the status of the task which is executing this migration', on_delete=django.db.models.deletion.RESTRICT, to='user_tasks.usertaskstatus'),
+        ),
+        migrations.CreateModel(
+            name='ModulestoreBlockSource',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False, verbose_name='created')),
+                ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False, verbose_name='modified')),
+                ('key', opaque_keys.edx.django.models.UsageKeyField(help_text='Original usage key of the XBlock that has been imported.', max_length=255)),
+                ('forwarded', models.OneToOneField(help_text='If set, the system will forward references of this block source over to the target of this block migration', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='forwards', to='modulestore_migrator.modulestoreblockmigration')),
+                ('overall_source', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='blocks', to='modulestore_migrator.modulestoresource')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.AddField(
+            model_name='modulestoreblockmigration',
+            name='overall_migration',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='block_migrations', to='modulestore_migrator.modulestoremigration'),
+        ),
+        migrations.AddField(
+            model_name='modulestoreblockmigration',
+            name='source',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='modulestore_migrator.modulestoreblocksource'),
+        ),
+        migrations.AddField(
+            model_name='modulestoreblockmigration',
+            name='target',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='oel_publishing.publishableentity'),
+        ),
+        migrations.AlterUniqueTogether(
+            name='modulestoreblockmigration',
+            unique_together={('overall_migration', 'source'), ('overall_migration', 'target')},
+        ),
+    ]
diff --git a/cms/djangoapps/modulestore_migrator/models.py b/cms/djangoapps/modulestore_migrator/models.py
index 5a07c2e2e562..576dfa4f2e82 100644
--- a/cms/djangoapps/modulestore_migrator/models.py
+++ b/cms/djangoapps/modulestore_migrator/models.py
@@ -30,14 +30,15 @@ class ModulestoreSource(models.Model):
     key = LearningContextKeyField(
         max_length=255,
         unique=True,
-        help_text=_('Key of the content source (a course or a legacy library)')
+        help_text=_('Key of the content source (a course or a legacy library)'),
     )
-    forwarded_by = models.ForeignKey(
+    forwarded = models.OneToOneField(
         'modulestore_migrator.ModulestoreMigration',
         null=True,
         blank=True,
         on_delete=models.SET_NULL,
-        help_text=_('If set, the system will forward references of this source over to the target of this migration')
+        help_text=_('If set, the system will forward references of this source over to the target of this migration'),
+        related_name="forwards",
     )
 
     def __str__(self):
@@ -57,7 +58,7 @@ class ModulestoreMigration(models.Model):
     * Each Migration is tied to a single UserTaskStatus, which connects it to a user and
       contains the progress of the import.
     * A single ModulestoreSource may very well have multiple ModulestoreMigrations; however,
-      at most one of them with be the "authoritative" migration, as indicated by `forwarded_by`.
+      at most one of them with be the "authoritative" migration, as indicated by `forwarded`.
     """
 
     ## MIGRATION SPECIFICATION
@@ -140,14 +141,16 @@ class ModulestoreBlockSource(TimeStampedModel):
         max_length=255,
         help_text=_('Original usage key of the XBlock that has been imported.'),
     )
-    forwarded_by = models.ForeignKey(
+    forwarded = models.OneToOneField(
         'modulestore_migrator.ModulestoreBlockMigration',
         null=True,
         on_delete=models.SET_NULL,
         help_text=_(
             'If set, the system will forward references of this block source over to the target of this block migration'
         ),
+        related_name="forwards",
     )
+    unique_together = [("overall_source", "key")]
 
     def __str__(self):
         return f"{self.__class__.__name__}('{self.key}')"
@@ -163,8 +166,8 @@ class ModulestoreBlockMigration(TimeStampedModel):
 
     Note:
     * A single ModulestoreBlockSource may very well have multiple ModulestoreBlockMigrations; however,
-      at most one of them with be the "authoritative" migration, as indicated by `forwarded_by`.
-      This will coincide with the `overall_migration` being pointed to by `forwarded_by` as well.
+      at most one of them with be the "authoritative" migration, as indicated by `forwarded`.
+      This will coincide with the `overall_migration` being pointed to by `forwarded` as well.
     """
     overall_migration = models.ForeignKey(
         ModulestoreMigration,
diff --git a/cms/djangoapps/modulestore_migrator/tasks.py b/cms/djangoapps/modulestore_migrator/tasks.py
index f8ae790f019f..747e1605ed0c 100644
--- a/cms/djangoapps/modulestore_migrator/tasks.py
+++ b/cms/djangoapps/modulestore_migrator/tasks.py
@@ -260,7 +260,8 @@ def migrate_from_modulestore(
     # block_target_pks_to_change_log_record_pks: dict[int, int] = dict(
     #     change_log.records.values_list("target_entity_id", "id")
     # )
-    block_migrations = ModulestoreBlockMigration.objects.bulk_create(
+    #block_migrations = ModulestoreBlockMigration.objects.bulk_create(
+    ModulestoreBlockMigration.objects.bulk_create(
         [
             ModulestoreBlockMigration(
                 overall_migration=migration,
@@ -272,6 +273,7 @@ def migrate_from_modulestore(
             for block_source_key, block_target_ver in block_source_keys_to_target_vers.items()
         ],
     )
+    block_migrations = ModulestoreBlockMigration.objects.filter(overall_migration=migration)
     status.increment_completed_steps()
 
     status.set_state(MigrationStep.FORWARDING.value)
@@ -280,9 +282,11 @@ def migrate_from_modulestore(
             block_migration.source: block_migration for block_migration in block_migrations
         }
         for block_source, block_migration in block_sources_to_block_migrations.items():
-            block_source.forwarded_by = block_migration
-        ModulestoreBlockSource.objects.bulk_update(block_sources_to_block_migrations.keys(), ["forwarded_by"])
-        source.forwarded_by = migration
+            block_source.forwarded = block_migration
+            block_source.save()
+        # ModulestoreBlockSource.objects.bulk_update(block_sources_to_block_migrations.keys(), ["forwarded"])
+        source.forwarded = migration
+        source.save()
     status.increment_completed_steps()
 
     status.set_state(MigrationStep.POPULATING_COLLECTION.value)

From 71d4007360eb3d317dc9299cfaa3fcbaa3d308f6 Mon Sep 17 00:00:00 2001
From: Kyle McCormick <kyle@axim.org>
Date: Wed, 25 Jun 2025 13:04:22 -0400
Subject: [PATCH 14/40] refactor: remove unnecessary non-Noneness check after
 get_library

---
 cms/djangoapps/modulestore_migrator/api.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/cms/djangoapps/modulestore_migrator/api.py b/cms/djangoapps/modulestore_migrator/api.py
index 403c5706238a..843e852822c9 100644
--- a/cms/djangoapps/modulestore_migrator/api.py
+++ b/cms/djangoapps/modulestore_migrator/api.py
@@ -33,11 +33,8 @@ def start_migration_to_library(
     """
     source, _ = ModulestoreSource.objects.get_or_create(key=source_key)
     target_library = get_library(target_library_key)
-    if not (target_package_id := target_library.learning_package_id):
-        raise ValueError(
-            f"Cannot import {source_key} into library at {target_library_key} because the "
-            "library is not connected to a learning package"
-        )
+    # get_library ensures that the library is connected to a learning package.
+    target_package_id: int = target_library.learning_package_id  # type: ignore[assignment]
     target_collection_id = None
     if target_collection_slug:
         target_collection_id = get_collection(target_package_id, target_collection_slug).id

From bbce8fab549657763bc24e2ef4048f34a18b4d45 Mon Sep 17 00:00:00 2001
From: Andrii <andrii.hantkovskyi@raccoongang.com>
Date: Mon, 16 Jun 2025 11:41:08 +0300
Subject: [PATCH 15/40] test: cover new changes with tests

---
 .../modulestore_migrator/tests/__init__.py    |    0
 .../modulestore_migrator/tests/factories.py   |   66 +
 .../modulestore_migrator/tests/test_api.py    |   48 +
 .../modulestore_migrator/tests/test_tasks.py  | 1174 +++++++++++++++++
 4 files changed, 1288 insertions(+)
 create mode 100644 cms/djangoapps/modulestore_migrator/tests/__init__.py
 create mode 100644 cms/djangoapps/modulestore_migrator/tests/factories.py
 create mode 100644 cms/djangoapps/modulestore_migrator/tests/test_api.py
 create mode 100644 cms/djangoapps/modulestore_migrator/tests/test_tasks.py

diff --git a/cms/djangoapps/modulestore_migrator/tests/__init__.py b/cms/djangoapps/modulestore_migrator/tests/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/cms/djangoapps/modulestore_migrator/tests/factories.py b/cms/djangoapps/modulestore_migrator/tests/factories.py
new file mode 100644
index 000000000000..2e4fa441b5e1
--- /dev/null
+++ b/cms/djangoapps/modulestore_migrator/tests/factories.py
@@ -0,0 +1,66 @@
+"""
+Factories for creating test data for the modulestore migrator.
+"""
+import uuid
+
+import factory
+from opaque_keys.edx.keys import LearningContextKey
+from openedx_learning.api.authoring_models import LearningPackage
+from organizations.tests.factories import OrganizationFactory
+
+from common.djangoapps.student.tests.factories import UserFactory
+from cms.djangoapps.modulestore_migrator.models import ModulestoreSource, ModulestoreMigration
+from openedx.core.djangoapps.content_libraries.api import ContentLibrary
+
+
+class LearningPackageFactory(factory.django.DjangoModelFactory):
+    """
+    Factory for LearningPackage model.
+    """
+
+    class Meta:
+        model = LearningPackage
+
+    title = factory.Faker('sentence')
+    description = factory.Faker('sentence')
+    uuid = factory.LazyFunction(lambda: str(uuid.uuid4()))
+    created = factory.Faker('date_time')
+    updated = factory.Faker('date_time')
+
+
+class ContentLibraryFactory(factory.django.DjangoModelFactory):
+    """
+    Factory for ContentLibrary model.
+    """
+
+    class Meta:
+        model = ContentLibrary
+
+    org = factory.SubFactory(OrganizationFactory)
+    license = factory.Faker('sentence')
+    slug = factory.Faker('slug')
+    learning_package = factory.SubFactory(LearningPackageFactory)
+
+
+class ModulestoreSourceFactory(factory.django.DjangoModelFactory):
+    """
+    Factory for creating ModulestoreSource instances.
+    """
+    class Meta:
+        model = ModulestoreSource
+    forwarded_by = None
+
+    @factory.lazy_attribute
+    def key(self):
+        return LearningContextKey.from_string(f"course-v1:edX+DemoX+{uuid.uuid4()}")
+
+
+class ModulestoreMigrationFactory(factory.django.DjangoModelFactory):
+    """
+    Factory for creating ModulestoreMigration instances.
+    """
+    class Meta:
+        model = ModulestoreMigration
+
+    source = factory.SubFactory(ModulestoreSourceFactory)
+    user = factory.SubFactory(UserFactory)
diff --git a/cms/djangoapps/modulestore_migrator/tests/test_api.py b/cms/djangoapps/modulestore_migrator/tests/test_api.py
new file mode 100644
index 000000000000..56611a30a736
--- /dev/null
+++ b/cms/djangoapps/modulestore_migrator/tests/test_api.py
@@ -0,0 +1,48 @@
+"""
+Test cases for the modulestore migrator API.
+"""
+
+import pytest
+from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
+
+from common.djangoapps.student.tests.factories import UserFactory
+from cms.djangoapps.modulestore_migrator import api
+from cms.djangoapps.modulestore_migrator.data import CompositionLevel
+from cms.djangoapps.modulestore_migrator.models import ModulestoreMigration
+from cms.djangoapps.modulestore_migrator.tests.factories import ContentLibraryFactory, ModulestoreSourceFactory
+
+
+@pytest.mark.django_db
+class TestModulestoreMigratorAPI(ModuleStoreTestCase):
+    """
+    Test cases for the modulestore migrator API.
+    """
+
+    def setUp(self):
+        super().setUp()
+
+        self.library = ContentLibraryFactory()
+
+    def test_start_migration_to_library(self):
+        """
+        Test that the API can start a migration to a library.
+        """
+        source = ModulestoreSourceFactory()
+        user = UserFactory()
+
+        api.start_migration_to_library(
+            user=user,
+            source_key=source.key,
+            target_library_key=self.library.library_key,
+            target_collection_slug=None,
+            composition_level=CompositionLevel.Component.value,
+            replace_existing=False,
+            forward_source_to_target=False,
+        )
+
+        modulestoremigration = ModulestoreMigration.objects.get()
+        assert modulestoremigration.source.key == source.key
+        assert modulestoremigration.composition_level == CompositionLevel.Component.value
+        assert modulestoremigration.replace_existing is False
+        assert modulestoremigration.task_status is not None
+        assert modulestoremigration.task_status.user == user
diff --git a/cms/djangoapps/modulestore_migrator/tests/test_tasks.py b/cms/djangoapps/modulestore_migrator/tests/test_tasks.py
new file mode 100644
index 000000000000..2ef6e7d5a0c9
--- /dev/null
+++ b/cms/djangoapps/modulestore_migrator/tests/test_tasks.py
@@ -0,0 +1,1174 @@
+"""
+Tests for the modulestore_migrator tasks
+"""
+
+from unittest.mock import Mock
+import ddt
+from django.utils import timezone
+from lxml import etree
+from opaque_keys.edx.keys import CourseKey
+from opaque_keys.edx.locator import LibraryLocator, LibraryLocatorV2
+from openedx_learning.api.authoring_models import Collection, PublishableEntityVersion
+from openedx_learning.api import authoring as authoring_api
+from organizations.tests.factories import OrganizationFactory
+from user_tasks.tasks import UserTaskStatus
+from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
+from xmodule.modulestore.tests.factories import CourseFactory
+
+from common.djangoapps.student.tests.factories import UserFactory
+from cms.djangoapps.modulestore_migrator.data import CompositionLevel
+from cms.djangoapps.modulestore_migrator.models import (
+    ModulestoreMigration,
+    ModulestoreSource,
+)
+from cms.djangoapps.modulestore_migrator.tasks import (
+    _migrate_component,
+    _migrate_container,
+    _migrate_node,
+    _slugify_source_usage_key,
+    _MigratedNode,
+    _MigrationTask,
+    migrate_from_modulestore,
+    MigrationStep,
+)
+from cms.djangoapps.modulestore_migrator.tests.factories import ContentLibraryFactory
+from openedx.core.djangoapps.content_libraries.api import ContainerType
+
+
+@ddt.ddt
+class TestMigrateFromModulestore(ModuleStoreTestCase):
+    """
+    Test the migrate_from_modulestore task
+    """
+
+    def setUp(self):
+        super().setUp()
+        self.user = UserFactory()
+        lib_key = LibraryLocatorV2.from_string("lib:testorg:tes-key")
+        self.learning_package = authoring_api.create_learning_package(
+            key=lib_key,
+            title="Test Package",
+            created=timezone.now(),
+            description="Test Description",
+        )
+        self.library = ContentLibraryFactory(
+            org=OrganizationFactory(short_name=lib_key.org),
+            slug=lib_key.slug,
+            learning_package=self.learning_package,
+        )
+        self.organization = self.library.org
+        self.course = CourseFactory(
+            org=self.organization.short_name,
+            course="TestCourse",
+            run="TestRun",
+            display_name="Test Course",
+        )
+        self.collection = Collection.objects.create(
+            learning_package=self.learning_package,
+            key="test_collection",
+            title="Test Collection",
+        )
+
+    def test_slugify_source_usage_key_course(self):
+        """Test _slugify_source_usage_key with course usage key"""
+        course_key = CourseKey.from_string("course-v1:TestOrg+TestCourse+TestRun")
+        usage_key = course_key.make_usage_key("problem", "test_problem")
+
+        result = _slugify_source_usage_key(usage_key)
+
+        self.assertEqual(result, "TestOrg__TestCourse__TestRun__test_problem")
+
+    def test_slugify_source_usage_key_library(self):
+        """Test _slugify_source_usage_key with library usage key"""
+        library_key = LibraryLocator(org="TestOrg", library="TestLibrary")
+        usage_key = library_key.make_usage_key("problem", "test_problem")
+
+        result = _slugify_source_usage_key(usage_key)
+
+        self.assertEqual(result, "TestOrg__TestLibrary__test_problem")
+
+    def test_migrate_node_wiki_tag(self):
+        """Test _migrate_node ignores wiki tags"""
+        wiki_node = etree.fromstring("<wiki />")
+
+        result = _migrate_node(
+            content_by_filename={},
+            source_context_key=self.course.id,
+            source_node=wiki_node,
+            target_package_id=self.learning_package.id,
+            target_library_key=self.library.library_key,
+            composition_level=CompositionLevel.Unit,
+            replace_existing=False,
+            created_at=timezone.now(),
+            created_by=self.user.id,
+        )
+
+        self.assertIsNone(result.source_to_target)
+        self.assertEqual(len(result.children), 0)
+
+    def test_migrate_node_course_root(self):
+        """Test _migrate_node handles course root"""
+        course_node = etree.fromstring(
+            '<course url_name="course" display_name="Test Course">'
+            '<chapter url_name="chapter1" display_name="Chapter 1" />'
+            "</course>"
+        )
+
+        result = _migrate_node(
+            content_by_filename={},
+            source_context_key=self.course.id,
+            source_node=course_node,
+            target_package_id=self.learning_package.id,
+            target_library_key=self.library.library_key,
+            composition_level=CompositionLevel.Unit,
+            replace_existing=False,
+            created_at=timezone.now(),
+            created_by=self.user.id,
+        )
+
+        # Course root should not be migrated
+        self.assertIsNone(result.source_to_target)
+        # But should have children processed
+        self.assertEqual(len(result.children), 1)
+
+    def test_migrate_node_library_root(self):
+        """Test _migrate_node handles library root"""
+        library_node = etree.fromstring(
+            '<library url_name="library" display_name="Test Library">'
+            '<problem url_name="problem1" display_name="Problem 1" />'
+            "</library>"
+        )
+        result = _migrate_node(
+            content_by_filename={},
+            source_context_key=self.course.id,
+            source_node=library_node,
+            target_package_id=self.learning_package.id,
+            target_library_key=self.library.library_key,
+            composition_level=CompositionLevel.Unit,
+            replace_existing=False,
+            created_at=timezone.now(),
+            created_by=self.user.id,
+        )
+
+        # Library root should not be migrated
+        self.assertIsNone(result.source_to_target)
+        # But should have children processed
+        self.assertEqual(len(result.children), 1)
+
+    @ddt.data(
+        ("chapter", CompositionLevel.Unit, None),
+        ("sequential", CompositionLevel.Unit, None),
+        ("vertical", CompositionLevel.Unit, True),
+        ("chapter", CompositionLevel.Section, True),
+        ("sequential", CompositionLevel.Section, True),
+        ("vertical", CompositionLevel.Section, True),
+    )
+    @ddt.unpack
+    def test_migrate_node_container_composition_level(
+        self, tag_name, composition_level, should_migrate
+    ):
+        """Test _migrate_node respects composition level for containers"""
+        container_node = etree.fromstring(
+            f'<{tag_name} url_name="test_{tag_name}" display_name="Test {tag_name.title()}" />'
+        )
+
+        result = _migrate_node(
+            content_by_filename={},
+            source_context_key=self.course.id,
+            source_node=container_node,
+            target_package_id=self.learning_package.id,
+            target_library_key=self.library.library_key,
+            composition_level=composition_level,
+            replace_existing=False,
+            created_at=timezone.now(),
+            created_by=self.user.id,
+        )
+
+        if should_migrate:
+            self.assertIsNotNone(result.source_to_target)
+            source_key, _ = result.source_to_target
+            self.assertEqual(source_key.block_type, tag_name)
+            self.assertEqual(source_key.block_id, f"test_{tag_name}")
+        else:
+            self.assertIsNone(result.source_to_target)
+
+    def test_migrate_node_without_url_name(self):
+        """Test _migrate_node handles nodes without url_name"""
+        node_without_url_name = etree.fromstring(
+            '<problem display_name="No URL Name" />'
+        )
+
+        result = _migrate_node(
+            content_by_filename={},
+            source_context_key=self.course.id,
+            source_node=node_without_url_name,
+            target_package_id=self.learning_package.id,
+            target_library_key=self.library.library_key,
+            composition_level=CompositionLevel.Unit,
+            replace_existing=False,
+            created_at=timezone.now(),
+            created_by=self.user.id,
+        )
+
+        self.assertIsNone(result.source_to_target)
+        self.assertEqual(len(result.children), 0)
+
+    def test_migrated_node_all_source_to_target_pairs(self):
+        """Test _MigratedNode.all_source_to_target_pairs traversal"""
+
+        mock_version1 = Mock(spec=PublishableEntityVersion)
+        mock_version2 = Mock(spec=PublishableEntityVersion)
+        mock_version3 = Mock(spec=PublishableEntityVersion)
+
+        key1 = self.course.id.make_usage_key("problem", "problem1")
+        key2 = self.course.id.make_usage_key("problem", "problem2")
+        key3 = self.course.id.make_usage_key("problem", "problem3")
+
+        # Create nested structure
+        child_node = _MigratedNode(source_to_target=(key3, mock_version3), children=[])
+
+        parent_node = _MigratedNode(
+            source_to_target=(key1, mock_version1),
+            children=[
+                _MigratedNode(source_to_target=(key2, mock_version2), children=[]),
+                child_node,
+            ],
+        )
+
+        pairs = list(parent_node.all_source_to_target_pairs())
+
+        self.assertEqual(len(pairs), 3)
+        self.assertEqual(pairs[0][0], key1)
+        self.assertEqual(pairs[1][0], key2)
+        self.assertEqual(pairs[2][0], key3)
+
+    def test_migrate_from_modulestore_invalid_source(self):
+        """Test migrate_from_modulestore with invalid source"""
+        task = migrate_from_modulestore.apply_async(
+            kwargs={
+                "user_id": self.user.id,
+                "source_pk": 999999,  # Non-existent source
+                "target_package_pk": self.learning_package.id,
+                "target_collection_pk": self.collection.id,
+                "replace_existing": False,
+                "composition_level": CompositionLevel.Unit.value,
+                "forward_source_to_target": False,
+            }
+        )
+
+        result = task.get()
+        self.assertIsNone(result)
+
+        status = UserTaskStatus.objects.get(task_id=task.id)
+        self.assertEqual(status.state, UserTaskStatus.FAILED)
+
+    def test_migrate_from_modulestore_invalid_target_package(self):
+        """Test migrate_from_modulestore with invalid target package"""
+        source = ModulestoreSource.objects.create(
+            key=self.course.id,
+        )
+
+        task = migrate_from_modulestore.apply_async(
+            kwargs={
+                "user_id": self.user.id,
+                "source_pk": source.id,
+                "target_package_pk": 999999,  # Non-existent package
+                "target_collection_pk": self.collection.id,
+                "replace_existing": False,
+                "composition_level": CompositionLevel.Unit.value,
+                "forward_source_to_target": False,
+            }
+        )
+
+        result = task.get()
+        self.assertIsNone(result)
+
+        status = UserTaskStatus.objects.get(task_id=task.id)
+        self.assertEqual(status.state, UserTaskStatus.FAILED)
+
+    def test_migrate_from_modulestore_invalid_collection(self):
+        """Test migrate_from_modulestore with invalid collection"""
+        source = ModulestoreSource.objects.create(
+            key=self.course.id,
+        )
+
+        task = migrate_from_modulestore.apply_async(
+            kwargs={
+                "user_id": self.user.id,
+                "source_pk": source.id,
+                "target_package_pk": self.learning_package.id,
+                "target_collection_pk": 999999,  # Non-existent collection
+                "replace_existing": False,
+                "composition_level": CompositionLevel.Unit.value,
+                "forward_source_to_target": False,
+            }
+        )
+
+        result = task.get()
+        self.assertIsNone(result)
+
+        status = UserTaskStatus.objects.get(task_id=task.id)
+        self.assertEqual(status.state, UserTaskStatus.FAILED)
+
+    def test_migration_task_calculate_total_steps(self):
+        """Test _MigrationTask.calculate_total_steps returns correct count"""
+        total_steps = _MigrationTask.calculate_total_steps({})
+        expected_steps = len(list(MigrationStep))
+        self.assertEqual(total_steps, expected_steps)
+
+    def test_migrate_component_success(self):
+        """Test _migrate_component successfully creates a new component"""
+        source_key = self.course.id.make_usage_key("problem", "test_problem")
+        olx = '<problem display_name="Test Problem"><multiplechoiceresponse></multiplechoiceresponse></problem>'
+
+        result = _migrate_component(
+            content_by_filename={},
+            source_key=source_key,
+            olx=olx,
+            target_package_id=self.learning_package.id,
+            target_library_key=self.library.library_key,
+            replace_existing=False,
+            created_by=self.user.id,
+            created_at=timezone.now(),
+        )
+
+        self.assertIsNotNone(result)
+        self.assertIsInstance(result, PublishableEntityVersion)
+
+        # Verify component was created
+        self.assertEqual(
+            "problem", result.componentversion.component.component_type.name
+        )
+
+    def test_migrate_component_with_static_content(self):
+        """Test _migrate_component with static file content"""
+        source_key = self.course.id.make_usage_key("problem", "test_problem_with_image")
+        olx = '<problem display_name="Test Problem"><p>See image: test_image.png</p></problem>'
+
+        # Create some test content
+        media_type = authoring_api.get_or_create_media_type("image/png")
+        test_content = authoring_api.get_or_create_file_content(
+            self.learning_package.id,
+            media_type.id,
+            data=b"fake_image_data",
+            created=timezone.now(),
+        )
+
+        content_by_filename = {"test_image.png": test_content.id}
+
+        result = _migrate_component(
+            content_by_filename=content_by_filename,
+            source_key=source_key,
+            olx=olx,
+            target_package_id=self.learning_package.id,
+            target_library_key=self.library.library_key,
+            replace_existing=False,
+            created_by=self.user.id,
+            created_at=timezone.now(),
+        )
+
+        self.assertIsNotNone(result)
+
+        # Verify component version content was created
+        component_content = result.componentversion.componentversioncontent_set.filter(
+            key="static/test_image.png"
+        ).first()
+        self.assertIsNotNone(component_content)
+        self.assertEqual(component_content.content_id, test_content.id)
+
+    def test_migrate_component_replace_existing_false(self):
+        """Test _migrate_component with replace_existing=False returns existing component"""
+        source_key = self.course.id.make_usage_key("problem", "existing_problem")
+        olx = '<problem display_name="Test Problem"><multiplechoiceresponse></multiplechoiceresponse></problem>'
+
+        # Create component first time
+        first_result = _migrate_component(
+            content_by_filename={},
+            source_key=source_key,
+            olx=olx,
+            target_package_id=self.learning_package.id,
+            target_library_key=self.library.library_key,
+            replace_existing=False,
+            created_by=self.user.id,
+            created_at=timezone.now(),
+        )
+
+        # Try to create again with replace_existing=False
+        second_result = _migrate_component(
+            content_by_filename={},
+            source_key=source_key,
+            olx='<problem display_name="Updated Problem"><multiplechoiceresponse></multiplechoiceresponse></problem>',
+            target_package_id=self.learning_package.id,
+            target_library_key=self.library.library_key,
+            replace_existing=False,
+            created_by=self.user.id,
+            created_at=timezone.now(),
+        )
+
+        self.assertEqual(first_result.entity_id, second_result.entity_id)
+        self.assertEqual(first_result.version_num, second_result.version_num)
+
+    def test_migrate_component_replace_existing_true(self):
+        """Test _migrate_component with replace_existing=True creates new version"""
+        source_key = self.course.id.make_usage_key("problem", "replaceable_problem")
+        original_olx = '<problem display_name="Original"><multiplechoiceresponse></multiplechoiceresponse></problem>'
+
+        # Create component first time
+        first_result = _migrate_component(
+            content_by_filename={},
+            source_key=source_key,
+            olx=original_olx,
+            target_package_id=self.learning_package.id,
+            target_library_key=self.library.library_key,
+            replace_existing=False,
+            created_by=self.user.id,
+            created_at=timezone.now(),
+        )
+
+        # Replace with new content
+        updated_olx = '<problem display_name="Updated"><multiplechoiceresponse></multiplechoiceresponse></problem>'
+        second_result = _migrate_component(
+            content_by_filename={},
+            source_key=source_key,
+            olx=updated_olx,
+            target_package_id=self.learning_package.id,
+            target_library_key=self.library.library_key,
+            replace_existing=True,
+            created_by=self.user.id,
+            created_at=timezone.now(),
+        )
+
+        self.assertEqual(first_result.entity_id, second_result.entity_id)
+        self.assertNotEqual(first_result.version_num, second_result.version_num)
+
+    def test_migrate_component_different_block_types(self):
+        """Test _migrate_component with different block types"""
+        block_types = ["problem", "html", "video", "discussion"]
+
+        for block_type in block_types:
+            source_key = self.course.id.make_usage_key(block_type, f"test_{block_type}")
+            olx = f'<{block_type} display_name="Test {block_type.title()}"></{block_type}>'
+
+            result = _migrate_component(
+                content_by_filename={},
+                source_key=source_key,
+                olx=olx,
+                target_package_id=self.learning_package.id,
+                target_library_key=self.library.library_key,
+                replace_existing=False,
+                created_by=self.user.id,
+                created_at=timezone.now(),
+            )
+
+            self.assertIsNotNone(result, f"Failed to migrate {block_type}")
+
+            # Verify correct component type was created
+            self.assertEqual(
+                block_type, result.componentversion.component.component_type.name
+            )
+
+    def test_migrate_component_content_filename_not_in_olx(self):
+        """Test _migrate_component ignores content files not referenced in OLX"""
+        source_key = self.course.id.make_usage_key(
+            "problem", "test_problem_selective_content"
+        )
+        olx = '<problem display_name="Test Problem"><p>See image: referenced.png</p></problem>'
+
+        # Create test content
+        media_type = authoring_api.get_or_create_media_type("image/png")
+        referenced_content = authoring_api.get_or_create_file_content(
+            self.learning_package.id,
+            media_type.id,
+            data=b"referenced_image_data",
+            created=timezone.now(),
+        )
+        unreferenced_content = authoring_api.get_or_create_file_content(
+            self.learning_package.id,
+            media_type.id,
+            data=b"unreferenced_image_data",
+            created=timezone.now(),
+        )
+
+        content_by_filename = {
+            "referenced.png": referenced_content.id,
+            "unreferenced.png": unreferenced_content.id,
+        }
+
+        result = _migrate_component(
+            content_by_filename=content_by_filename,
+            source_key=source_key,
+            olx=olx,
+            target_package_id=self.learning_package.id,
+            target_library_key=self.library.library_key,
+            replace_existing=False,
+            created_by=self.user.id,
+            created_at=timezone.now(),
+        )
+
+        self.assertIsNotNone(result)
+
+        # Verify only referenced content was added
+        referenced_content_exists = (
+            result.componentversion.componentversioncontent_set.filter(
+                key="static/referenced.png"
+            ).exists()
+        )
+        unreferenced_content_exists = (
+            result.componentversion.componentversioncontent_set.filter(
+                key="static/unreferenced.png"
+            ).exists()
+        )
+
+        self.assertTrue(referenced_content_exists)
+        self.assertFalse(unreferenced_content_exists)
+
+    def test_migrate_component_library_source_key(self):
+        """Test _migrate_component with library source key"""
+        library_key = LibraryLocator(org="TestOrg", library="TestLibrary")
+        source_key = library_key.make_usage_key("problem", "library_problem")
+        olx = '<problem display_name="Library Problem"><multiplechoiceresponse></multiplechoiceresponse></problem>'
+
+        result = _migrate_component(
+            content_by_filename={},
+            source_key=source_key,
+            olx=olx,
+            target_package_id=self.learning_package.id,
+            target_library_key=self.library.library_key,
+            replace_existing=False,
+            created_by=self.user.id,
+            created_at=timezone.now(),
+        )
+
+        self.assertIsNotNone(result)
+
+        # Verify correct local key was generated for library source
+        self.assertEqual(
+            "problem", result.componentversion.component.component_type.name
+        )
+
+    def test_migrate_component_duplicate_content_integrity_error(self):
+        """Test _migrate_component handles IntegrityError when content already exists"""
+        source_key = self.course.id.make_usage_key(
+            "problem", "test_problem_duplicate_content"
+        )
+        olx = '<problem display_name="Test Problem"><p>See image: duplicate.png</p></problem>'
+
+        # Create test content
+        media_type = authoring_api.get_or_create_media_type("image/png")
+        test_content = authoring_api.get_or_create_file_content(
+            self.learning_package.id,
+            media_type.id,
+            data=b"test_image_data",
+            created=timezone.now(),
+        )
+
+        content_by_filename = {"duplicate.png": test_content.id}
+
+        # First migration should succeed
+        first_result = _migrate_component(
+            content_by_filename=content_by_filename,
+            source_key=source_key,
+            olx=olx,
+            target_package_id=self.learning_package.id,
+            target_library_key=self.library.library_key,
+            replace_existing=False,
+            created_by=self.user.id,
+            created_at=timezone.now(),
+        )
+
+        # Second migration with same content should handle IntegrityError gracefully
+        second_result = _migrate_component(
+            content_by_filename=content_by_filename,
+            source_key=source_key,
+            olx=olx,
+            target_package_id=self.learning_package.id,
+            target_library_key=self.library.library_key,
+            replace_existing=True,
+            created_by=self.user.id,
+            created_at=timezone.now(),
+        )
+
+        self.assertIsNotNone(first_result)
+        self.assertIsNotNone(second_result)
+
+    def test_migrate_container_creates_new_container(self):
+        """Test _migrate_container creates a new container when none exists"""
+        source_key = self.course.id.make_usage_key("vertical", "test_vertical")
+
+        # Create some child components first
+        child_component_1 = authoring_api.create_component(
+            self.learning_package.id,
+            component_type=authoring_api.get_or_create_component_type(
+                "xblock.v1", "problem"
+            ),
+            local_key="child_problem_1",
+            created=timezone.now(),
+            created_by=self.user.id,
+        )
+        child_version_1 = authoring_api.create_next_component_version(
+            child_component_1.pk,
+            content_to_replace={},
+            created=timezone.now(),
+            created_by=self.user.id,
+        )
+
+        child_component_2 = authoring_api.create_component(
+            self.learning_package.id,
+            component_type=authoring_api.get_or_create_component_type(
+                "xblock.v1", "html"
+            ),
+            local_key="child_html_1",
+            created=timezone.now(),
+            created_by=self.user.id,
+        )
+        child_version_2 = authoring_api.create_next_component_version(
+            child_component_2.pk,
+            content_to_replace={},
+            created=timezone.now(),
+            created_by=self.user.id,
+        )
+
+        children = [
+            child_version_1.publishable_entity_version,
+            child_version_2.publishable_entity_version,
+        ]
+
+        print("=" * 40)
+        print(self.library.library_key)
+        print(self.learning_package.id)
+        print(self.learning_package.key)
+        print("=" * 40)
+        result = _migrate_container(
+            source_key=source_key,
+            container_type=ContainerType.Unit,
+            title="Test Vertical",
+            children=children,
+            target_library_key=self.library.library_key,
+            replace_existing=False,
+            created_by=self.user.id,
+            created_at=timezone.now(),
+        )
+
+        self.assertIsNotNone(result)
+        self.assertIsInstance(result, PublishableEntityVersion)
+
+        # Verify container was created with correct properties
+        container_version = result.containerversion
+        self.assertEqual(container_version.title, "Test Vertical")
+
+        # Verify children were added
+        entity_rows = container_version.entity_list.entitylistrow_set.all()
+        self.assertEqual(len(entity_rows), 2)
+
+        child_entity_ids = {row.entity_id for row in entity_rows}
+        expected_entity_ids = {child.entity_id for child in children}
+        self.assertEqual(child_entity_ids, expected_entity_ids)
+
+    def test_migrate_container_different_container_types(self):
+        """Test _migrate_container works with different container types"""
+        container_types = [
+            (ContainerType.Unit, "vertical"),
+            (ContainerType.Subsection, "sequential"),
+            (ContainerType.Section, "chapter"),
+        ]
+
+        for container_type, block_type in container_types:
+            with self.subTest(container_type=container_type, block_type=block_type):
+                source_key = self.course.id.make_usage_key(
+                    block_type, f"test_{block_type}"
+                )
+
+                result = _migrate_container(
+                    source_key=source_key,
+                    container_type=container_type,
+                    title=f"Test {block_type.title()}",
+                    children=[],
+                    target_library_key=self.library.library_key,
+                    replace_existing=False,
+                    created_by=self.user.id,
+                    created_at=timezone.now(),
+                )
+
+                self.assertIsNotNone(result)
+
+                # Verify container was created with correct type
+                container_version = result.containerversion
+                self.assertEqual(container_version.title, f"Test {block_type.title()}")
+
+    def test_migrate_container_replace_existing_false(self):
+        """Test _migrate_container returns existing container when replace_existing=False"""
+        source_key = self.course.id.make_usage_key("vertical", "existing_vertical")
+
+        # Create container first time
+        first_result = _migrate_container(
+            source_key=source_key,
+            container_type=ContainerType.Unit,
+            title="Original Title",
+            children=[],
+            target_library_key=self.library.library_key,
+            replace_existing=False,
+            created_by=self.user.id,
+            created_at=timezone.now(),
+        )
+
+        # Try to create again with different title and replace_existing=False
+        second_result = _migrate_container(
+            source_key=source_key,
+            container_type=ContainerType.Unit,
+            title="Updated Title",
+            children=[],
+            target_library_key=self.library.library_key,
+            replace_existing=False,
+            created_by=self.user.id,
+            created_at=timezone.now(),
+        )
+
+        # Should return the same entity and version
+        self.assertEqual(first_result.entity_id, second_result.entity_id)
+        self.assertEqual(first_result.version_num, second_result.version_num)
+
+        # Title should remain unchanged
+        container_version = second_result.containerversion
+        self.assertEqual(container_version.title, "Original Title")
+
+    def test_migrate_container_replace_existing_true(self):
+        """Test _migrate_container creates new version when replace_existing=True"""
+        source_key = self.course.id.make_usage_key("vertical", "replaceable_vertical")
+
+        # Create initial child component
+        child_component = authoring_api.create_component(
+            self.learning_package.id,
+            component_type=authoring_api.get_or_create_component_type(
+                "xblock.v1", "problem"
+            ),
+            local_key="child_problem",
+            created=timezone.now(),
+            created_by=self.user.id,
+        )
+        child_version = authoring_api.create_next_component_version(
+            child_component.pk,
+            content_to_replace={},
+            created=timezone.now(),
+            created_by=self.user.id,
+        )
+
+        # Create container first time
+        first_result = _migrate_container(
+            source_key=source_key,
+            container_type=ContainerType.Unit,
+            title="Original Title",
+            children=[],
+            target_library_key=self.library.library_key,
+            replace_existing=False,
+            created_by=self.user.id,
+            created_at=timezone.now(),
+        )
+
+        # Replace with new content
+        second_result = _migrate_container(
+            source_key=source_key,
+            container_type=ContainerType.Unit,
+            title="Updated Title",
+            children=[child_version.publishable_entity_version],
+            target_library_key=self.library.library_key,
+            replace_existing=True,
+            created_by=self.user.id,
+            created_at=timezone.now(),
+        )
+
+        # Should be same entity but different version
+        self.assertEqual(first_result.entity_id, second_result.entity_id)
+        self.assertNotEqual(first_result.version_num, second_result.version_num)
+
+        # Title and children should be updated
+        container_version = second_result.containerversion
+        self.assertEqual(container_version.title, "Updated Title")
+        self.assertEqual(container_version.entity_list.entitylistrow_set.count(), 1)
+
+    def test_migrate_container_with_library_source_key(self):
+        """Test _migrate_container with library source key"""
+        library_key = LibraryLocator(org="TestOrg", library="TestLibrary")
+        source_key = library_key.make_usage_key("vertical", "library_vertical")
+
+        result = _migrate_container(
+            source_key=source_key,
+            container_type=ContainerType.Unit,
+            title="Library Vertical",
+            children=[],
+            target_library_key=self.library.library_key,
+            replace_existing=False,
+            created_by=self.user.id,
+            created_at=timezone.now(),
+        )
+
+        self.assertIsNotNone(result)
+
+        # Verify correct slugified key was generated
+        container_version = result.containerversion
+        self.assertEqual(container_version.title, "Library Vertical")
+
+    def test_migrate_container_empty_children_list(self):
+        """Test _migrate_container handles empty children list"""
+        source_key = self.course.id.make_usage_key("vertical", "empty_vertical")
+
+        result = _migrate_container(
+            source_key=source_key,
+            container_type=ContainerType.Unit,
+            title="Empty Vertical",
+            children=[],
+            target_library_key=self.library.library_key,
+            replace_existing=False,
+            created_by=self.user.id,
+            created_at=timezone.now(),
+        )
+
+        self.assertIsNotNone(result)
+
+        # Verify container was created with no children
+        container_version = result.containerversion
+        self.assertEqual(container_version.entity_list.entitylistrow_set.count(), 0)
+
+    def test_migrate_container_preserves_child_order(self):
+        """Test _migrate_container preserves the order of children"""
+        source_key = self.course.id.make_usage_key("vertical", "ordered_vertical")
+
+        # Create multiple child components
+        children = []
+        for i in range(3):
+            child_component = authoring_api.create_component(
+                self.learning_package.id,
+                component_type=authoring_api.get_or_create_component_type(
+                    "xblock.v1", "problem"
+                ),
+                local_key=f"child_problem_{i}",
+                created=timezone.now(),
+                created_by=self.user.id,
+            )
+            child_version = authoring_api.create_next_component_version(
+                child_component.pk,
+                content_to_replace={},
+                created=timezone.now(),
+                created_by=self.user.id,
+            )
+            children.append(child_version.publishable_entity_version)
+
+        result = _migrate_container(
+            source_key=source_key,
+            container_type=ContainerType.Unit,
+            title="Ordered Vertical",
+            children=children,
+            target_library_key=self.library.library_key,
+            replace_existing=False,
+            created_by=self.user.id,
+            created_at=timezone.now(),
+        )
+
+        # Verify children order is preserved
+        container_version = result.containerversion
+        entity_rows = list(
+            container_version.entity_list.entitylistrow_set.order_by("order_num")
+        )
+
+        self.assertEqual(len(entity_rows), 3)
+        for i, (expected_child, actual_row) in enumerate(zip(children, entity_rows)):
+            self.assertEqual(expected_child.entity_id, actual_row.entity_id)
+
+    def test_migrate_container_with_mixed_child_types(self):
+        """Test _migrate_container with children of different component types"""
+        source_key = self.course.id.make_usage_key("vertical", "mixed_vertical")
+
+        # Create children of different types
+        problem_component = authoring_api.create_component(
+            self.learning_package.id,
+            component_type=authoring_api.get_or_create_component_type(
+                "xblock.v1", "problem"
+            ),
+            local_key="mixed_problem",
+            created=timezone.now(),
+            created_by=self.user.id,
+        )
+        problem_version = authoring_api.create_next_component_version(
+            problem_component.pk,
+            content_to_replace={},
+            created=timezone.now(),
+            created_by=self.user.id,
+        )
+
+        html_component = authoring_api.create_component(
+            self.learning_package.id,
+            component_type=authoring_api.get_or_create_component_type(
+                "xblock.v1", "html"
+            ),
+            local_key="mixed_html",
+            created=timezone.now(),
+            created_by=self.user.id,
+        )
+        html_version = authoring_api.create_next_component_version(
+            html_component.pk,
+            content_to_replace={},
+            created=timezone.now(),
+            created_by=self.user.id,
+        )
+
+        video_component = authoring_api.create_component(
+            self.learning_package.id,
+            component_type=authoring_api.get_or_create_component_type(
+                "xblock.v1", "video"
+            ),
+            local_key="mixed_video",
+            created=timezone.now(),
+            created_by=self.user.id,
+        )
+        video_version = authoring_api.create_next_component_version(
+            video_component.pk,
+            content_to_replace={},
+            created=timezone.now(),
+            created_by=self.user.id,
+        )
+
+        children = [
+            problem_version.publishable_entity_version,
+            html_version.publishable_entity_version,
+            video_version.publishable_entity_version,
+        ]
+
+        result = _migrate_container(
+            source_key=source_key,
+            container_type=ContainerType.Unit,
+            title="Mixed Content Vertical",
+            children=children,
+            target_library_key=self.library.library_key,
+            replace_existing=False,
+            created_by=self.user.id,
+            created_at=timezone.now(),
+        )
+
+        self.assertIsNotNone(result)
+
+        # Verify all children were added
+        container_version = result.containerversion
+        self.assertEqual(container_version.entity_list.entitylistrow_set.count(), 3)
+
+        # Verify each child type is present
+        child_entity_ids = set(
+            container_version.entity_list.entitylistrow_set.values_list(
+                "entity_id", flat=True
+            )
+        )
+        expected_entity_ids = {child.entity_id for child in children}
+        self.assertEqual(child_entity_ids, expected_entity_ids)
+
+    def test_migrate_container_generates_correct_target_key(self):
+        """Test _migrate_container generates correct target key from source key"""
+        # Test with course source key
+        course_source_key = self.course.id.make_usage_key("vertical", "test_vertical")
+
+        course_result = _migrate_container(
+            source_key=course_source_key,
+            container_type=ContainerType.Unit,
+            title="Course Vertical",
+            children=[],
+            target_library_key=self.library.library_key,
+            replace_existing=False,
+            created_by=self.user.id,
+            created_at=timezone.now(),
+        )
+
+        # Test with library source key
+        library_key = LibraryLocator(org="TestOrg", library="TestLibrary")
+        library_source_key = library_key.make_usage_key("vertical", "test_vertical")
+
+        library_result = _migrate_container(
+            source_key=library_source_key,
+            container_type=ContainerType.Unit,
+            title="Library Vertical",
+            children=[],
+            target_library_key=self.library.library_key,
+            replace_existing=False,
+            created_by=self.user.id,
+            created_at=timezone.now(),
+        )
+
+        # Both should succeed but have different underlying identifiers
+        self.assertIsNotNone(course_result)
+        self.assertIsNotNone(library_result)
+        self.assertNotEqual(course_result.entity_id, library_result.entity_id)
+
+    def test_migrate_from_modulestore_success_course(self):
+        """Test successful migration from course to library"""
+        source = ModulestoreSource.objects.create(key=self.course.id)
+
+        task = migrate_from_modulestore.apply_async(
+            kwargs={
+                "user_id": self.user.id,
+                "source_pk": source.id,
+                "target_package_pk": self.learning_package.id,
+                "target_collection_pk": self.collection.id,
+                "replace_existing": False,
+                "composition_level": CompositionLevel.Unit.value,
+                "forward_source_to_target": False,
+            }
+        )
+
+        task.get()
+
+        # Verify task completed successfully
+        status = UserTaskStatus.objects.get(task_id=task.id)
+        self.assertEqual(status.state, UserTaskStatus.SUCCEEDED)
+
+        # Verify migration record was created
+        migration = ModulestoreMigration.objects.get(
+            source=source, target=self.learning_package
+        )
+        self.assertEqual(migration.composition_level, CompositionLevel.Unit.value)
+        self.assertFalse(migration.replace_existing)
+
+    def test_migrate_from_modulestore_library_validation_failure(self):
+        """Test migration from legacy library fails when modulestore content doesn't exist"""
+        library_key = LibraryLocator(org="TestOrg", library="TestLibrary")
+
+        source = ModulestoreSource.objects.create(key=library_key)
+
+        task = migrate_from_modulestore.apply_async(
+            kwargs={
+                "user_id": self.user.id,
+                "source_pk": source.id,
+                "target_package_pk": self.learning_package.id,
+                "target_collection_pk": None,
+                "replace_existing": True,
+                "composition_level": CompositionLevel.Section.value,
+                "forward_source_to_target": True,
+            }
+        )
+
+        # This will fail because we don't have actual library content in modulestore
+        task.get()
+        status = UserTaskStatus.objects.get(task_id=task.id)
+
+        # Should fail at loading step since we don't have real modulestore content
+        self.assertEqual(status.state, UserTaskStatus.FAILED)
+
+    def test_migrate_from_modulestore_invalid_source_key_type(self):
+        """Test migration with invalid source key type"""
+        # Create a source with an invalid key type
+        invalid_key = LibraryLocatorV2.from_string("lib:testorg:invalid")
+        source = ModulestoreSource.objects.create(key=invalid_key)
+
+        task = migrate_from_modulestore.apply_async(
+            kwargs={
+                "user_id": self.user.id,
+                "source_pk": source.id,
+                "target_package_pk": self.learning_package.id,
+                "target_collection_pk": self.collection.id,
+                "replace_existing": False,
+                "composition_level": CompositionLevel.Unit.value,
+                "forward_source_to_target": False,
+            }
+        )
+
+        result = task.get()
+        self.assertIsNone(result)
+
+        status = UserTaskStatus.objects.get(task_id=task.id)
+        self.assertEqual(status.state, UserTaskStatus.FAILED)
+
+    def test_migrate_from_modulestore_nonexistent_modulestore_item(self):
+        """Test migration when modulestore item doesn't exist"""
+        # Create source with course that doesn't exist in modulestore
+        nonexistent_course_key = CourseKey.from_string(
+            "course-v1:NonExistent+Course+Run"
+        )
+        source = ModulestoreSource.objects.create(key=nonexistent_course_key)
+
+        task = migrate_from_modulestore.apply_async(
+            kwargs={
+                "user_id": self.user.id,
+                "source_pk": source.id,
+                "target_package_pk": self.learning_package.id,
+                "target_collection_pk": self.collection.id,
+                "replace_existing": False,
+                "composition_level": CompositionLevel.Unit.value,
+                "forward_source_to_target": False,
+            }
+        )
+
+        result = task.get()
+        self.assertIsNone(result)
+
+        status = UserTaskStatus.objects.get(task_id=task.id)
+        self.assertEqual(status.state, UserTaskStatus.FAILED)
+
+    def test_migrate_from_modulestore_task_status_progression(self):
+        """Test that task status progresses through expected steps"""
+        source = ModulestoreSource.objects.create(key=self.course.id)
+
+        task = migrate_from_modulestore.apply_async(
+            kwargs={
+                "user_id": self.user.id,
+                "source_pk": source.id,
+                "target_package_pk": self.learning_package.id,
+                "target_collection_pk": self.collection.id,
+                "replace_existing": False,
+                "composition_level": CompositionLevel.Unit.value,
+                "forward_source_to_target": False,
+            }
+        )
+
+        task.get()
+
+        # Verify task went through validation step
+        status = UserTaskStatus.objects.get(task_id=task.id)
+
+        # Should either succeed or fail, but should have progressed past validation
+        self.assertIn(status.state, [UserTaskStatus.SUCCEEDED, UserTaskStatus.FAILED])
+
+        # Verify migration task was created
+        migration = ModulestoreMigration.objects.get(
+            source=source, target=self.learning_package
+        )
+        self.assertEqual(migration.task_status, status)
+
+    def test_migrate_from_modulestore_multiple_users_no_interference(self):
+        """Test that migrations by different users don't interfere with each other"""
+        source = ModulestoreSource.objects.create(key=self.course.id)
+        other_user = UserFactory()
+
+        # Start migration for first user
+        task1 = migrate_from_modulestore.apply_async(
+            kwargs={
+                "user_id": self.user.id,
+                "source_pk": source.id,
+                "target_package_pk": self.learning_package.id,
+                "target_collection_pk": self.collection.id,
+                "replace_existing": False,
+                "composition_level": CompositionLevel.Unit.value,
+                "forward_source_to_target": False,
+            }
+        )
+
+        # Start migration for second user with same source/target
+        task2 = migrate_from_modulestore.apply_async(
+            kwargs={
+                "user_id": other_user.id,
+                "source_pk": source.id,
+                "target_package_pk": self.learning_package.id,
+                "target_collection_pk": self.collection.id,
+                "replace_existing": False,
+                "composition_level": CompositionLevel.Unit.value,
+                "forward_source_to_target": False,
+            }
+        )
+
+        # Both tasks should complete (or fail) independently
+        task1.get()
+        task2.get()
+
+        # Verify both tasks created their own status records
+        status1 = UserTaskStatus.objects.get(task_id=task1.id)
+        status2 = UserTaskStatus.objects.get(task_id=task2.id)
+
+        self.assertEqual(status1.user, self.user)
+        self.assertEqual(status2.user, other_user)
+
+        # The first task should not be cancelled since it's from a different user
+        self.assertNotEqual(status1.state, UserTaskStatus.CANCELED)

From ccd08fe3d51b513c3506e0c549055bbe86a2d52b Mon Sep 17 00:00:00 2001
From: Andrii <andrii.hantkovskyi@raccoongang.com>
Date: Mon, 16 Jun 2025 15:35:11 +0300
Subject: [PATCH 16/40] test: add collection_slug case

---
 .../modulestore_migrator/tests/test_api.py    | 51 +++++++++++++++++--
 1 file changed, 48 insertions(+), 3 deletions(-)

diff --git a/cms/djangoapps/modulestore_migrator/tests/test_api.py b/cms/djangoapps/modulestore_migrator/tests/test_api.py
index 56611a30a736..f5587a7ae248 100644
--- a/cms/djangoapps/modulestore_migrator/tests/test_api.py
+++ b/cms/djangoapps/modulestore_migrator/tests/test_api.py
@@ -2,6 +2,9 @@
 Test cases for the modulestore migrator API.
 """
 
+from opaque_keys.edx.locator import LibraryLocatorV2
+from openedx_learning.api import authoring as authoring_api
+from organizations.tests.factories import OrganizationFactory
 import pytest
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 
@@ -9,7 +12,8 @@
 from cms.djangoapps.modulestore_migrator import api
 from cms.djangoapps.modulestore_migrator.data import CompositionLevel
 from cms.djangoapps.modulestore_migrator.models import ModulestoreMigration
-from cms.djangoapps.modulestore_migrator.tests.factories import ContentLibraryFactory, ModulestoreSourceFactory
+from cms.djangoapps.modulestore_migrator.tests.factories import ModulestoreSourceFactory
+from openedx.core.djangoapps.content_libraries import api as lib_api
 
 
 @pytest.mark.django_db
@@ -21,7 +25,17 @@ class TestModulestoreMigratorAPI(ModuleStoreTestCase):
     def setUp(self):
         super().setUp()
 
-        self.library = ContentLibraryFactory()
+        self.organization = OrganizationFactory()
+        self.lib_key = LibraryLocatorV2.from_string(
+            f"lib:{self.organization.short_name}:test-key"
+        )
+        lib_api.create_library(
+            org=self.organization,
+            slug=self.lib_key.slug,
+            title="Test Library",
+        )
+        self.library = lib_api.ContentLibrary.objects.get(slug=self.lib_key.slug)
+        self.learning_package = self.library.learning_package
 
     def test_start_migration_to_library(self):
         """
@@ -42,7 +56,38 @@ def test_start_migration_to_library(self):
 
         modulestoremigration = ModulestoreMigration.objects.get()
         assert modulestoremigration.source.key == source.key
-        assert modulestoremigration.composition_level == CompositionLevel.Component.value
+        assert (
+            modulestoremigration.composition_level == CompositionLevel.Component.value
+        )
         assert modulestoremigration.replace_existing is False
         assert modulestoremigration.task_status is not None
         assert modulestoremigration.task_status.user == user
+
+    def test_start_migration_to_library_with_collection(self):
+        """
+        Test that the API can start a migration to a library with a target collection.
+        """
+
+        source = ModulestoreSourceFactory()
+        user = UserFactory()
+
+        collection_key = "test-collection"
+        authoring_api.create_collection(
+            learning_package_id=self.learning_package.id,
+            key=collection_key,
+            title="Test Collection",
+            created_by=user.id,
+        )
+
+        api.start_migration_to_library(
+            user=user,
+            source_key=source.key,
+            target_library_key=self.library.library_key,
+            target_collection_slug=collection_key,
+            composition_level=CompositionLevel.Component.value,
+            replace_existing=False,
+            forward_source_to_target=False,
+        )
+
+        modulestoremigration = ModulestoreMigration.objects.get()
+        assert modulestoremigration.target_collection.key == collection_key

From 7c77cc5e8bdb46c714f7e705010f51d4cb510f12 Mon Sep 17 00:00:00 2001
From: Andrii <andrii.hantkovskyi@raccoongang.com>
Date: Mon, 16 Jun 2025 15:35:35 +0300
Subject: [PATCH 17/40] refactor: remove ContentLibrary & LearningPackage
 factories

---
 .../modulestore_migrator/tests/factories.py   | 46 +------------------
 1 file changed, 1 insertion(+), 45 deletions(-)

diff --git a/cms/djangoapps/modulestore_migrator/tests/factories.py b/cms/djangoapps/modulestore_migrator/tests/factories.py
index 2e4fa441b5e1..91d53d659814 100644
--- a/cms/djangoapps/modulestore_migrator/tests/factories.py
+++ b/cms/djangoapps/modulestore_migrator/tests/factories.py
@@ -5,41 +5,8 @@
 
 import factory
 from opaque_keys.edx.keys import LearningContextKey
-from openedx_learning.api.authoring_models import LearningPackage
-from organizations.tests.factories import OrganizationFactory
 
-from common.djangoapps.student.tests.factories import UserFactory
-from cms.djangoapps.modulestore_migrator.models import ModulestoreSource, ModulestoreMigration
-from openedx.core.djangoapps.content_libraries.api import ContentLibrary
-
-
-class LearningPackageFactory(factory.django.DjangoModelFactory):
-    """
-    Factory for LearningPackage model.
-    """
-
-    class Meta:
-        model = LearningPackage
-
-    title = factory.Faker('sentence')
-    description = factory.Faker('sentence')
-    uuid = factory.LazyFunction(lambda: str(uuid.uuid4()))
-    created = factory.Faker('date_time')
-    updated = factory.Faker('date_time')
-
-
-class ContentLibraryFactory(factory.django.DjangoModelFactory):
-    """
-    Factory for ContentLibrary model.
-    """
-
-    class Meta:
-        model = ContentLibrary
-
-    org = factory.SubFactory(OrganizationFactory)
-    license = factory.Faker('sentence')
-    slug = factory.Faker('slug')
-    learning_package = factory.SubFactory(LearningPackageFactory)
+from cms.djangoapps.modulestore_migrator.models import ModulestoreSource
 
 
 class ModulestoreSourceFactory(factory.django.DjangoModelFactory):
@@ -53,14 +20,3 @@ class Meta:
     @factory.lazy_attribute
     def key(self):
         return LearningContextKey.from_string(f"course-v1:edX+DemoX+{uuid.uuid4()}")
-
-
-class ModulestoreMigrationFactory(factory.django.DjangoModelFactory):
-    """
-    Factory for creating ModulestoreMigration instances.
-    """
-    class Meta:
-        model = ModulestoreMigration
-
-    source = factory.SubFactory(ModulestoreSourceFactory)
-    user = factory.SubFactory(UserFactory)

From 6fdb33acd531fa538ce681f26518c006f08f7952 Mon Sep 17 00:00:00 2001
From: Andrii <andrii.hantkovskyi@raccoongang.com>
Date: Mon, 16 Jun 2025 15:37:51 +0300
Subject: [PATCH 18/40] refactor: fix docstring style, remove redundant
 comments & clean a little bit

---
 .../modulestore_migrator/tests/test_tasks.py  | 292 +++++++++---------
 1 file changed, 152 insertions(+), 140 deletions(-)

diff --git a/cms/djangoapps/modulestore_migrator/tests/test_tasks.py b/cms/djangoapps/modulestore_migrator/tests/test_tasks.py
index 2ef6e7d5a0c9..93908bace90d 100644
--- a/cms/djangoapps/modulestore_migrator/tests/test_tasks.py
+++ b/cms/djangoapps/modulestore_migrator/tests/test_tasks.py
@@ -11,6 +11,7 @@
 from openedx_learning.api.authoring_models import Collection, PublishableEntityVersion
 from openedx_learning.api import authoring as authoring_api
 from organizations.tests.factories import OrganizationFactory
+from user_tasks.models import UserTaskArtifact
 from user_tasks.tasks import UserTaskStatus
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory
@@ -31,8 +32,7 @@
     migrate_from_modulestore,
     MigrationStep,
 )
-from cms.djangoapps.modulestore_migrator.tests.factories import ContentLibraryFactory
-from openedx.core.djangoapps.content_libraries.api import ContainerType
+from openedx.core.djangoapps.content_libraries import api as lib_api
 
 
 @ddt.ddt
@@ -44,19 +44,17 @@ class TestMigrateFromModulestore(ModuleStoreTestCase):
     def setUp(self):
         super().setUp()
         self.user = UserFactory()
-        lib_key = LibraryLocatorV2.from_string("lib:testorg:tes-key")
-        self.learning_package = authoring_api.create_learning_package(
-            key=lib_key,
-            title="Test Package",
-            created=timezone.now(),
-            description="Test Description",
+        self.organization = OrganizationFactory(short_name="testorg")
+        lib_key = LibraryLocatorV2.from_string(
+            f"lib:{self.organization.short_name}:test-key"
         )
-        self.library = ContentLibraryFactory(
-            org=OrganizationFactory(short_name=lib_key.org),
+        lib_api.create_library(
+            org=self.organization,
             slug=lib_key.slug,
-            learning_package=self.learning_package,
+            title="Test Library",
         )
-        self.organization = self.library.org
+        self.library = lib_api.ContentLibrary.objects.get(slug=lib_key.slug)
+        self.learning_package = self.library.learning_package
         self.course = CourseFactory(
             org=self.organization.short_name,
             course="TestCourse",
@@ -69,8 +67,18 @@ def setUp(self):
             title="Test Collection",
         )
 
+    def _get_task_status_fail_message(self, status):
+        """
+        Helper method to get the failure message from a UserTaskStatus object.
+        """
+        if status.state == UserTaskStatus.FAILED:
+            return UserTaskArtifact.objects.get(status=status, name="Error").text
+        return None
+
     def test_slugify_source_usage_key_course(self):
-        """Test _slugify_source_usage_key with course usage key"""
+        """
+        Test _slugify_source_usage_key with course usage key
+        """
         course_key = CourseKey.from_string("course-v1:TestOrg+TestCourse+TestRun")
         usage_key = course_key.make_usage_key("problem", "test_problem")
 
@@ -79,7 +87,9 @@ def test_slugify_source_usage_key_course(self):
         self.assertEqual(result, "TestOrg__TestCourse__TestRun__test_problem")
 
     def test_slugify_source_usage_key_library(self):
-        """Test _slugify_source_usage_key with library usage key"""
+        """
+        Test _slugify_source_usage_key with library usage key
+        """
         library_key = LibraryLocator(org="TestOrg", library="TestLibrary")
         usage_key = library_key.make_usage_key("problem", "test_problem")
 
@@ -88,7 +98,9 @@ def test_slugify_source_usage_key_library(self):
         self.assertEqual(result, "TestOrg__TestLibrary__test_problem")
 
     def test_migrate_node_wiki_tag(self):
-        """Test _migrate_node ignores wiki tags"""
+        """
+        Test _migrate_node ignores wiki tags
+        """
         wiki_node = etree.fromstring("<wiki />")
 
         result = _migrate_node(
@@ -107,7 +119,9 @@ def test_migrate_node_wiki_tag(self):
         self.assertEqual(len(result.children), 0)
 
     def test_migrate_node_course_root(self):
-        """Test _migrate_node handles course root"""
+        """
+        Test _migrate_node handles course root
+        """
         course_node = etree.fromstring(
             '<course url_name="course" display_name="Test Course">'
             '<chapter url_name="chapter1" display_name="Chapter 1" />'
@@ -132,7 +146,9 @@ def test_migrate_node_course_root(self):
         self.assertEqual(len(result.children), 1)
 
     def test_migrate_node_library_root(self):
-        """Test _migrate_node handles library root"""
+        """
+        Test _migrate_node handles library root
+        """
         library_node = etree.fromstring(
             '<library url_name="library" display_name="Test Library">'
             '<problem url_name="problem1" display_name="Problem 1" />'
@@ -167,7 +183,9 @@ def test_migrate_node_library_root(self):
     def test_migrate_node_container_composition_level(
         self, tag_name, composition_level, should_migrate
     ):
-        """Test _migrate_node respects composition level for containers"""
+        """
+        Test _migrate_node respects composition level for containers
+        """
         container_node = etree.fromstring(
             f'<{tag_name} url_name="test_{tag_name}" display_name="Test {tag_name.title()}" />'
         )
@@ -193,7 +211,9 @@ def test_migrate_node_container_composition_level(
             self.assertIsNone(result.source_to_target)
 
     def test_migrate_node_without_url_name(self):
-        """Test _migrate_node handles nodes without url_name"""
+        """
+        Test _migrate_node handles nodes without url_name
+        """
         node_without_url_name = etree.fromstring(
             '<problem display_name="No URL Name" />'
         )
@@ -214,8 +234,9 @@ def test_migrate_node_without_url_name(self):
         self.assertEqual(len(result.children), 0)
 
     def test_migrated_node_all_source_to_target_pairs(self):
-        """Test _MigratedNode.all_source_to_target_pairs traversal"""
-
+        """
+        Test _MigratedNode.all_source_to_target_pairs traversal
+        """
         mock_version1 = Mock(spec=PublishableEntityVersion)
         mock_version2 = Mock(spec=PublishableEntityVersion)
         mock_version3 = Mock(spec=PublishableEntityVersion)
@@ -224,9 +245,7 @@ def test_migrated_node_all_source_to_target_pairs(self):
         key2 = self.course.id.make_usage_key("problem", "problem2")
         key3 = self.course.id.make_usage_key("problem", "problem3")
 
-        # Create nested structure
         child_node = _MigratedNode(source_to_target=(key3, mock_version3), children=[])
-
         parent_node = _MigratedNode(
             source_to_target=(key1, mock_version1),
             children=[
@@ -243,7 +262,9 @@ def test_migrated_node_all_source_to_target_pairs(self):
         self.assertEqual(pairs[2][0], key3)
 
     def test_migrate_from_modulestore_invalid_source(self):
-        """Test migrate_from_modulestore with invalid source"""
+        """
+        Test migrate_from_modulestore with invalid source
+        """
         task = migrate_from_modulestore.apply_async(
             kwargs={
                 "user_id": self.user.id,
@@ -256,14 +277,14 @@ def test_migrate_from_modulestore_invalid_source(self):
             }
         )
 
-        result = task.get()
-        self.assertIsNone(result)
-
         status = UserTaskStatus.objects.get(task_id=task.id)
         self.assertEqual(status.state, UserTaskStatus.FAILED)
+        self.assertEqual(self._get_task_status_fail_message(status), "ModulestoreSource matching query does not exist.")
 
     def test_migrate_from_modulestore_invalid_target_package(self):
-        """Test migrate_from_modulestore with invalid target package"""
+        """
+        Test migrate_from_modulestore with invalid target package
+        """
         source = ModulestoreSource.objects.create(
             key=self.course.id,
         )
@@ -280,14 +301,14 @@ def test_migrate_from_modulestore_invalid_target_package(self):
             }
         )
 
-        result = task.get()
-        self.assertIsNone(result)
-
         status = UserTaskStatus.objects.get(task_id=task.id)
         self.assertEqual(status.state, UserTaskStatus.FAILED)
+        self.assertEqual(self._get_task_status_fail_message(status), "LearningPackage matching query does not exist.")
 
     def test_migrate_from_modulestore_invalid_collection(self):
-        """Test migrate_from_modulestore with invalid collection"""
+        """
+        Test migrate_from_modulestore with invalid collection
+        """
         source = ModulestoreSource.objects.create(
             key=self.course.id,
         )
@@ -304,20 +325,22 @@ def test_migrate_from_modulestore_invalid_collection(self):
             }
         )
 
-        result = task.get()
-        self.assertIsNone(result)
-
         status = UserTaskStatus.objects.get(task_id=task.id)
         self.assertEqual(status.state, UserTaskStatus.FAILED)
+        self.assertEqual(self._get_task_status_fail_message(status), "Collection matching query does not exist.")
 
     def test_migration_task_calculate_total_steps(self):
-        """Test _MigrationTask.calculate_total_steps returns correct count"""
+        """
+        Test _MigrationTask.calculate_total_steps returns correct count
+        """
         total_steps = _MigrationTask.calculate_total_steps({})
         expected_steps = len(list(MigrationStep))
         self.assertEqual(total_steps, expected_steps)
 
     def test_migrate_component_success(self):
-        """Test _migrate_component successfully creates a new component"""
+        """
+        Test _migrate_component successfully creates a new component
+        """
         source_key = self.course.id.make_usage_key("problem", "test_problem")
         olx = '<problem display_name="Test Problem"><multiplechoiceresponse></multiplechoiceresponse></problem>'
 
@@ -335,17 +358,17 @@ def test_migrate_component_success(self):
         self.assertIsNotNone(result)
         self.assertIsInstance(result, PublishableEntityVersion)
 
-        # Verify component was created
         self.assertEqual(
             "problem", result.componentversion.component.component_type.name
         )
 
     def test_migrate_component_with_static_content(self):
-        """Test _migrate_component with static file content"""
+        """
+        Test _migrate_component with static file content
+        """
         source_key = self.course.id.make_usage_key("problem", "test_problem_with_image")
         olx = '<problem display_name="Test Problem"><p>See image: test_image.png</p></problem>'
 
-        # Create some test content
         media_type = authoring_api.get_or_create_media_type("image/png")
         test_content = authoring_api.get_or_create_file_content(
             self.learning_package.id,
@@ -369,7 +392,6 @@ def test_migrate_component_with_static_content(self):
 
         self.assertIsNotNone(result)
 
-        # Verify component version content was created
         component_content = result.componentversion.componentversioncontent_set.filter(
             key="static/test_image.png"
         ).first()
@@ -377,11 +399,12 @@ def test_migrate_component_with_static_content(self):
         self.assertEqual(component_content.content_id, test_content.id)
 
     def test_migrate_component_replace_existing_false(self):
-        """Test _migrate_component with replace_existing=False returns existing component"""
+        """
+        Test _migrate_component with replace_existing=False returns existing component
+        """
         source_key = self.course.id.make_usage_key("problem", "existing_problem")
         olx = '<problem display_name="Test Problem"><multiplechoiceresponse></multiplechoiceresponse></problem>'
 
-        # Create component first time
         first_result = _migrate_component(
             content_by_filename={},
             source_key=source_key,
@@ -393,7 +416,6 @@ def test_migrate_component_replace_existing_false(self):
             created_at=timezone.now(),
         )
 
-        # Try to create again with replace_existing=False
         second_result = _migrate_component(
             content_by_filename={},
             source_key=source_key,
@@ -409,11 +431,12 @@ def test_migrate_component_replace_existing_false(self):
         self.assertEqual(first_result.version_num, second_result.version_num)
 
     def test_migrate_component_replace_existing_true(self):
-        """Test _migrate_component with replace_existing=True creates new version"""
+        """
+        Test _migrate_component with replace_existing=True creates new version
+        """
         source_key = self.course.id.make_usage_key("problem", "replaceable_problem")
         original_olx = '<problem display_name="Original"><multiplechoiceresponse></multiplechoiceresponse></problem>'
 
-        # Create component first time
         first_result = _migrate_component(
             content_by_filename={},
             source_key=source_key,
@@ -425,7 +448,6 @@ def test_migrate_component_replace_existing_true(self):
             created_at=timezone.now(),
         )
 
-        # Replace with new content
         updated_olx = '<problem display_name="Updated"><multiplechoiceresponse></multiplechoiceresponse></problem>'
         second_result = _migrate_component(
             content_by_filename={},
@@ -442,7 +464,9 @@ def test_migrate_component_replace_existing_true(self):
         self.assertNotEqual(first_result.version_num, second_result.version_num)
 
     def test_migrate_component_different_block_types(self):
-        """Test _migrate_component with different block types"""
+        """
+        Test _migrate_component with different block types
+        """
         block_types = ["problem", "html", "video", "discussion"]
 
         for block_type in block_types:
@@ -462,19 +486,19 @@ def test_migrate_component_different_block_types(self):
 
             self.assertIsNotNone(result, f"Failed to migrate {block_type}")
 
-            # Verify correct component type was created
             self.assertEqual(
                 block_type, result.componentversion.component.component_type.name
             )
 
     def test_migrate_component_content_filename_not_in_olx(self):
-        """Test _migrate_component ignores content files not referenced in OLX"""
+        """
+        Test _migrate_component ignores content files not referenced in OLX
+        """
         source_key = self.course.id.make_usage_key(
             "problem", "test_problem_selective_content"
         )
         olx = '<problem display_name="Test Problem"><p>See image: referenced.png</p></problem>'
 
-        # Create test content
         media_type = authoring_api.get_or_create_media_type("image/png")
         referenced_content = authoring_api.get_or_create_file_content(
             self.learning_package.id,
@@ -507,7 +531,6 @@ def test_migrate_component_content_filename_not_in_olx(self):
 
         self.assertIsNotNone(result)
 
-        # Verify only referenced content was added
         referenced_content_exists = (
             result.componentversion.componentversioncontent_set.filter(
                 key="static/referenced.png"
@@ -523,7 +546,9 @@ def test_migrate_component_content_filename_not_in_olx(self):
         self.assertFalse(unreferenced_content_exists)
 
     def test_migrate_component_library_source_key(self):
-        """Test _migrate_component with library source key"""
+        """
+        Test _migrate_component with library source key
+        """
         library_key = LibraryLocator(org="TestOrg", library="TestLibrary")
         source_key = library_key.make_usage_key("problem", "library_problem")
         olx = '<problem display_name="Library Problem"><multiplechoiceresponse></multiplechoiceresponse></problem>'
@@ -541,19 +566,19 @@ def test_migrate_component_library_source_key(self):
 
         self.assertIsNotNone(result)
 
-        # Verify correct local key was generated for library source
         self.assertEqual(
             "problem", result.componentversion.component.component_type.name
         )
 
     def test_migrate_component_duplicate_content_integrity_error(self):
-        """Test _migrate_component handles IntegrityError when content already exists"""
+        """
+        Test _migrate_component handles IntegrityError when content already exists
+        """
         source_key = self.course.id.make_usage_key(
             "problem", "test_problem_duplicate_content"
         )
         olx = '<problem display_name="Test Problem"><p>See image: duplicate.png</p></problem>'
 
-        # Create test content
         media_type = authoring_api.get_or_create_media_type("image/png")
         test_content = authoring_api.get_or_create_file_content(
             self.learning_package.id,
@@ -564,7 +589,6 @@ def test_migrate_component_duplicate_content_integrity_error(self):
 
         content_by_filename = {"duplicate.png": test_content.id}
 
-        # First migration should succeed
         first_result = _migrate_component(
             content_by_filename=content_by_filename,
             source_key=source_key,
@@ -576,7 +600,6 @@ def test_migrate_component_duplicate_content_integrity_error(self):
             created_at=timezone.now(),
         )
 
-        # Second migration with same content should handle IntegrityError gracefully
         second_result = _migrate_component(
             content_by_filename=content_by_filename,
             source_key=source_key,
@@ -590,12 +613,14 @@ def test_migrate_component_duplicate_content_integrity_error(self):
 
         self.assertIsNotNone(first_result)
         self.assertIsNotNone(second_result)
+        self.assertEqual(first_result.entity_id, second_result.entity_id)
 
     def test_migrate_container_creates_new_container(self):
-        """Test _migrate_container creates a new container when none exists"""
+        """
+        Test _migrate_container creates a new container when none exists
+        """
         source_key = self.course.id.make_usage_key("vertical", "test_vertical")
 
-        # Create some child components first
         child_component_1 = authoring_api.create_component(
             self.learning_package.id,
             component_type=authoring_api.get_or_create_component_type(
@@ -633,14 +658,9 @@ def test_migrate_container_creates_new_container(self):
             child_version_2.publishable_entity_version,
         ]
 
-        print("=" * 40)
-        print(self.library.library_key)
-        print(self.learning_package.id)
-        print(self.learning_package.key)
-        print("=" * 40)
         result = _migrate_container(
             source_key=source_key,
-            container_type=ContainerType.Unit,
+            container_type=lib_api.ContainerType.Unit,
             title="Test Vertical",
             children=children,
             target_library_key=self.library.library_key,
@@ -649,14 +669,11 @@ def test_migrate_container_creates_new_container(self):
             created_at=timezone.now(),
         )
 
-        self.assertIsNotNone(result)
         self.assertIsInstance(result, PublishableEntityVersion)
 
-        # Verify container was created with correct properties
         container_version = result.containerversion
         self.assertEqual(container_version.title, "Test Vertical")
 
-        # Verify children were added
         entity_rows = container_version.entity_list.entitylistrow_set.all()
         self.assertEqual(len(entity_rows), 2)
 
@@ -665,11 +682,13 @@ def test_migrate_container_creates_new_container(self):
         self.assertEqual(child_entity_ids, expected_entity_ids)
 
     def test_migrate_container_different_container_types(self):
-        """Test _migrate_container works with different container types"""
+        """
+        Test _migrate_container works with different container types
+        """
         container_types = [
-            (ContainerType.Unit, "vertical"),
-            (ContainerType.Subsection, "sequential"),
-            (ContainerType.Section, "chapter"),
+            (lib_api.ContainerType.Unit, "vertical"),
+            (lib_api.ContainerType.Subsection, "sequential"),
+            (lib_api.ContainerType.Section, "chapter"),
         ]
 
         for container_type, block_type in container_types:
@@ -691,18 +710,18 @@ def test_migrate_container_different_container_types(self):
 
                 self.assertIsNotNone(result)
 
-                # Verify container was created with correct type
                 container_version = result.containerversion
                 self.assertEqual(container_version.title, f"Test {block_type.title()}")
 
     def test_migrate_container_replace_existing_false(self):
-        """Test _migrate_container returns existing container when replace_existing=False"""
+        """
+        Test _migrate_container returns existing container when replace_existing=False
+        """
         source_key = self.course.id.make_usage_key("vertical", "existing_vertical")
 
-        # Create container first time
         first_result = _migrate_container(
             source_key=source_key,
-            container_type=ContainerType.Unit,
+            container_type=lib_api.ContainerType.Unit,
             title="Original Title",
             children=[],
             target_library_key=self.library.library_key,
@@ -711,10 +730,9 @@ def test_migrate_container_replace_existing_false(self):
             created_at=timezone.now(),
         )
 
-        # Try to create again with different title and replace_existing=False
         second_result = _migrate_container(
             source_key=source_key,
-            container_type=ContainerType.Unit,
+            container_type=lib_api.ContainerType.Unit,
             title="Updated Title",
             children=[],
             target_library_key=self.library.library_key,
@@ -723,19 +741,18 @@ def test_migrate_container_replace_existing_false(self):
             created_at=timezone.now(),
         )
 
-        # Should return the same entity and version
         self.assertEqual(first_result.entity_id, second_result.entity_id)
         self.assertEqual(first_result.version_num, second_result.version_num)
 
-        # Title should remain unchanged
         container_version = second_result.containerversion
         self.assertEqual(container_version.title, "Original Title")
 
     def test_migrate_container_replace_existing_true(self):
-        """Test _migrate_container creates new version when replace_existing=True"""
+        """
+        Test _migrate_container creates new version when replace_existing=True
+        """
         source_key = self.course.id.make_usage_key("vertical", "replaceable_vertical")
 
-        # Create initial child component
         child_component = authoring_api.create_component(
             self.learning_package.id,
             component_type=authoring_api.get_or_create_component_type(
@@ -752,10 +769,9 @@ def test_migrate_container_replace_existing_true(self):
             created_by=self.user.id,
         )
 
-        # Create container first time
         first_result = _migrate_container(
             source_key=source_key,
-            container_type=ContainerType.Unit,
+            container_type=lib_api.ContainerType.Unit,
             title="Original Title",
             children=[],
             target_library_key=self.library.library_key,
@@ -764,10 +780,9 @@ def test_migrate_container_replace_existing_true(self):
             created_at=timezone.now(),
         )
 
-        # Replace with new content
         second_result = _migrate_container(
             source_key=source_key,
-            container_type=ContainerType.Unit,
+            container_type=lib_api.ContainerType.Unit,
             title="Updated Title",
             children=[child_version.publishable_entity_version],
             target_library_key=self.library.library_key,
@@ -776,23 +791,23 @@ def test_migrate_container_replace_existing_true(self):
             created_at=timezone.now(),
         )
 
-        # Should be same entity but different version
         self.assertEqual(first_result.entity_id, second_result.entity_id)
         self.assertNotEqual(first_result.version_num, second_result.version_num)
 
-        # Title and children should be updated
         container_version = second_result.containerversion
         self.assertEqual(container_version.title, "Updated Title")
         self.assertEqual(container_version.entity_list.entitylistrow_set.count(), 1)
 
     def test_migrate_container_with_library_source_key(self):
-        """Test _migrate_container with library source key"""
+        """
+        Test _migrate_container with library source key
+        """
         library_key = LibraryLocator(org="TestOrg", library="TestLibrary")
         source_key = library_key.make_usage_key("vertical", "library_vertical")
 
         result = _migrate_container(
             source_key=source_key,
-            container_type=ContainerType.Unit,
+            container_type=lib_api.ContainerType.Unit,
             title="Library Vertical",
             children=[],
             target_library_key=self.library.library_key,
@@ -803,17 +818,18 @@ def test_migrate_container_with_library_source_key(self):
 
         self.assertIsNotNone(result)
 
-        # Verify correct slugified key was generated
         container_version = result.containerversion
         self.assertEqual(container_version.title, "Library Vertical")
 
     def test_migrate_container_empty_children_list(self):
-        """Test _migrate_container handles empty children list"""
+        """
+        Test _migrate_container handles empty children list
+        """
         source_key = self.course.id.make_usage_key("vertical", "empty_vertical")
 
         result = _migrate_container(
             source_key=source_key,
-            container_type=ContainerType.Unit,
+            container_type=lib_api.ContainerType.Unit,
             title="Empty Vertical",
             children=[],
             target_library_key=self.library.library_key,
@@ -824,15 +840,15 @@ def test_migrate_container_empty_children_list(self):
 
         self.assertIsNotNone(result)
 
-        # Verify container was created with no children
         container_version = result.containerversion
         self.assertEqual(container_version.entity_list.entitylistrow_set.count(), 0)
 
     def test_migrate_container_preserves_child_order(self):
-        """Test _migrate_container preserves the order of children"""
+        """
+        Test _migrate_container preserves the order of children
+        """
         source_key = self.course.id.make_usage_key("vertical", "ordered_vertical")
 
-        # Create multiple child components
         children = []
         for i in range(3):
             child_component = authoring_api.create_component(
@@ -854,7 +870,7 @@ def test_migrate_container_preserves_child_order(self):
 
         result = _migrate_container(
             source_key=source_key,
-            container_type=ContainerType.Unit,
+            container_type=lib_api.ContainerType.Unit,
             title="Ordered Vertical",
             children=children,
             target_library_key=self.library.library_key,
@@ -863,7 +879,6 @@ def test_migrate_container_preserves_child_order(self):
             created_at=timezone.now(),
         )
 
-        # Verify children order is preserved
         container_version = result.containerversion
         entity_rows = list(
             container_version.entity_list.entitylistrow_set.order_by("order_num")
@@ -874,10 +889,11 @@ def test_migrate_container_preserves_child_order(self):
             self.assertEqual(expected_child.entity_id, actual_row.entity_id)
 
     def test_migrate_container_with_mixed_child_types(self):
-        """Test _migrate_container with children of different component types"""
+        """
+        Test _migrate_container with children of different component types
+        """
         source_key = self.course.id.make_usage_key("vertical", "mixed_vertical")
 
-        # Create children of different types
         problem_component = authoring_api.create_component(
             self.learning_package.id,
             component_type=authoring_api.get_or_create_component_type(
@@ -934,7 +950,7 @@ def test_migrate_container_with_mixed_child_types(self):
 
         result = _migrate_container(
             source_key=source_key,
-            container_type=ContainerType.Unit,
+            container_type=lib_api.ContainerType.Unit,
             title="Mixed Content Vertical",
             children=children,
             target_library_key=self.library.library_key,
@@ -945,11 +961,9 @@ def test_migrate_container_with_mixed_child_types(self):
 
         self.assertIsNotNone(result)
 
-        # Verify all children were added
         container_version = result.containerversion
         self.assertEqual(container_version.entity_list.entitylistrow_set.count(), 3)
 
-        # Verify each child type is present
         child_entity_ids = set(
             container_version.entity_list.entitylistrow_set.values_list(
                 "entity_id", flat=True
@@ -959,13 +973,14 @@ def test_migrate_container_with_mixed_child_types(self):
         self.assertEqual(child_entity_ids, expected_entity_ids)
 
     def test_migrate_container_generates_correct_target_key(self):
-        """Test _migrate_container generates correct target key from source key"""
-        # Test with course source key
+        """
+        Test _migrate_container generates correct target key from source key
+        """
         course_source_key = self.course.id.make_usage_key("vertical", "test_vertical")
 
         course_result = _migrate_container(
             source_key=course_source_key,
-            container_type=ContainerType.Unit,
+            container_type=lib_api.ContainerType.Unit,
             title="Course Vertical",
             children=[],
             target_library_key=self.library.library_key,
@@ -974,13 +989,12 @@ def test_migrate_container_generates_correct_target_key(self):
             created_at=timezone.now(),
         )
 
-        # Test with library source key
         library_key = LibraryLocator(org="TestOrg", library="TestLibrary")
         library_source_key = library_key.make_usage_key("vertical", "test_vertical")
 
         library_result = _migrate_container(
             source_key=library_source_key,
-            container_type=ContainerType.Unit,
+            container_type=lib_api.ContainerType.Unit,
             title="Library Vertical",
             children=[],
             target_library_key=self.library.library_key,
@@ -989,13 +1003,14 @@ def test_migrate_container_generates_correct_target_key(self):
             created_at=timezone.now(),
         )
 
-        # Both should succeed but have different underlying identifiers
         self.assertIsNotNone(course_result)
         self.assertIsNotNone(library_result)
         self.assertNotEqual(course_result.entity_id, library_result.entity_id)
 
     def test_migrate_from_modulestore_success_course(self):
-        """Test successful migration from course to library"""
+        """
+        Test successful migration from course to library
+        """
         source = ModulestoreSource.objects.create(key=self.course.id)
 
         task = migrate_from_modulestore.apply_async(
@@ -1010,13 +1025,9 @@ def test_migrate_from_modulestore_success_course(self):
             }
         )
 
-        task.get()
-
-        # Verify task completed successfully
         status = UserTaskStatus.objects.get(task_id=task.id)
         self.assertEqual(status.state, UserTaskStatus.SUCCEEDED)
 
-        # Verify migration record was created
         migration = ModulestoreMigration.objects.get(
             source=source, target=self.learning_package
         )
@@ -1024,7 +1035,9 @@ def test_migrate_from_modulestore_success_course(self):
         self.assertFalse(migration.replace_existing)
 
     def test_migrate_from_modulestore_library_validation_failure(self):
-        """Test migration from legacy library fails when modulestore content doesn't exist"""
+        """
+        Test migration from legacy library fails when modulestore content doesn't exist
+        """
         library_key = LibraryLocator(org="TestOrg", library="TestLibrary")
 
         source = ModulestoreSource.objects.create(key=library_key)
@@ -1041,16 +1054,20 @@ def test_migrate_from_modulestore_library_validation_failure(self):
             }
         )
 
-        # This will fail because we don't have actual library content in modulestore
-        task.get()
         status = UserTaskStatus.objects.get(task_id=task.id)
 
         # Should fail at loading step since we don't have real modulestore content
         self.assertEqual(status.state, UserTaskStatus.FAILED)
+        self.assertEqual(
+            self._get_task_status_fail_message(status),
+            "Failed to load source item 'lib-block-v1:TestOrg+TestLibrary+type@library+block@library' "
+            "from ModuleStore: library-v1:TestOrg+TestLibrary+branch@library"
+        )
 
     def test_migrate_from_modulestore_invalid_source_key_type(self):
-        """Test migration with invalid source key type"""
-        # Create a source with an invalid key type
+        """
+        Test migration with invalid source key type
+        """
         invalid_key = LibraryLocatorV2.from_string("lib:testorg:invalid")
         source = ModulestoreSource.objects.create(key=invalid_key)
 
@@ -1066,15 +1083,17 @@ def test_migrate_from_modulestore_invalid_source_key_type(self):
             }
         )
 
-        result = task.get()
-        self.assertIsNone(result)
-
         status = UserTaskStatus.objects.get(task_id=task.id)
         self.assertEqual(status.state, UserTaskStatus.FAILED)
+        self.assertEqual(
+            self._get_task_status_fail_message(status),
+            f"Not a valid source context key: {invalid_key}. Source key must reference a course or a legacy library."
+        )
 
     def test_migrate_from_modulestore_nonexistent_modulestore_item(self):
-        """Test migration when modulestore item doesn't exist"""
-        # Create source with course that doesn't exist in modulestore
+        """
+        Test migration when modulestore item doesn't exist
+        """
         nonexistent_course_key = CourseKey.from_string(
             "course-v1:NonExistent+Course+Run"
         )
@@ -1092,11 +1111,13 @@ def test_migrate_from_modulestore_nonexistent_modulestore_item(self):
             }
         )
 
-        result = task.get()
-        self.assertIsNone(result)
-
         status = UserTaskStatus.objects.get(task_id=task.id)
         self.assertEqual(status.state, UserTaskStatus.FAILED)
+        self.assertEqual(
+            self._get_task_status_fail_message(status),
+            "Failed to load source item 'block-v1:NonExistent+Course+Run+type@course+block@course' "
+            "from ModuleStore: course-v1:NonExistent+Course+Run+branch@draft-branch"
+        )
 
     def test_migrate_from_modulestore_task_status_progression(self):
         """Test that task status progresses through expected steps"""
@@ -1114,26 +1135,23 @@ def test_migrate_from_modulestore_task_status_progression(self):
             }
         )
 
-        task.get()
-
-        # Verify task went through validation step
         status = UserTaskStatus.objects.get(task_id=task.id)
 
         # Should either succeed or fail, but should have progressed past validation
         self.assertIn(status.state, [UserTaskStatus.SUCCEEDED, UserTaskStatus.FAILED])
 
-        # Verify migration task was created
         migration = ModulestoreMigration.objects.get(
             source=source, target=self.learning_package
         )
         self.assertEqual(migration.task_status, status)
 
     def test_migrate_from_modulestore_multiple_users_no_interference(self):
-        """Test that migrations by different users don't interfere with each other"""
+        """
+        Test that migrations by different users don't interfere with each other
+        """
         source = ModulestoreSource.objects.create(key=self.course.id)
         other_user = UserFactory()
 
-        # Start migration for first user
         task1 = migrate_from_modulestore.apply_async(
             kwargs={
                 "user_id": self.user.id,
@@ -1146,7 +1164,6 @@ def test_migrate_from_modulestore_multiple_users_no_interference(self):
             }
         )
 
-        # Start migration for second user with same source/target
         task2 = migrate_from_modulestore.apply_async(
             kwargs={
                 "user_id": other_user.id,
@@ -1159,11 +1176,6 @@ def test_migrate_from_modulestore_multiple_users_no_interference(self):
             }
         )
 
-        # Both tasks should complete (or fail) independently
-        task1.get()
-        task2.get()
-
-        # Verify both tasks created their own status records
         status1 = UserTaskStatus.objects.get(task_id=task1.id)
         status2 = UserTaskStatus.objects.get(task_id=task2.id)
 

From f034ce79de85247507ea99453c208587adae1333 Mon Sep 17 00:00:00 2001
From: Andrii <andrii.hantkovskyi@raccoongang.com>
Date: Fri, 4 Jul 2025 14:27:16 +0300
Subject: [PATCH 19/40] feat: implement TODOs & fix tests

---
 cms/djangoapps/modulestore_migrator/tasks.py  | 172 ++++++++++--------
 .../modulestore_migrator/tests/factories.py   |   1 -
 .../modulestore_migrator/tests/test_tasks.py  |   4 +-
 3 files changed, 103 insertions(+), 74 deletions(-)

diff --git a/cms/djangoapps/modulestore_migrator/tasks.py b/cms/djangoapps/modulestore_migrator/tasks.py
index 747e1605ed0c..e42497c8f14c 100644
--- a/cms/djangoapps/modulestore_migrator/tasks.py
+++ b/cms/djangoapps/modulestore_migrator/tasks.py
@@ -3,6 +3,7 @@
 """
 from __future__ import annotations
 
+import hashlib
 import mimetypes
 import os
 import typing as t
@@ -26,7 +27,7 @@
 from openedx_learning.api.authoring_models import (
     Collection,
     Component,
-    ContainerVersion,
+    ComponentVersionContent,
     LearningPackage,
     PublishableEntity,
     PublishableEntityVersion,
@@ -224,6 +225,7 @@ def migrate_from_modulestore(
             created_at=datetime.now(timezone.utc),
             created_by=status.user_id,
         )
+    change_log.save()
     migration.change_log = change_log
     status.increment_completed_steps()
 
@@ -231,47 +233,11 @@ def migrate_from_modulestore(
     staged_content.delete()
     status.increment_completed_steps()
 
-    # @@TODO We currently do the mapping in bulk in order to reduce the number of DB queries.
-    #        But, as a user, it means that there are no artifacts (ModulestoreBlockMigrations)
-    #        to be shown as the structure is being imported, which takes can take several minutes.
-    #        Would be better to, instead, create each ModulestoreBlockSource and
-    #        ModulestoreBlockMigration as we create its PublisahbleEntity(Version)? If
-    #        we did this, we'd want to make sure that the objects are actually visible
-    #        to the user mid-import (via django admin, or the library interface, or even just as
-    #        as a "progress bar" field in the REST API), otherwise this would be pointless.
-    status.set_state(MigrationStep.MAPPING_OLD_TO_NEW.value)
-    block_source_keys_to_target_vers = dict(root_migrated_node.all_source_to_target_pairs())
-    ModulestoreBlockSource.objects.bulk_create(
-        [
-            ModulestoreBlockSource(overall_source=source, key=source_usage_key)
-            for source_usage_key in block_source_keys_to_target_vers.keys()
-        ],
-        # Note: bulk_create will *not* return the primary keys of ModulestoreBlockSource
-        # objects that already exist (and thus were skipped by ignore_conflicts), so, in
-        # order to use ModulestoreBlockSource instances, we must re-load them in the next step.
-        ignore_conflicts=True
-    )
-    block_source_keys_to_sources: dict[UsageKey, ModulestoreBlockSource] = {
-        block_source.key: block_source for block_source in source.blocks.all()
-    }
-    # @@TODO We get an error when we try to use the change_log, because it hasn't
-    #        been saved yet. Until we fix this, we won't be able to set
-    #        ModuleBlockMigration.change_log_record.
-    # block_target_pks_to_change_log_record_pks: dict[int, int] = dict(
-    #     change_log.records.values_list("target_entity_id", "id")
-    # )
-    #block_migrations = ModulestoreBlockMigration.objects.bulk_create(
-    ModulestoreBlockMigration.objects.bulk_create(
-        [
-            ModulestoreBlockMigration(
-                overall_migration=migration,
-                source=block_source_keys_to_sources[block_source_key],
-                target_id=block_target_ver.entity_id,
-                # @@TODO See above
-                # change_log_record_id=block_target_pks_to_change_log_record_pks[block_target_ver.entity_id],
-            )
-            for block_source_key, block_target_ver in block_source_keys_to_target_vers.items()
-        ],
+    _create_migration_artifacts_incrementally(
+        root_migrated_node=root_migrated_node,
+        source=source,
+        migration=migration,
+        status=status,
     )
     block_migrations = ModulestoreBlockMigration.objects.filter(overall_migration=migration)
     status.increment_completed_steps()
@@ -291,16 +257,22 @@ def migrate_from_modulestore(
 
     status.set_state(MigrationStep.POPULATING_COLLECTION.value)
     if target_collection:
-        # @@TODO This dict (block_target_pks_to_change_log_record_pks) was based on the change_log calculation
-        #        above which is commented out. In order to add to target_collection, we either need to fix the
-        #        change_log query above, or we need to calculate these target_pks some other way
-        block_target_pks: list[int] = []  # list(block_target_pks_to_change_log_record_pks.keys())
-        authoring_api.add_to_collection(
-            learning_package_id=target_package_pk,
-            key=target_collection.key,
-            entities_qset=PublishableEntity.objects.filter(id__in=block_target_pks),
-            created_by=user_id,
+        block_target_pks: list[int] = list(
+            ModulestoreBlockMigration.objects.filter(
+                overall_migration=migration
+            ).values_list('target_id', flat=True)
         )
+
+        if block_target_pks:
+            authoring_api.add_to_collection(
+                learning_package_id=target_package_pk,
+                key=target_collection.key,
+                entities_qset=PublishableEntity.objects.filter(id__in=block_target_pks),
+                created_by=user_id,
+            )
+            log.info(f"Added {len(block_target_pks)} entities to collection {target_collection.key}")
+        else:
+            log.warning("No target entities found to add to collection")
     status.increment_completed_steps()
 
 
@@ -533,36 +505,94 @@ def _migrate_component(
         if filename_no_ext not in olx:
             continue
         new_path = f"static/{filename}"
-        try:
-            authoring_api.create_component_version_content(component_version.pk, content_pk, key=new_path)
-        # @@TODO is there a way to determine content already exists that doesn't run the risk
-        #        of swallowing other, unexpected IntegrityErrors?
-        except IntegrityError:
-            pass  # Content already exists
+        _create_component_version_content_safely(
+            component_version_pk=component_version.pk,
+            content_pk=content_pk,
+            key=new_path
+        )
     return component_version.publishable_entity_version
 
 
 def _slugify_source_usage_key(key: UsageKey) -> str:
     """
-    Return an appropriate slug (aka block_id, aka container_id) for the target entity.
-
-    Mix the legacy source context (course/library) information with the source block_id,
-    thus ensuring that migrations of two blocks with the same id from different source
-    contexts will not collide.
-
-    Note: We don't need to factor in block_type, because the target keys already do that.
-    Note: Slugs can't have plus signs, which are normally how legacy keys are delimted.
-
-    @@TODO -- Is this good enough? Conflicts are technically possible if a user has manually
-    formatted the key this way, but that seems super unlikely to happen by accident, right ... ?
-    Conflicts are also technically posssible for
+    Return an appropriate slug with collision avoidance.
     """
     context_key = key.course_key
+
     if isinstance(context_key, LibraryLocator):
-        return f"{context_key.org}__{context_key.library}__{key.block_id}"
+        base_slug = f"{context_key.org}__{context_key.library}__{key.block_id}"
     elif isinstance(context_key, CourseKey):
-        return f"{context_key.org}__{context_key.course}__{context_key.run}__{key.block_id}"
+        base_slug = f"{context_key.org}__{context_key.course}__{context_key.run}__{key.block_id}"
     else:
         raise ValueError(
             f"Unexpected source usage key: {key}. Expected legacy course or library usage locator."
         )
+
+    # Add hash suffix to reduce collision probability
+    key_hash = hashlib.md5(str(key).encode()).hexdigest()[:8]
+    final_slug = f"{base_slug}_{key_hash}"
+
+    # Ensure slug length is reasonable (max 250 characters)
+    if len(final_slug) > 250:
+        # Truncate and add hash to maintain uniqueness
+        truncated = base_slug[:235]
+        final_slug = f"{truncated}_{key_hash}"
+
+    return final_slug
+
+
+def _create_migration_artifacts_incrementally(
+    root_migrated_node: _MigratedNode,
+    source: ModulestoreSource,
+    migration: ModulestoreMigration,
+    status: UserTaskStatus
+) -> None:
+    """
+    Create ModulestoreBlockSource and ModulestoreBlockMigration objects incrementally.
+    """
+    nodes = tuple(root_migrated_node.all_source_to_target_pairs())
+    total_nodes = len(nodes)
+    processed = 0
+
+    for source_usage_key, target_version in root_migrated_node.all_source_to_target_pairs():
+        block_source, _ = ModulestoreBlockSource.objects.get_or_create(
+            overall_source=source,
+            key=source_usage_key
+        )
+
+        ModulestoreBlockMigration.objects.create(
+            overall_migration=migration,
+            source=block_source,
+            target_id=target_version.entity_id,
+        )
+
+        processed += 1
+        if processed % 10 == 0 or processed == total_nodes:
+            status.set_state(
+                f"{MigrationStep.MAPPING_OLD_TO_NEW.value} ({processed}/{total_nodes})"
+            )
+
+
+def _create_component_version_content_safely(
+    component_version_pk: int,
+    content_pk: int,
+    key: str
+) -> bool:
+    """
+    Create component version content, returning True if created or False if already exists.
+    """
+    try:
+        if ComponentVersionContent.objects.filter(
+            component_version_id=component_version_pk,
+            content_id=content_pk,
+            key=key
+        ).exists():
+            return False
+
+        authoring_api.create_component_version_content(
+            component_version_pk, content_pk, key=key
+        )
+        return True
+    except IntegrityError as e:
+        log.warning(f"IntegrityError creating content {key}: {e}")
+        return False
diff --git a/cms/djangoapps/modulestore_migrator/tests/factories.py b/cms/djangoapps/modulestore_migrator/tests/factories.py
index 91d53d659814..e506257efcf2 100644
--- a/cms/djangoapps/modulestore_migrator/tests/factories.py
+++ b/cms/djangoapps/modulestore_migrator/tests/factories.py
@@ -15,7 +15,6 @@ class ModulestoreSourceFactory(factory.django.DjangoModelFactory):
     """
     class Meta:
         model = ModulestoreSource
-    forwarded_by = None
 
     @factory.lazy_attribute
     def key(self):
diff --git a/cms/djangoapps/modulestore_migrator/tests/test_tasks.py b/cms/djangoapps/modulestore_migrator/tests/test_tasks.py
index 93908bace90d..1512bbe89f62 100644
--- a/cms/djangoapps/modulestore_migrator/tests/test_tasks.py
+++ b/cms/djangoapps/modulestore_migrator/tests/test_tasks.py
@@ -84,7 +84,7 @@ def test_slugify_source_usage_key_course(self):
 
         result = _slugify_source_usage_key(usage_key)
 
-        self.assertEqual(result, "TestOrg__TestCourse__TestRun__test_problem")
+        self.assertEqual(result, "TestOrg__TestCourse__TestRun__test_problem_9a9c0b4c")
 
     def test_slugify_source_usage_key_library(self):
         """
@@ -95,7 +95,7 @@ def test_slugify_source_usage_key_library(self):
 
         result = _slugify_source_usage_key(usage_key)
 
-        self.assertEqual(result, "TestOrg__TestLibrary__test_problem")
+        self.assertEqual(result, "TestOrg__TestLibrary__test_problem_a63e2785")
 
     def test_migrate_node_wiki_tag(self):
         """

From e7287e61d31eaa57a7995bfb94b800002a051c65 Mon Sep 17 00:00:00 2001
From: Maksim Sokolskiy <maksim.sokolskiy@raccoongang.com>
Date: Fri, 25 Jul 2025 17:02:18 +0300
Subject: [PATCH 20/40] feat: implement _create_migration_artifacts_in_bulk

Left the incremental implementation to compare.

TODO:
- remove one of the competitive versions
- discuss the better option
- amend this commit and clear commin history

Performance:
- incremental for 39 Blocks 0.06 sec
- bulk for 39 Blocks 0.006 sec
---
 cms/djangoapps/modulestore_migrator/tasks.py | 75 +++++++++++++++++++-
 1 file changed, 74 insertions(+), 1 deletion(-)

diff --git a/cms/djangoapps/modulestore_migrator/tasks.py b/cms/djangoapps/modulestore_migrator/tasks.py
index e42497c8f14c..2136f5172a89 100644
--- a/cms/djangoapps/modulestore_migrator/tasks.py
+++ b/cms/djangoapps/modulestore_migrator/tasks.py
@@ -233,12 +233,13 @@ def migrate_from_modulestore(
     staged_content.delete()
     status.increment_completed_steps()
 
-    _create_migration_artifacts_incrementally(
+    _create_migration_artifacts_in_bulk(
         root_migrated_node=root_migrated_node,
         source=source,
         migration=migration,
         status=status,
     )
+
     block_migrations = ModulestoreBlockMigration.objects.filter(overall_migration=migration)
     status.increment_completed_steps()
 
@@ -541,6 +542,78 @@ def _slugify_source_usage_key(key: UsageKey) -> str:
     return final_slug
 
 
+def _create_migration_artifacts_in_bulk(
+    root_migrated_node: _MigratedNode,
+    source: ModulestoreSource,
+    migration: ModulestoreMigration,
+    status: UserTaskStatus
+) -> None:
+    """
+    Create ModulestoreBlockSource and ModulestoreBlockMigration objects in bulk.
+    """
+    nodes = tuple(root_migrated_node.all_source_to_target_pairs())
+    total_nodes = len(nodes)
+
+    # Prepare data for bulk operations
+    block_sources_to_create = []
+    block_migrations_to_create = []
+    existing_block_sources = {}
+
+    # Get existing block sources to avoid duplicates
+    existing_sources = ModulestoreBlockSource.objects.filter(
+        overall_source=source,
+        key__in=[source_usage_key for source_usage_key, _ in nodes]
+    ).values('key', 'id')
+
+    existing_block_sources = {source['key']: source['id'] for source in existing_sources}
+
+    # Prepare block sources for creation (only new ones)
+    for source_usage_key, target_version in nodes:
+        if source_usage_key not in existing_block_sources:
+            block_sources_to_create.append(
+                ModulestoreBlockSource(
+                    overall_source=source,
+                    key=source_usage_key
+                )
+            )
+
+    # Bulk create new block sources
+    if block_sources_to_create:
+        created_sources = ModulestoreBlockSource.objects.bulk_create(
+            block_sources_to_create,
+            ignore_conflicts=True  # Handle race conditions
+        )
+
+        # Update existing_block_sources with newly created ones
+        for created_source in created_sources:
+            existing_block_sources[created_source.key] = created_source.id
+
+    # If we still don't have all sources (due to ignore_conflicts), fetch them again
+    if len(existing_block_sources) < total_nodes:
+        all_sources = ModulestoreBlockSource.objects.filter(
+            overall_source=source,
+            key__in=[source_usage_key for source_usage_key, _ in nodes]
+        ).values('key', 'id')
+        existing_block_sources = {source['key']: source['id'] for source in all_sources}
+
+    # Prepare block migrations for bulk creation
+    for source_usage_key, target_version in nodes:
+        block_source_id = existing_block_sources[source_usage_key]
+        block_migrations_to_create.append(
+            ModulestoreBlockMigration(
+                overall_migration=migration,
+                source_id=block_source_id,
+                target_id=target_version.entity_id,
+            )
+        )
+
+    # Bulk create block migrations
+    ModulestoreBlockMigration.objects.bulk_create(
+        block_migrations_to_create,
+        ignore_conflicts=True  # Handle potential duplicates
+    )
+
+
 def _create_migration_artifacts_incrementally(
     root_migrated_node: _MigratedNode,
     source: ModulestoreSource,

From 280b3268ee2223baf78f9c0a1e7eccc4320c8f2b Mon Sep 17 00:00:00 2001
From: Maksim Sokolskiy <maksim.sokolskiy@raccoongang.com>
Date: Fri, 1 Aug 2025 14:37:04 +0300
Subject: [PATCH 21/40] feat: implement Handling duplicates in modulestore
 migrator

TODO:
- remove extensive loggins, it's currently required
  for debugging purpuse
- Update tests regarding the new slugification logic
  and according to new field
- update API
- debug and fix performance issue during authoring_api.add_to_collection
- refactor existing_source_to_target_keys by moving it and
  some common arguments from _migrate_node to MigrationContext
- test API and remove unused fields
---
 cms/djangoapps/modulestore_migrator/admin.py  |   3 +
 cms/djangoapps/modulestore_migrator/api.py    |   2 +
 ...remigration_preserve_url_slugs_and_more.py |  23 ++
 cms/djangoapps/modulestore_migrator/models.py |   6 +
 .../rest_api/v0/serializers.py                |   6 +
 .../modulestore_migrator/rest_api/v0/views.py |   5 +
 cms/djangoapps/modulestore_migrator/tasks.py  | 245 ++++++++++++++++--
 .../modulestore_migrator/tests/test_api.py    |   3 +
 .../modulestore_migrator/tests/test_tasks.py  |   1 +
 9 files changed, 266 insertions(+), 28 deletions(-)
 create mode 100644 cms/djangoapps/modulestore_migrator/migrations/0005_modulestoremigration_preserve_url_slugs_and_more.py

diff --git a/cms/djangoapps/modulestore_migrator/admin.py b/cms/djangoapps/modulestore_migrator/admin.py
index 36e2acca4e83..af4b5ef2a483 100644
--- a/cms/djangoapps/modulestore_migrator/admin.py
+++ b/cms/djangoapps/modulestore_migrator/admin.py
@@ -29,6 +29,7 @@ class StartMigrationTaskForm(ActionForm):
     """
     target_key = forms.CharField(label="Target library or collection key →", required=False)
     replace_existing = forms.BooleanField(label="Replace existing content? →", required=False)
+    preserve_url_slugs = forms.BooleanField(label="Preserve current slugs? →", required=False, initial=True)
     forward_to_target = forms.BooleanField(label="Forward references? →", required=False)
     composition_level = forms.ChoiceField(
         label="Aggregate up to →", choices=CompositionLevel.supported_choices, required=False
@@ -60,6 +61,7 @@ def task_status_details(obj: ModulestoreMigration) -> str:
     task_status_details,
     "composition_level",
     "replace_existing",
+    "preserve_url_slugs",
     "change_log",
     "staged_content",
 )
@@ -143,6 +145,7 @@ def start_migration_task(
                     target_collection_slug=target_collection_slug,
                     composition_level=form.cleaned_data['composition_level'],
                     replace_existing=form.cleaned_data['replace_existing'],
+                    preserve_url_slugs=form.cleaned_data['preserve_url_slugs'],
                     forward_source_to_target=form.cleaned_data['forward_to_target'],
                 )
             except Exception as exc:  # pylint: disable=broad-except
diff --git a/cms/djangoapps/modulestore_migrator/api.py b/cms/djangoapps/modulestore_migrator/api.py
index 843e852822c9..bcfa5c75a4f8 100644
--- a/cms/djangoapps/modulestore_migrator/api.py
+++ b/cms/djangoapps/modulestore_migrator/api.py
@@ -26,6 +26,7 @@ def start_migration_to_library(
     target_collection_slug: str | None = None,
     composition_level: CompositionLevel,
     replace_existing: bool,
+    preserve_url_slugs: bool,
     forward_source_to_target: bool,
 ) -> None:
     """
@@ -45,5 +46,6 @@ def start_migration_to_library(
         target_collection_pk=target_collection_id,
         composition_level=composition_level,
         replace_existing=replace_existing,
+        preserve_url_slugs=preserve_url_slugs,
         forward_source_to_target=forward_source_to_target,
     )
diff --git a/cms/djangoapps/modulestore_migrator/migrations/0005_modulestoremigration_preserve_url_slugs_and_more.py b/cms/djangoapps/modulestore_migrator/migrations/0005_modulestoremigration_preserve_url_slugs_and_more.py
new file mode 100644
index 000000000000..bd8593b43e6d
--- /dev/null
+++ b/cms/djangoapps/modulestore_migrator/migrations/0005_modulestoremigration_preserve_url_slugs_and_more.py
@@ -0,0 +1,23 @@
+# Generated by Django 4.2.22 on 2025-07-31 12:30
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('modulestore_migrator', '0004_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='modulestoremigration',
+            name='preserve_url_slugs',
+            field=models.BooleanField(default=True, help_text='If imported blocks have hashed slugs - do we want to preserve it?'),
+        ),
+        migrations.AlterField(
+            model_name='modulestoremigration',
+            name='composition_level',
+            field=models.CharField(choices=[('component', 'Component'), ('unit', 'Unit'), ('subsection', 'Subsection'), ('section', 'Section')], default='component', help_text='Maximum hierachy level at which content should be aggregated in target library', max_length=255),
+        ),
+    ]
diff --git a/cms/djangoapps/modulestore_migrator/models.py b/cms/djangoapps/modulestore_migrator/models.py
index 576dfa4f2e82..640d05f2f564 100644
--- a/cms/djangoapps/modulestore_migrator/models.py
+++ b/cms/djangoapps/modulestore_migrator/models.py
@@ -79,6 +79,12 @@ class ModulestoreMigration(models.Model):
             "If a piece of content already exists in the content library, should the import process replace it?"
         ),
     )
+    preserve_url_slugs = models.BooleanField(
+        default=True,
+        help_text=_(
+            "If imported blocks have hashed slugs - do we want to preserve it?"
+        ),
+    )
     target = models.ForeignKey(
         LearningPackage,
         on_delete=models.CASCADE,
diff --git a/cms/djangoapps/modulestore_migrator/rest_api/v0/serializers.py b/cms/djangoapps/modulestore_migrator/rest_api/v0/serializers.py
index 2d959411b01f..e60b2e020cd7 100644
--- a/cms/djangoapps/modulestore_migrator/rest_api/v0/serializers.py
+++ b/cms/djangoapps/modulestore_migrator/rest_api/v0/serializers.py
@@ -37,6 +37,11 @@ class ModulestoreMigrationSerializer(serializers.ModelSerializer):
         required=False,
         default=False,
     )
+    preserve_url_slugs = serializers.BooleanField(
+        help_text="If true, current slugs wil be preserved.",
+        required=False,
+        default=True,
+    )
     target_collection_slug = serializers.CharField(
         help_text="The target collection slug within the library to import into. Optional.",
         required=False,
@@ -51,6 +56,7 @@ class Meta:
             'target_collection_slug',
             'composition_level',
             'replace_existing',
+            'preserve_url_slugs',
         ]
 
     def get_fields(self):
diff --git a/cms/djangoapps/modulestore_migrator/rest_api/v0/views.py b/cms/djangoapps/modulestore_migrator/rest_api/v0/views.py
index 1c5cfdd89f3d..211154ff7bb8 100644
--- a/cms/djangoapps/modulestore_migrator/rest_api/v0/views.py
+++ b/cms/djangoapps/modulestore_migrator/rest_api/v0/views.py
@@ -33,6 +33,7 @@ class ImportViewSet(StatusViewSet):
                 "composition_level": "<composition_level>",  # Optional, defaults to "component"
                 "target_collection_slug": "<target_collection_slug>",  # Optional
                 "replace_existing": "<boolean>"  # Optional, defaults to false
+                "preserve_url_slugs": "<boolean>"  # Optional, defaults to true
             }
 
         Example request:
@@ -41,6 +42,7 @@ class ImportViewSet(StatusViewSet):
                 "target": "library-v1:org1+lib_1",
                 "composition_level": "unit",
                 "replace_existing": true
+                "preserve_url_slugs": true
             }
 
         Example response:
@@ -58,6 +60,7 @@ class ImportViewSet(StatusViewSet):
                     "source": "course-v1:OpenedX+DemoX+DemoCourse",
                     "composition_level": "unit",
                     "replace_existing": true
+                    "preserve_url_slugs": true
                 }
             }
 
@@ -79,6 +82,7 @@ class ImportViewSet(StatusViewSet):
                     "source": "course-v1:OpenedX+DemoX+DemoCourse2",
                     "composition_level": "component",
                     "replace_existing": false
+                    "preserve_url_slugs": false
                 }
             }
     """
@@ -113,6 +117,7 @@ def create(self, request, *args, **kwargs):
             target_collection_slug=validated_data.get('target_collection_slug'),
             composition_level=validated_data['composition_level'],
             replace_existing=validated_data['replace_existing'],
+            preserve_url_slugs=validated_data['preserve_url_slugs'],
             forward_source_to_target=False,  # @@TODO - Set to False for now. Explain this better.
         )
         return UserTaskStatus.objects.get(task_id=task.id)
diff --git a/cms/djangoapps/modulestore_migrator/tasks.py b/cms/djangoapps/modulestore_migrator/tasks.py
index 2136f5172a89..61feff79d438 100644
--- a/cms/djangoapps/modulestore_migrator/tasks.py
+++ b/cms/djangoapps/modulestore_migrator/tasks.py
@@ -3,18 +3,19 @@
 """
 from __future__ import annotations
 
-import hashlib
 import mimetypes
 import os
 import typing as t
 from dataclasses import dataclass
 from datetime import datetime, timezone
 from enum import Enum
+from uuid import uuid4
 
 from celery import shared_task
 from celery.utils.log import get_task_logger
 from django.db import IntegrityError
 from django.core.exceptions import ObjectDoesNotExist
+from django.utils.text import slugify
 from edx_django_utils.monitoring import set_code_owner_attribute_from_module
 from lxml import etree
 from lxml.etree import _ElementTree as XmlTree
@@ -34,7 +35,7 @@
 )
 from user_tasks.tasks import UserTask, UserTaskStatus
 
-from openedx.core.djangoapps.content_libraries.api import ContainerType
+from openedx.core.djangoapps.content_libraries.api import ContainerType, blocks
 from openedx.core.djangoapps.content_libraries import api as libraries_api
 from openedx.core.djangoapps.content_libraries.models import ContentLibrary
 from openedx.core.djangoapps.content_staging import api as staging_api
@@ -94,6 +95,7 @@ def migrate_from_modulestore(
     target_package_pk: int,
     target_collection_pk: int,
     replace_existing: bool,
+    preserve_url_slugs: bool,
     composition_level: str,
     forward_source_to_target: bool,
 ) -> None:
@@ -133,6 +135,7 @@ def migrate_from_modulestore(
         source=source,
         composition_level=composition_level,
         replace_existing=replace_existing,
+        preserve_url_slugs=preserve_url_slugs,
         target=target_package,
         target_collection=target_collection,
         task_status=status,
@@ -213,14 +216,32 @@ def migrate_from_modulestore(
     status.increment_completed_steps()
 
     status.set_state(MigrationStep.IMPORTING_STRUCTURE.value)
+
+    # @@TODO: I propose to make it better:
+    # Implement as a MigrationContext dataclass
+    # encapsulate in it the following migration artibutes
+    # Context:
+        # existing_source_to_target_keys:
+        # content_by_filename:
+        # target_package_id:
+        # replace_existing:
+        # preserve_url_slugs:
+    # This will reduce parameter count from 10+ to 2-3
+    existing_source_to_target_keys = {
+        block.source.key: block.target for block in ModulestoreBlockMigration.objects.filter(
+        overall_migration__target=migration.target.id)
+    }
+
     with authoring_api.bulk_draft_changes_for(migration.target.id) as change_log:
         root_migrated_node = _migrate_node(
+            existing_source_to_target_keys=existing_source_to_target_keys,
             content_by_filename=content_by_filename,
             source_context_key=source_root_usage_key.course_key,
             source_node=root_node,
             target_library_key=target_library.library_key,
             target_package_id=target_package_pk,
             replace_existing=replace_existing,
+            preserve_url_slugs=preserve_url_slugs,
             composition_level=CompositionLevel(composition_level),
             created_at=datetime.now(timezone.utc),
             created_by=status.user_id,
@@ -233,7 +254,7 @@ def migrate_from_modulestore(
     staged_content.delete()
     status.increment_completed_steps()
 
-    _create_migration_artifacts_in_bulk(
+    _create_migration_artifacts_incrementally(
         root_migrated_node=root_migrated_node,
         source=source,
         migration=migration,
@@ -263,8 +284,13 @@ def migrate_from_modulestore(
                 overall_migration=migration
             ).values_list('target_id', flat=True)
         )
-
         if block_target_pks:
+            log.info("Started adding entities to a collection")
+            # @@TODO: Investigate an issue with huge
+            # time consumption during this step
+            # For existing and deleted blocks this step takes
+            # up to 110 seconds
+            # For new blocks this step takes up to 3 seconds
             authoring_api.add_to_collection(
                 learning_package_id=target_package_pk,
                 key=target_collection.key,
@@ -284,7 +310,7 @@ class _MigratedNode:
 
     Note that target_version can equal None even when there migrated children.
     This happens, particularly, if the node is above the requested composition level
-    but has descendents which are at or below sad level.
+    but has descendents which are at or below that level.
     """
     source_to_target: tuple[UsageKey, PublishableEntityVersion] | None
     children: list[_MigratedNode]
@@ -301,6 +327,7 @@ def all_source_to_target_pairs(self) -> t.Iterable[tuple[UsageKey, PublishableEn
 
 def _migrate_node(
     *,
+    existing_source_to_target_keys: dict[UsageKey, PublishableEntityVersion],
     content_by_filename: dict[str, int],
     source_context_key: CourseKey,  # Note: This includes legacy LibraryLocators, which are sneakily CourseKeys.
     source_node: XmlTree,
@@ -308,6 +335,7 @@ def _migrate_node(
     target_library_key: LibraryLocatorV2,
     composition_level: CompositionLevel,
     replace_existing: bool,
+    preserve_url_slugs: bool,
     created_at: datetime,
     created_by: int,
 ) -> _MigratedNode:
@@ -349,6 +377,7 @@ def _migrate_node(
     if should_migrate_children:
         migrated_children = [
             _migrate_node(
+                existing_source_to_target_keys=existing_source_to_target_keys,
                 content_by_filename=content_by_filename,
                 source_context_key=source_context_key,
                 source_node=source_node_child,
@@ -356,6 +385,7 @@ def _migrate_node(
                 target_library_key=target_library_key,
                 composition_level=composition_level,
                 replace_existing=replace_existing,
+                preserve_url_slugs=preserve_url_slugs,
                 created_by=created_by,
                 created_at=created_at,
             )
@@ -368,6 +398,7 @@ def _migrate_node(
             source_key: UsageKey = source_context_key.make_usage_key(source_node.tag, source_block_id)
             target_entity_version = (
                 _migrate_container(
+                    existing_source_to_target_keys=existing_source_to_target_keys,
                     source_key=source_key,
                     container_type=container_type,
                     title=source_node.get('display_name', source_block_id),
@@ -378,23 +409,32 @@ def _migrate_node(
                     ],
                     target_library_key=target_library_key,
                     replace_existing=replace_existing,
+                    preserve_url_slugs=preserve_url_slugs,
                     created_by=created_by,
                     created_at=created_at,
                 )
                 if container_type else
                 _migrate_component(
+                    existing_source_to_target_keys=existing_source_to_target_keys,
                     content_by_filename=content_by_filename,
                     source_key=source_key,
                     olx=source_olx,
                     target_package_id=target_package_id,
                     target_library_key=target_library_key,
                     replace_existing=replace_existing,
+                    preserve_url_slugs=preserve_url_slugs,
                     created_by=created_by,
                     created_at=created_at,
                 )
             )
             if target_entity_version:
                 source_to_target = (source_key, target_entity_version)
+                # Update the existing_source_to_target_keys dictionary with the new mapping
+                existing_source_to_target_keys[source_key] = target_entity_version
+                log.info(
+                    f"Migrated node from {source_context_key} to {target_library_key} "
+                    f"with version {target_entity_version}"
+                )
         else:
             log.warning(
                 f"Cannot migrate node from {source_context_key} to {target_library_key} "
@@ -405,12 +445,14 @@ def _migrate_node(
 
 def _migrate_container(
     *,
+    existing_source_to_target_keys: dict[UsageKey, PublishableEntityVersion],
     source_key: UsageKey,
     container_type: ContainerType,
     title: str,
     children: list[PublishableEntityVersion],
     target_library_key: LibraryLocatorV2,
     replace_existing: bool,
+    preserve_url_slugs: bool,
     created_by: int,
     created_at: datetime,
 ) -> PublishableEntityVersion:
@@ -423,6 +465,7 @@ def _migrate_container(
     target_key = LibraryContainerLocator(
         target_library_key, container_type.value, _slugify_source_usage_key(source_key)
     )
+
     try:
         container = libraries_api.get_container(target_key)
         container_exists = True
@@ -456,12 +499,14 @@ def _migrate_container(
 
 def _migrate_component(
     *,
+    existing_source_to_target_keys: dict[UsageKey, PublishableEntityVersion],
     content_by_filename: dict[str, int],
     source_key: UsageKey,
     olx: str,
     target_package_id: int,
     target_library_key: LibraryLocatorV2,
     replace_existing: bool,
+    preserve_url_slugs: bool,
     created_by: int,
     created_at: datetime,
 ) -> PublishableEntityVersion | None:
@@ -472,18 +517,30 @@ def _migrate_component(
      package, but let's keep than an internal assumption.)
     """
     component_type = authoring_api.get_or_create_component_type("xblock.v1", source_key.block_type)
-    # mypy thinks LibraryUsageLocatorV2 is abstract. It's not.
-    target_key = LibraryUsageLocatorV2(  # type: ignore[abstract]
-        target_library_key, source_key.block_type, _slugify_source_usage_key(source_key)
+
+    target_key = _deduplicate_block_id(
+        source_key,
+        target_library_key,
+        component_type,
+        olx,
+        existing_source_to_target_keys,
+        preserve_url_slugs,
     )
+
     try:
+        log.info(f"Attempting to retrieve component for {target_key}")
         component = authoring_api.get_components(target_package_id).get(
             component_type=component_type,
             local_key=target_key.block_id,
         )
         component_existed = True
+        # Do we have a specific method for this?
+        component_deleted = not component.versioning.draft
+        log.info(f"It's existed: {component_existed}")
+        log.info(f"It's deleted: {component_deleted}")
     except Component.DoesNotExist:
         component_existed = False
+        component_deleted = False
         try:
             libraries_api.validate_can_add_block_to_library(
                 target_library_key, target_key.block_type, target_key.block_id
@@ -498,8 +555,13 @@ def _migrate_component(
             created=created_at,
             created_by=created_by,
         )
-    if component_existed and not replace_existing:
+
+    # Component existed and we do not replace it and it is not deleted previously
+    if component_existed and not component_deleted and not replace_existing:
         return component.versioning.draft.publishable_entity_version
+
+    # If component existed and was deleted or we have to replace the current version
+    # Create the new component version for it
     component_version = libraries_api.set_library_block_olx(target_key, new_olx_str=olx)
     for filename, content_pk in content_by_filename.items():
         filename_no_ext, _ = os.path.splitext(filename)
@@ -514,34 +576,161 @@ def _migrate_component(
     return component_version.publishable_entity_version
 
 
-def _slugify_source_usage_key(key: UsageKey) -> str:
+def _deduplicate_block_id(
+    source_key: UsageKey,
+    target_library_key: LibraryLocatorV2,
+    component_type: str,
+    olx: str,
+    existing_source_to_target_keys: dict[UsageKey, PublishableEntityVersion],
+    preserve_url_slugs: bool = False
+) -> LibraryUsageLocatorV2:
     """
-    Return an appropriate slug with collision avoidance.
+    Deduplicate a block_id by appending a unique identifier if necessary.
+
+    Args:
+        source_key: The original usage key from the source
+        target_library_key: The target library locator
+        component_type: The component type string
+        existing_source_to_target_keys: Mapping of already migrated keys
+        preserve_url_slugs: Whether to preserve original URL slugs
+
+    Returns:
+        A unique LibraryUsageLocatorV2 for the target
+
+    Raises:
+        ValueError: If source_key is invalid
     """
-    context_key = key.course_key
+    if not source_key or not source_key.block_id:
+        raise ValueError(f"Invalid source_key: {source_key}")
 
-    if isinstance(context_key, LibraryLocator):
-        base_slug = f"{context_key.org}__{context_key.library}__{key.block_id}"
-    elif isinstance(context_key, CourseKey):
-        base_slug = f"{context_key.org}__{context_key.course}__{context_key.run}__{key.block_id}"
-    else:
-        raise ValueError(
-            f"Unexpected source usage key: {key}. Expected legacy course or library usage locator."
+    log.debug(f"Processing deduplication for source key: {source_key}")
+
+    # Check if we already processed this block
+    if source_key in existing_source_to_target_keys:
+        log.debug(f"Block {source_key} already exists, reusing existing target")
+        existing_version = existing_source_to_target_keys[source_key]
+
+        # Parse the key more safely
+        try:
+            key_parts = existing_version.key.split(":")
+            if len(key_parts) < 2:
+                raise ValueError(f"Invalid key format: {existing_version.key}")
+            block_id = key_parts[-1]
+        except (AttributeError, IndexError) as e:
+            raise ValueError(f"Failed to parse existing key: {existing_version.key}") from e
+
+        # mypy thinks LibraryUsageLocatorV2 is abstract. It's not.
+        return LibraryUsageLocatorV2(  # type: ignore[abstract]
+            target_library_key,
+            source_key.block_type,
+            block_id
         )
 
-    # Add hash suffix to reduce collision probability
-    key_hash = hashlib.md5(str(key).encode()).hexdigest()[:8]
-    final_slug = f"{base_slug}_{key_hash}"
+    # Generate new unique block ID
+    log.debug(f"Creating new block for {source_key.block_id}")
+    base_slug = _slugify_source_usage_key(source_key, olx, preserve_url_slugs=preserve_url_slugs)
+    unique_slug = _find_unique_slug(component_type, base_slug)
 
-    # Ensure slug length is reasonable (max 250 characters)
-    if len(final_slug) > 250:
-        # Truncate and add hash to maintain uniqueness
-        truncated = base_slug[:235]
-        final_slug = f"{truncated}_{key_hash}"
+    log.info(f"Created unique slug '{unique_slug}' for block {source_key.block_id}")
 
-    return final_slug
+    # mypy thinks LibraryUsageLocatorV2 is abstract. It's not.
+    return LibraryUsageLocatorV2(  # type: ignore[abstract]
+        target_library_key,
+        source_key.block_type,
+        unique_slug
+    )
+
+
+def _find_unique_slug(component_type: str, base_slug: str, max_attempts: int = 1000) -> str:
+    """
+    Find a unique slug by appending incrementing numbers if necessary.
+    Using batch querying to avoid multiple database roundtrips.
+
+    Args:
+        component_type: The component type to check against
+        base_slug: The base slug to make unique
+        max_attempts: Maximum number of attempts to prevent infinite loops
+
+    Returns:
+        A unique slug string
+
+    Raises:
+        RuntimeError: If unable to find unique slug within max_attempts
+    """
+    # Check if base slug is already unique
+    base_key = f"{component_type}:{base_slug}"
+
+    # Fetch all existing slugs that start with our pattern in one query
+    # This avoids multiple database roundtrips
+    existing_keys = set(
+        PublishableEntity.objects.filter(
+            key__startswith=f"{component_type}:{base_slug}"
+        ).values_list('key', flat=True)
+    )
+
+    # Check if base slug is available
+    if base_key not in existing_keys:
+        return base_slug
 
+    # Try numbered variations until we find one that doesn't exist
+    for i in range(1, max_attempts + 1):
+        candidate_slug = f"{base_slug}_{i}"
+        candidate_key = f"{component_type}:{candidate_slug}"
 
+        if candidate_key not in existing_keys:
+            return candidate_slug
+
+    raise RuntimeError(f"Unable to find unique slug after {max_attempts} attempts for base: {base_slug}")
+
+
+def _slugify_source_usage_key(
+    key: UsageKey,
+    olx_str: str = "",
+    preserve_url_slugs: bool = False
+) -> str:
+    """
+    Return an appropriate slug (aka block_id, aka container_id) for the target entity.
+
+    When preserve_url_slugs is False, attempts to create a human-readable slug
+    from the content title, falling back to the original block_id if parsing fails.
+    Otherwise, returns the original block_id.
+
+    Args:
+        key: The source usage key
+        olx_str: The OLX content string to extract title from
+        preserve_url_slugs: Whether to preserve original block IDs
+
+    Returns:
+        A slug string suitable for use as a block identifier
+    """
+    if preserve_url_slugs:
+        return key.block_id
+
+    # Try to generate a human-readable slug from content title
+    if olx_str:
+        try:
+            # Taken from openedx/core/djangoapps/content_libraries/api/blocks.py:354
+            # @@TODO: Extract the logic into a separate function for better
+            # readability and maintainability
+            olx_node = etree.fromstring(olx_str)
+            title = blocks._title_from_olx_node(olx_node)
+            if title:
+                # Slugify the title and append some random characters for uniqueness
+                slug = slugify(title, allow_unicode=True)
+                if slug:
+                    return f"{slug}-{uuid4().hex[-6:]}"
+        except (etree.XMLSyntaxError, AttributeError, TypeError) as e:
+            log.debug(f"Failed to parse OLX for title extraction: {e}")
+        except Exception as e:
+            log.warning(f"Unexpected error during title extraction: {e}")
+
+    # Fallback to original block_id
+    return key.block_id
+
+
+# Not used for now since it causes issues with
+# adding to Collections
+# Required for additional investigation
 def _create_migration_artifacts_in_bulk(
     root_migrated_node: _MigratedNode,
     source: ModulestoreSource,
diff --git a/cms/djangoapps/modulestore_migrator/tests/test_api.py b/cms/djangoapps/modulestore_migrator/tests/test_api.py
index f5587a7ae248..50b56e926286 100644
--- a/cms/djangoapps/modulestore_migrator/tests/test_api.py
+++ b/cms/djangoapps/modulestore_migrator/tests/test_api.py
@@ -51,6 +51,7 @@ def test_start_migration_to_library(self):
             target_collection_slug=None,
             composition_level=CompositionLevel.Component.value,
             replace_existing=False,
+            preserve_url_slugs=True,
             forward_source_to_target=False,
         )
 
@@ -60,6 +61,7 @@ def test_start_migration_to_library(self):
             modulestoremigration.composition_level == CompositionLevel.Component.value
         )
         assert modulestoremigration.replace_existing is False
+        assert modulestoremigration.preserve_url_slugs is True
         assert modulestoremigration.task_status is not None
         assert modulestoremigration.task_status.user == user
 
@@ -86,6 +88,7 @@ def test_start_migration_to_library_with_collection(self):
             target_collection_slug=collection_key,
             composition_level=CompositionLevel.Component.value,
             replace_existing=False,
+            preserve_url_slugs=True,
             forward_source_to_target=False,
         )
 
diff --git a/cms/djangoapps/modulestore_migrator/tests/test_tasks.py b/cms/djangoapps/modulestore_migrator/tests/test_tasks.py
index 1512bbe89f62..946ea71b480c 100644
--- a/cms/djangoapps/modulestore_migrator/tests/test_tasks.py
+++ b/cms/djangoapps/modulestore_migrator/tests/test_tasks.py
@@ -111,6 +111,7 @@ def test_migrate_node_wiki_tag(self):
             target_library_key=self.library.library_key,
             composition_level=CompositionLevel.Unit,
             replace_existing=False,
+            preserve_url_slugs=True,
             created_at=timezone.now(),
             created_by=self.user.id,
         )

From c560d6029c988a4487fffb2b9392168d33e06444 Mon Sep 17 00:00:00 2001
From: Maksim Sokolskiy <maksim.sokolskiy@raccoongang.com>
Date: Sun, 3 Aug 2025 22:50:53 +0300
Subject: [PATCH 22/40] feat: implement Containers restoring

Changes:
- refactor slugification
- restore a deleted container
---
 cms/djangoapps/modulestore_migrator/tasks.py | 81 +++++++++++++-------
 1 file changed, 52 insertions(+), 29 deletions(-)

diff --git a/cms/djangoapps/modulestore_migrator/tasks.py b/cms/djangoapps/modulestore_migrator/tasks.py
index 61feff79d438..62b44933e56c 100644
--- a/cms/djangoapps/modulestore_migrator/tasks.py
+++ b/cms/djangoapps/modulestore_migrator/tasks.py
@@ -408,6 +408,7 @@ def _migrate_node(
                         migrated_child.source_to_target
                     ],
                     target_library_key=target_library_key,
+                    target_package_id=target_package_id,
                     replace_existing=replace_existing,
                     preserve_url_slugs=preserve_url_slugs,
                     created_by=created_by,
@@ -451,6 +452,7 @@ def _migrate_container(
     title: str,
     children: list[PublishableEntityVersion],
     target_library_key: LibraryLocatorV2,
+    target_package_id: int,
     replace_existing: bool,
     preserve_url_slugs: bool,
     created_by: int,
@@ -463,7 +465,9 @@ def _migrate_container(
      package, but let's keep than an internal assumption.)
     """
     target_key = LibraryContainerLocator(
-        target_library_key, container_type.value, _slugify_source_usage_key(source_key)
+        target_library_key,
+        container_type.value,
+        _slugify_source_usage_key(source_key, title)
     )
 
     try:
@@ -471,14 +475,21 @@ def _migrate_container(
         container_exists = True
     except libraries_api.ContentLibraryContainerNotFound:
         container_exists = False
-        container = libraries_api.create_container(
-            library_key=target_library_key,
-            container_type=container_type,
-            slug=target_key.container_id,
-            title=title,
-            created=created_at,
-            user_id=created_by,
-        )
+        if PublishableEntity.objects.filter(
+            learning_package_id=target_package_id,
+            key=target_key.container_id,
+        ).exists():
+            libraries_api.restore_container(container_key=target_key)
+            container = libraries_api.get_container(target_key)
+        else:
+            container = libraries_api.create_container(
+                library_key=target_library_key,
+                container_type=container_type,
+                slug=target_key.container_id,
+                title=title,
+                created=created_at,
+                user_id=created_by,
+            )
     if container_exists and not replace_existing:
         return PublishableEntityVersion.objects.get(
             entity_id=container.container_pk,
@@ -628,9 +639,15 @@ def _deduplicate_block_id(
 
     # Generate new unique block ID
     log.debug(f"Creating new block for {source_key.block_id}")
-    base_slug = _slugify_source_usage_key(source_key, olx, preserve_url_slugs=preserve_url_slugs)
-    unique_slug = _find_unique_slug(component_type, base_slug)
 
+    title = _get_title_from_olx(olx) or source_key.block_id
+
+    base_slug = _slugify_source_usage_key(
+        source_key,
+        title,
+        preserve_url_slugs=preserve_url_slugs
+    )
+    unique_slug = _find_unique_slug(component_type, base_slug)
     log.info(f"Created unique slug '{unique_slug}' for block {source_key.block_id}")
 
     # mypy thinks LibraryUsageLocatorV2 is abstract. It's not.
@@ -683,9 +700,28 @@ def _find_unique_slug(component_type: str, base_slug: str, max_attempts: int = 1
     raise RuntimeError(f"Unable to find unique slug after {max_attempts} attempts for base: {base_slug}")
 
 
+def _get_title_from_olx(olx_str: str) -> str | None:
+    """
+    Extract the title from an OLX string.
+
+    Args:
+        olx_str: The OLX content string to extract title from
+
+    Returns:
+        The extracted title string
+    """
+    try:
+        olx_node = etree.fromstring(olx_str)
+        return blocks._title_from_olx_node(olx_node)
+    except (etree.XMLSyntaxError, AttributeError, TypeError) as e:
+        log.debug(f"Failed to parse OLX for title extraction: {e}")
+    except Exception as e:
+        log.warning(f"Unexpected error during title extraction: {e}")
+
+
 def _slugify_source_usage_key(
     key: UsageKey,
-    olx_str: str = "",
+    title: str,
     preserve_url_slugs: bool = False
 ) -> str:
     """
@@ -706,23 +742,10 @@ def _slugify_source_usage_key(
     if preserve_url_slugs:
         return key.block_id
 
-    # Try to generate a human-readable slug from content title
-    if olx_str:
-        try:
-            # Taken from openedx/core/djangoapps/content_libraries/api/blocks.py:354
-            # @@TODO: Extract the logic into a separate function for better
-            # readability and maintainability
-            olx_node = etree.fromstring(olx_str)
-            title = blocks._title_from_olx_node(olx_node)
-            if title:
-                # Slugify the title and append some random characters for uniqueness
-                slug = slugify(title, allow_unicode=True)
-                if slug:
-                    return f"{slug}-{uuid4().hex[-6:]}"
-        except (etree.XMLSyntaxError, AttributeError, TypeError) as e:
-            log.debug(f"Failed to parse OLX for title extraction: {e}")
-        except Exception as e:
-            log.warning(f"Unexpected error during title extraction: {e}")
+    # Slugify the title and append some random characters for uniqueness
+    slug = slugify(title, allow_unicode=True)
+    if slug:
+        return f"{slug}-{uuid4().hex[-6:]}"
 
     # Fallback to original block_id
     return key.block_id

From d252ce651023f92deb1ddb35c04d314f8a7c55ca Mon Sep 17 00:00:00 2001
From: Maksim Sokolskiy <maksim.sokolskiy@raccoongang.com>
Date: Mon, 4 Aug 2025 17:06:46 +0300
Subject: [PATCH 23/40] feat: implement Containers deduplication

TODO:
- decrease code duplication
- add tests
---
 cms/djangoapps/modulestore_migrator/tasks.py | 73 +++++++++++++++++---
 1 file changed, 62 insertions(+), 11 deletions(-)

diff --git a/cms/djangoapps/modulestore_migrator/tasks.py b/cms/djangoapps/modulestore_migrator/tasks.py
index 62b44933e56c..2cf0efd623f4 100644
--- a/cms/djangoapps/modulestore_migrator/tasks.py
+++ b/cms/djangoapps/modulestore_migrator/tasks.py
@@ -464,11 +464,15 @@ def _migrate_container(
     (We assume that the destination is a library rather than some other future kind of learning
      package, but let's keep than an internal assumption.)
     """
-    target_key = LibraryContainerLocator(
+    target_key = _deduplicate_container(
+        source_key,
         target_library_key,
-        container_type.value,
-        _slugify_source_usage_key(source_key, title)
+        container_type,
+        title,
+        existing_source_to_target_keys,
+        preserve_url_slugs,
     )
+    log.info(f"Target key: {target_key}")
 
     try:
         container = libraries_api.get_container(target_key)
@@ -587,6 +591,48 @@ def _migrate_component(
     return component_version.publishable_entity_version
 
 
+def _deduplicate_container(
+    source_key: UsageKey,
+    target_library_key: LibraryLocatorV2,
+    container_type: ContainerType,
+    title: str,
+    existing_source_to_target_keys: dict[UsageKey, PublishableEntityVersion],
+    preserve_url_slugs: bool = False
+) -> LibraryUsageLocatorV2:
+    if not source_key or not source_key.block_id:
+        raise ValueError(f"Invalid source_key: {source_key}")
+
+    log.debug(f"Processing deduplication for source key: {source_key}")
+
+    # Check if we already processed this block
+    if source_key in existing_source_to_target_keys:
+        log.debug(f"Block {source_key} already exists, reusing existing target")
+        existing_version = existing_source_to_target_keys[source_key]
+
+        return LibraryContainerLocator(
+            target_library_key,
+            container_type.value,
+            existing_version.key
+        )
+
+    # Generate new unique block ID
+    log.debug(f"Creating new block for {source_key.block_id}")
+
+    base_slug = _slugify_source_usage_key(
+        source_key,
+        title,
+        preserve_url_slugs
+    )
+    unique_slug = _find_unique_slug(base_slug)
+
+    log.info(f"Created new block with slug: {unique_slug}")
+
+    return LibraryContainerLocator(
+        target_library_key,
+        container_type.value,
+        unique_slug
+    )
+
 def _deduplicate_block_id(
     source_key: UsageKey,
     target_library_key: LibraryLocatorV2,
@@ -641,13 +687,13 @@ def _deduplicate_block_id(
     log.debug(f"Creating new block for {source_key.block_id}")
 
     title = _get_title_from_olx(olx) or source_key.block_id
-
     base_slug = _slugify_source_usage_key(
         source_key,
         title,
         preserve_url_slugs=preserve_url_slugs
     )
-    unique_slug = _find_unique_slug(component_type, base_slug)
+    unique_slug = _find_unique_slug(base_slug, component_type)
+
     log.info(f"Created unique slug '{unique_slug}' for block {source_key.block_id}")
 
     # mypy thinks LibraryUsageLocatorV2 is abstract. It's not.
@@ -658,7 +704,7 @@ def _deduplicate_block_id(
     )
 
 
-def _find_unique_slug(component_type: str, base_slug: str, max_attempts: int = 1000) -> str:
+def _find_unique_slug(base_slug: str, component_type: str = "", max_attempts: int = 1000) -> str:
     """
     Find a unique slug by appending incrementing numbers if necessary.
     Using batch querying to avoid multiple database roundtrips.
@@ -674,14 +720,16 @@ def _find_unique_slug(component_type: str, base_slug: str, max_attempts: int = 1
     Raises:
         RuntimeError: If unable to find unique slug within max_attempts
     """
-    # Check if base slug is already unique
-    base_key = f"{component_type}:{base_slug}"
+    if not component_type:
+        base_key = base_slug
+    else:
+        base_key = f"{component_type}:{base_slug}"
 
     # Fetch all existing slugs that start with our pattern in one query
     # This avoids multiple database roundtrips
     existing_keys = set(
         PublishableEntity.objects.filter(
-            key__startswith=f"{component_type}:{base_slug}"
+            key__startswith=base_key
         ).values_list('key', flat=True)
     )
 
@@ -722,7 +770,8 @@ def _get_title_from_olx(olx_str: str) -> str | None:
 def _slugify_source_usage_key(
     key: UsageKey,
     title: str,
-    preserve_url_slugs: bool = False
+    preserve_url_slugs: bool = False,
+    use_hash: bool = False
 ) -> str:
     """
     Return an appropriate slug (aka block_id, aka container_id) for the target entity.
@@ -745,7 +794,9 @@ def _slugify_source_usage_key(
     # Slugify the title and append some random characters for uniqueness
     slug = slugify(title, allow_unicode=True)
     if slug:
-        return f"{slug}-{uuid4().hex[-6:]}"
+        if use_hash:
+            return f"{slug}-{uuid4().hex[-6:]}"
+        return slug
 
     # Fallback to original block_id
     return key.block_id

From fe3163e3b4a9cc903119027816562111dd607749 Mon Sep 17 00:00:00 2001
From: Maksim Sokolskiy <maksim.sokolskiy@raccoongang.com>
Date: Mon, 4 Aug 2025 23:50:01 +0300
Subject: [PATCH 24/40] test: fix modulestore_migrator test

Changes:
- fix updating the existing_source_to_target_keys dictionary process
- fix new slug generation for Contaners
---
 cms/djangoapps/modulestore_migrator/tasks.py  |  22 +++-
 .../modulestore_migrator/tests/test_tasks.py  | 105 +++++++++++++++++-
 2 files changed, 117 insertions(+), 10 deletions(-)

diff --git a/cms/djangoapps/modulestore_migrator/tasks.py b/cms/djangoapps/modulestore_migrator/tasks.py
index 2cf0efd623f4..22225238bf67 100644
--- a/cms/djangoapps/modulestore_migrator/tasks.py
+++ b/cms/djangoapps/modulestore_migrator/tasks.py
@@ -431,7 +431,7 @@ def _migrate_node(
             if target_entity_version:
                 source_to_target = (source_key, target_entity_version)
                 # Update the existing_source_to_target_keys dictionary with the new mapping
-                existing_source_to_target_keys[source_key] = target_entity_version
+                existing_source_to_target_keys[source_key] = target_entity_version.entity
                 log.info(
                     f"Migrated node from {source_context_key} to {target_library_key} "
                     f"with version {target_entity_version}"
@@ -623,7 +623,7 @@ def _deduplicate_container(
         title,
         preserve_url_slugs
     )
-    unique_slug = _find_unique_slug(base_slug)
+    unique_slug = _find_unique_slug(base_slug, existing_source_to_target_keys)
 
     log.info(f"Created new block with slug: {unique_slug}")
 
@@ -692,7 +692,7 @@ def _deduplicate_block_id(
         title,
         preserve_url_slugs=preserve_url_slugs
     )
-    unique_slug = _find_unique_slug(base_slug, component_type)
+    unique_slug = _find_unique_slug(base_slug, existing_source_to_target_keys, component_type)
 
     log.info(f"Created unique slug '{unique_slug}' for block {source_key.block_id}")
 
@@ -704,7 +704,12 @@ def _deduplicate_block_id(
     )
 
 
-def _find_unique_slug(base_slug: str, component_type: str = "", max_attempts: int = 1000) -> str:
+def _find_unique_slug(
+    base_slug: str,
+    existing_source_to_target_keys: dict[UsageKey, PublishableEntityVersion],
+    component_type: str = "",
+    max_attempts: int = 1000
+) -> str:
     """
     Find a unique slug by appending incrementing numbers if necessary.
     Using batch querying to avoid multiple database roundtrips.
@@ -732,15 +737,20 @@ def _find_unique_slug(base_slug: str, component_type: str = "", max_attempts: in
             key__startswith=base_key
         ).values_list('key', flat=True)
     )
+    existing_pe_keys = (
+        publishable_entity.key for _, publishable_entity in
+        existing_source_to_target_keys.items()
+        if publishable_entity.key.startswith(base_key)
+    )
 
     # Check if base slug is available
-    if base_key not in existing_keys:
+    if base_key not in existing_keys and base_key not in existing_pe_keys:
         return base_slug
 
     # Try numbered variations until we find one that doesn't exist
     for i in range(1, max_attempts + 1):
         candidate_slug = f"{base_slug}_{i}"
-        candidate_key = f"{component_type}:{candidate_slug}"
+        candidate_key = f"{component_type}:{candidate_slug}" if component_type else candidate_slug
 
         if candidate_key not in existing_keys:
             return candidate_slug
diff --git a/cms/djangoapps/modulestore_migrator/tests/test_tasks.py b/cms/djangoapps/modulestore_migrator/tests/test_tasks.py
index 946ea71b480c..e5fcb419a3bd 100644
--- a/cms/djangoapps/modulestore_migrator/tests/test_tasks.py
+++ b/cms/djangoapps/modulestore_migrator/tests/test_tasks.py
@@ -82,9 +82,9 @@ def test_slugify_source_usage_key_course(self):
         course_key = CourseKey.from_string("course-v1:TestOrg+TestCourse+TestRun")
         usage_key = course_key.make_usage_key("problem", "test_problem")
 
-        result = _slugify_source_usage_key(usage_key)
+        result = _slugify_source_usage_key(usage_key, "test_problem")
 
-        self.assertEqual(result, "TestOrg__TestCourse__TestRun__test_problem_9a9c0b4c")
+        self.assertEqual(result, "test_problem")
 
     def test_slugify_source_usage_key_library(self):
         """
@@ -93,9 +93,9 @@ def test_slugify_source_usage_key_library(self):
         library_key = LibraryLocator(org="TestOrg", library="TestLibrary")
         usage_key = library_key.make_usage_key("problem", "test_problem")
 
-        result = _slugify_source_usage_key(usage_key)
+        result = _slugify_source_usage_key(usage_key, "test_problem")
 
-        self.assertEqual(result, "TestOrg__TestLibrary__test_problem_a63e2785")
+        self.assertEqual(result, "test_problem")
 
     def test_migrate_node_wiki_tag(self):
         """
@@ -104,6 +104,7 @@ def test_migrate_node_wiki_tag(self):
         wiki_node = etree.fromstring("<wiki />")
 
         result = _migrate_node(
+            existing_source_to_target_keys={},
             content_by_filename={},
             source_context_key=self.course.id,
             source_node=wiki_node,
@@ -130,6 +131,7 @@ def test_migrate_node_course_root(self):
         )
 
         result = _migrate_node(
+            existing_source_to_target_keys={},
             content_by_filename={},
             source_context_key=self.course.id,
             source_node=course_node,
@@ -137,6 +139,7 @@ def test_migrate_node_course_root(self):
             target_library_key=self.library.library_key,
             composition_level=CompositionLevel.Unit,
             replace_existing=False,
+            preserve_url_slugs=True,
             created_at=timezone.now(),
             created_by=self.user.id,
         )
@@ -156,6 +159,7 @@ def test_migrate_node_library_root(self):
             "</library>"
         )
         result = _migrate_node(
+            existing_source_to_target_keys={},
             content_by_filename={},
             source_context_key=self.course.id,
             source_node=library_node,
@@ -163,6 +167,7 @@ def test_migrate_node_library_root(self):
             target_library_key=self.library.library_key,
             composition_level=CompositionLevel.Unit,
             replace_existing=False,
+            preserve_url_slugs=True,
             created_at=timezone.now(),
             created_by=self.user.id,
         )
@@ -192,6 +197,7 @@ def test_migrate_node_container_composition_level(
         )
 
         result = _migrate_node(
+            existing_source_to_target_keys={},
             content_by_filename={},
             source_context_key=self.course.id,
             source_node=container_node,
@@ -199,6 +205,7 @@ def test_migrate_node_container_composition_level(
             target_library_key=self.library.library_key,
             composition_level=composition_level,
             replace_existing=False,
+            preserve_url_slugs=True,
             created_at=timezone.now(),
             created_by=self.user.id,
         )
@@ -220,6 +227,7 @@ def test_migrate_node_without_url_name(self):
         )
 
         result = _migrate_node(
+            existing_source_to_target_keys={},
             content_by_filename={},
             source_context_key=self.course.id,
             source_node=node_without_url_name,
@@ -227,6 +235,7 @@ def test_migrate_node_without_url_name(self):
             target_library_key=self.library.library_key,
             composition_level=CompositionLevel.Unit,
             replace_existing=False,
+            preserve_url_slugs=True,
             created_at=timezone.now(),
             created_by=self.user.id,
         )
@@ -273,6 +282,7 @@ def test_migrate_from_modulestore_invalid_source(self):
                 "target_package_pk": self.learning_package.id,
                 "target_collection_pk": self.collection.id,
                 "replace_existing": False,
+                "preserve_url_slugs": True,
                 "composition_level": CompositionLevel.Unit.value,
                 "forward_source_to_target": False,
             }
@@ -297,6 +307,7 @@ def test_migrate_from_modulestore_invalid_target_package(self):
                 "target_package_pk": 999999,  # Non-existent package
                 "target_collection_pk": self.collection.id,
                 "replace_existing": False,
+                "preserve_url_slugs": True,
                 "composition_level": CompositionLevel.Unit.value,
                 "forward_source_to_target": False,
             }
@@ -321,6 +332,7 @@ def test_migrate_from_modulestore_invalid_collection(self):
                 "target_package_pk": self.learning_package.id,
                 "target_collection_pk": 999999,  # Non-existent collection
                 "replace_existing": False,
+                "preserve_url_slugs": True,
                 "composition_level": CompositionLevel.Unit.value,
                 "forward_source_to_target": False,
             }
@@ -346,12 +358,14 @@ def test_migrate_component_success(self):
         olx = '<problem display_name="Test Problem"><multiplechoiceresponse></multiplechoiceresponse></problem>'
 
         result = _migrate_component(
+            existing_source_to_target_keys={},
             content_by_filename={},
             source_key=source_key,
             olx=olx,
             target_package_id=self.learning_package.id,
             target_library_key=self.library.library_key,
             replace_existing=False,
+            preserve_url_slugs=True,
             created_by=self.user.id,
             created_at=timezone.now(),
         )
@@ -381,12 +395,14 @@ def test_migrate_component_with_static_content(self):
         content_by_filename = {"test_image.png": test_content.id}
 
         result = _migrate_component(
+            existing_source_to_target_keys={},
             content_by_filename=content_by_filename,
             source_key=source_key,
             olx=olx,
             target_package_id=self.learning_package.id,
             target_library_key=self.library.library_key,
             replace_existing=False,
+            preserve_url_slugs=True,
             created_by=self.user.id,
             created_at=timezone.now(),
         )
@@ -406,24 +422,32 @@ def test_migrate_component_replace_existing_false(self):
         source_key = self.course.id.make_usage_key("problem", "existing_problem")
         olx = '<problem display_name="Test Problem"><multiplechoiceresponse></multiplechoiceresponse></problem>'
 
+        existing_source_to_target_keys = {}
+
         first_result = _migrate_component(
+            existing_source_to_target_keys=existing_source_to_target_keys,
             content_by_filename={},
             source_key=source_key,
             olx=olx,
             target_package_id=self.learning_package.id,
             target_library_key=self.library.library_key,
             replace_existing=False,
+            preserve_url_slugs=True,
             created_by=self.user.id,
             created_at=timezone.now(),
         )
 
+        existing_source_to_target_keys[source_key] = first_result.entity
+
         second_result = _migrate_component(
+            existing_source_to_target_keys=existing_source_to_target_keys,
             content_by_filename={},
             source_key=source_key,
             olx='<problem display_name="Updated Problem"><multiplechoiceresponse></multiplechoiceresponse></problem>',
             target_package_id=self.learning_package.id,
             target_library_key=self.library.library_key,
             replace_existing=False,
+            preserve_url_slugs=True,
             created_by=self.user.id,
             created_at=timezone.now(),
         )
@@ -438,25 +462,33 @@ def test_migrate_component_replace_existing_true(self):
         source_key = self.course.id.make_usage_key("problem", "replaceable_problem")
         original_olx = '<problem display_name="Original"><multiplechoiceresponse></multiplechoiceresponse></problem>'
 
+        existing_source_to_target_keys = {}
+
         first_result = _migrate_component(
+            existing_source_to_target_keys=existing_source_to_target_keys,
             content_by_filename={},
             source_key=source_key,
             olx=original_olx,
             target_package_id=self.learning_package.id,
             target_library_key=self.library.library_key,
             replace_existing=False,
+            preserve_url_slugs=True,
             created_by=self.user.id,
             created_at=timezone.now(),
         )
 
+        existing_source_to_target_keys[source_key] = first_result.entity
+
         updated_olx = '<problem display_name="Updated"><multiplechoiceresponse></multiplechoiceresponse></problem>'
         second_result = _migrate_component(
+            existing_source_to_target_keys=existing_source_to_target_keys,
             content_by_filename={},
             source_key=source_key,
             olx=updated_olx,
             target_package_id=self.learning_package.id,
             target_library_key=self.library.library_key,
             replace_existing=True,
+            preserve_url_slugs=True,
             created_by=self.user.id,
             created_at=timezone.now(),
         )
@@ -475,12 +507,14 @@ def test_migrate_component_different_block_types(self):
             olx = f'<{block_type} display_name="Test {block_type.title()}"></{block_type}>'
 
             result = _migrate_component(
+                existing_source_to_target_keys={},
                 content_by_filename={},
                 source_key=source_key,
                 olx=olx,
                 target_package_id=self.learning_package.id,
                 target_library_key=self.library.library_key,
                 replace_existing=False,
+                preserve_url_slugs=True,
                 created_by=self.user.id,
                 created_at=timezone.now(),
             )
@@ -520,12 +554,14 @@ def test_migrate_component_content_filename_not_in_olx(self):
         }
 
         result = _migrate_component(
+            existing_source_to_target_keys={},
             content_by_filename=content_by_filename,
             source_key=source_key,
             olx=olx,
             target_package_id=self.learning_package.id,
             target_library_key=self.library.library_key,
             replace_existing=False,
+            preserve_url_slugs=True,
             created_by=self.user.id,
             created_at=timezone.now(),
         )
@@ -555,12 +591,14 @@ def test_migrate_component_library_source_key(self):
         olx = '<problem display_name="Library Problem"><multiplechoiceresponse></multiplechoiceresponse></problem>'
 
         result = _migrate_component(
+            existing_source_to_target_keys={},
             content_by_filename={},
             source_key=source_key,
             olx=olx,
             target_package_id=self.learning_package.id,
             target_library_key=self.library.library_key,
             replace_existing=False,
+            preserve_url_slugs=True,
             created_by=self.user.id,
             created_at=timezone.now(),
         )
@@ -590,24 +628,32 @@ def test_migrate_component_duplicate_content_integrity_error(self):
 
         content_by_filename = {"duplicate.png": test_content.id}
 
+        existing_source_to_target_keys = {}
+
         first_result = _migrate_component(
+            existing_source_to_target_keys=existing_source_to_target_keys,
             content_by_filename=content_by_filename,
             source_key=source_key,
             olx=olx,
             target_package_id=self.learning_package.id,
             target_library_key=self.library.library_key,
             replace_existing=False,
+            preserve_url_slugs=True,
             created_by=self.user.id,
             created_at=timezone.now(),
         )
 
+        existing_source_to_target_keys[source_key] = first_result.entity
+
         second_result = _migrate_component(
+            existing_source_to_target_keys=existing_source_to_target_keys,
             content_by_filename=content_by_filename,
             source_key=source_key,
             olx=olx,
             target_package_id=self.learning_package.id,
             target_library_key=self.library.library_key,
             replace_existing=True,
+            preserve_url_slugs=True,
             created_by=self.user.id,
             created_at=timezone.now(),
         )
@@ -660,12 +706,15 @@ def test_migrate_container_creates_new_container(self):
         ]
 
         result = _migrate_container(
+            existing_source_to_target_keys={},
             source_key=source_key,
             container_type=lib_api.ContainerType.Unit,
             title="Test Vertical",
             children=children,
             target_library_key=self.library.library_key,
+            target_package_id=self.learning_package.id,
             replace_existing=False,
+            preserve_url_slugs=True,
             created_by=self.user.id,
             created_at=timezone.now(),
         )
@@ -699,12 +748,15 @@ def test_migrate_container_different_container_types(self):
                 )
 
                 result = _migrate_container(
+                    existing_source_to_target_keys={},
                     source_key=source_key,
                     container_type=container_type,
                     title=f"Test {block_type.title()}",
                     children=[],
                     target_library_key=self.library.library_key,
+                    target_package_id=self.learning_package.id,
                     replace_existing=False,
+                    preserve_url_slugs=True,
                     created_by=self.user.id,
                     created_at=timezone.now(),
                 )
@@ -720,24 +772,34 @@ def test_migrate_container_replace_existing_false(self):
         """
         source_key = self.course.id.make_usage_key("vertical", "existing_vertical")
 
+        existing_source_to_target_keys = {}
+
         first_result = _migrate_container(
+            existing_source_to_target_keys=existing_source_to_target_keys,
             source_key=source_key,
             container_type=lib_api.ContainerType.Unit,
             title="Original Title",
             children=[],
             target_library_key=self.library.library_key,
+            target_package_id=self.learning_package.id,
             replace_existing=False,
+            preserve_url_slugs=True,
             created_by=self.user.id,
             created_at=timezone.now(),
         )
 
+        existing_source_to_target_keys[source_key] = first_result.entity
+
         second_result = _migrate_container(
+            existing_source_to_target_keys=existing_source_to_target_keys,
             source_key=source_key,
             container_type=lib_api.ContainerType.Unit,
             title="Updated Title",
             children=[],
             target_library_key=self.library.library_key,
+            target_package_id=self.learning_package.id,
             replace_existing=False,
+            preserve_url_slugs=True,
             created_by=self.user.id,
             created_at=timezone.now(),
         )
@@ -770,24 +832,34 @@ def test_migrate_container_replace_existing_true(self):
             created_by=self.user.id,
         )
 
+        existing_source_to_target_keys = {}
+
         first_result = _migrate_container(
+            existing_source_to_target_keys=existing_source_to_target_keys,
             source_key=source_key,
             container_type=lib_api.ContainerType.Unit,
             title="Original Title",
             children=[],
             target_library_key=self.library.library_key,
+            target_package_id=self.learning_package.id,
             replace_existing=False,
+            preserve_url_slugs=True,
             created_by=self.user.id,
             created_at=timezone.now(),
         )
 
+        existing_source_to_target_keys[source_key] = first_result.entity
+
         second_result = _migrate_container(
+            existing_source_to_target_keys=existing_source_to_target_keys,
             source_key=source_key,
             container_type=lib_api.ContainerType.Unit,
             title="Updated Title",
             children=[child_version.publishable_entity_version],
             target_library_key=self.library.library_key,
+            target_package_id=self.learning_package.id,
             replace_existing=True,
+            preserve_url_slugs=True,
             created_by=self.user.id,
             created_at=timezone.now(),
         )
@@ -807,12 +879,15 @@ def test_migrate_container_with_library_source_key(self):
         source_key = library_key.make_usage_key("vertical", "library_vertical")
 
         result = _migrate_container(
+            existing_source_to_target_keys={},
             source_key=source_key,
             container_type=lib_api.ContainerType.Unit,
             title="Library Vertical",
             children=[],
             target_library_key=self.library.library_key,
+            target_package_id=self.learning_package.id,
             replace_existing=False,
+            preserve_url_slugs=True,
             created_by=self.user.id,
             created_at=timezone.now(),
         )
@@ -829,12 +904,15 @@ def test_migrate_container_empty_children_list(self):
         source_key = self.course.id.make_usage_key("vertical", "empty_vertical")
 
         result = _migrate_container(
+            existing_source_to_target_keys={},
             source_key=source_key,
             container_type=lib_api.ContainerType.Unit,
             title="Empty Vertical",
             children=[],
             target_library_key=self.library.library_key,
+            target_package_id=self.learning_package.id,
             replace_existing=False,
+            preserve_url_slugs=True,
             created_by=self.user.id,
             created_at=timezone.now(),
         )
@@ -870,12 +948,15 @@ def test_migrate_container_preserves_child_order(self):
             children.append(child_version.publishable_entity_version)
 
         result = _migrate_container(
+            existing_source_to_target_keys={},
             source_key=source_key,
             container_type=lib_api.ContainerType.Unit,
             title="Ordered Vertical",
             children=children,
             target_library_key=self.library.library_key,
+            target_package_id=self.learning_package.id,
             replace_existing=False,
+            preserve_url_slugs=True,
             created_by=self.user.id,
             created_at=timezone.now(),
         )
@@ -950,12 +1031,15 @@ def test_migrate_container_with_mixed_child_types(self):
         ]
 
         result = _migrate_container(
+            existing_source_to_target_keys={},
             source_key=source_key,
             container_type=lib_api.ContainerType.Unit,
             title="Mixed Content Vertical",
             children=children,
             target_library_key=self.library.library_key,
+            target_package_id=self.learning_package.id,
             replace_existing=False,
+            preserve_url_slugs=True,
             created_by=self.user.id,
             created_at=timezone.now(),
         )
@@ -980,12 +1064,15 @@ def test_migrate_container_generates_correct_target_key(self):
         course_source_key = self.course.id.make_usage_key("vertical", "test_vertical")
 
         course_result = _migrate_container(
+            existing_source_to_target_keys={},
             source_key=course_source_key,
             container_type=lib_api.ContainerType.Unit,
             title="Course Vertical",
             children=[],
             target_library_key=self.library.library_key,
+            target_package_id=self.learning_package.id,
             replace_existing=False,
+            preserve_url_slugs=True,
             created_by=self.user.id,
             created_at=timezone.now(),
         )
@@ -994,12 +1081,15 @@ def test_migrate_container_generates_correct_target_key(self):
         library_source_key = library_key.make_usage_key("vertical", "test_vertical")
 
         library_result = _migrate_container(
+            existing_source_to_target_keys={},
             source_key=library_source_key,
             container_type=lib_api.ContainerType.Unit,
             title="Library Vertical",
             children=[],
             target_library_key=self.library.library_key,
+            target_package_id=self.learning_package.id,
             replace_existing=False,
+            preserve_url_slugs=True,
             created_by=self.user.id,
             created_at=timezone.now(),
         )
@@ -1021,6 +1111,7 @@ def test_migrate_from_modulestore_success_course(self):
                 "target_package_pk": self.learning_package.id,
                 "target_collection_pk": self.collection.id,
                 "replace_existing": False,
+                "preserve_url_slugs": True,
                 "composition_level": CompositionLevel.Unit.value,
                 "forward_source_to_target": False,
             }
@@ -1050,6 +1141,7 @@ def test_migrate_from_modulestore_library_validation_failure(self):
                 "target_package_pk": self.learning_package.id,
                 "target_collection_pk": None,
                 "replace_existing": True,
+                "preserve_url_slugs": True,
                 "composition_level": CompositionLevel.Section.value,
                 "forward_source_to_target": True,
             }
@@ -1079,6 +1171,7 @@ def test_migrate_from_modulestore_invalid_source_key_type(self):
                 "target_package_pk": self.learning_package.id,
                 "target_collection_pk": self.collection.id,
                 "replace_existing": False,
+                "preserve_url_slugs": True,
                 "composition_level": CompositionLevel.Unit.value,
                 "forward_source_to_target": False,
             }
@@ -1107,6 +1200,7 @@ def test_migrate_from_modulestore_nonexistent_modulestore_item(self):
                 "target_package_pk": self.learning_package.id,
                 "target_collection_pk": self.collection.id,
                 "replace_existing": False,
+                "preserve_url_slugs": True,
                 "composition_level": CompositionLevel.Unit.value,
                 "forward_source_to_target": False,
             }
@@ -1131,6 +1225,7 @@ def test_migrate_from_modulestore_task_status_progression(self):
                 "target_package_pk": self.learning_package.id,
                 "target_collection_pk": self.collection.id,
                 "replace_existing": False,
+                "preserve_url_slugs": True,
                 "composition_level": CompositionLevel.Unit.value,
                 "forward_source_to_target": False,
             }
@@ -1160,6 +1255,7 @@ def test_migrate_from_modulestore_multiple_users_no_interference(self):
                 "target_package_pk": self.learning_package.id,
                 "target_collection_pk": self.collection.id,
                 "replace_existing": False,
+                "preserve_url_slugs": True,
                 "composition_level": CompositionLevel.Unit.value,
                 "forward_source_to_target": False,
             }
@@ -1172,6 +1268,7 @@ def test_migrate_from_modulestore_multiple_users_no_interference(self):
                 "target_package_pk": self.learning_package.id,
                 "target_collection_pk": self.collection.id,
                 "replace_existing": False,
+                "preserve_url_slugs": True,
                 "composition_level": CompositionLevel.Unit.value,
                 "forward_source_to_target": False,
             }

From 5b8289e71a9fdd0d282dd839ea65ef0b3424052a Mon Sep 17 00:00:00 2001
From: Maksim Sokolskiy <maksim.sokolskiy@raccoongang.com>
Date: Sun, 10 Aug 2025 17:02:55 +0300
Subject: [PATCH 25/40] feat: implement MigrationContext

Changes:
- refactor migration context usage
- update tests
- add new tests
- fix typo in return type for _deduplicate_container
---
 cms/djangoapps/modulestore_migrator/tasks.py  | 230 ++++----
 .../modulestore_migrator/tests/test_tasks.py  | 533 +++++++++++-------
 2 files changed, 438 insertions(+), 325 deletions(-)

diff --git a/cms/djangoapps/modulestore_migrator/tasks.py b/cms/djangoapps/modulestore_migrator/tasks.py
index 22225238bf67..e5c2bc92f043 100644
--- a/cms/djangoapps/modulestore_migrator/tasks.py
+++ b/cms/djangoapps/modulestore_migrator/tasks.py
@@ -84,6 +84,36 @@ def calculate_total_steps(arguments_dict):
         return len(list(MigrationStep))
 
 
+@dataclass(frozen=True)
+class MigrationContext:
+    existing_source_to_target_keys: dict[UsageKey, PublishableEntity]
+    target_package_id: int
+    target_library_key: LibraryLocatorV2
+    source_context_key: CourseKey  # Note: This includes legacy LibraryLocators, which are sneakily CourseKeys.
+    composition_level: CompositionLevel
+    replace_existing: bool
+    preserve_url_slugs: bool
+    created_by: int
+    created_at: datetime
+
+    def is_already_migrated(self, source_key: UsageKey) -> bool:
+        return source_key in self.existing_source_to_target_keys
+
+    def get_existing_target(self, source_key: UsageKey) -> PublishableEntityVersion | None:
+        return self.existing_source_to_target_keys.get(source_key)
+
+    def add_migration(self, source_key: UsageKey, target: PublishableEntity) -> None:
+        """Update the context with a new migration (keeps it current)"""
+        self.existing_source_to_target_keys[source_key] = target
+
+    def get_migrated_entities(self, base_key: str) -> set[UsageKey]:
+        return set(
+            publishable_entity.key for _, publishable_entity in
+            self.existing_source_to_target_keys.items()
+            if publishable_entity.key.startswith(base_key)
+        )
+
+
 @shared_task(base=_MigrationTask, bind=True)
 # Note: The decorator @set_code_owner_attribute cannot be used here because the UserTaskMixin
 #   does stack inspection and can't handle additional decorators.
@@ -217,34 +247,28 @@ def migrate_from_modulestore(
 
     status.set_state(MigrationStep.IMPORTING_STRUCTURE.value)
 
-    # @@TODO: I propose to make it better:
-    # Implement as a MigrationContext dataclass
-    # encapsulate in it the following migration artibutes
-    # Context:
-        # existing_source_to_target_keys:
-        # content_by_filename:
-        # target_package_id:
-        # replace_existing:
-        # preserve_url_slugs:
-    # This will reduce parameter count from 10+ to 2-3
     existing_source_to_target_keys = {
         block.source.key: block.target for block in ModulestoreBlockMigration.objects.filter(
         overall_migration__target=migration.target.id)
     }
 
+    migration_context = MigrationContext(
+        existing_source_to_target_keys=existing_source_to_target_keys,
+        target_package_id=target_package_pk,
+        target_library_key=target_library.library_key,
+        source_context_key=source_root_usage_key.course_key,
+        composition_level=CompositionLevel(composition_level),
+        replace_existing=replace_existing,
+        preserve_url_slugs=preserve_url_slugs,
+        created_by=status.user_id,
+        created_at=datetime.now(timezone.utc),
+    )
+
     with authoring_api.bulk_draft_changes_for(migration.target.id) as change_log:
         root_migrated_node = _migrate_node(
-            existing_source_to_target_keys=existing_source_to_target_keys,
+            context=migration_context,
             content_by_filename=content_by_filename,
-            source_context_key=source_root_usage_key.course_key,
             source_node=root_node,
-            target_library_key=target_library.library_key,
-            target_package_id=target_package_pk,
-            replace_existing=replace_existing,
-            preserve_url_slugs=preserve_url_slugs,
-            composition_level=CompositionLevel(composition_level),
-            created_at=datetime.now(timezone.utc),
-            created_by=status.user_id,
         )
     change_log.save()
     migration.change_log = change_log
@@ -327,21 +351,13 @@ def all_source_to_target_pairs(self) -> t.Iterable[tuple[UsageKey, PublishableEn
 
 def _migrate_node(
     *,
-    existing_source_to_target_keys: dict[UsageKey, PublishableEntityVersion],
+    context: MigrationContext,
     content_by_filename: dict[str, int],
-    source_context_key: CourseKey,  # Note: This includes legacy LibraryLocators, which are sneakily CourseKeys.
     source_node: XmlTree,
-    target_package_id: int,
-    target_library_key: LibraryLocatorV2,
-    composition_level: CompositionLevel,
-    replace_existing: bool,
-    preserve_url_slugs: bool,
-    created_at: datetime,
-    created_by: int,
 ) -> _MigratedNode:
     """
     Migration an OLX node (source_node) from a legacy course or library (source_context_key) to a
-    learning package (target_library). If the node is a container, create it in the target iff
+    learning package (context.target_library). If the node is a container, create it in the target if
     it is at or above the requested composition_level; otherwise, just import its contents.
     Recursively apply the same logic to all children.
     """
@@ -371,23 +387,15 @@ def _migrate_node(
             should_migrate_children = False
     else:
         node_level = CompositionLevel(container_type.value)
-        should_migrate_node = not node_level.is_higher_than(composition_level)
+        should_migrate_node = not node_level.is_higher_than(context.composition_level)
         should_migrate_children = True
     migrated_children: list[_MigratedNode] = []
     if should_migrate_children:
         migrated_children = [
             _migrate_node(
-                existing_source_to_target_keys=existing_source_to_target_keys,
+                context=context,
                 content_by_filename=content_by_filename,
-                source_context_key=source_context_key,
                 source_node=source_node_child,
-                target_package_id=target_package_id,
-                target_library_key=target_library_key,
-                composition_level=composition_level,
-                replace_existing=replace_existing,
-                preserve_url_slugs=preserve_url_slugs,
-                created_by=created_by,
-                created_at=created_at,
             )
             for source_node_child in source_node.getchildren()
         ]
@@ -395,10 +403,10 @@ def _migrate_node(
     if should_migrate_node:
         source_olx = etree.tostring(source_node).decode('utf-8')
         if source_block_id := source_node.get('url_name'):
-            source_key: UsageKey = source_context_key.make_usage_key(source_node.tag, source_block_id)
+            source_key: UsageKey = context.source_context_key.make_usage_key(source_node.tag, source_block_id)
             target_entity_version = (
                 _migrate_container(
-                    existing_source_to_target_keys=existing_source_to_target_keys,
+                    context=context,
                     source_key=source_key,
                     container_type=container_type,
                     title=source_node.get('display_name', source_block_id),
@@ -407,38 +415,26 @@ def _migrate_node(
                         for migrated_child in migrated_children if
                         migrated_child.source_to_target
                     ],
-                    target_library_key=target_library_key,
-                    target_package_id=target_package_id,
-                    replace_existing=replace_existing,
-                    preserve_url_slugs=preserve_url_slugs,
-                    created_by=created_by,
-                    created_at=created_at,
                 )
                 if container_type else
                 _migrate_component(
-                    existing_source_to_target_keys=existing_source_to_target_keys,
+                    context=context,
                     content_by_filename=content_by_filename,
                     source_key=source_key,
                     olx=source_olx,
-                    target_package_id=target_package_id,
-                    target_library_key=target_library_key,
-                    replace_existing=replace_existing,
-                    preserve_url_slugs=preserve_url_slugs,
-                    created_by=created_by,
-                    created_at=created_at,
                 )
             )
             if target_entity_version:
                 source_to_target = (source_key, target_entity_version)
                 # Update the existing_source_to_target_keys dictionary with the new mapping
-                existing_source_to_target_keys[source_key] = target_entity_version.entity
+                context.add_migration(source_key, target_entity_version.entity)
                 log.info(
-                    f"Migrated node from {source_context_key} to {target_library_key} "
+                    f"Migrated node from {context.source_context_key} to {context.target_library_key} "
                     f"with version {target_entity_version}"
                 )
         else:
             log.warning(
-                f"Cannot migrate node from {source_context_key} to {target_library_key} "
+                f"Cannot migrate node from {context.source_context_key} to {context.target_library_key} "
                 f"because it lacks an url_name and thus has no identity: {source_olx}"
             )
     return _MigratedNode(source_to_target=source_to_target, children=migrated_children)
@@ -446,17 +442,11 @@ def _migrate_node(
 
 def _migrate_container(
     *,
-    existing_source_to_target_keys: dict[UsageKey, PublishableEntityVersion],
+    context: MigrationContext,
     source_key: UsageKey,
     container_type: ContainerType,
     title: str,
     children: list[PublishableEntityVersion],
-    target_library_key: LibraryLocatorV2,
-    target_package_id: int,
-    replace_existing: bool,
-    preserve_url_slugs: bool,
-    created_by: int,
-    created_at: datetime,
 ) -> PublishableEntityVersion:
     """
     Create, update, or replace a container in a library based on a source key and children.
@@ -465,12 +455,10 @@ def _migrate_container(
      package, but let's keep than an internal assumption.)
     """
     target_key = _deduplicate_container(
+        context,
         source_key,
-        target_library_key,
         container_type,
         title,
-        existing_source_to_target_keys,
-        preserve_url_slugs,
     )
     log.info(f"Target key: {target_key}")
 
@@ -480,21 +468,21 @@ def _migrate_container(
     except libraries_api.ContentLibraryContainerNotFound:
         container_exists = False
         if PublishableEntity.objects.filter(
-            learning_package_id=target_package_id,
+            learning_package_id=context.target_package_id,
             key=target_key.container_id,
         ).exists():
             libraries_api.restore_container(container_key=target_key)
             container = libraries_api.get_container(target_key)
         else:
             container = libraries_api.create_container(
-                library_key=target_library_key,
+                library_key=context.target_library_key,
                 container_type=container_type,
                 slug=target_key.container_id,
                 title=title,
-                created=created_at,
-                user_id=created_by,
+                created=context.created_at,
+                user_id=context.created_by,
             )
-    if container_exists and not replace_existing:
+    if container_exists and not context.replace_existing:
         return PublishableEntityVersion.objects.get(
             entity_id=container.container_pk,
             version_num=container.draft_version_num,
@@ -506,24 +494,18 @@ def _migrate_container(
             authoring_api.ContainerEntityRow(entity_pk=child.entity_id, version_pk=None)
             for child in children
         ],
-        created=created_at,
-        created_by=created_by,
+        created=context.created_at,
+        created_by=context.created_by,
         container_version_cls=container_type.container_model_classes[1],
     ).publishable_entity_version
 
 
 def _migrate_component(
     *,
-    existing_source_to_target_keys: dict[UsageKey, PublishableEntityVersion],
+    context: MigrationContext,
     content_by_filename: dict[str, int],
     source_key: UsageKey,
     olx: str,
-    target_package_id: int,
-    target_library_key: LibraryLocatorV2,
-    replace_existing: bool,
-    preserve_url_slugs: bool,
-    created_by: int,
-    created_at: datetime,
 ) -> PublishableEntityVersion | None:
     """
     Create, update, or replace a component in a library based on a source key and OLX.
@@ -534,17 +516,15 @@ def _migrate_component(
     component_type = authoring_api.get_or_create_component_type("xblock.v1", source_key.block_type)
 
     target_key = _deduplicate_block_id(
+        context,
         source_key,
-        target_library_key,
         component_type,
         olx,
-        existing_source_to_target_keys,
-        preserve_url_slugs,
     )
 
     try:
         log.info(f"Attempting to retrieve component for {target_key}")
-        component = authoring_api.get_components(target_package_id).get(
+        component = authoring_api.get_components(context.target_package_id).get(
             component_type=component_type,
             local_key=target_key.block_id,
         )
@@ -558,21 +538,21 @@ def _migrate_component(
         component_deleted = False
         try:
             libraries_api.validate_can_add_block_to_library(
-                target_library_key, target_key.block_type, target_key.block_id
+                context.target_library_key, target_key.block_type, target_key.block_id
             )
         except libraries_api.IncompatibleTypesError as e:
-            log.error(f"Error validating block for library {target_library_key}: {e}")
+            log.error(f"Error validating block for library {context.target_library_key}: {e}")
             return None
         component = authoring_api.create_component(
-            target_package_id,
+            context.target_package_id,
             component_type=component_type,
             local_key=target_key.block_id,
-            created=created_at,
-            created_by=created_by,
+            created=context.created_at,
+            created_by=context.created_by,
         )
 
     # Component existed and we do not replace it and it is not deleted previously
-    if component_existed and not component_deleted and not replace_existing:
+    if component_existed and not component_deleted and not context.replace_existing:
         return component.versioning.draft.publishable_entity_version
 
     # If component existed and was deleted or we have to replace the current version
@@ -592,25 +572,23 @@ def _migrate_component(
 
 
 def _deduplicate_container(
+    context: MigrationContext,
     source_key: UsageKey,
-    target_library_key: LibraryLocatorV2,
     container_type: ContainerType,
     title: str,
-    existing_source_to_target_keys: dict[UsageKey, PublishableEntityVersion],
-    preserve_url_slugs: bool = False
-) -> LibraryUsageLocatorV2:
+) -> LibraryContainerLocator:
     if not source_key or not source_key.block_id:
         raise ValueError(f"Invalid source_key: {source_key}")
 
     log.debug(f"Processing deduplication for source key: {source_key}")
 
     # Check if we already processed this block
-    if source_key in existing_source_to_target_keys:
+    if context.is_already_migrated(source_key):
         log.debug(f"Block {source_key} already exists, reusing existing target")
-        existing_version = existing_source_to_target_keys[source_key]
+        existing_version = context.get_existing_target(source_key)
 
         return LibraryContainerLocator(
-            target_library_key,
+            context.target_library_key,
             container_type.value,
             existing_version.key
         )
@@ -618,38 +596,37 @@ def _deduplicate_container(
     # Generate new unique block ID
     log.debug(f"Creating new block for {source_key.block_id}")
 
-    base_slug = _slugify_source_usage_key(
-        source_key,
-        title,
-        preserve_url_slugs
+    base_slug = (
+        source_key.block_id
+        if context.preserve_url_slugs
+        else _slugify_source_usage_key(
+            source_key,
+            title,
+        )
     )
-    unique_slug = _find_unique_slug(base_slug, existing_source_to_target_keys)
+    unique_slug = _find_unique_slug(context, base_slug)
 
     log.info(f"Created new block with slug: {unique_slug}")
 
     return LibraryContainerLocator(
-        target_library_key,
+        context.target_library_key,
         container_type.value,
         unique_slug
     )
 
 def _deduplicate_block_id(
+    context: MigrationContext,
     source_key: UsageKey,
-    target_library_key: LibraryLocatorV2,
     component_type: str,
     olx: str,
-    existing_source_to_target_keys: dict[UsageKey, PublishableEntityVersion],
-    preserve_url_slugs: bool = False
 ) -> LibraryUsageLocatorV2:
     """
     Deduplicate a block_id by appending a unique identifier if necessary.
 
     Args:
+        context: The migration context
         source_key: The original usage key from the source
-        target_library_key: The target library locator
         component_type: The component type string
-        existing_source_to_target_keys: Mapping of already migrated keys
-        preserve_url_slugs: Whether to preserve original URL slugs
 
     Returns:
         A unique LibraryUsageLocatorV2 for the target
@@ -663,9 +640,9 @@ def _deduplicate_block_id(
     log.debug(f"Processing deduplication for source key: {source_key}")
 
     # Check if we already processed this block
-    if source_key in existing_source_to_target_keys:
+    if context.is_already_migrated(source_key):
         log.debug(f"Block {source_key} already exists, reusing existing target")
-        existing_version = existing_source_to_target_keys[source_key]
+        existing_version = context.get_existing_target(source_key)
 
         # Parse the key more safely
         try:
@@ -678,7 +655,7 @@ def _deduplicate_block_id(
 
         # mypy thinks LibraryUsageLocatorV2 is abstract. It's not.
         return LibraryUsageLocatorV2(  # type: ignore[abstract]
-            target_library_key,
+            context.target_library_key,
             source_key.block_type,
             block_id
         )
@@ -687,26 +664,29 @@ def _deduplicate_block_id(
     log.debug(f"Creating new block for {source_key.block_id}")
 
     title = _get_title_from_olx(olx) or source_key.block_id
-    base_slug = _slugify_source_usage_key(
-        source_key,
-        title,
-        preserve_url_slugs=preserve_url_slugs
+    base_slug = (
+        source_key.block_id
+        if context.preserve_url_slugs
+        else _slugify_source_usage_key(
+            source_key,
+            title,
+        )
     )
-    unique_slug = _find_unique_slug(base_slug, existing_source_to_target_keys, component_type)
+    unique_slug = _find_unique_slug(context, base_slug, component_type)
 
     log.info(f"Created unique slug '{unique_slug}' for block {source_key.block_id}")
 
     # mypy thinks LibraryUsageLocatorV2 is abstract. It's not.
     return LibraryUsageLocatorV2(  # type: ignore[abstract]
-        target_library_key,
+        context.target_library_key,
         source_key.block_type,
         unique_slug
     )
 
 
 def _find_unique_slug(
+    context: MigrationContext,
     base_slug: str,
-    existing_source_to_target_keys: dict[UsageKey, PublishableEntityVersion],
     component_type: str = "",
     max_attempts: int = 1000
 ) -> str:
@@ -737,11 +717,7 @@ def _find_unique_slug(
             key__startswith=base_key
         ).values_list('key', flat=True)
     )
-    existing_pe_keys = (
-        publishable_entity.key for _, publishable_entity in
-        existing_source_to_target_keys.items()
-        if publishable_entity.key.startswith(base_key)
-    )
+    existing_pe_keys = context.get_migrated_entities(base_key)
 
     # Check if base slug is available
     if base_key not in existing_keys and base_key not in existing_pe_keys:
@@ -780,7 +756,6 @@ def _get_title_from_olx(olx_str: str) -> str | None:
 def _slugify_source_usage_key(
     key: UsageKey,
     title: str,
-    preserve_url_slugs: bool = False,
     use_hash: bool = False
 ) -> str:
     """
@@ -798,9 +773,6 @@ def _slugify_source_usage_key(
     Returns:
         A slug string suitable for use as a block identifier
     """
-    if preserve_url_slugs:
-        return key.block_id
-
     # Slugify the title and append some random characters for uniqueness
     slug = slugify(title, allow_unicode=True)
     if slug:
diff --git a/cms/djangoapps/modulestore_migrator/tests/test_tasks.py b/cms/djangoapps/modulestore_migrator/tests/test_tasks.py
index e5fcb419a3bd..97fdebe4e4af 100644
--- a/cms/djangoapps/modulestore_migrator/tests/test_tasks.py
+++ b/cms/djangoapps/modulestore_migrator/tests/test_tasks.py
@@ -28,6 +28,7 @@
     _migrate_node,
     _slugify_source_usage_key,
     _MigratedNode,
+    MigrationContext,
     _MigrationTask,
     migrate_from_modulestore,
     MigrationStep,
@@ -102,14 +103,11 @@ def test_migrate_node_wiki_tag(self):
         Test _migrate_node ignores wiki tags
         """
         wiki_node = etree.fromstring("<wiki />")
-
-        result = _migrate_node(
+        context = MigrationContext(
             existing_source_to_target_keys={},
-            content_by_filename={},
-            source_context_key=self.course.id,
-            source_node=wiki_node,
             target_package_id=self.learning_package.id,
             target_library_key=self.library.library_key,
+            source_context_key=self.course.id,
             composition_level=CompositionLevel.Unit,
             replace_existing=False,
             preserve_url_slugs=True,
@@ -117,6 +115,12 @@ def test_migrate_node_wiki_tag(self):
             created_by=self.user.id,
         )
 
+        result = _migrate_node(
+            context=context,
+            content_by_filename={},
+            source_node=wiki_node,
+        )
+
         self.assertIsNone(result.source_to_target)
         self.assertEqual(len(result.children), 0)
 
@@ -129,14 +133,11 @@ def test_migrate_node_course_root(self):
             '<chapter url_name="chapter1" display_name="Chapter 1" />'
             "</course>"
         )
-
-        result = _migrate_node(
+        context = MigrationContext(
             existing_source_to_target_keys={},
-            content_by_filename={},
-            source_context_key=self.course.id,
-            source_node=course_node,
             target_package_id=self.learning_package.id,
             target_library_key=self.library.library_key,
+            source_context_key=self.course.id,
             composition_level=CompositionLevel.Unit,
             replace_existing=False,
             preserve_url_slugs=True,
@@ -144,6 +145,12 @@ def test_migrate_node_course_root(self):
             created_by=self.user.id,
         )
 
+        result = _migrate_node(
+            context=context,
+            content_by_filename={},
+            source_node=course_node,
+        )
+
         # Course root should not be migrated
         self.assertIsNone(result.source_to_target)
         # But should have children processed
@@ -158,19 +165,22 @@ def test_migrate_node_library_root(self):
             '<problem url_name="problem1" display_name="Problem 1" />'
             "</library>"
         )
-        result = _migrate_node(
+        context = MigrationContext(
             existing_source_to_target_keys={},
-            content_by_filename={},
-            source_context_key=self.course.id,
-            source_node=library_node,
             target_package_id=self.learning_package.id,
             target_library_key=self.library.library_key,
+            source_context_key=self.course.id,
             composition_level=CompositionLevel.Unit,
             replace_existing=False,
             preserve_url_slugs=True,
             created_at=timezone.now(),
             created_by=self.user.id,
         )
+        result = _migrate_node(
+            context=context,
+            content_by_filename={},
+            source_node=library_node,
+        )
 
         # Library root should not be migrated
         self.assertIsNone(result.source_to_target)
@@ -195,14 +205,11 @@ def test_migrate_node_container_composition_level(
         container_node = etree.fromstring(
             f'<{tag_name} url_name="test_{tag_name}" display_name="Test {tag_name.title()}" />'
         )
-
-        result = _migrate_node(
+        context = MigrationContext(
             existing_source_to_target_keys={},
-            content_by_filename={},
-            source_context_key=self.course.id,
-            source_node=container_node,
             target_package_id=self.learning_package.id,
             target_library_key=self.library.library_key,
+            source_context_key=self.course.id,
             composition_level=composition_level,
             replace_existing=False,
             preserve_url_slugs=True,
@@ -210,6 +217,12 @@ def test_migrate_node_container_composition_level(
             created_by=self.user.id,
         )
 
+        result = _migrate_node(
+            context=context,
+            content_by_filename={},
+            source_node=container_node,
+        )
+
         if should_migrate:
             self.assertIsNotNone(result.source_to_target)
             source_key, _ = result.source_to_target
@@ -225,14 +238,11 @@ def test_migrate_node_without_url_name(self):
         node_without_url_name = etree.fromstring(
             '<problem display_name="No URL Name" />'
         )
-
-        result = _migrate_node(
+        context = MigrationContext(
             existing_source_to_target_keys={},
-            content_by_filename={},
-            source_context_key=self.course.id,
-            source_node=node_without_url_name,
             target_package_id=self.learning_package.id,
             target_library_key=self.library.library_key,
+            source_context_key=self.course.id,
             composition_level=CompositionLevel.Unit,
             replace_existing=False,
             preserve_url_slugs=True,
@@ -240,6 +250,12 @@ def test_migrate_node_without_url_name(self):
             created_by=self.user.id,
         )
 
+        result = _migrate_node(
+            context=context,
+            content_by_filename={},
+            source_node=node_without_url_name,
+        )
+
         self.assertIsNone(result.source_to_target)
         self.assertEqual(len(result.children), 0)
 
@@ -356,18 +372,23 @@ def test_migrate_component_success(self):
         """
         source_key = self.course.id.make_usage_key("problem", "test_problem")
         olx = '<problem display_name="Test Problem"><multiplechoiceresponse></multiplechoiceresponse></problem>'
-
-        result = _migrate_component(
+        context = MigrationContext(
             existing_source_to_target_keys={},
-            content_by_filename={},
-            source_key=source_key,
-            olx=olx,
             target_package_id=self.learning_package.id,
             target_library_key=self.library.library_key,
+            source_context_key=self.course.id,
+            composition_level=CompositionLevel.Unit,
             replace_existing=False,
             preserve_url_slugs=True,
-            created_by=self.user.id,
             created_at=timezone.now(),
+            created_by=self.user.id,
+        )
+
+        result = _migrate_component(
+            context=context,
+            content_by_filename={},
+            source_key=source_key,
+            olx=olx,
         )
 
         self.assertIsNotNone(result)
@@ -391,20 +412,25 @@ def test_migrate_component_with_static_content(self):
             data=b"fake_image_data",
             created=timezone.now(),
         )
+        context = MigrationContext(
+            existing_source_to_target_keys={},
+            target_package_id=self.learning_package.id,
+            target_library_key=self.library.library_key,
+            source_context_key=self.course.id,
+            composition_level=CompositionLevel.Unit,
+            replace_existing=False,
+            preserve_url_slugs=True,
+            created_at=timezone.now(),
+            created_by=self.user.id,
+        )
 
         content_by_filename = {"test_image.png": test_content.id}
 
         result = _migrate_component(
-            existing_source_to_target_keys={},
+            context=context,
             content_by_filename=content_by_filename,
             source_key=source_key,
             olx=olx,
-            target_package_id=self.learning_package.id,
-            target_library_key=self.library.library_key,
-            replace_existing=False,
-            preserve_url_slugs=True,
-            created_by=self.user.id,
-            created_at=timezone.now(),
         )
 
         self.assertIsNotNone(result)
@@ -421,39 +447,77 @@ def test_migrate_component_replace_existing_false(self):
         """
         source_key = self.course.id.make_usage_key("problem", "existing_problem")
         olx = '<problem display_name="Test Problem"><multiplechoiceresponse></multiplechoiceresponse></problem>'
-
-        existing_source_to_target_keys = {}
-
-        first_result = _migrate_component(
-            existing_source_to_target_keys=existing_source_to_target_keys,
-            content_by_filename={},
-            source_key=source_key,
-            olx=olx,
+        context = MigrationContext(
+            existing_source_to_target_keys={},
             target_package_id=self.learning_package.id,
             target_library_key=self.library.library_key,
+            source_context_key=self.course.id,
+            composition_level=CompositionLevel.Unit,
             replace_existing=False,
             preserve_url_slugs=True,
-            created_by=self.user.id,
             created_at=timezone.now(),
+            created_by=self.user.id,
         )
 
-        existing_source_to_target_keys[source_key] = first_result.entity
+        first_result = _migrate_component(
+            context=context,
+            content_by_filename={},
+            source_key=source_key,
+            olx=olx,
+        )
+
+        context.existing_source_to_target_keys[source_key] = first_result.entity
 
         second_result = _migrate_component(
-            existing_source_to_target_keys=existing_source_to_target_keys,
+            context=context,
             content_by_filename={},
             source_key=source_key,
             olx='<problem display_name="Updated Problem"><multiplechoiceresponse></multiplechoiceresponse></problem>',
+        )
+
+        self.assertEqual(first_result.entity_id, second_result.entity_id)
+        self.assertEqual(first_result.version_num, second_result.version_num)
+
+    def test_migrate_component_same_title(self):
+        """
+        Test _migrate_component for two components with the same title
+
+        Using preserve_url_slugs=False to create a new component with
+        a different URL slug based on the component's Title.
+        """
+        source_key_1 = self.course.id.make_usage_key("problem", "existing_problem_1")
+        source_key_2 = self.course.id.make_usage_key("problem", "existing_problem_2")
+        olx = '<problem display_name="Test Problem"><multiplechoiceresponse></multiplechoiceresponse></problem>'
+        context = MigrationContext(
+            existing_source_to_target_keys={},
             target_package_id=self.learning_package.id,
             target_library_key=self.library.library_key,
+            source_context_key=self.course.id,
+            composition_level=CompositionLevel.Unit,
             replace_existing=False,
-            preserve_url_slugs=True,
-            created_by=self.user.id,
+            preserve_url_slugs=False,
             created_at=timezone.now(),
+            created_by=self.user.id,
         )
 
-        self.assertEqual(first_result.entity_id, second_result.entity_id)
-        self.assertEqual(first_result.version_num, second_result.version_num)
+        first_result = _migrate_component(
+            context=context,
+            content_by_filename={},
+            source_key=source_key_1,
+            olx=olx,
+        )
+
+        context.existing_source_to_target_keys[source_key_1] = first_result.entity
+
+        second_result = _migrate_component(
+            context=context,
+            content_by_filename={},
+            source_key=source_key_2,
+            olx=olx,
+        )
+
+        self.assertNotEqual(first_result.entity_id, second_result.entity_id)
+        self.assertNotEqual(first_result.entity.key, second_result.entity.key)
 
     def test_migrate_component_replace_existing_true(self):
         """
@@ -461,36 +525,33 @@ def test_migrate_component_replace_existing_true(self):
         """
         source_key = self.course.id.make_usage_key("problem", "replaceable_problem")
         original_olx = '<problem display_name="Original"><multiplechoiceresponse></multiplechoiceresponse></problem>'
-
-        existing_source_to_target_keys = {}
+        context = MigrationContext(
+            existing_source_to_target_keys={},
+            target_package_id=self.learning_package.id,
+            target_library_key=self.library.library_key,
+            source_context_key=self.course.id,
+            composition_level=CompositionLevel.Unit,
+            replace_existing=True,
+            preserve_url_slugs=True,
+            created_at=timezone.now(),
+            created_by=self.user.id,
+        )
 
         first_result = _migrate_component(
-            existing_source_to_target_keys=existing_source_to_target_keys,
+            context=context,
             content_by_filename={},
             source_key=source_key,
             olx=original_olx,
-            target_package_id=self.learning_package.id,
-            target_library_key=self.library.library_key,
-            replace_existing=False,
-            preserve_url_slugs=True,
-            created_by=self.user.id,
-            created_at=timezone.now(),
         )
 
-        existing_source_to_target_keys[source_key] = first_result.entity
+        context.existing_source_to_target_keys[source_key] = first_result.entity
 
         updated_olx = '<problem display_name="Updated"><multiplechoiceresponse></multiplechoiceresponse></problem>'
         second_result = _migrate_component(
-            existing_source_to_target_keys=existing_source_to_target_keys,
+            context=context,
             content_by_filename={},
             source_key=source_key,
             olx=updated_olx,
-            target_package_id=self.learning_package.id,
-            target_library_key=self.library.library_key,
-            replace_existing=True,
-            preserve_url_slugs=True,
-            created_by=self.user.id,
-            created_at=timezone.now(),
         )
 
         self.assertEqual(first_result.entity_id, second_result.entity_id)
@@ -505,18 +566,23 @@ def test_migrate_component_different_block_types(self):
         for block_type in block_types:
             source_key = self.course.id.make_usage_key(block_type, f"test_{block_type}")
             olx = f'<{block_type} display_name="Test {block_type.title()}"></{block_type}>'
-
-            result = _migrate_component(
+            context = MigrationContext(
                 existing_source_to_target_keys={},
-                content_by_filename={},
-                source_key=source_key,
-                olx=olx,
                 target_package_id=self.learning_package.id,
                 target_library_key=self.library.library_key,
+                source_context_key=self.course.id,
+                composition_level=CompositionLevel.Unit,
                 replace_existing=False,
                 preserve_url_slugs=True,
-                created_by=self.user.id,
                 created_at=timezone.now(),
+                created_by=self.user.id,
+            )
+
+            result = _migrate_component(
+                context=context,
+                content_by_filename={},
+                source_key=source_key,
+                olx=olx,
             )
 
             self.assertIsNotNone(result, f"Failed to migrate {block_type}")
@@ -552,18 +618,23 @@ def test_migrate_component_content_filename_not_in_olx(self):
             "referenced.png": referenced_content.id,
             "unreferenced.png": unreferenced_content.id,
         }
-
-        result = _migrate_component(
+        context = MigrationContext(
             existing_source_to_target_keys={},
-            content_by_filename=content_by_filename,
-            source_key=source_key,
-            olx=olx,
             target_package_id=self.learning_package.id,
             target_library_key=self.library.library_key,
+            source_context_key=self.course.id,
+            composition_level=CompositionLevel.Unit,
             replace_existing=False,
             preserve_url_slugs=True,
-            created_by=self.user.id,
             created_at=timezone.now(),
+            created_by=self.user.id,
+        )
+
+        result = _migrate_component(
+            context=context,
+            content_by_filename=content_by_filename,
+            source_key=source_key,
+            olx=olx,
         )
 
         self.assertIsNotNone(result)
@@ -589,18 +660,23 @@ def test_migrate_component_library_source_key(self):
         library_key = LibraryLocator(org="TestOrg", library="TestLibrary")
         source_key = library_key.make_usage_key("problem", "library_problem")
         olx = '<problem display_name="Library Problem"><multiplechoiceresponse></multiplechoiceresponse></problem>'
-
-        result = _migrate_component(
+        context = MigrationContext(
             existing_source_to_target_keys={},
-            content_by_filename={},
-            source_key=source_key,
-            olx=olx,
             target_package_id=self.learning_package.id,
             target_library_key=self.library.library_key,
+            source_context_key=self.course.id,
+            composition_level=CompositionLevel.Unit,
             replace_existing=False,
             preserve_url_slugs=True,
-            created_by=self.user.id,
             created_at=timezone.now(),
+            created_by=self.user.id,
+        )
+
+        result = _migrate_component(
+            context=context,
+            content_by_filename={},
+            source_key=source_key,
+            olx=olx,
         )
 
         self.assertIsNotNone(result)
@@ -625,37 +701,33 @@ def test_migrate_component_duplicate_content_integrity_error(self):
             data=b"test_image_data",
             created=timezone.now(),
         )
-
         content_by_filename = {"duplicate.png": test_content.id}
-
-        existing_source_to_target_keys = {}
+        context = MigrationContext(
+            existing_source_to_target_keys={},
+            target_package_id=self.learning_package.id,
+            target_library_key=self.library.library_key,
+            source_context_key=self.course.id,
+            composition_level=CompositionLevel.Unit,
+            replace_existing=True,
+            preserve_url_slugs=True,
+            created_at=timezone.now(),
+            created_by=self.user.id,
+        )
 
         first_result = _migrate_component(
-            existing_source_to_target_keys=existing_source_to_target_keys,
+            context=context,
             content_by_filename=content_by_filename,
             source_key=source_key,
             olx=olx,
-            target_package_id=self.learning_package.id,
-            target_library_key=self.library.library_key,
-            replace_existing=False,
-            preserve_url_slugs=True,
-            created_by=self.user.id,
-            created_at=timezone.now(),
         )
 
-        existing_source_to_target_keys[source_key] = first_result.entity
+        context.existing_source_to_target_keys[source_key] = first_result.entity
 
         second_result = _migrate_component(
-            existing_source_to_target_keys=existing_source_to_target_keys,
+            context=context,
             content_by_filename=content_by_filename,
             source_key=source_key,
             olx=olx,
-            target_package_id=self.learning_package.id,
-            target_library_key=self.library.library_key,
-            replace_existing=True,
-            preserve_url_slugs=True,
-            created_by=self.user.id,
-            created_at=timezone.now(),
         )
 
         self.assertIsNotNone(first_result)
@@ -704,19 +776,24 @@ def test_migrate_container_creates_new_container(self):
             child_version_1.publishable_entity_version,
             child_version_2.publishable_entity_version,
         ]
+        context = MigrationContext(
+            existing_source_to_target_keys={},
+            target_package_id=self.learning_package.id,
+            target_library_key=self.library.library_key,
+            source_context_key=self.course.id,
+            composition_level=CompositionLevel.Unit,
+            replace_existing=False,
+            preserve_url_slugs=True,
+            created_at=timezone.now(),
+            created_by=self.user.id,
+        )
 
         result = _migrate_container(
-            existing_source_to_target_keys={},
+            context=context,
             source_key=source_key,
             container_type=lib_api.ContainerType.Unit,
             title="Test Vertical",
             children=children,
-            target_library_key=self.library.library_key,
-            target_package_id=self.learning_package.id,
-            replace_existing=False,
-            preserve_url_slugs=True,
-            created_by=self.user.id,
-            created_at=timezone.now(),
         )
 
         self.assertIsInstance(result, PublishableEntityVersion)
@@ -740,6 +817,17 @@ def test_migrate_container_different_container_types(self):
             (lib_api.ContainerType.Subsection, "sequential"),
             (lib_api.ContainerType.Section, "chapter"),
         ]
+        context = MigrationContext(
+            existing_source_to_target_keys={},
+            target_package_id=self.learning_package.id,
+            target_library_key=self.library.library_key,
+            source_context_key=self.course.id,
+            composition_level=CompositionLevel.Unit,
+            replace_existing=False,
+            preserve_url_slugs=True,
+            created_at=timezone.now(),
+            created_by=self.user.id,
+        )
 
         for container_type, block_type in container_types:
             with self.subTest(container_type=container_type, block_type=block_type):
@@ -748,17 +836,11 @@ def test_migrate_container_different_container_types(self):
                 )
 
                 result = _migrate_container(
-                    existing_source_to_target_keys={},
+                    context=context,
                     source_key=source_key,
                     container_type=container_type,
                     title=f"Test {block_type.title()}",
                     children=[],
-                    target_library_key=self.library.library_key,
-                    target_package_id=self.learning_package.id,
-                    replace_existing=False,
-                    preserve_url_slugs=True,
-                    created_by=self.user.id,
-                    created_at=timezone.now(),
                 )
 
                 self.assertIsNotNone(result)
@@ -771,37 +853,34 @@ def test_migrate_container_replace_existing_false(self):
         Test _migrate_container returns existing container when replace_existing=False
         """
         source_key = self.course.id.make_usage_key("vertical", "existing_vertical")
-
-        existing_source_to_target_keys = {}
+        context = MigrationContext(
+            existing_source_to_target_keys={},
+            target_package_id=self.learning_package.id,
+            target_library_key=self.library.library_key,
+            source_context_key=self.course.id,
+            composition_level=CompositionLevel.Unit,
+            replace_existing=False,
+            preserve_url_slugs=True,
+            created_at=timezone.now(),
+            created_by=self.user.id,
+        )
 
         first_result = _migrate_container(
-            existing_source_to_target_keys=existing_source_to_target_keys,
+            context=context,
             source_key=source_key,
             container_type=lib_api.ContainerType.Unit,
             title="Original Title",
             children=[],
-            target_library_key=self.library.library_key,
-            target_package_id=self.learning_package.id,
-            replace_existing=False,
-            preserve_url_slugs=True,
-            created_by=self.user.id,
-            created_at=timezone.now(),
         )
 
-        existing_source_to_target_keys[source_key] = first_result.entity
+        context.existing_source_to_target_keys[source_key] = first_result.entity
 
         second_result = _migrate_container(
-            existing_source_to_target_keys=existing_source_to_target_keys,
+            context=context,
             source_key=source_key,
             container_type=lib_api.ContainerType.Unit,
             title="Updated Title",
             children=[],
-            target_library_key=self.library.library_key,
-            target_package_id=self.learning_package.id,
-            replace_existing=False,
-            preserve_url_slugs=True,
-            created_by=self.user.id,
-            created_at=timezone.now(),
         )
 
         self.assertEqual(first_result.entity_id, second_result.entity_id)
@@ -810,6 +889,53 @@ def test_migrate_container_replace_existing_false(self):
         container_version = second_result.containerversion
         self.assertEqual(container_version.title, "Original Title")
 
+    def test_migrate_container_same_title(self):
+        """
+        Test _migrate_container for two containers with the same title
+
+        Using preserve_url_slugs=False to create a new Unit with
+        a different URL slug based on the container's Title.
+        """
+        source_key_1 = self.course.id.make_usage_key("vertical", "human_readable_vertical_1")
+        source_key_2 = self.course.id.make_usage_key("vertical", "human_readable_vertical_2")
+        context = MigrationContext(
+            existing_source_to_target_keys={},
+            target_package_id=self.learning_package.id,
+            target_library_key=self.library.library_key,
+            source_context_key=self.course.id,
+            composition_level=CompositionLevel.Unit,
+            replace_existing=False,
+            preserve_url_slugs=False,
+            created_at=timezone.now(),
+            created_by=self.user.id,
+        )
+
+        first_result = _migrate_container(
+            context=context,
+            source_key=source_key_1,
+            container_type=lib_api.ContainerType.Unit,
+            title="Original Human Readable Title",
+            children=[],
+        )
+
+        context.existing_source_to_target_keys[source_key_1] = first_result.entity
+
+        second_result = _migrate_container(
+            context=context,
+            source_key=source_key_2,
+            container_type=lib_api.ContainerType.Unit,
+            title="Original Human Readable Title",
+            children=[],
+        )
+
+        self.assertNotEqual(first_result.entity_id, second_result.entity_id)
+        self.assertNotEqual(first_result.entity.key, second_result.entity.key)
+        # Make sure the current logic from tasts::_find_unique_slug is used
+        self.assertEqual(second_result.entity.key, first_result.entity.key+"_1")
+
+        container_version = second_result.containerversion
+        self.assertEqual(container_version.title, "Original Human Readable Title")
+
     def test_migrate_container_replace_existing_true(self):
         """
         Test _migrate_container creates new version when replace_existing=True
@@ -831,37 +957,34 @@ def test_migrate_container_replace_existing_true(self):
             created=timezone.now(),
             created_by=self.user.id,
         )
-
-        existing_source_to_target_keys = {}
+        context = MigrationContext(
+            existing_source_to_target_keys={},
+            target_package_id=self.learning_package.id,
+            target_library_key=self.library.library_key,
+            source_context_key=self.course.id,
+            composition_level=CompositionLevel.Unit,
+            replace_existing=True,
+            preserve_url_slugs=True,
+            created_at=timezone.now(),
+            created_by=self.user.id,
+        )
 
         first_result = _migrate_container(
-            existing_source_to_target_keys=existing_source_to_target_keys,
+            context=context,
             source_key=source_key,
             container_type=lib_api.ContainerType.Unit,
             title="Original Title",
             children=[],
-            target_library_key=self.library.library_key,
-            target_package_id=self.learning_package.id,
-            replace_existing=False,
-            preserve_url_slugs=True,
-            created_by=self.user.id,
-            created_at=timezone.now(),
         )
 
-        existing_source_to_target_keys[source_key] = first_result.entity
+        context.existing_source_to_target_keys[source_key] = first_result.entity
 
         second_result = _migrate_container(
-            existing_source_to_target_keys=existing_source_to_target_keys,
+            context=context,
             source_key=source_key,
             container_type=lib_api.ContainerType.Unit,
             title="Updated Title",
             children=[child_version.publishable_entity_version],
-            target_library_key=self.library.library_key,
-            target_package_id=self.learning_package.id,
-            replace_existing=True,
-            preserve_url_slugs=True,
-            created_by=self.user.id,
-            created_at=timezone.now(),
         )
 
         self.assertEqual(first_result.entity_id, second_result.entity_id)
@@ -877,19 +1000,24 @@ def test_migrate_container_with_library_source_key(self):
         """
         library_key = LibraryLocator(org="TestOrg", library="TestLibrary")
         source_key = library_key.make_usage_key("vertical", "library_vertical")
+        context = MigrationContext(
+            existing_source_to_target_keys={},
+            target_package_id=self.learning_package.id,
+            target_library_key=self.library.library_key,
+            source_context_key=self.course.id,
+            composition_level=CompositionLevel.Unit,
+            replace_existing=False,
+            preserve_url_slugs=True,
+            created_at=timezone.now(),
+            created_by=self.user.id,
+        )
 
         result = _migrate_container(
-            existing_source_to_target_keys={},
+            context=context,
             source_key=source_key,
             container_type=lib_api.ContainerType.Unit,
             title="Library Vertical",
             children=[],
-            target_library_key=self.library.library_key,
-            target_package_id=self.learning_package.id,
-            replace_existing=False,
-            preserve_url_slugs=True,
-            created_by=self.user.id,
-            created_at=timezone.now(),
         )
 
         self.assertIsNotNone(result)
@@ -902,19 +1030,24 @@ def test_migrate_container_empty_children_list(self):
         Test _migrate_container handles empty children list
         """
         source_key = self.course.id.make_usage_key("vertical", "empty_vertical")
+        context = MigrationContext(
+            existing_source_to_target_keys={},
+            target_package_id=self.learning_package.id,
+            target_library_key=self.library.library_key,
+            source_context_key=self.course.id,
+            composition_level=CompositionLevel.Unit,
+            replace_existing=False,
+            preserve_url_slugs=True,
+            created_at=timezone.now(),
+            created_by=self.user.id,
+        )
 
         result = _migrate_container(
-            existing_source_to_target_keys={},
+            context=context,
             source_key=source_key,
             container_type=lib_api.ContainerType.Unit,
             title="Empty Vertical",
             children=[],
-            target_library_key=self.library.library_key,
-            target_package_id=self.learning_package.id,
-            replace_existing=False,
-            preserve_url_slugs=True,
-            created_by=self.user.id,
-            created_at=timezone.now(),
         )
 
         self.assertIsNotNone(result)
@@ -927,7 +1060,17 @@ def test_migrate_container_preserves_child_order(self):
         Test _migrate_container preserves the order of children
         """
         source_key = self.course.id.make_usage_key("vertical", "ordered_vertical")
-
+        context = MigrationContext(
+            existing_source_to_target_keys={},
+            target_package_id=self.learning_package.id,
+            target_library_key=self.library.library_key,
+            source_context_key=self.course.id,
+            composition_level=CompositionLevel.Unit,
+            replace_existing=False,
+            preserve_url_slugs=True,
+            created_at=timezone.now(),
+            created_by=self.user.id,
+        )
         children = []
         for i in range(3):
             child_component = authoring_api.create_component(
@@ -948,17 +1091,11 @@ def test_migrate_container_preserves_child_order(self):
             children.append(child_version.publishable_entity_version)
 
         result = _migrate_container(
-            existing_source_to_target_keys={},
+            context=context,
             source_key=source_key,
             container_type=lib_api.ContainerType.Unit,
             title="Ordered Vertical",
             children=children,
-            target_library_key=self.library.library_key,
-            target_package_id=self.learning_package.id,
-            replace_existing=False,
-            preserve_url_slugs=True,
-            created_by=self.user.id,
-            created_at=timezone.now(),
         )
 
         container_version = result.containerversion
@@ -1029,19 +1166,24 @@ def test_migrate_container_with_mixed_child_types(self):
             html_version.publishable_entity_version,
             video_version.publishable_entity_version,
         ]
+        context = MigrationContext(
+            existing_source_to_target_keys={},
+            target_package_id=self.learning_package.id,
+            target_library_key=self.library.library_key,
+            source_context_key=self.course.id,
+            composition_level=CompositionLevel.Unit,
+            replace_existing=False,
+            preserve_url_slugs=True,
+            created_at=timezone.now(),
+            created_by=self.user.id,
+        )
 
         result = _migrate_container(
-            existing_source_to_target_keys={},
+            context=context,
             source_key=source_key,
             container_type=lib_api.ContainerType.Unit,
             title="Mixed Content Vertical",
             children=children,
-            target_library_key=self.library.library_key,
-            target_package_id=self.learning_package.id,
-            replace_existing=False,
-            preserve_url_slugs=True,
-            created_by=self.user.id,
-            created_at=timezone.now(),
         )
 
         self.assertIsNotNone(result)
@@ -1062,36 +1204,35 @@ def test_migrate_container_generates_correct_target_key(self):
         Test _migrate_container generates correct target key from source key
         """
         course_source_key = self.course.id.make_usage_key("vertical", "test_vertical")
+        context = MigrationContext(
+            existing_source_to_target_keys={},
+            target_package_id=self.learning_package.id,
+            target_library_key=self.library.library_key,
+            source_context_key=self.course.id,
+            composition_level=CompositionLevel.Unit,
+            replace_existing=False,
+            preserve_url_slugs=True,
+            created_at=timezone.now(),
+            created_by=self.user.id,
+        )
 
         course_result = _migrate_container(
-            existing_source_to_target_keys={},
+            context=context,
             source_key=course_source_key,
             container_type=lib_api.ContainerType.Unit,
             title="Course Vertical",
             children=[],
-            target_library_key=self.library.library_key,
-            target_package_id=self.learning_package.id,
-            replace_existing=False,
-            preserve_url_slugs=True,
-            created_by=self.user.id,
-            created_at=timezone.now(),
         )
 
         library_key = LibraryLocator(org="TestOrg", library="TestLibrary")
         library_source_key = library_key.make_usage_key("vertical", "test_vertical")
 
         library_result = _migrate_container(
-            existing_source_to_target_keys={},
+            context=context,
             source_key=library_source_key,
             container_type=lib_api.ContainerType.Unit,
             title="Library Vertical",
             children=[],
-            target_library_key=self.library.library_key,
-            target_package_id=self.learning_package.id,
-            replace_existing=False,
-            preserve_url_slugs=True,
-            created_by=self.user.id,
-            created_at=timezone.now(),
         )
 
         self.assertIsNotNone(course_result)

From a5ff3fd1a0d35659fcc51230afd5bf1ef60e3997 Mon Sep 17 00:00:00 2001
From: Maksim Sokolskiy <maksim.sokolskiy@raccoongang.com>
Date: Sun, 10 Aug 2025 20:39:31 +0300
Subject: [PATCH 26/40] refactor: avoid redundant DB queries

---
 cms/djangoapps/modulestore_migrator/tasks.py  | 37 +++++++++++--------
 .../modulestore_migrator/tests/test_tasks.py  |  1 +
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/cms/djangoapps/modulestore_migrator/tasks.py b/cms/djangoapps/modulestore_migrator/tasks.py
index e5c2bc92f043..29300ff8b749 100644
--- a/cms/djangoapps/modulestore_migrator/tasks.py
+++ b/cms/djangoapps/modulestore_migrator/tasks.py
@@ -99,7 +99,7 @@ class MigrationContext:
     def is_already_migrated(self, source_key: UsageKey) -> bool:
         return source_key in self.existing_source_to_target_keys
 
-    def get_existing_target(self, source_key: UsageKey) -> PublishableEntityVersion | None:
+    def get_existing_target(self, source_key: UsageKey) -> PublishableEntity | None:
         return self.existing_source_to_target_keys.get(source_key)
 
     def add_migration(self, source_key: UsageKey, target: PublishableEntity) -> None:
@@ -247,6 +247,10 @@ def migrate_from_modulestore(
 
     status.set_state(MigrationStep.IMPORTING_STRUCTURE.value)
 
+    # "key" is locally unique across all PublishableEntities within
+    # a given LearningPackage.
+    # We use this mapping to ensure that we don't create duplicate
+    # PublishableEntities during the migration process for a given LearningPackage.
     existing_source_to_target_keys = {
         block.source.key: block.target for block in ModulestoreBlockMigration.objects.filter(
         overall_migration__target=migration.target.id)
@@ -427,6 +431,16 @@ def _migrate_node(
             if target_entity_version:
                 source_to_target = (source_key, target_entity_version)
                 # Update the existing_source_to_target_keys dictionary with the new mapping
+                #
+                # This step is critical because it ensures we have an up-to-date mapping of source keys
+                # to target entities.
+                #
+                # While we could re-fetch entity versions from the database to guarantee this,
+                # it's currently unnecessary as the required target entities are actually available.
+                #
+                # @@TODO: Implement a stricter enforcement mechanism.
+                # The system should prevent a node from being migrated without an update
+                # to the `existing_source_to_target_keys` dictionary.
                 context.add_migration(source_key, target_entity_version.entity)
                 log.info(
                     f"Migrated node from {context.source_context_key} to {context.target_library_key} "
@@ -642,16 +656,16 @@ def _deduplicate_block_id(
     # Check if we already processed this block
     if context.is_already_migrated(source_key):
         log.debug(f"Block {source_key} already exists, reusing existing target")
-        existing_version = context.get_existing_target(source_key)
+        existing_target = context.get_existing_target(source_key)
 
         # Parse the key more safely
         try:
-            key_parts = existing_version.key.split(":")
+            key_parts = existing_target.key.split(":")
             if len(key_parts) < 2:
-                raise ValueError(f"Invalid key format: {existing_version.key}")
+                raise ValueError(f"Invalid key format: {existing_target.key}")
             block_id = key_parts[-1]
         except (AttributeError, IndexError) as e:
-            raise ValueError(f"Failed to parse existing key: {existing_version.key}") from e
+            raise ValueError(f"Failed to parse existing key: {existing_target.key}") from e
 
         # mypy thinks LibraryUsageLocatorV2 is abstract. It's not.
         return LibraryUsageLocatorV2(  # type: ignore[abstract]
@@ -710,17 +724,10 @@ def _find_unique_slug(
     else:
         base_key = f"{component_type}:{base_slug}"
 
-    # Fetch all existing slugs that start with our pattern in one query
-    # This avoids multiple database roundtrips
-    existing_keys = set(
-        PublishableEntity.objects.filter(
-            key__startswith=base_key
-        ).values_list('key', flat=True)
-    )
-    existing_pe_keys = context.get_migrated_entities(base_key)
+    existing_publishable_entity_keys = context.get_migrated_entities(base_key)
 
     # Check if base slug is available
-    if base_key not in existing_keys and base_key not in existing_pe_keys:
+    if base_key not in existing_publishable_entity_keys:
         return base_slug
 
     # Try numbered variations until we find one that doesn't exist
@@ -728,7 +735,7 @@ def _find_unique_slug(
         candidate_slug = f"{base_slug}_{i}"
         candidate_key = f"{component_type}:{candidate_slug}" if component_type else candidate_slug
 
-        if candidate_key not in existing_keys:
+        if candidate_key not in existing_publishable_entity_keys:
             return candidate_slug
 
     raise RuntimeError(f"Unable to find unique slug after {max_attempts} attempts for base: {base_slug}")
diff --git a/cms/djangoapps/modulestore_migrator/tests/test_tasks.py b/cms/djangoapps/modulestore_migrator/tests/test_tasks.py
index 97fdebe4e4af..2822a1313f5f 100644
--- a/cms/djangoapps/modulestore_migrator/tests/test_tasks.py
+++ b/cms/djangoapps/modulestore_migrator/tests/test_tasks.py
@@ -1223,6 +1223,7 @@ def test_migrate_container_generates_correct_target_key(self):
             title="Course Vertical",
             children=[],
         )
+        context.add_migration(course_source_key, course_result.entity)
 
         library_key = LibraryLocator(org="TestOrg", library="TestLibrary")
         library_source_key = library_key.make_usage_key("vertical", "test_vertical")

From dcf3b9a6047525af99ce03b07c7c088725d51b24 Mon Sep 17 00:00:00 2001
From: Maksim Sokolskiy <maksim.sokolskiy@raccoongang.com>
Date: Sun, 10 Aug 2025 23:12:40 +0300
Subject: [PATCH 27/40] fix: Rest API create action returns incorrect value

---
 .../modulestore_migrator/rest_api/v0/serializers.py    |  3 +--
 .../modulestore_migrator/rest_api/v0/views.py          | 10 ++++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/cms/djangoapps/modulestore_migrator/rest_api/v0/serializers.py b/cms/djangoapps/modulestore_migrator/rest_api/v0/serializers.py
index e60b2e020cd7..80d972527488 100644
--- a/cms/djangoapps/modulestore_migrator/rest_api/v0/serializers.py
+++ b/cms/djangoapps/modulestore_migrator/rest_api/v0/serializers.py
@@ -20,7 +20,6 @@ class ModulestoreMigrationSerializer(serializers.ModelSerializer):
     source = serializers.CharField(
         help_text="The source course or legacy library key to import from.",
         required=True,
-        source='source.key',
     )
     target = serializers.CharField(
         help_text="The target library key to import into.",
@@ -38,7 +37,7 @@ class ModulestoreMigrationSerializer(serializers.ModelSerializer):
         default=False,
     )
     preserve_url_slugs = serializers.BooleanField(
-        help_text="If true, current slugs wil be preserved.",
+        help_text="If true, current slugs will be preserved.",
         required=False,
         default=True,
     )
diff --git a/cms/djangoapps/modulestore_migrator/rest_api/v0/views.py b/cms/djangoapps/modulestore_migrator/rest_api/v0/views.py
index 211154ff7bb8..ceb276a1d8a2 100644
--- a/cms/djangoapps/modulestore_migrator/rest_api/v0/views.py
+++ b/cms/djangoapps/modulestore_migrator/rest_api/v0/views.py
@@ -5,6 +5,8 @@
 from edx_rest_framework_extensions.auth.jwt.authentication import JwtAuthentication
 from edx_rest_framework_extensions.auth.session.authentication import SessionAuthenticationAllowInactiveUser
 from rest_framework.permissions import IsAdminUser
+from rest_framework.response import Response
+from rest_framework import status
 from user_tasks.models import UserTaskStatus
 from user_tasks.views import StatusViewSet
 
@@ -114,10 +116,14 @@ def create(self, request, *args, **kwargs):
             user=request.user,
             source_key=validated_data['source'],
             target_library_key=validated_data['target'],
-            target_collection_slug=validated_data.get('target_collection_slug'),
+            target_collection_slug=validated_data['target_collection_slug'],
             composition_level=validated_data['composition_level'],
             replace_existing=validated_data['replace_existing'],
             preserve_url_slugs=validated_data['preserve_url_slugs'],
             forward_source_to_target=False,  # @@TODO - Set to False for now. Explain this better.
         )
-        return UserTaskStatus.objects.get(task_id=task.id)
+
+        task_status = UserTaskStatus.objects.get(task_id=task.id)
+        serializer = self.get_serializer(task_status)
+
+        return Response(serializer.data, status=status.HTTP_201_CREATED)

From c1132de2bafd7f3c00b4dd8e1882dc9257f28a36 Mon Sep 17 00:00:00 2001
From: Maksim Sokolskiy <maksim.sokolskiy@raccoongang.com>
Date: Mon, 11 Aug 2025 00:21:06 +0300
Subject: [PATCH 28/40] refactor: update Rest API contract

Changes:
- remove `name` field
- rename `modulestoremigration` to `parameters`
- update docstring to correctly describe `state_text`
---
 .../modulestore_migrator/rest_api/v0/serializers.py  | 12 ++++++++++--
 .../modulestore_migrator/rest_api/v0/views.py        |  8 ++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/cms/djangoapps/modulestore_migrator/rest_api/v0/serializers.py b/cms/djangoapps/modulestore_migrator/rest_api/v0/serializers.py
index 80d972527488..d254510baea8 100644
--- a/cms/djangoapps/modulestore_migrator/rest_api/v0/serializers.py
+++ b/cms/djangoapps/modulestore_migrator/rest_api/v0/serializers.py
@@ -90,8 +90,16 @@ class StatusWithModulestoreMigrationSerializer(StatusSerializer):
     Serializer for the import task status.
     """
 
-    modulestoremigration = ModulestoreMigrationSerializer()
+    parameters = ModulestoreMigrationSerializer(source='modulestoremigration')
 
     class Meta:
         model = StatusSerializer.Meta.model
-        fields = [*StatusSerializer.Meta.fields, 'modulestoremigration']
+        fields = [*StatusSerializer.Meta.fields, 'parameters']
+
+    def get_fields(self):
+        """
+        Remove unwanted fields
+        """
+        fields = super().get_fields()
+        fields.pop('name', None)
+        return fields
diff --git a/cms/djangoapps/modulestore_migrator/rest_api/v0/views.py b/cms/djangoapps/modulestore_migrator/rest_api/v0/views.py
index ceb276a1d8a2..08163f346f1b 100644
--- a/cms/djangoapps/modulestore_migrator/rest_api/v0/views.py
+++ b/cms/djangoapps/modulestore_migrator/rest_api/v0/views.py
@@ -51,14 +51,14 @@ class ImportViewSet(StatusViewSet):
             {
                 "name": migrate_from_modulestore",
                 "state": "Succeeded",
-                "state_text": "Succeeded",
+                "state_text": "Succeeded",  # Translation into the current language of the current state
                 "completed_steps": 11,
                 "total_steps": 11,
                 "attempts": 1,
                 "created": "2025-05-14T22:24:37.048539Z",
                 "modified": "2025-05-14T22:24:59.128068Z",
                 "artifacts": [],
-                "modulestoremigration": {
+                "parameters": {
                     "source": "course-v1:OpenedX+DemoX+DemoCourse",
                     "composition_level": "unit",
                     "replace_existing": true
@@ -72,7 +72,7 @@ class ImportViewSet(StatusViewSet):
         Example response:
             {
                 "name": "migrate_from_modulestore",
-                "state": "Importing staged files and resources",
+                "state": "Importing staged content structure",
                 "state_text": "Importing staged content structure",
                 "completed_steps": 6,
                 "total_steps": 11,
@@ -80,7 +80,7 @@ class ImportViewSet(StatusViewSet):
                 "created": "2025-05-14T22:24:37.048539Z",
                 "modified": "2025-05-14T22:24:59.128068Z",
                 "artifacts": [],
-                "modulestoremigration": {
+                "parameters": {
                     "source": "course-v1:OpenedX+DemoX+DemoCourse2",
                     "composition_level": "component",
                     "replace_existing": false

From 68ae017c700c10f530e9b7f5067489dd9f125ff0 Mon Sep 17 00:00:00 2001
From: Kyle McCormick <kyle@axim.org>
Date: Fri, 15 Aug 2025 09:59:40 -0400
Subject: [PATCH 29/40] fix: remove unnecessary imports left over from rebase

---
 .../djangoapps/content_libraries/api/containers.py  | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/openedx/core/djangoapps/content_libraries/api/containers.py b/openedx/core/djangoapps/content_libraries/api/containers.py
index 9417a886c293..0a4be2f912c8 100644
--- a/openedx/core/djangoapps/content_libraries/api/containers.py
+++ b/openedx/core/djangoapps/content_libraries/api/containers.py
@@ -23,18 +23,7 @@
     LIBRARY_CONTAINER_UPDATED,
 )
 from openedx_learning.api import authoring as authoring_api
-from openedx_learning.api.authoring_models import (
-    Component,
-    ComponentVersion,
-    Container,
-    ContainerVersion,
-    Unit,
-    UnitVersion,
-    Subsection,
-    SubsectionVersion,
-    Section,
-    SectionVersion,
-)
+from openedx_learning.api.authoring_models import Container, ContainerVersion
 from openedx.core.djangoapps.content_libraries.api.collections import library_collection_locator
 
 from openedx.core.djangoapps.xblock.api import get_component_from_usage_key

From 603d203cc588eead84a4298f3a86a3233cee7f5f Mon Sep 17 00:00:00 2001
From: Maksim Sokolskiy <maksim.sokolskiy@raccoongang.com>
Date: Thu, 21 Aug 2025 18:58:47 +0300
Subject: [PATCH 30/40] feat: implement RepeatHandlingStrategy

Implementated as part of https://github.com/openedx/frontend-app-authoring/issues/2378
Allows for a future work on Fork strategy.
---
 cms/djangoapps/modulestore_migrator/admin.py  |  12 +-
 cms/djangoapps/modulestore_migrator/api.py    |  13 ++-
 cms/djangoapps/modulestore_migrator/data.py   |  36 ++++++
 .../migrations/0001_initial.py                |  15 +--
 .../0002_source_forwardedby_blank.py          |  19 ----
 .../migrations/0003_remove_everything.py      |  61 ----------
 .../migrations/0004_initial.py                | 107 ------------------
 ...remigration_preserve_url_slugs_and_more.py |  23 ----
 cms/djangoapps/modulestore_migrator/models.py |  13 ++-
 .../modulestore_migrator/rest_api/urls.py     |   4 +-
 .../rest_api/{v0 => v1}/__init__.py           |   0
 .../rest_api/{v0 => v1}/serializers.py        |  11 +-
 .../rest_api/{v0 => v1}/urls.py               |   4 +-
 .../rest_api/{v0 => v1}/views.py              |  42 ++++---
 cms/djangoapps/modulestore_migrator/tasks.py  |  30 +++--
 .../modulestore_migrator/tests/test_api.py    |  27 ++++-
 .../modulestore_migrator/tests/test_tasks.py  |  72 ++++++------
 17 files changed, 184 insertions(+), 305 deletions(-)
 delete mode 100644 cms/djangoapps/modulestore_migrator/migrations/0002_source_forwardedby_blank.py
 delete mode 100644 cms/djangoapps/modulestore_migrator/migrations/0003_remove_everything.py
 delete mode 100644 cms/djangoapps/modulestore_migrator/migrations/0004_initial.py
 delete mode 100644 cms/djangoapps/modulestore_migrator/migrations/0005_modulestoremigration_preserve_url_slugs_and_more.py
 rename cms/djangoapps/modulestore_migrator/rest_api/{v0 => v1}/__init__.py (100%)
 rename cms/djangoapps/modulestore_migrator/rest_api/{v0 => v1}/serializers.py (90%)
 rename cms/djangoapps/modulestore_migrator/rest_api/{v0 => v1}/urls.py (62%)
 rename cms/djangoapps/modulestore_migrator/rest_api/{v0 => v1}/views.py (77%)

diff --git a/cms/djangoapps/modulestore_migrator/admin.py b/cms/djangoapps/modulestore_migrator/admin.py
index af4b5ef2a483..8eef778531ac 100644
--- a/cms/djangoapps/modulestore_migrator/admin.py
+++ b/cms/djangoapps/modulestore_migrator/admin.py
@@ -16,7 +16,7 @@
 from openedx.core.types.http import AuthenticatedHttpRequest
 
 from . import api
-from .data import CompositionLevel
+from .data import CompositionLevel, RepeatHandlingStrategy
 from .models import ModulestoreSource, ModulestoreMigration, ModulestoreBlockSource, ModulestoreBlockMigration
 
 
@@ -28,7 +28,11 @@ class StartMigrationTaskForm(ActionForm):
     Params for start_migration_task admin adtion, displayed next the "Go" button.
     """
     target_key = forms.CharField(label="Target library or collection key →", required=False)
-    replace_existing = forms.BooleanField(label="Replace existing content? →", required=False)
+    repeat_handling_strategy = forms.ChoiceField(
+        label="How to handle existing content? →",
+        choices=RepeatHandlingStrategy.supported_choices,
+        required=False,
+    )
     preserve_url_slugs = forms.BooleanField(label="Preserve current slugs? →", required=False, initial=True)
     forward_to_target = forms.BooleanField(label="Forward references? →", required=False)
     composition_level = forms.ChoiceField(
@@ -60,7 +64,7 @@ def task_status_details(obj: ModulestoreMigration) -> str:
     # so we will need to use type:ignore below.
     task_status_details,
     "composition_level",
-    "replace_existing",
+    "repeat_handling_strategy",
     "preserve_url_slugs",
     "change_log",
     "staged_content",
@@ -144,7 +148,7 @@ def start_migration_task(
                     target_library_key=target_library_key,
                     target_collection_slug=target_collection_slug,
                     composition_level=form.cleaned_data['composition_level'],
-                    replace_existing=form.cleaned_data['replace_existing'],
+                    repeat_handling_strategy=form.cleaned_data['repeat_handling_strategy'],
                     preserve_url_slugs=form.cleaned_data['preserve_url_slugs'],
                     forward_source_to_target=form.cleaned_data['forward_to_target'],
                 )
diff --git a/cms/djangoapps/modulestore_migrator/api.py b/cms/djangoapps/modulestore_migrator/api.py
index bcfa5c75a4f8..d921aef4ec60 100644
--- a/cms/djangoapps/modulestore_migrator/api.py
+++ b/cms/djangoapps/modulestore_migrator/api.py
@@ -9,7 +9,7 @@
 from openedx.core.types.user import AuthUser
 
 from . import tasks
-from .data import CompositionLevel
+from .data import CompositionLevel, RepeatHandlingStrategy
 from .models import ModulestoreSource
 
 
@@ -24,28 +24,33 @@ def start_migration_to_library(
     source_key: LearningContextKey,
     target_library_key: LibraryLocatorV2,
     target_collection_slug: str | None = None,
-    composition_level: CompositionLevel,
-    replace_existing: bool,
+    composition_level: str,
+    repeat_handling_strategy: str,
     preserve_url_slugs: bool,
     forward_source_to_target: bool,
 ) -> None:
     """
     Import a course or legacy library into a V2 library (or, a collection within a V2 library).
     """
+    # Can raise NotImplementedError for the Fork strategy
+    assert RepeatHandlingStrategy(repeat_handling_strategy).is_implemented()
+
     source, _ = ModulestoreSource.objects.get_or_create(key=source_key)
     target_library = get_library(target_library_key)
     # get_library ensures that the library is connected to a learning package.
     target_package_id: int = target_library.learning_package_id  # type: ignore[assignment]
     target_collection_id = None
+
     if target_collection_slug:
         target_collection_id = get_collection(target_package_id, target_collection_slug).id
+
     return tasks.migrate_from_modulestore.delay(
         user_id=user.id,
         source_pk=source.id,
         target_package_pk=target_package_id,
         target_collection_pk=target_collection_id,
         composition_level=composition_level,
-        replace_existing=replace_existing,
+        repeat_handling_strategy=repeat_handling_strategy,
         preserve_url_slugs=preserve_url_slugs,
         forward_source_to_target=forward_source_to_target,
     )
diff --git a/cms/djangoapps/modulestore_migrator/data.py b/cms/djangoapps/modulestore_migrator/data.py
index 3112a0f57f57..c2c5f0c29f01 100644
--- a/cms/djangoapps/modulestore_migrator/data.py
+++ b/cms/djangoapps/modulestore_migrator/data.py
@@ -43,3 +43,39 @@ def supported_choices(cls) -> list[tuple[str, str]]:
             (composition_level.value, composition_level.name)
             for composition_level in cls
         ]
+
+
+class RepeatHandlingStrategy(Enum):
+    """
+    Enumeration of repeat handling strategies for imported content.
+    """
+    Skip = 'skip'
+    Fork = 'fork'
+    Update = 'update'
+
+    @classmethod
+    def supported_choices(cls) -> list[tuple[str, str]]:
+        """
+        Returns all supported repeat handling strategies as a list of tuples,
+        for use in a Django Models ChoiceField.
+        """
+        return [
+            (strategy.value, strategy.name)
+            for strategy in cls
+        ]
+
+    @classmethod
+    def default(cls) -> RepeatHandlingStrategy:
+        """
+        Returns the default repeat handling strategy.
+        """
+        return cls.Skip
+
+    def is_implemented(self) -> bool:
+        """
+        Returns True if the repeat handling strategy is implemented.
+        """
+        if self == self.Fork:
+            raise NotImplementedError("Forking is not implemented yet.")
+
+        return True
diff --git a/cms/djangoapps/modulestore_migrator/migrations/0001_initial.py b/cms/djangoapps/modulestore_migrator/migrations/0001_initial.py
index 4d9bc62de01b..3a74ac85d10c 100644
--- a/cms/djangoapps/modulestore_migrator/migrations/0001_initial.py
+++ b/cms/djangoapps/modulestore_migrator/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.22 on 2025-06-10 04:27
+# Generated by Django 4.2.22 on 2025-08-21 14:17
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -13,9 +13,9 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('oel_collections', '0005_alter_collection_options_alter_collection_enabled'),
-        ('oel_publishing', '0008_alter_draftchangelogrecord_options_and_more'),
-        ('content_staging', '0005_stagedcontent_version_num'),
         ('user_tasks', '0004_url_textfield'),
+        ('content_staging', '0006_alter_userclipboard_source_usage_key'),
+        ('oel_publishing', '0008_alter_draftchangelogrecord_options_and_more'),
     ]
 
     operations = [
@@ -33,7 +33,8 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('composition_level', models.CharField(choices=[('component', 'Component'), ('unit', 'Unit'), ('subsection', 'Subsection'), ('section', 'Section')], default='component', help_text='Maximum hierachy level at which content should be aggregated in target library', max_length=255)),
-                ('replace_existing', models.BooleanField(default=False, help_text='If a piece of content already exists in the content library, should the import process replace it?')),
+                ('repeat_handling_strategy', models.CharField(choices=[('skip', 'Skip'), ('fork', 'Fork'), ('update', 'Update')], default='skip', help_text='If a piece of content already exists in the content library, choose how to handle it.', max_length=24)),
+                ('preserve_url_slugs', models.BooleanField(default=True, help_text='If imported blocks have hashed slugs - do we want to preserve it?')),
                 ('change_log', models.ForeignKey(help_text='Changelog entry in the target learning package which records this migration', null=True, on_delete=django.db.models.deletion.SET_NULL, to='oel_publishing.draftchangelog')),
             ],
         ),
@@ -42,7 +43,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('key', opaque_keys.edx.django.models.LearningContextKeyField(help_text='Key of the content source (a course or a legacy library)', max_length=255, unique=True)),
-                ('forwarded_by', models.ForeignKey(help_text='If set, the system will forward references of this source over to the target of this migration', null=True, on_delete=django.db.models.deletion.SET_NULL, to='modulestore_migrator.modulestoremigration')),
+                ('forwarded', models.OneToOneField(blank=True, help_text='If set, the system will forward references of this source over to the target of this migration', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='forwards', to='modulestore_migrator.modulestoremigration')),
             ],
         ),
         migrations.AddField(
@@ -77,7 +78,7 @@ class Migration(migrations.Migration):
                 ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False, verbose_name='created')),
                 ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False, verbose_name='modified')),
                 ('key', opaque_keys.edx.django.models.UsageKeyField(help_text='Original usage key of the XBlock that has been imported.', max_length=255)),
-                ('forwarded_by', models.ForeignKey(help_text='If set, the system will forward references of this block source over to the target of this block migration', null=True, on_delete=django.db.models.deletion.SET_NULL, to='modulestore_migrator.modulestoreblockmigration')),
+                ('forwarded', models.OneToOneField(help_text='If set, the system will forward references of this block source over to the target of this block migration', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='forwards', to='modulestore_migrator.modulestoreblockmigration')),
                 ('overall_source', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='blocks', to='modulestore_migrator.modulestoresource')),
             ],
             options={
@@ -101,6 +102,6 @@ class Migration(migrations.Migration):
         ),
         migrations.AlterUniqueTogether(
             name='modulestoreblockmigration',
-            unique_together={('overall_migration', 'target'), ('overall_migration', 'source')},
+            unique_together={('overall_migration', 'source'), ('overall_migration', 'target')},
         ),
     ]
diff --git a/cms/djangoapps/modulestore_migrator/migrations/0002_source_forwardedby_blank.py b/cms/djangoapps/modulestore_migrator/migrations/0002_source_forwardedby_blank.py
deleted file mode 100644
index 4d2d802ca788..000000000000
--- a/cms/djangoapps/modulestore_migrator/migrations/0002_source_forwardedby_blank.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated by Django 4.2.22 on 2025-06-11 15:12
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('modulestore_migrator', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='modulestoresource',
-            name='forwarded_by',
-            field=models.ForeignKey(blank=True, help_text='If set, the system will forward references of this source over to the target of this migration', null=True, on_delete=django.db.models.deletion.SET_NULL, to='modulestore_migrator.modulestoremigration'),
-        ),
-    ]
diff --git a/cms/djangoapps/modulestore_migrator/migrations/0003_remove_everything.py b/cms/djangoapps/modulestore_migrator/migrations/0003_remove_everything.py
deleted file mode 100644
index 3cbeed703ae5..000000000000
--- a/cms/djangoapps/modulestore_migrator/migrations/0003_remove_everything.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# Generated by Django 4.2.22 on 2025-06-19 18:40
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('modulestore_migrator', '0002_source_forwardedby_blank'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='modulestoreblocksource',
-            name='forwarded_by',
-        ),
-        migrations.RemoveField(
-            model_name='modulestoreblocksource',
-            name='overall_source',
-        ),
-        migrations.RemoveField(
-            model_name='modulestoremigration',
-            name='change_log',
-        ),
-        migrations.RemoveField(
-            model_name='modulestoremigration',
-            name='source',
-        ),
-        migrations.RemoveField(
-            model_name='modulestoremigration',
-            name='staged_content',
-        ),
-        migrations.RemoveField(
-            model_name='modulestoremigration',
-            name='target',
-        ),
-        migrations.RemoveField(
-            model_name='modulestoremigration',
-            name='target_collection',
-        ),
-        migrations.RemoveField(
-            model_name='modulestoremigration',
-            name='task_status',
-        ),
-        migrations.RemoveField(
-            model_name='modulestoresource',
-            name='forwarded_by',
-        ),
-        migrations.DeleteModel(
-            name='ModulestoreBlockMigration',
-        ),
-        migrations.DeleteModel(
-            name='ModulestoreBlockSource',
-        ),
-        migrations.DeleteModel(
-            name='ModulestoreMigration',
-        ),
-        migrations.DeleteModel(
-            name='ModulestoreSource',
-        ),
-    ]
diff --git a/cms/djangoapps/modulestore_migrator/migrations/0004_initial.py b/cms/djangoapps/modulestore_migrator/migrations/0004_initial.py
deleted file mode 100644
index fb1537bf8016..000000000000
--- a/cms/djangoapps/modulestore_migrator/migrations/0004_initial.py
+++ /dev/null
@@ -1,107 +0,0 @@
-# Generated by Django 4.2.22 on 2025-06-19 18:46
-
-from django.db import migrations, models
-import django.db.models.deletion
-import django.utils.timezone
-import model_utils.fields
-import opaque_keys.edx.django.models
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        ('oel_collections', '0005_alter_collection_options_alter_collection_enabled'),
-        ('content_staging', '0005_stagedcontent_version_num'),
-        ('oel_publishing', '0008_alter_draftchangelogrecord_options_and_more'),
-        ('user_tasks', '0004_url_textfield'),
-        ('modulestore_migrator', '0003_remove_everything'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='ModulestoreBlockMigration',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False, verbose_name='created')),
-                ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False, verbose_name='modified')),
-                ('change_log_record', models.OneToOneField(null=True, on_delete=django.db.models.deletion.SET_NULL, to='oel_publishing.draftchangelogrecord')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='ModulestoreMigration',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('composition_level', models.CharField(choices=[('component', 'Component'), ('unit', 'Unit'), ('subsection', 'Subsection'), ('section', 'Section'), ('outline_root', 'OutlineRoot')], default='component', help_text='Maximum hierachy level at which content should be aggregated in target library', max_length=255)),
-                ('replace_existing', models.BooleanField(default=False, help_text='If a piece of content already exists in the content library, should the import process replace it?')),
-                ('change_log', models.ForeignKey(help_text='Changelog entry in the target learning package which records this migration', null=True, on_delete=django.db.models.deletion.SET_NULL, to='oel_publishing.draftchangelog')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='ModulestoreSource',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('key', opaque_keys.edx.django.models.LearningContextKeyField(help_text='Key of the content source (a course or a legacy library)', max_length=255, unique=True)),
-                ('forwarded', models.OneToOneField(blank=True, help_text='If set, the system will forward references of this source over to the target of this migration', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='forwards', to='modulestore_migrator.modulestoremigration')),
-            ],
-        ),
-        migrations.AddField(
-            model_name='modulestoremigration',
-            name='source',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='migrations', to='modulestore_migrator.modulestoresource'),
-        ),
-        migrations.AddField(
-            model_name='modulestoremigration',
-            name='staged_content',
-            field=models.OneToOneField(help_text='Modulestore content is processed and staged before importing it to a learning packge. We temporarily save the staged content to allow for troubleshooting of failed migrations.', null=True, on_delete=django.db.models.deletion.SET_NULL, to='content_staging.stagedcontent'),
-        ),
-        migrations.AddField(
-            model_name='modulestoremigration',
-            name='target',
-            field=models.ForeignKey(help_text='Content will be imported into this library', on_delete=django.db.models.deletion.CASCADE, to='oel_publishing.learningpackage'),
-        ),
-        migrations.AddField(
-            model_name='modulestoremigration',
-            name='target_collection',
-            field=models.ForeignKey(blank=True, help_text='Optional - Collection (within the target library) into which imported content will be grouped', null=True, on_delete=django.db.models.deletion.SET_NULL, to='oel_collections.collection'),
-        ),
-        migrations.AddField(
-            model_name='modulestoremigration',
-            name='task_status',
-            field=models.OneToOneField(help_text='Tracks the status of the task which is executing this migration', on_delete=django.db.models.deletion.RESTRICT, to='user_tasks.usertaskstatus'),
-        ),
-        migrations.CreateModel(
-            name='ModulestoreBlockSource',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False, verbose_name='created')),
-                ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False, verbose_name='modified')),
-                ('key', opaque_keys.edx.django.models.UsageKeyField(help_text='Original usage key of the XBlock that has been imported.', max_length=255)),
-                ('forwarded', models.OneToOneField(help_text='If set, the system will forward references of this block source over to the target of this block migration', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='forwards', to='modulestore_migrator.modulestoreblockmigration')),
-                ('overall_source', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='blocks', to='modulestore_migrator.modulestoresource')),
-            ],
-            options={
-                'abstract': False,
-            },
-        ),
-        migrations.AddField(
-            model_name='modulestoreblockmigration',
-            name='overall_migration',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='block_migrations', to='modulestore_migrator.modulestoremigration'),
-        ),
-        migrations.AddField(
-            model_name='modulestoreblockmigration',
-            name='source',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='modulestore_migrator.modulestoreblocksource'),
-        ),
-        migrations.AddField(
-            model_name='modulestoreblockmigration',
-            name='target',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='oel_publishing.publishableentity'),
-        ),
-        migrations.AlterUniqueTogether(
-            name='modulestoreblockmigration',
-            unique_together={('overall_migration', 'source'), ('overall_migration', 'target')},
-        ),
-    ]
diff --git a/cms/djangoapps/modulestore_migrator/migrations/0005_modulestoremigration_preserve_url_slugs_and_more.py b/cms/djangoapps/modulestore_migrator/migrations/0005_modulestoremigration_preserve_url_slugs_and_more.py
deleted file mode 100644
index bd8593b43e6d..000000000000
--- a/cms/djangoapps/modulestore_migrator/migrations/0005_modulestoremigration_preserve_url_slugs_and_more.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Generated by Django 4.2.22 on 2025-07-31 12:30
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('modulestore_migrator', '0004_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='modulestoremigration',
-            name='preserve_url_slugs',
-            field=models.BooleanField(default=True, help_text='If imported blocks have hashed slugs - do we want to preserve it?'),
-        ),
-        migrations.AlterField(
-            model_name='modulestoremigration',
-            name='composition_level',
-            field=models.CharField(choices=[('component', 'Component'), ('unit', 'Unit'), ('subsection', 'Subsection'), ('section', 'Section')], default='component', help_text='Maximum hierachy level at which content should be aggregated in target library', max_length=255),
-        ),
-    ]
diff --git a/cms/djangoapps/modulestore_migrator/models.py b/cms/djangoapps/modulestore_migrator/models.py
index 640d05f2f564..b63dffc112b5 100644
--- a/cms/djangoapps/modulestore_migrator/models.py
+++ b/cms/djangoapps/modulestore_migrator/models.py
@@ -17,8 +17,7 @@
     LearningPackage, PublishableEntity, Collection, DraftChangeLog, DraftChangeLogRecord
 )
 
-from openedx.core.djangoapps.content_staging.models import StagedContent
-from .data import CompositionLevel
+from .data import CompositionLevel, RepeatHandlingStrategy
 
 User = get_user_model()
 
@@ -73,10 +72,12 @@ class ModulestoreMigration(models.Model):
         default=CompositionLevel.Component.value,
         help_text=_('Maximum hierachy level at which content should be aggregated in target library'),
     )
-    replace_existing = models.BooleanField(
-        default=False,
+    repeat_handling_strategy = models.CharField(
+        choices=RepeatHandlingStrategy.supported_choices(),
+        default=RepeatHandlingStrategy.default().value,
+        max_length=24,
         help_text=_(
-            "If a piece of content already exists in the content library, should the import process replace it?"
+            "If a piece of content already exists in the content library, choose how to handle it."
         ),
     )
     preserve_url_slugs = models.BooleanField(
@@ -111,7 +112,7 @@ class ModulestoreMigration(models.Model):
         help_text=_("Changelog entry in the target learning package which records this migration"),
     )
     staged_content = models.OneToOneField(
-        StagedContent,
+        "content_staging.StagedContent",
         null=True,
         on_delete=models.SET_NULL,  # Staged content is liable to be deleted in order to save space
         help_text=_(
diff --git a/cms/djangoapps/modulestore_migrator/rest_api/urls.py b/cms/djangoapps/modulestore_migrator/rest_api/urls.py
index b993a5952ce0..63bdb1aa1b56 100644
--- a/cms/djangoapps/modulestore_migrator/rest_api/urls.py
+++ b/cms/djangoapps/modulestore_migrator/rest_api/urls.py
@@ -4,10 +4,10 @@
 
 from django.urls import include, path
 
-from .v0 import urls as v0_urls
+from .v1 import urls as v1_urls
 
 app_name = 'modulestore_migrator'
 
 urlpatterns = [
-    path('v0/', include(v0_urls)),
+    path('v1/', include(v1_urls)),
 ]
diff --git a/cms/djangoapps/modulestore_migrator/rest_api/v0/__init__.py b/cms/djangoapps/modulestore_migrator/rest_api/v1/__init__.py
similarity index 100%
rename from cms/djangoapps/modulestore_migrator/rest_api/v0/__init__.py
rename to cms/djangoapps/modulestore_migrator/rest_api/v1/__init__.py
diff --git a/cms/djangoapps/modulestore_migrator/rest_api/v0/serializers.py b/cms/djangoapps/modulestore_migrator/rest_api/v1/serializers.py
similarity index 90%
rename from cms/djangoapps/modulestore_migrator/rest_api/v0/serializers.py
rename to cms/djangoapps/modulestore_migrator/rest_api/v1/serializers.py
index d254510baea8..3937ee8874ed 100644
--- a/cms/djangoapps/modulestore_migrator/rest_api/v0/serializers.py
+++ b/cms/djangoapps/modulestore_migrator/rest_api/v1/serializers.py
@@ -8,7 +8,7 @@
 from rest_framework import serializers
 from user_tasks.serializers import StatusSerializer
 
-from cms.djangoapps.modulestore_migrator.data import CompositionLevel
+from cms.djangoapps.modulestore_migrator.data import CompositionLevel, RepeatHandlingStrategy
 from cms.djangoapps.modulestore_migrator.models import ModulestoreMigration
 
 
@@ -31,10 +31,11 @@ class ModulestoreMigrationSerializer(serializers.ModelSerializer):
         required=False,
         default=CompositionLevel.Component.value,
     )
-    replace_existing = serializers.BooleanField(
-        help_text="If true, replace existing content in the target library.",
+    repeat_handling_strategy = serializers.ChoiceField(
+        help_text="If a piece of content already exists in the content library, choose how to handle it.",
+        choices=RepeatHandlingStrategy.supported_choices(),
         required=False,
-        default=False,
+        default=RepeatHandlingStrategy.Skip.value,
     )
     preserve_url_slugs = serializers.BooleanField(
         help_text="If true, current slugs will be preserved.",
@@ -54,7 +55,7 @@ class Meta:
             'target',
             'target_collection_slug',
             'composition_level',
-            'replace_existing',
+            'repeat_handling_strategy',
             'preserve_url_slugs',
         ]
 
diff --git a/cms/djangoapps/modulestore_migrator/rest_api/v0/urls.py b/cms/djangoapps/modulestore_migrator/rest_api/v1/urls.py
similarity index 62%
rename from cms/djangoapps/modulestore_migrator/rest_api/v0/urls.py
rename to cms/djangoapps/modulestore_migrator/rest_api/v1/urls.py
index 9f50f2a27e96..f0b4f9eb0e48 100644
--- a/cms/djangoapps/modulestore_migrator/rest_api/v0/urls.py
+++ b/cms/djangoapps/modulestore_migrator/rest_api/v1/urls.py
@@ -1,11 +1,11 @@
 """
-Course to Library Import API v0 URLs.
+Course to Library Import API v1 URLs.
 """
 
 from rest_framework.routers import SimpleRouter
 from .views import ImportViewSet
 
 ROUTER = SimpleRouter()
-ROUTER.register(r'imports', ImportViewSet)
+ROUTER.register(r'migrations', ImportViewSet)
 
 urlpatterns = ROUTER.urls
diff --git a/cms/djangoapps/modulestore_migrator/rest_api/v0/views.py b/cms/djangoapps/modulestore_migrator/rest_api/v1/views.py
similarity index 77%
rename from cms/djangoapps/modulestore_migrator/rest_api/v0/views.py
rename to cms/djangoapps/modulestore_migrator/rest_api/v1/views.py
index 08163f346f1b..4dfe94eae66d 100644
--- a/cms/djangoapps/modulestore_migrator/rest_api/v0/views.py
+++ b/cms/djangoapps/modulestore_migrator/rest_api/v1/views.py
@@ -1,6 +1,7 @@
 """
-API v0 views.
+API v1 views.
 """
+import logging
 
 from edx_rest_framework_extensions.auth.jwt.authentication import JwtAuthentication
 from edx_rest_framework_extensions.auth.session.authentication import SessionAuthenticationAllowInactiveUser
@@ -16,6 +17,9 @@
 from .serializers import ModulestoreMigrationSerializer, StatusWithModulestoreMigrationSerializer
 
 
+log = logging.getLogger(__name__)
+
+
 class ImportViewSet(StatusViewSet):
     """
     Import course content from modulestore into a content library.
@@ -25,7 +29,7 @@ class ImportViewSet(StatusViewSet):
 
     API Endpoints
     ------------
-    POST /api/modulestore_migrator/v0/imports/
+    POST /api/modulestore_migrator/v1/migrations/
         Start the import process.
 
         Request body:
@@ -34,7 +38,7 @@ class ImportViewSet(StatusViewSet):
                 "target": "<target_library>",
                 "composition_level": "<composition_level>",  # Optional, defaults to "component"
                 "target_collection_slug": "<target_collection_slug>",  # Optional
-                "replace_existing": "<boolean>"  # Optional, defaults to false
+                "repeat_handling_strategy": "<repeat_handling_strategy>"  # Optional, defaults to Skip
                 "preserve_url_slugs": "<boolean>"  # Optional, defaults to true
             }
 
@@ -43,7 +47,7 @@ class ImportViewSet(StatusViewSet):
                 "source": "course-v1:edX+DemoX+2014_T1",
                 "target": "library-v1:org1+lib_1",
                 "composition_level": "unit",
-                "replace_existing": true
+                "repeat_handling_strategy": "update",
                 "preserve_url_slugs": true
             }
 
@@ -61,12 +65,12 @@ class ImportViewSet(StatusViewSet):
                 "parameters": {
                     "source": "course-v1:OpenedX+DemoX+DemoCourse",
                     "composition_level": "unit",
-                    "replace_existing": true
+                    "repeat_handling_strategy": "update",
                     "preserve_url_slugs": true
                 }
             }
 
-    GET /api/modulestore_migrator/v0/imports/<uuid>/
+    GET /api/modulestore_migrator/v1/migrations/<uuid>/
         Get the status of the import task.
 
         Example response:
@@ -83,7 +87,7 @@ class ImportViewSet(StatusViewSet):
                 "parameters": {
                     "source": "course-v1:OpenedX+DemoX+DemoCourse2",
                     "composition_level": "component",
-                    "replace_existing": false
+                    "repeat_handling_strategy": "skip",
                     "preserve_url_slugs": false
                 }
             }
@@ -112,16 +116,20 @@ def create(self, request, *args, **kwargs):
         serializer_data.is_valid(raise_exception=True)
         validated_data = serializer_data.validated_data
 
-        task = start_migration_to_library(
-            user=request.user,
-            source_key=validated_data['source'],
-            target_library_key=validated_data['target'],
-            target_collection_slug=validated_data['target_collection_slug'],
-            composition_level=validated_data['composition_level'],
-            replace_existing=validated_data['replace_existing'],
-            preserve_url_slugs=validated_data['preserve_url_slugs'],
-            forward_source_to_target=False,  # @@TODO - Set to False for now. Explain this better.
-        )
+        try:
+            task = start_migration_to_library(
+                user=request.user,
+                source_key=validated_data['source'],
+                target_library_key=validated_data['target'],
+                target_collection_slug=validated_data['target_collection_slug'],
+                composition_level=validated_data['composition_level'],
+                repeat_handling_strategy=validated_data['repeat_handling_strategy'],
+                preserve_url_slugs=validated_data['preserve_url_slugs'],
+                forward_source_to_target=False,  # @@TODO - Set to False for now. Explain this better.
+            )
+        except NotImplementedError as e:
+            log.exception(str(e))
+            return Response({'error': str(e)}, status=status.HTTP_400_BAD_REQUEST)
 
         task_status = UserTaskStatus.objects.get(task_id=task.id)
         serializer = self.get_serializer(task_status)
diff --git a/cms/djangoapps/modulestore_migrator/tasks.py b/cms/djangoapps/modulestore_migrator/tasks.py
index 29300ff8b749..366e96c4a79c 100644
--- a/cms/djangoapps/modulestore_migrator/tasks.py
+++ b/cms/djangoapps/modulestore_migrator/tasks.py
@@ -43,7 +43,7 @@
 from xmodule.modulestore.django import modulestore
 
 from .constants import CONTENT_STAGING_PURPOSE_TEMPLATE
-from .data import CompositionLevel
+from .data import CompositionLevel, RepeatHandlingStrategy
 from .models import ModulestoreSource, ModulestoreMigration, ModulestoreBlockSource, ModulestoreBlockMigration
 
 
@@ -91,7 +91,7 @@ class MigrationContext:
     target_library_key: LibraryLocatorV2
     source_context_key: CourseKey  # Note: This includes legacy LibraryLocators, which are sneakily CourseKeys.
     composition_level: CompositionLevel
-    replace_existing: bool
+    repeat_handling_strategy: RepeatHandlingStrategy
     preserve_url_slugs: bool
     created_by: int
     created_at: datetime
@@ -113,6 +113,20 @@ def get_migrated_entities(self, base_key: str) -> set[UsageKey]:
             if publishable_entity.key.startswith(base_key)
         )
 
+    @property
+    def should_skip_strategy(self) -> bool:
+        """
+        Determines whether the repeat handling strategy should skip the entity.
+        """
+        return self.repeat_handling_strategy is RepeatHandlingStrategy.Skip
+
+    @property
+    def should_update_strategy(self) -> bool:
+        """
+        Determines whether the repeat handling strategy should update the entity.
+        """
+        return self.repeat_handling_strategy is RepeatHandlingStrategy.Update
+
 
 @shared_task(base=_MigrationTask, bind=True)
 # Note: The decorator @set_code_owner_attribute cannot be used here because the UserTaskMixin
@@ -124,7 +138,7 @@ def migrate_from_modulestore(
     source_pk: int,
     target_package_pk: int,
     target_collection_pk: int,
-    replace_existing: bool,
+    repeat_handling_strategy: str,
     preserve_url_slugs: bool,
     composition_level: str,
     forward_source_to_target: bool,
@@ -164,7 +178,7 @@ def migrate_from_modulestore(
     migration = ModulestoreMigration.objects.create(
         source=source,
         composition_level=composition_level,
-        replace_existing=replace_existing,
+        repeat_handling_strategy=repeat_handling_strategy,
         preserve_url_slugs=preserve_url_slugs,
         target=target_package,
         target_collection=target_collection,
@@ -262,7 +276,7 @@ def migrate_from_modulestore(
         target_library_key=target_library.library_key,
         source_context_key=source_root_usage_key.course_key,
         composition_level=CompositionLevel(composition_level),
-        replace_existing=replace_existing,
+        repeat_handling_strategy=RepeatHandlingStrategy(repeat_handling_strategy),
         preserve_url_slugs=preserve_url_slugs,
         created_by=status.user_id,
         created_at=datetime.now(timezone.utc),
@@ -300,7 +314,7 @@ def migrate_from_modulestore(
         for block_source, block_migration in block_sources_to_block_migrations.items():
             block_source.forwarded = block_migration
             block_source.save()
-        # ModulestoreBlockSource.objects.bulk_update(block_sources_to_block_migrations.keys(), ["forwarded"])
+
         source.forwarded = migration
         source.save()
     status.increment_completed_steps()
@@ -496,7 +510,7 @@ def _migrate_container(
                 created=context.created_at,
                 user_id=context.created_by,
             )
-    if container_exists and not context.replace_existing:
+    if container_exists and context.should_skip_strategy:
         return PublishableEntityVersion.objects.get(
             entity_id=container.container_pk,
             version_num=container.draft_version_num,
@@ -566,7 +580,7 @@ def _migrate_component(
         )
 
     # Component existed and we do not replace it and it is not deleted previously
-    if component_existed and not component_deleted and not context.replace_existing:
+    if component_existed and not component_deleted and context.should_skip_strategy:
         return component.versioning.draft.publishable_entity_version
 
     # If component existed and was deleted or we have to replace the current version
diff --git a/cms/djangoapps/modulestore_migrator/tests/test_api.py b/cms/djangoapps/modulestore_migrator/tests/test_api.py
index 50b56e926286..a130fcd6a7ba 100644
--- a/cms/djangoapps/modulestore_migrator/tests/test_api.py
+++ b/cms/djangoapps/modulestore_migrator/tests/test_api.py
@@ -10,7 +10,7 @@
 
 from common.djangoapps.student.tests.factories import UserFactory
 from cms.djangoapps.modulestore_migrator import api
-from cms.djangoapps.modulestore_migrator.data import CompositionLevel
+from cms.djangoapps.modulestore_migrator.data import CompositionLevel, RepeatHandlingStrategy
 from cms.djangoapps.modulestore_migrator.models import ModulestoreMigration
 from cms.djangoapps.modulestore_migrator.tests.factories import ModulestoreSourceFactory
 from openedx.core.djangoapps.content_libraries import api as lib_api
@@ -50,7 +50,7 @@ def test_start_migration_to_library(self):
             target_library_key=self.library.library_key,
             target_collection_slug=None,
             composition_level=CompositionLevel.Component.value,
-            replace_existing=False,
+            repeat_handling_strategy=RepeatHandlingStrategy.Skip.value,
             preserve_url_slugs=True,
             forward_source_to_target=False,
         )
@@ -60,7 +60,7 @@ def test_start_migration_to_library(self):
         assert (
             modulestoremigration.composition_level == CompositionLevel.Component.value
         )
-        assert modulestoremigration.replace_existing is False
+        assert modulestoremigration.repeat_handling_strategy == RepeatHandlingStrategy.Skip.value
         assert modulestoremigration.preserve_url_slugs is True
         assert modulestoremigration.task_status is not None
         assert modulestoremigration.task_status.user == user
@@ -87,10 +87,29 @@ def test_start_migration_to_library_with_collection(self):
             target_library_key=self.library.library_key,
             target_collection_slug=collection_key,
             composition_level=CompositionLevel.Component.value,
-            replace_existing=False,
+            repeat_handling_strategy=RepeatHandlingStrategy.Skip.value,
             preserve_url_slugs=True,
             forward_source_to_target=False,
         )
 
         modulestoremigration = ModulestoreMigration.objects.get()
         assert modulestoremigration.target_collection.key == collection_key
+
+    def test_forking_is_not_implemented(self):
+        """
+        Test that the API raises NotImplementedError for the Fork strategy.
+        """
+        source = ModulestoreSourceFactory()
+        user = UserFactory()
+
+        with pytest.raises(NotImplementedError):
+            api.start_migration_to_library(
+                user=user,
+                source_key=source.key,
+                target_library_key=self.library.library_key,
+                target_collection_slug=None,
+                composition_level=CompositionLevel.Component.value,
+                repeat_handling_strategy=RepeatHandlingStrategy.Fork.value,
+                preserve_url_slugs=True,
+                forward_source_to_target=False,
+            )
diff --git a/cms/djangoapps/modulestore_migrator/tests/test_tasks.py b/cms/djangoapps/modulestore_migrator/tests/test_tasks.py
index 2822a1313f5f..6d50212f4ca8 100644
--- a/cms/djangoapps/modulestore_migrator/tests/test_tasks.py
+++ b/cms/djangoapps/modulestore_migrator/tests/test_tasks.py
@@ -17,7 +17,7 @@
 from xmodule.modulestore.tests.factories import CourseFactory
 
 from common.djangoapps.student.tests.factories import UserFactory
-from cms.djangoapps.modulestore_migrator.data import CompositionLevel
+from cms.djangoapps.modulestore_migrator.data import CompositionLevel, RepeatHandlingStrategy
 from cms.djangoapps.modulestore_migrator.models import (
     ModulestoreMigration,
     ModulestoreSource,
@@ -109,7 +109,7 @@ def test_migrate_node_wiki_tag(self):
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
             composition_level=CompositionLevel.Unit,
-            replace_existing=False,
+            repeat_handling_strategy=RepeatHandlingStrategy.Skip,
             preserve_url_slugs=True,
             created_at=timezone.now(),
             created_by=self.user.id,
@@ -139,7 +139,7 @@ def test_migrate_node_course_root(self):
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
             composition_level=CompositionLevel.Unit,
-            replace_existing=False,
+            repeat_handling_strategy=RepeatHandlingStrategy.Skip,
             preserve_url_slugs=True,
             created_at=timezone.now(),
             created_by=self.user.id,
@@ -171,7 +171,7 @@ def test_migrate_node_library_root(self):
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
             composition_level=CompositionLevel.Unit,
-            replace_existing=False,
+            repeat_handling_strategy=RepeatHandlingStrategy.Skip,
             preserve_url_slugs=True,
             created_at=timezone.now(),
             created_by=self.user.id,
@@ -211,7 +211,7 @@ def test_migrate_node_container_composition_level(
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
             composition_level=composition_level,
-            replace_existing=False,
+            repeat_handling_strategy=RepeatHandlingStrategy.Skip,
             preserve_url_slugs=True,
             created_at=timezone.now(),
             created_by=self.user.id,
@@ -244,7 +244,7 @@ def test_migrate_node_without_url_name(self):
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
             composition_level=CompositionLevel.Unit,
-            replace_existing=False,
+            repeat_handling_strategy=RepeatHandlingStrategy.Skip,
             preserve_url_slugs=True,
             created_at=timezone.now(),
             created_by=self.user.id,
@@ -297,7 +297,7 @@ def test_migrate_from_modulestore_invalid_source(self):
                 "source_pk": 999999,  # Non-existent source
                 "target_package_pk": self.learning_package.id,
                 "target_collection_pk": self.collection.id,
-                "replace_existing": False,
+                "repeat_handling_strategy" : RepeatHandlingStrategy.Skip.value,
                 "preserve_url_slugs": True,
                 "composition_level": CompositionLevel.Unit.value,
                 "forward_source_to_target": False,
@@ -322,7 +322,7 @@ def test_migrate_from_modulestore_invalid_target_package(self):
                 "source_pk": source.id,
                 "target_package_pk": 999999,  # Non-existent package
                 "target_collection_pk": self.collection.id,
-                "replace_existing": False,
+                "repeat_handling_strategy" : RepeatHandlingStrategy.Skip.value,
                 "preserve_url_slugs": True,
                 "composition_level": CompositionLevel.Unit.value,
                 "forward_source_to_target": False,
@@ -347,7 +347,7 @@ def test_migrate_from_modulestore_invalid_collection(self):
                 "source_pk": source.id,
                 "target_package_pk": self.learning_package.id,
                 "target_collection_pk": 999999,  # Non-existent collection
-                "replace_existing": False,
+                "repeat_handling_strategy" : RepeatHandlingStrategy.Skip.value,
                 "preserve_url_slugs": True,
                 "composition_level": CompositionLevel.Unit.value,
                 "forward_source_to_target": False,
@@ -378,7 +378,7 @@ def test_migrate_component_success(self):
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
             composition_level=CompositionLevel.Unit,
-            replace_existing=False,
+            repeat_handling_strategy=RepeatHandlingStrategy.Skip,
             preserve_url_slugs=True,
             created_at=timezone.now(),
             created_by=self.user.id,
@@ -418,7 +418,7 @@ def test_migrate_component_with_static_content(self):
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
             composition_level=CompositionLevel.Unit,
-            replace_existing=False,
+            repeat_handling_strategy=RepeatHandlingStrategy.Skip,
             preserve_url_slugs=True,
             created_at=timezone.now(),
             created_by=self.user.id,
@@ -453,7 +453,7 @@ def test_migrate_component_replace_existing_false(self):
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
             composition_level=CompositionLevel.Unit,
-            replace_existing=False,
+            repeat_handling_strategy=RepeatHandlingStrategy.Skip,
             preserve_url_slugs=True,
             created_at=timezone.now(),
             created_by=self.user.id,
@@ -494,7 +494,7 @@ def test_migrate_component_same_title(self):
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
             composition_level=CompositionLevel.Unit,
-            replace_existing=False,
+            repeat_handling_strategy=RepeatHandlingStrategy.Skip,
             preserve_url_slugs=False,
             created_at=timezone.now(),
             created_by=self.user.id,
@@ -531,7 +531,7 @@ def test_migrate_component_replace_existing_true(self):
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
             composition_level=CompositionLevel.Unit,
-            replace_existing=True,
+            repeat_handling_strategy=RepeatHandlingStrategy.Update,
             preserve_url_slugs=True,
             created_at=timezone.now(),
             created_by=self.user.id,
@@ -572,7 +572,7 @@ def test_migrate_component_different_block_types(self):
                 target_library_key=self.library.library_key,
                 source_context_key=self.course.id,
                 composition_level=CompositionLevel.Unit,
-                replace_existing=False,
+                repeat_handling_strategy=RepeatHandlingStrategy.Skip,
                 preserve_url_slugs=True,
                 created_at=timezone.now(),
                 created_by=self.user.id,
@@ -624,7 +624,7 @@ def test_migrate_component_content_filename_not_in_olx(self):
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
             composition_level=CompositionLevel.Unit,
-            replace_existing=False,
+            repeat_handling_strategy=RepeatHandlingStrategy.Skip,
             preserve_url_slugs=True,
             created_at=timezone.now(),
             created_by=self.user.id,
@@ -666,7 +666,7 @@ def test_migrate_component_library_source_key(self):
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
             composition_level=CompositionLevel.Unit,
-            replace_existing=False,
+            repeat_handling_strategy=RepeatHandlingStrategy.Skip,
             preserve_url_slugs=True,
             created_at=timezone.now(),
             created_by=self.user.id,
@@ -708,7 +708,7 @@ def test_migrate_component_duplicate_content_integrity_error(self):
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
             composition_level=CompositionLevel.Unit,
-            replace_existing=True,
+            repeat_handling_strategy=RepeatHandlingStrategy.Update,
             preserve_url_slugs=True,
             created_at=timezone.now(),
             created_by=self.user.id,
@@ -782,7 +782,7 @@ def test_migrate_container_creates_new_container(self):
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
             composition_level=CompositionLevel.Unit,
-            replace_existing=False,
+            repeat_handling_strategy=RepeatHandlingStrategy.Skip,
             preserve_url_slugs=True,
             created_at=timezone.now(),
             created_by=self.user.id,
@@ -823,7 +823,7 @@ def test_migrate_container_different_container_types(self):
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
             composition_level=CompositionLevel.Unit,
-            replace_existing=False,
+            repeat_handling_strategy=RepeatHandlingStrategy.Skip,
             preserve_url_slugs=True,
             created_at=timezone.now(),
             created_by=self.user.id,
@@ -859,7 +859,7 @@ def test_migrate_container_replace_existing_false(self):
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
             composition_level=CompositionLevel.Unit,
-            replace_existing=False,
+            repeat_handling_strategy=RepeatHandlingStrategy.Skip,
             preserve_url_slugs=True,
             created_at=timezone.now(),
             created_by=self.user.id,
@@ -904,7 +904,7 @@ def test_migrate_container_same_title(self):
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
             composition_level=CompositionLevel.Unit,
-            replace_existing=False,
+            repeat_handling_strategy=RepeatHandlingStrategy.Skip,
             preserve_url_slugs=False,
             created_at=timezone.now(),
             created_by=self.user.id,
@@ -963,7 +963,7 @@ def test_migrate_container_replace_existing_true(self):
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
             composition_level=CompositionLevel.Unit,
-            replace_existing=True,
+            repeat_handling_strategy=RepeatHandlingStrategy.Update,
             preserve_url_slugs=True,
             created_at=timezone.now(),
             created_by=self.user.id,
@@ -1006,7 +1006,7 @@ def test_migrate_container_with_library_source_key(self):
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
             composition_level=CompositionLevel.Unit,
-            replace_existing=False,
+            repeat_handling_strategy=RepeatHandlingStrategy.Skip,
             preserve_url_slugs=True,
             created_at=timezone.now(),
             created_by=self.user.id,
@@ -1036,7 +1036,7 @@ def test_migrate_container_empty_children_list(self):
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
             composition_level=CompositionLevel.Unit,
-            replace_existing=False,
+            repeat_handling_strategy=RepeatHandlingStrategy.Skip,
             preserve_url_slugs=True,
             created_at=timezone.now(),
             created_by=self.user.id,
@@ -1066,7 +1066,7 @@ def test_migrate_container_preserves_child_order(self):
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
             composition_level=CompositionLevel.Unit,
-            replace_existing=False,
+            repeat_handling_strategy=RepeatHandlingStrategy.Skip,
             preserve_url_slugs=True,
             created_at=timezone.now(),
             created_by=self.user.id,
@@ -1172,7 +1172,7 @@ def test_migrate_container_with_mixed_child_types(self):
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
             composition_level=CompositionLevel.Unit,
-            replace_existing=False,
+            repeat_handling_strategy=RepeatHandlingStrategy.Skip,
             preserve_url_slugs=True,
             created_at=timezone.now(),
             created_by=self.user.id,
@@ -1210,7 +1210,7 @@ def test_migrate_container_generates_correct_target_key(self):
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
             composition_level=CompositionLevel.Unit,
-            replace_existing=False,
+            repeat_handling_strategy=RepeatHandlingStrategy.Skip,
             preserve_url_slugs=True,
             created_at=timezone.now(),
             created_by=self.user.id,
@@ -1252,7 +1252,7 @@ def test_migrate_from_modulestore_success_course(self):
                 "source_pk": source.id,
                 "target_package_pk": self.learning_package.id,
                 "target_collection_pk": self.collection.id,
-                "replace_existing": False,
+                "repeat_handling_strategy" : RepeatHandlingStrategy.Skip.value,
                 "preserve_url_slugs": True,
                 "composition_level": CompositionLevel.Unit.value,
                 "forward_source_to_target": False,
@@ -1266,7 +1266,7 @@ def test_migrate_from_modulestore_success_course(self):
             source=source, target=self.learning_package
         )
         self.assertEqual(migration.composition_level, CompositionLevel.Unit.value)
-        self.assertFalse(migration.replace_existing)
+        self.assertEqual(migration.repeat_handling_strategy, RepeatHandlingStrategy.Skip.value)
 
     def test_migrate_from_modulestore_library_validation_failure(self):
         """
@@ -1282,7 +1282,7 @@ def test_migrate_from_modulestore_library_validation_failure(self):
                 "source_pk": source.id,
                 "target_package_pk": self.learning_package.id,
                 "target_collection_pk": None,
-                "replace_existing": True,
+                "repeat_handling_strategy": RepeatHandlingStrategy.Update.value,
                 "preserve_url_slugs": True,
                 "composition_level": CompositionLevel.Section.value,
                 "forward_source_to_target": True,
@@ -1312,7 +1312,7 @@ def test_migrate_from_modulestore_invalid_source_key_type(self):
                 "source_pk": source.id,
                 "target_package_pk": self.learning_package.id,
                 "target_collection_pk": self.collection.id,
-                "replace_existing": False,
+                "repeat_handling_strategy" : RepeatHandlingStrategy.Skip.value,
                 "preserve_url_slugs": True,
                 "composition_level": CompositionLevel.Unit.value,
                 "forward_source_to_target": False,
@@ -1341,7 +1341,7 @@ def test_migrate_from_modulestore_nonexistent_modulestore_item(self):
                 "source_pk": source.id,
                 "target_package_pk": self.learning_package.id,
                 "target_collection_pk": self.collection.id,
-                "replace_existing": False,
+                "repeat_handling_strategy" : RepeatHandlingStrategy.Skip.value,
                 "preserve_url_slugs": True,
                 "composition_level": CompositionLevel.Unit.value,
                 "forward_source_to_target": False,
@@ -1366,7 +1366,7 @@ def test_migrate_from_modulestore_task_status_progression(self):
                 "source_pk": source.id,
                 "target_package_pk": self.learning_package.id,
                 "target_collection_pk": self.collection.id,
-                "replace_existing": False,
+                "repeat_handling_strategy": RepeatHandlingStrategy.Skip.value,
                 "preserve_url_slugs": True,
                 "composition_level": CompositionLevel.Unit.value,
                 "forward_source_to_target": False,
@@ -1396,7 +1396,7 @@ def test_migrate_from_modulestore_multiple_users_no_interference(self):
                 "source_pk": source.id,
                 "target_package_pk": self.learning_package.id,
                 "target_collection_pk": self.collection.id,
-                "replace_existing": False,
+                "repeat_handling_strategy" : RepeatHandlingStrategy.Skip.value,
                 "preserve_url_slugs": True,
                 "composition_level": CompositionLevel.Unit.value,
                 "forward_source_to_target": False,
@@ -1409,7 +1409,7 @@ def test_migrate_from_modulestore_multiple_users_no_interference(self):
                 "source_pk": source.id,
                 "target_package_pk": self.learning_package.id,
                 "target_collection_pk": self.collection.id,
-                "replace_existing": False,
+                "repeat_handling_strategy" : RepeatHandlingStrategy.Skip.value,
                 "preserve_url_slugs": True,
                 "composition_level": CompositionLevel.Unit.value,
                 "forward_source_to_target": False,

From e77f6b8e9378cb3e30cf41d1f9727c3a8cd0c61b Mon Sep 17 00:00:00 2001
From: Maksim Sokolskiy <maksim.sokolskiy@raccoongang.com>
Date: Tue, 26 Aug 2025 14:35:11 +0300
Subject: [PATCH 31/40] refactor: address code review comments, clean code

---
 cms/djangoapps/modulestore_migrator/tasks.py  | 164 +++++-------------
 .../modulestore_migrator/tests/test_tasks.py  | 118 ++++++-------
 2 files changed, 90 insertions(+), 192 deletions(-)

diff --git a/cms/djangoapps/modulestore_migrator/tasks.py b/cms/djangoapps/modulestore_migrator/tasks.py
index 366e96c4a79c..e141611b6b35 100644
--- a/cms/djangoapps/modulestore_migrator/tasks.py
+++ b/cms/djangoapps/modulestore_migrator/tasks.py
@@ -9,7 +9,6 @@
 from dataclasses import dataclass
 from datetime import datetime, timezone
 from enum import Enum
-from uuid import uuid4
 
 from celery import shared_task
 from celery.utils.log import get_task_logger
@@ -85,11 +84,12 @@ def calculate_total_steps(arguments_dict):
 
 
 @dataclass(frozen=True)
-class MigrationContext:
-    existing_source_to_target_keys: dict[UsageKey, PublishableEntity]
+class _MigrationContext:
+    existing_source_to_target_keys: dict[UsageKey, PublishableEntity]  # Note: This data is intended to be mutable to reflect changes in the migration process.
     target_package_id: int
     target_library_key: LibraryLocatorV2
     source_context_key: CourseKey  # Note: This includes legacy LibraryLocators, which are sneakily CourseKeys.
+    content_by_filename: dict[str, int]
     composition_level: CompositionLevel
     repeat_handling_strategy: RepeatHandlingStrategy
     preserve_url_slugs: bool
@@ -106,7 +106,7 @@ def add_migration(self, source_key: UsageKey, target: PublishableEntity) -> None
         """Update the context with a new migration (keeps it current)"""
         self.existing_source_to_target_keys[source_key] = target
 
-    def get_migrated_entities(self, base_key: str) -> set[UsageKey]:
+    def get_existing_target_entity_keys(self, base_key: str) -> set[str]:
         return set(
             publishable_entity.key for _, publishable_entity in
             self.existing_source_to_target_keys.items()
@@ -270,11 +270,12 @@ def migrate_from_modulestore(
         overall_migration__target=migration.target.id)
     }
 
-    migration_context = MigrationContext(
+    migration_context = _MigrationContext(
         existing_source_to_target_keys=existing_source_to_target_keys,
         target_package_id=target_package_pk,
         target_library_key=target_library.library_key,
         source_context_key=source_root_usage_key.course_key,
+        content_by_filename=content_by_filename,
         composition_level=CompositionLevel(composition_level),
         repeat_handling_strategy=RepeatHandlingStrategy(repeat_handling_strategy),
         preserve_url_slugs=preserve_url_slugs,
@@ -285,7 +286,6 @@ def migrate_from_modulestore(
     with authoring_api.bulk_draft_changes_for(migration.target.id) as change_log:
         root_migrated_node = _migrate_node(
             context=migration_context,
-            content_by_filename=content_by_filename,
             source_node=root_node,
         )
     change_log.save()
@@ -327,7 +327,6 @@ def migrate_from_modulestore(
             ).values_list('target_id', flat=True)
         )
         if block_target_pks:
-            log.info("Started adding entities to a collection")
             # @@TODO: Investigate an issue with huge
             # time consumption during this step
             # For existing and deleted blocks this step takes
@@ -339,7 +338,6 @@ def migrate_from_modulestore(
                 entities_qset=PublishableEntity.objects.filter(id__in=block_target_pks),
                 created_by=user_id,
             )
-            log.info(f"Added {len(block_target_pks)} entities to collection {target_collection.key}")
         else:
             log.warning("No target entities found to add to collection")
     status.increment_completed_steps()
@@ -369,25 +367,24 @@ def all_source_to_target_pairs(self) -> t.Iterable[tuple[UsageKey, PublishableEn
 
 def _migrate_node(
     *,
-    context: MigrationContext,
-    content_by_filename: dict[str, int],
+    context: _MigrationContext,
     source_node: XmlTree,
 ) -> _MigratedNode:
     """
-    Migration an OLX node (source_node) from a legacy course or library (source_context_key) to a
+    Migrate an OLX node (source_node) from a legacy course or library (source_context_key) to a
     learning package (context.target_library). If the node is a container, create it in the target if
     it is at or above the requested composition_level; otherwise, just import its contents.
     Recursively apply the same logic to all children.
     """
     # The OLX tag will map to one of the following...
     #   * A wiki tag                  --> Ignore
-    #   * A recognized container type --> Migration children, and import container if requested.
-    #   * A legacy library root       --> Migration children, but NOT the root itself.
-    #   * A course root               --> Migration children, but NOT the root itself (for Teak, at least. Future
+    #   * A recognized container type --> Migrate children, and import container if requested.
+    #   * A legacy library root       --> Migrate children, but NOT the root itself.
+    #   * A course root               --> Migrate children, but NOT the root itself (for Ulmo, at least. Future
     #                                     releases may support treating the Course as an importable container).
     #   * Something else              --> Try to import it as a component. If that fails, then it's either an un-
     #                                     supported component type, or it's an XBlock with dynamic children, which we
-    #                                     do not support in libraries as of Teak.
+    #                                     do not support in libraries as of Ulmo.
     should_migrate_node: bool
     should_migrate_children: bool
     container_type: ContainerType | None  # if None, it's a Component
@@ -412,7 +409,6 @@ def _migrate_node(
         migrated_children = [
             _migrate_node(
                 context=context,
-                content_by_filename=content_by_filename,
                 source_node=source_node_child,
             )
             for source_node_child in source_node.getchildren()
@@ -437,7 +433,6 @@ def _migrate_node(
                 if container_type else
                 _migrate_component(
                     context=context,
-                    content_by_filename=content_by_filename,
                     source_key=source_key,
                     olx=source_olx,
                 )
@@ -456,10 +451,6 @@ def _migrate_node(
                 # The system should prevent a node from being migrated without an update
                 # to the `existing_source_to_target_keys` dictionary.
                 context.add_migration(source_key, target_entity_version.entity)
-                log.info(
-                    f"Migrated node from {context.source_context_key} to {context.target_library_key} "
-                    f"with version {target_entity_version}"
-                )
         else:
             log.warning(
                 f"Cannot migrate node from {context.source_context_key} to {context.target_library_key} "
@@ -470,7 +461,7 @@ def _migrate_node(
 
 def _migrate_container(
     *,
-    context: MigrationContext,
+    context: _MigrationContext,
     source_key: UsageKey,
     container_type: ContainerType,
     title: str,
@@ -482,14 +473,12 @@ def _migrate_container(
     (We assume that the destination is a library rather than some other future kind of learning
      package, but let's keep than an internal assumption.)
     """
-    target_key = _deduplicate_container(
+    target_key = _get_distinct_target_container_key(
         context,
         source_key,
         container_type,
         title,
     )
-    log.info(f"Target key: {target_key}")
-
     try:
         container = libraries_api.get_container(target_key)
         container_exists = True
@@ -530,8 +519,7 @@ def _migrate_container(
 
 def _migrate_component(
     *,
-    context: MigrationContext,
-    content_by_filename: dict[str, int],
+    context: _MigrationContext,
     source_key: UsageKey,
     olx: str,
 ) -> PublishableEntityVersion | None:
@@ -543,7 +531,7 @@ def _migrate_component(
     """
     component_type = authoring_api.get_or_create_component_type("xblock.v1", source_key.block_type)
 
-    target_key = _deduplicate_block_id(
+    target_key = _get_distinct_target_usage_key(
         context,
         source_key,
         component_type,
@@ -551,7 +539,6 @@ def _migrate_component(
     )
 
     try:
-        log.info(f"Attempting to retrieve component for {target_key}")
         component = authoring_api.get_components(context.target_package_id).get(
             component_type=component_type,
             local_key=target_key.block_id,
@@ -559,8 +546,6 @@ def _migrate_component(
         component_existed = True
         # Do we have a specific method for this?
         component_deleted = not component.versioning.draft
-        log.info(f"It's existed: {component_existed}")
-        log.info(f"It's deleted: {component_deleted}")
     except Component.DoesNotExist:
         component_existed = False
         component_deleted = False
@@ -586,33 +571,37 @@ def _migrate_component(
     # If component existed and was deleted or we have to replace the current version
     # Create the new component version for it
     component_version = libraries_api.set_library_block_olx(target_key, new_olx_str=olx)
-    for filename, content_pk in content_by_filename.items():
+    for filename, content_pk in context.content_by_filename.items():
         filename_no_ext, _ = os.path.splitext(filename)
         if filename_no_ext not in olx:
             continue
         new_path = f"static/{filename}"
-        _create_component_version_content_safely(
-            component_version_pk=component_version.pk,
-            content_pk=content_pk,
-            key=new_path
+        authoring_api.create_component_version_content(
+            component_version.pk, content_pk, key=new_path
         )
     return component_version.publishable_entity_version
 
 
-def _deduplicate_container(
-    context: MigrationContext,
+def _get_distinct_target_container_key(
+    context: _MigrationContext,
     source_key: UsageKey,
     container_type: ContainerType,
     title: str,
 ) -> LibraryContainerLocator:
-    if not source_key or not source_key.block_id:
-        raise ValueError(f"Invalid source_key: {source_key}")
+    """
+    Find a unique key for block_id by appending a unique identifier if necessary.
 
-    log.debug(f"Processing deduplication for source key: {source_key}")
+    Args:
+        context (_MigrationContext): The migration context.
+        source_key (UsageKey): The source key.
+        container_type (ContainerType): The container type.
+        title (str): The title.
 
+    Returns:
+        LibraryContainerLocator: The target container key.
+    """
     # Check if we already processed this block
     if context.is_already_migrated(source_key):
-        log.debug(f"Block {source_key} already exists, reusing existing target")
         existing_version = context.get_existing_target(source_key)
 
         return LibraryContainerLocator(
@@ -620,41 +609,34 @@ def _deduplicate_container(
             container_type.value,
             existing_version.key
         )
-
     # Generate new unique block ID
-    log.debug(f"Creating new block for {source_key.block_id}")
-
     base_slug = (
         source_key.block_id
         if context.preserve_url_slugs
-        else _slugify_source_usage_key(
-            source_key,
-            title,
-        )
+        else (slugify(title) or source_key.block_id)
     )
     unique_slug = _find_unique_slug(context, base_slug)
 
-    log.info(f"Created new block with slug: {unique_slug}")
-
     return LibraryContainerLocator(
         context.target_library_key,
         container_type.value,
         unique_slug
     )
 
-def _deduplicate_block_id(
-    context: MigrationContext,
+def _get_distinct_target_usage_key(
+    context: _MigrationContext,
     source_key: UsageKey,
     component_type: str,
     olx: str,
 ) -> LibraryUsageLocatorV2:
     """
-    Deduplicate a block_id by appending a unique identifier if necessary.
+    Find a unique key for block_id by appending a unique identifier if necessary.
 
     Args:
         context: The migration context
         source_key: The original usage key from the source
         component_type: The component type string
+        olx: The OLX content of the component
 
     Returns:
         A unique LibraryUsageLocatorV2 for the target
@@ -662,11 +644,6 @@ def _deduplicate_block_id(
     Raises:
         ValueError: If source_key is invalid
     """
-    if not source_key or not source_key.block_id:
-        raise ValueError(f"Invalid source_key: {source_key}")
-
-    log.debug(f"Processing deduplication for source key: {source_key}")
-
     # Check if we already processed this block
     if context.is_already_migrated(source_key):
         log.debug(f"Block {source_key} already exists, reusing existing target")
@@ -689,21 +666,14 @@ def _deduplicate_block_id(
         )
 
     # Generate new unique block ID
-    log.debug(f"Creating new block for {source_key.block_id}")
-
     title = _get_title_from_olx(olx) or source_key.block_id
     base_slug = (
         source_key.block_id
         if context.preserve_url_slugs
-        else _slugify_source_usage_key(
-            source_key,
-            title,
-        )
+        else (slugify(title) or source_key.block_id)
     )
     unique_slug = _find_unique_slug(context, base_slug, component_type)
 
-    log.info(f"Created unique slug '{unique_slug}' for block {source_key.block_id}")
-
     # mypy thinks LibraryUsageLocatorV2 is abstract. It's not.
     return LibraryUsageLocatorV2(  # type: ignore[abstract]
         context.target_library_key,
@@ -713,7 +683,7 @@ def _deduplicate_block_id(
 
 
 def _find_unique_slug(
-    context: MigrationContext,
+    context: _MigrationContext,
     base_slug: str,
     component_type: str = "",
     max_attempts: int = 1000
@@ -738,7 +708,7 @@ def _find_unique_slug(
     else:
         base_key = f"{component_type}:{base_slug}"
 
-    existing_publishable_entity_keys = context.get_migrated_entities(base_key)
+    existing_publishable_entity_keys = context.get_existing_target_entity_keys(base_key)
 
     # Check if base slug is available
     if base_key not in existing_publishable_entity_keys:
@@ -774,37 +744,6 @@ def _get_title_from_olx(olx_str: str) -> str | None:
         log.warning(f"Unexpected error during title extraction: {e}")
 
 
-def _slugify_source_usage_key(
-    key: UsageKey,
-    title: str,
-    use_hash: bool = False
-) -> str:
-    """
-    Return an appropriate slug (aka block_id, aka container_id) for the target entity.
-
-    When preserve_url_slugs is False, attempts to create a human-readable slug
-    from the content title, falling back to the original block_id if parsing fails.
-    Otherwise, returns the original block_id.
-
-    Args:
-        key: The source usage key
-        olx_str: The OLX content string to extract title from
-        preserve_url_slugs: Whether to preserve original block IDs
-
-    Returns:
-        A slug string suitable for use as a block identifier
-    """
-    # Slugify the title and append some random characters for uniqueness
-    slug = slugify(title, allow_unicode=True)
-    if slug:
-        if use_hash:
-            return f"{slug}-{uuid4().hex[-6:]}"
-        return slug
-
-    # Fallback to original block_id
-    return key.block_id
-
-
 # Not used for now since it causes issues with
 # adding to Collections
 # Required for additional investigation
@@ -910,28 +849,3 @@ def _create_migration_artifacts_incrementally(
             status.set_state(
                 f"{MigrationStep.MAPPING_OLD_TO_NEW.value} ({processed}/{total_nodes})"
             )
-
-
-def _create_component_version_content_safely(
-    component_version_pk: int,
-    content_pk: int,
-    key: str
-) -> bool:
-    """
-    Create component version content, returning True if created or False if already exists.
-    """
-    try:
-        if ComponentVersionContent.objects.filter(
-            component_version_id=component_version_pk,
-            content_id=content_pk,
-            key=key
-        ).exists():
-            return False
-
-        authoring_api.create_component_version_content(
-            component_version_pk, content_pk, key=key
-        )
-        return True
-    except IntegrityError as e:
-        log.warning(f"IntegrityError creating content {key}: {e}")
-        return False
diff --git a/cms/djangoapps/modulestore_migrator/tests/test_tasks.py b/cms/djangoapps/modulestore_migrator/tests/test_tasks.py
index 6d50212f4ca8..8c43c0f6899b 100644
--- a/cms/djangoapps/modulestore_migrator/tests/test_tasks.py
+++ b/cms/djangoapps/modulestore_migrator/tests/test_tasks.py
@@ -5,6 +5,7 @@
 from unittest.mock import Mock
 import ddt
 from django.utils import timezone
+from django.utils.text import slugify
 from lxml import etree
 from opaque_keys.edx.keys import CourseKey
 from opaque_keys.edx.locator import LibraryLocator, LibraryLocatorV2
@@ -26,9 +27,8 @@
     _migrate_component,
     _migrate_container,
     _migrate_node,
-    _slugify_source_usage_key,
     _MigratedNode,
-    MigrationContext,
+    _MigrationContext,
     _MigrationTask,
     migrate_from_modulestore,
     MigrationStep,
@@ -76,38 +76,17 @@ def _get_task_status_fail_message(self, status):
             return UserTaskArtifact.objects.get(status=status, name="Error").text
         return None
 
-    def test_slugify_source_usage_key_course(self):
-        """
-        Test _slugify_source_usage_key with course usage key
-        """
-        course_key = CourseKey.from_string("course-v1:TestOrg+TestCourse+TestRun")
-        usage_key = course_key.make_usage_key("problem", "test_problem")
-
-        result = _slugify_source_usage_key(usage_key, "test_problem")
-
-        self.assertEqual(result, "test_problem")
-
-    def test_slugify_source_usage_key_library(self):
-        """
-        Test _slugify_source_usage_key with library usage key
-        """
-        library_key = LibraryLocator(org="TestOrg", library="TestLibrary")
-        usage_key = library_key.make_usage_key("problem", "test_problem")
-
-        result = _slugify_source_usage_key(usage_key, "test_problem")
-
-        self.assertEqual(result, "test_problem")
-
     def test_migrate_node_wiki_tag(self):
         """
         Test _migrate_node ignores wiki tags
         """
         wiki_node = etree.fromstring("<wiki />")
-        context = MigrationContext(
+        context = _MigrationContext(
             existing_source_to_target_keys={},
             target_package_id=self.learning_package.id,
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
+            content_by_filename={},
             composition_level=CompositionLevel.Unit,
             repeat_handling_strategy=RepeatHandlingStrategy.Skip,
             preserve_url_slugs=True,
@@ -117,7 +96,6 @@ def test_migrate_node_wiki_tag(self):
 
         result = _migrate_node(
             context=context,
-            content_by_filename={},
             source_node=wiki_node,
         )
 
@@ -133,11 +111,12 @@ def test_migrate_node_course_root(self):
             '<chapter url_name="chapter1" display_name="Chapter 1" />'
             "</course>"
         )
-        context = MigrationContext(
+        context = _MigrationContext(
             existing_source_to_target_keys={},
             target_package_id=self.learning_package.id,
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
+            content_by_filename={},
             composition_level=CompositionLevel.Unit,
             repeat_handling_strategy=RepeatHandlingStrategy.Skip,
             preserve_url_slugs=True,
@@ -147,7 +126,6 @@ def test_migrate_node_course_root(self):
 
         result = _migrate_node(
             context=context,
-            content_by_filename={},
             source_node=course_node,
         )
 
@@ -165,11 +143,12 @@ def test_migrate_node_library_root(self):
             '<problem url_name="problem1" display_name="Problem 1" />'
             "</library>"
         )
-        context = MigrationContext(
+        context = _MigrationContext(
             existing_source_to_target_keys={},
             target_package_id=self.learning_package.id,
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
+            content_by_filename={},
             composition_level=CompositionLevel.Unit,
             repeat_handling_strategy=RepeatHandlingStrategy.Skip,
             preserve_url_slugs=True,
@@ -178,7 +157,6 @@ def test_migrate_node_library_root(self):
         )
         result = _migrate_node(
             context=context,
-            content_by_filename={},
             source_node=library_node,
         )
 
@@ -205,11 +183,12 @@ def test_migrate_node_container_composition_level(
         container_node = etree.fromstring(
             f'<{tag_name} url_name="test_{tag_name}" display_name="Test {tag_name.title()}" />'
         )
-        context = MigrationContext(
+        context = _MigrationContext(
             existing_source_to_target_keys={},
             target_package_id=self.learning_package.id,
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
+            content_by_filename={},
             composition_level=composition_level,
             repeat_handling_strategy=RepeatHandlingStrategy.Skip,
             preserve_url_slugs=True,
@@ -219,7 +198,6 @@ def test_migrate_node_container_composition_level(
 
         result = _migrate_node(
             context=context,
-            content_by_filename={},
             source_node=container_node,
         )
 
@@ -238,11 +216,12 @@ def test_migrate_node_without_url_name(self):
         node_without_url_name = etree.fromstring(
             '<problem display_name="No URL Name" />'
         )
-        context = MigrationContext(
+        context = _MigrationContext(
             existing_source_to_target_keys={},
             target_package_id=self.learning_package.id,
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
+            content_by_filename={},
             composition_level=CompositionLevel.Unit,
             repeat_handling_strategy=RepeatHandlingStrategy.Skip,
             preserve_url_slugs=True,
@@ -252,7 +231,6 @@ def test_migrate_node_without_url_name(self):
 
         result = _migrate_node(
             context=context,
-            content_by_filename={},
             source_node=node_without_url_name,
         )
 
@@ -372,11 +350,12 @@ def test_migrate_component_success(self):
         """
         source_key = self.course.id.make_usage_key("problem", "test_problem")
         olx = '<problem display_name="Test Problem"><multiplechoiceresponse></multiplechoiceresponse></problem>'
-        context = MigrationContext(
+        context = _MigrationContext(
             existing_source_to_target_keys={},
             target_package_id=self.learning_package.id,
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
+            content_by_filename={},
             composition_level=CompositionLevel.Unit,
             repeat_handling_strategy=RepeatHandlingStrategy.Skip,
             preserve_url_slugs=True,
@@ -386,7 +365,6 @@ def test_migrate_component_success(self):
 
         result = _migrate_component(
             context=context,
-            content_by_filename={},
             source_key=source_key,
             olx=olx,
         )
@@ -412,11 +390,13 @@ def test_migrate_component_with_static_content(self):
             data=b"fake_image_data",
             created=timezone.now(),
         )
-        context = MigrationContext(
+        content_by_filename = {"test_image.png": test_content.id}
+        context = _MigrationContext(
             existing_source_to_target_keys={},
             target_package_id=self.learning_package.id,
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
+            content_by_filename=content_by_filename,
             composition_level=CompositionLevel.Unit,
             repeat_handling_strategy=RepeatHandlingStrategy.Skip,
             preserve_url_slugs=True,
@@ -424,11 +404,9 @@ def test_migrate_component_with_static_content(self):
             created_by=self.user.id,
         )
 
-        content_by_filename = {"test_image.png": test_content.id}
 
         result = _migrate_component(
             context=context,
-            content_by_filename=content_by_filename,
             source_key=source_key,
             olx=olx,
         )
@@ -447,11 +425,12 @@ def test_migrate_component_replace_existing_false(self):
         """
         source_key = self.course.id.make_usage_key("problem", "existing_problem")
         olx = '<problem display_name="Test Problem"><multiplechoiceresponse></multiplechoiceresponse></problem>'
-        context = MigrationContext(
+        context = _MigrationContext(
             existing_source_to_target_keys={},
             target_package_id=self.learning_package.id,
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
+            content_by_filename={},
             composition_level=CompositionLevel.Unit,
             repeat_handling_strategy=RepeatHandlingStrategy.Skip,
             preserve_url_slugs=True,
@@ -461,7 +440,6 @@ def test_migrate_component_replace_existing_false(self):
 
         first_result = _migrate_component(
             context=context,
-            content_by_filename={},
             source_key=source_key,
             olx=olx,
         )
@@ -470,7 +448,6 @@ def test_migrate_component_replace_existing_false(self):
 
         second_result = _migrate_component(
             context=context,
-            content_by_filename={},
             source_key=source_key,
             olx='<problem display_name="Updated Problem"><multiplechoiceresponse></multiplechoiceresponse></problem>',
         )
@@ -488,11 +465,12 @@ def test_migrate_component_same_title(self):
         source_key_1 = self.course.id.make_usage_key("problem", "existing_problem_1")
         source_key_2 = self.course.id.make_usage_key("problem", "existing_problem_2")
         olx = '<problem display_name="Test Problem"><multiplechoiceresponse></multiplechoiceresponse></problem>'
-        context = MigrationContext(
+        context = _MigrationContext(
             existing_source_to_target_keys={},
             target_package_id=self.learning_package.id,
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
+            content_by_filename={},
             composition_level=CompositionLevel.Unit,
             repeat_handling_strategy=RepeatHandlingStrategy.Skip,
             preserve_url_slugs=False,
@@ -502,7 +480,6 @@ def test_migrate_component_same_title(self):
 
         first_result = _migrate_component(
             context=context,
-            content_by_filename={},
             source_key=source_key_1,
             olx=olx,
         )
@@ -511,7 +488,6 @@ def test_migrate_component_same_title(self):
 
         second_result = _migrate_component(
             context=context,
-            content_by_filename={},
             source_key=source_key_2,
             olx=olx,
         )
@@ -525,11 +501,12 @@ def test_migrate_component_replace_existing_true(self):
         """
         source_key = self.course.id.make_usage_key("problem", "replaceable_problem")
         original_olx = '<problem display_name="Original"><multiplechoiceresponse></multiplechoiceresponse></problem>'
-        context = MigrationContext(
+        context = _MigrationContext(
             existing_source_to_target_keys={},
             target_package_id=self.learning_package.id,
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
+            content_by_filename={},
             composition_level=CompositionLevel.Unit,
             repeat_handling_strategy=RepeatHandlingStrategy.Update,
             preserve_url_slugs=True,
@@ -539,7 +516,6 @@ def test_migrate_component_replace_existing_true(self):
 
         first_result = _migrate_component(
             context=context,
-            content_by_filename={},
             source_key=source_key,
             olx=original_olx,
         )
@@ -549,7 +525,6 @@ def test_migrate_component_replace_existing_true(self):
         updated_olx = '<problem display_name="Updated"><multiplechoiceresponse></multiplechoiceresponse></problem>'
         second_result = _migrate_component(
             context=context,
-            content_by_filename={},
             source_key=source_key,
             olx=updated_olx,
         )
@@ -566,11 +541,12 @@ def test_migrate_component_different_block_types(self):
         for block_type in block_types:
             source_key = self.course.id.make_usage_key(block_type, f"test_{block_type}")
             olx = f'<{block_type} display_name="Test {block_type.title()}"></{block_type}>'
-            context = MigrationContext(
+            context = _MigrationContext(
                 existing_source_to_target_keys={},
                 target_package_id=self.learning_package.id,
                 target_library_key=self.library.library_key,
                 source_context_key=self.course.id,
+                content_by_filename={},
                 composition_level=CompositionLevel.Unit,
                 repeat_handling_strategy=RepeatHandlingStrategy.Skip,
                 preserve_url_slugs=True,
@@ -580,7 +556,6 @@ def test_migrate_component_different_block_types(self):
 
             result = _migrate_component(
                 context=context,
-                content_by_filename={},
                 source_key=source_key,
                 olx=olx,
             )
@@ -618,11 +593,12 @@ def test_migrate_component_content_filename_not_in_olx(self):
             "referenced.png": referenced_content.id,
             "unreferenced.png": unreferenced_content.id,
         }
-        context = MigrationContext(
+        context = _MigrationContext(
             existing_source_to_target_keys={},
             target_package_id=self.learning_package.id,
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
+            content_by_filename=content_by_filename,
             composition_level=CompositionLevel.Unit,
             repeat_handling_strategy=RepeatHandlingStrategy.Skip,
             preserve_url_slugs=True,
@@ -632,7 +608,6 @@ def test_migrate_component_content_filename_not_in_olx(self):
 
         result = _migrate_component(
             context=context,
-            content_by_filename=content_by_filename,
             source_key=source_key,
             olx=olx,
         )
@@ -660,11 +635,12 @@ def test_migrate_component_library_source_key(self):
         library_key = LibraryLocator(org="TestOrg", library="TestLibrary")
         source_key = library_key.make_usage_key("problem", "library_problem")
         olx = '<problem display_name="Library Problem"><multiplechoiceresponse></multiplechoiceresponse></problem>'
-        context = MigrationContext(
+        context = _MigrationContext(
             existing_source_to_target_keys={},
             target_package_id=self.learning_package.id,
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
+            content_by_filename={},
             composition_level=CompositionLevel.Unit,
             repeat_handling_strategy=RepeatHandlingStrategy.Skip,
             preserve_url_slugs=True,
@@ -674,7 +650,6 @@ def test_migrate_component_library_source_key(self):
 
         result = _migrate_component(
             context=context,
-            content_by_filename={},
             source_key=source_key,
             olx=olx,
         )
@@ -702,11 +677,12 @@ def test_migrate_component_duplicate_content_integrity_error(self):
             created=timezone.now(),
         )
         content_by_filename = {"duplicate.png": test_content.id}
-        context = MigrationContext(
+        context = _MigrationContext(
             existing_source_to_target_keys={},
             target_package_id=self.learning_package.id,
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
+            content_by_filename=content_by_filename,
             composition_level=CompositionLevel.Unit,
             repeat_handling_strategy=RepeatHandlingStrategy.Update,
             preserve_url_slugs=True,
@@ -716,7 +692,6 @@ def test_migrate_component_duplicate_content_integrity_error(self):
 
         first_result = _migrate_component(
             context=context,
-            content_by_filename=content_by_filename,
             source_key=source_key,
             olx=olx,
         )
@@ -725,7 +700,6 @@ def test_migrate_component_duplicate_content_integrity_error(self):
 
         second_result = _migrate_component(
             context=context,
-            content_by_filename=content_by_filename,
             source_key=source_key,
             olx=olx,
         )
@@ -776,11 +750,12 @@ def test_migrate_container_creates_new_container(self):
             child_version_1.publishable_entity_version,
             child_version_2.publishable_entity_version,
         ]
-        context = MigrationContext(
+        context = _MigrationContext(
             existing_source_to_target_keys={},
             target_package_id=self.learning_package.id,
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
+            content_by_filename={},
             composition_level=CompositionLevel.Unit,
             repeat_handling_strategy=RepeatHandlingStrategy.Skip,
             preserve_url_slugs=True,
@@ -817,11 +792,12 @@ def test_migrate_container_different_container_types(self):
             (lib_api.ContainerType.Subsection, "sequential"),
             (lib_api.ContainerType.Section, "chapter"),
         ]
-        context = MigrationContext(
+        context = _MigrationContext(
             existing_source_to_target_keys={},
             target_package_id=self.learning_package.id,
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
+            content_by_filename={},
             composition_level=CompositionLevel.Unit,
             repeat_handling_strategy=RepeatHandlingStrategy.Skip,
             preserve_url_slugs=True,
@@ -853,11 +829,12 @@ def test_migrate_container_replace_existing_false(self):
         Test _migrate_container returns existing container when replace_existing=False
         """
         source_key = self.course.id.make_usage_key("vertical", "existing_vertical")
-        context = MigrationContext(
+        context = _MigrationContext(
             existing_source_to_target_keys={},
             target_package_id=self.learning_package.id,
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
+            content_by_filename={},
             composition_level=CompositionLevel.Unit,
             repeat_handling_strategy=RepeatHandlingStrategy.Skip,
             preserve_url_slugs=True,
@@ -898,11 +875,12 @@ def test_migrate_container_same_title(self):
         """
         source_key_1 = self.course.id.make_usage_key("vertical", "human_readable_vertical_1")
         source_key_2 = self.course.id.make_usage_key("vertical", "human_readable_vertical_2")
-        context = MigrationContext(
+        context = _MigrationContext(
             existing_source_to_target_keys={},
             target_package_id=self.learning_package.id,
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
+            content_by_filename={},
             composition_level=CompositionLevel.Unit,
             repeat_handling_strategy=RepeatHandlingStrategy.Skip,
             preserve_url_slugs=False,
@@ -957,11 +935,12 @@ def test_migrate_container_replace_existing_true(self):
             created=timezone.now(),
             created_by=self.user.id,
         )
-        context = MigrationContext(
+        context = _MigrationContext(
             existing_source_to_target_keys={},
             target_package_id=self.learning_package.id,
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
+            content_by_filename={},
             composition_level=CompositionLevel.Unit,
             repeat_handling_strategy=RepeatHandlingStrategy.Update,
             preserve_url_slugs=True,
@@ -1000,11 +979,12 @@ def test_migrate_container_with_library_source_key(self):
         """
         library_key = LibraryLocator(org="TestOrg", library="TestLibrary")
         source_key = library_key.make_usage_key("vertical", "library_vertical")
-        context = MigrationContext(
+        context = _MigrationContext(
             existing_source_to_target_keys={},
             target_package_id=self.learning_package.id,
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
+            content_by_filename={},
             composition_level=CompositionLevel.Unit,
             repeat_handling_strategy=RepeatHandlingStrategy.Skip,
             preserve_url_slugs=True,
@@ -1030,11 +1010,12 @@ def test_migrate_container_empty_children_list(self):
         Test _migrate_container handles empty children list
         """
         source_key = self.course.id.make_usage_key("vertical", "empty_vertical")
-        context = MigrationContext(
+        context = _MigrationContext(
             existing_source_to_target_keys={},
             target_package_id=self.learning_package.id,
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
+            content_by_filename={},
             composition_level=CompositionLevel.Unit,
             repeat_handling_strategy=RepeatHandlingStrategy.Skip,
             preserve_url_slugs=True,
@@ -1060,11 +1041,12 @@ def test_migrate_container_preserves_child_order(self):
         Test _migrate_container preserves the order of children
         """
         source_key = self.course.id.make_usage_key("vertical", "ordered_vertical")
-        context = MigrationContext(
+        context = _MigrationContext(
             existing_source_to_target_keys={},
             target_package_id=self.learning_package.id,
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
+            content_by_filename={},
             composition_level=CompositionLevel.Unit,
             repeat_handling_strategy=RepeatHandlingStrategy.Skip,
             preserve_url_slugs=True,
@@ -1166,11 +1148,12 @@ def test_migrate_container_with_mixed_child_types(self):
             html_version.publishable_entity_version,
             video_version.publishable_entity_version,
         ]
-        context = MigrationContext(
+        context = _MigrationContext(
             existing_source_to_target_keys={},
             target_package_id=self.learning_package.id,
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
+            content_by_filename={},
             composition_level=CompositionLevel.Unit,
             repeat_handling_strategy=RepeatHandlingStrategy.Skip,
             preserve_url_slugs=True,
@@ -1204,11 +1187,12 @@ def test_migrate_container_generates_correct_target_key(self):
         Test _migrate_container generates correct target key from source key
         """
         course_source_key = self.course.id.make_usage_key("vertical", "test_vertical")
-        context = MigrationContext(
+        context = _MigrationContext(
             existing_source_to_target_keys={},
             target_package_id=self.learning_package.id,
             target_library_key=self.library.library_key,
             source_context_key=self.course.id,
+            content_by_filename={},
             composition_level=CompositionLevel.Unit,
             repeat_handling_strategy=RepeatHandlingStrategy.Skip,
             preserve_url_slugs=True,

From 2189b4cd5691672ed5c323108d737e0031724aa3 Mon Sep 17 00:00:00 2001
From: Maksim Sokolskiy <maksim.sokolskiy@raccoongang.com>
Date: Tue, 2 Sep 2025 19:49:15 +0300
Subject: [PATCH 32/40] refactor: remove _create_migration_artifacts_in_bulk

---
 cms/djangoapps/modulestore_migrator/tasks.py | 80 --------------------
 1 file changed, 80 deletions(-)

diff --git a/cms/djangoapps/modulestore_migrator/tasks.py b/cms/djangoapps/modulestore_migrator/tasks.py
index e141611b6b35..be95d4d82c0c 100644
--- a/cms/djangoapps/modulestore_migrator/tasks.py
+++ b/cms/djangoapps/modulestore_migrator/tasks.py
@@ -327,11 +327,6 @@ def migrate_from_modulestore(
             ).values_list('target_id', flat=True)
         )
         if block_target_pks:
-            # @@TODO: Investigate an issue with huge
-            # time consumption during this step
-            # For existing and deleted blocks this step takes
-            # up to 110 seconds
-            # For new blocks this step takes up to 3 seconds
             authoring_api.add_to_collection(
                 learning_package_id=target_package_pk,
                 key=target_collection.key,
@@ -744,81 +739,6 @@ def _get_title_from_olx(olx_str: str) -> str | None:
         log.warning(f"Unexpected error during title extraction: {e}")
 
 
-# Not used for now since it causes issues with
-# adding to Collections
-# Required for additional investigation
-def _create_migration_artifacts_in_bulk(
-    root_migrated_node: _MigratedNode,
-    source: ModulestoreSource,
-    migration: ModulestoreMigration,
-    status: UserTaskStatus
-) -> None:
-    """
-    Create ModulestoreBlockSource and ModulestoreBlockMigration objects in bulk.
-    """
-    nodes = tuple(root_migrated_node.all_source_to_target_pairs())
-    total_nodes = len(nodes)
-
-    # Prepare data for bulk operations
-    block_sources_to_create = []
-    block_migrations_to_create = []
-    existing_block_sources = {}
-
-    # Get existing block sources to avoid duplicates
-    existing_sources = ModulestoreBlockSource.objects.filter(
-        overall_source=source,
-        key__in=[source_usage_key for source_usage_key, _ in nodes]
-    ).values('key', 'id')
-
-    existing_block_sources = {source['key']: source['id'] for source in existing_sources}
-
-    # Prepare block sources for creation (only new ones)
-    for source_usage_key, target_version in nodes:
-        if source_usage_key not in existing_block_sources:
-            block_sources_to_create.append(
-                ModulestoreBlockSource(
-                    overall_source=source,
-                    key=source_usage_key
-                )
-            )
-
-    # Bulk create new block sources
-    if block_sources_to_create:
-        created_sources = ModulestoreBlockSource.objects.bulk_create(
-            block_sources_to_create,
-            ignore_conflicts=True  # Handle race conditions
-        )
-
-        # Update existing_block_sources with newly created ones
-        for created_source in created_sources:
-            existing_block_sources[created_source.key] = created_source.id
-
-    # If we still don't have all sources (due to ignore_conflicts), fetch them again
-    if len(existing_block_sources) < total_nodes:
-        all_sources = ModulestoreBlockSource.objects.filter(
-            overall_source=source,
-            key__in=[source_usage_key for source_usage_key, _ in nodes]
-        ).values('key', 'id')
-        existing_block_sources = {source['key']: source['id'] for source in all_sources}
-
-    # Prepare block migrations for bulk creation
-    for source_usage_key, target_version in nodes:
-        block_source_id = existing_block_sources[source_usage_key]
-        block_migrations_to_create.append(
-            ModulestoreBlockMigration(
-                overall_migration=migration,
-                source_id=block_source_id,
-                target_id=target_version.entity_id,
-            )
-        )
-
-    # Bulk create block migrations
-    ModulestoreBlockMigration.objects.bulk_create(
-        block_migrations_to_create,
-        ignore_conflicts=True  # Handle potential duplicates
-    )
-
-
 def _create_migration_artifacts_incrementally(
     root_migrated_node: _MigratedNode,
     source: ModulestoreSource,

From b3300c9c73c6bc2d0ad51b52459215d378ff0098 Mon Sep 17 00:00:00 2001
From: Maksim Sokolskiy <maksim.sokolskiy@raccoongang.com>
Date: Tue, 2 Sep 2025 21:40:14 +0300
Subject: [PATCH 33/40] fix: imports after rebase

---
 .../content_libraries/api/container_metadata.py     | 13 ++++++++++++-
 .../djangoapps/content_libraries/api/containers.py  |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/openedx/core/djangoapps/content_libraries/api/container_metadata.py b/openedx/core/djangoapps/content_libraries/api/container_metadata.py
index 6a73ea699b78..53726ca49d45 100644
--- a/openedx/core/djangoapps/content_libraries/api/container_metadata.py
+++ b/openedx/core/djangoapps/content_libraries/api/container_metadata.py
@@ -9,7 +9,18 @@
 
 from opaque_keys.edx.locator import LibraryContainerLocator, LibraryLocatorV2, LibraryUsageLocatorV2
 from openedx_learning.api import authoring as authoring_api
-from openedx_learning.api.authoring_models import Container, Component, PublishableEntity
+from openedx_learning.api.authoring_models import (
+    Component,
+    Container,
+    ContainerVersion,
+    Unit,
+    UnitVersion,
+    Subsection,
+    SubsectionVersion,
+    Section,
+    SectionVersion,
+    PublishableEntity,
+)
 
 from openedx.core.djangoapps.content_tagging.api import get_object_tag_counts
 from openedx.core.djangoapps.xblock.api import get_component_from_usage_key
diff --git a/openedx/core/djangoapps/content_libraries/api/containers.py b/openedx/core/djangoapps/content_libraries/api/containers.py
index 0a4be2f912c8..28f05a05723a 100644
--- a/openedx/core/djangoapps/content_libraries/api/containers.py
+++ b/openedx/core/djangoapps/content_libraries/api/containers.py
@@ -23,7 +23,7 @@
     LIBRARY_CONTAINER_UPDATED,
 )
 from openedx_learning.api import authoring as authoring_api
-from openedx_learning.api.authoring_models import Container, ContainerVersion
+from openedx_learning.api.authoring_models import Container, ContainerVersion, Component
 from openedx.core.djangoapps.content_libraries.api.collections import library_collection_locator
 
 from openedx.core.djangoapps.xblock.api import get_component_from_usage_key

From cd35bfe1d70305202a6821738f740eb4143ee8a2 Mon Sep 17 00:00:00 2001
From: Maksim Sokolskiy <maksim.sokolskiy@raccoongang.com>
Date: Tue, 2 Sep 2025 23:07:12 +0300
Subject: [PATCH 34/40] style: improve code style quality

---
 cms/djangoapps/modulestore_migrator/tasks.py  |  4 +++-
 .../modulestore_migrator/tests/test_tasks.py  | 20 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/cms/djangoapps/modulestore_migrator/tasks.py b/cms/djangoapps/modulestore_migrator/tasks.py
index be95d4d82c0c..dbb9502836a9 100644
--- a/cms/djangoapps/modulestore_migrator/tasks.py
+++ b/cms/djangoapps/modulestore_migrator/tasks.py
@@ -267,7 +267,8 @@ def migrate_from_modulestore(
     # PublishableEntities during the migration process for a given LearningPackage.
     existing_source_to_target_keys = {
         block.source.key: block.target for block in ModulestoreBlockMigration.objects.filter(
-        overall_migration__target=migration.target.id)
+            overall_migration__target=migration.target.id
+        )
     }
 
     migration_context = _MigrationContext(
@@ -618,6 +619,7 @@ def _get_distinct_target_container_key(
         unique_slug
     )
 
+
 def _get_distinct_target_usage_key(
     context: _MigrationContext,
     source_key: UsageKey,
diff --git a/cms/djangoapps/modulestore_migrator/tests/test_tasks.py b/cms/djangoapps/modulestore_migrator/tests/test_tasks.py
index 8c43c0f6899b..6b219c088ef7 100644
--- a/cms/djangoapps/modulestore_migrator/tests/test_tasks.py
+++ b/cms/djangoapps/modulestore_migrator/tests/test_tasks.py
@@ -275,7 +275,7 @@ def test_migrate_from_modulestore_invalid_source(self):
                 "source_pk": 999999,  # Non-existent source
                 "target_package_pk": self.learning_package.id,
                 "target_collection_pk": self.collection.id,
-                "repeat_handling_strategy" : RepeatHandlingStrategy.Skip.value,
+                "repeat_handling_strategy": RepeatHandlingStrategy.Skip.value,
                 "preserve_url_slugs": True,
                 "composition_level": CompositionLevel.Unit.value,
                 "forward_source_to_target": False,
@@ -300,7 +300,7 @@ def test_migrate_from_modulestore_invalid_target_package(self):
                 "source_pk": source.id,
                 "target_package_pk": 999999,  # Non-existent package
                 "target_collection_pk": self.collection.id,
-                "repeat_handling_strategy" : RepeatHandlingStrategy.Skip.value,
+                "repeat_handling_strategy": RepeatHandlingStrategy.Skip.value,
                 "preserve_url_slugs": True,
                 "composition_level": CompositionLevel.Unit.value,
                 "forward_source_to_target": False,
@@ -325,7 +325,7 @@ def test_migrate_from_modulestore_invalid_collection(self):
                 "source_pk": source.id,
                 "target_package_pk": self.learning_package.id,
                 "target_collection_pk": 999999,  # Non-existent collection
-                "repeat_handling_strategy" : RepeatHandlingStrategy.Skip.value,
+                "repeat_handling_strategy": RepeatHandlingStrategy.Skip.value,
                 "preserve_url_slugs": True,
                 "composition_level": CompositionLevel.Unit.value,
                 "forward_source_to_target": False,
@@ -403,8 +403,6 @@ def test_migrate_component_with_static_content(self):
             created_at=timezone.now(),
             created_by=self.user.id,
         )
-
-
         result = _migrate_component(
             context=context,
             source_key=source_key,
@@ -909,7 +907,7 @@ def test_migrate_container_same_title(self):
         self.assertNotEqual(first_result.entity_id, second_result.entity_id)
         self.assertNotEqual(first_result.entity.key, second_result.entity.key)
         # Make sure the current logic from tasts::_find_unique_slug is used
-        self.assertEqual(second_result.entity.key, first_result.entity.key+"_1")
+        self.assertEqual(second_result.entity.key, first_result.entity.key + "_1")
 
         container_version = second_result.containerversion
         self.assertEqual(container_version.title, "Original Human Readable Title")
@@ -1236,7 +1234,7 @@ def test_migrate_from_modulestore_success_course(self):
                 "source_pk": source.id,
                 "target_package_pk": self.learning_package.id,
                 "target_collection_pk": self.collection.id,
-                "repeat_handling_strategy" : RepeatHandlingStrategy.Skip.value,
+                "repeat_handling_strategy": RepeatHandlingStrategy.Skip.value,
                 "preserve_url_slugs": True,
                 "composition_level": CompositionLevel.Unit.value,
                 "forward_source_to_target": False,
@@ -1296,7 +1294,7 @@ def test_migrate_from_modulestore_invalid_source_key_type(self):
                 "source_pk": source.id,
                 "target_package_pk": self.learning_package.id,
                 "target_collection_pk": self.collection.id,
-                "repeat_handling_strategy" : RepeatHandlingStrategy.Skip.value,
+                "repeat_handling_strategy": RepeatHandlingStrategy.Skip.value,
                 "preserve_url_slugs": True,
                 "composition_level": CompositionLevel.Unit.value,
                 "forward_source_to_target": False,
@@ -1325,7 +1323,7 @@ def test_migrate_from_modulestore_nonexistent_modulestore_item(self):
                 "source_pk": source.id,
                 "target_package_pk": self.learning_package.id,
                 "target_collection_pk": self.collection.id,
-                "repeat_handling_strategy" : RepeatHandlingStrategy.Skip.value,
+                "repeat_handling_strategy": RepeatHandlingStrategy.Skip.value,
                 "preserve_url_slugs": True,
                 "composition_level": CompositionLevel.Unit.value,
                 "forward_source_to_target": False,
@@ -1380,7 +1378,7 @@ def test_migrate_from_modulestore_multiple_users_no_interference(self):
                 "source_pk": source.id,
                 "target_package_pk": self.learning_package.id,
                 "target_collection_pk": self.collection.id,
-                "repeat_handling_strategy" : RepeatHandlingStrategy.Skip.value,
+                "repeat_handling_strategy": RepeatHandlingStrategy.Skip.value,
                 "preserve_url_slugs": True,
                 "composition_level": CompositionLevel.Unit.value,
                 "forward_source_to_target": False,
@@ -1393,7 +1391,7 @@ def test_migrate_from_modulestore_multiple_users_no_interference(self):
                 "source_pk": source.id,
                 "target_package_pk": self.learning_package.id,
                 "target_collection_pk": self.collection.id,
-                "repeat_handling_strategy" : RepeatHandlingStrategy.Skip.value,
+                "repeat_handling_strategy": RepeatHandlingStrategy.Skip.value,
                 "preserve_url_slugs": True,
                 "composition_level": CompositionLevel.Unit.value,
                 "forward_source_to_target": False,

From f04df27a1d2d43a6d83aa0e979ffc380892d7e1e Mon Sep 17 00:00:00 2001
From: Maksim Sokolskiy <maksim.sokolskiy@raccoongang.com>
Date: Wed, 3 Sep 2025 16:14:46 +0300
Subject: [PATCH 35/40] feat: add source_version field for ModulestoreMigration
 model

Changes:
- update initial migration
- update tests
---
 .../modulestore_migrator/migrations/0001_initial.py       | 7 ++++---
 cms/djangoapps/modulestore_migrator/models.py             | 6 ++++++
 cms/djangoapps/modulestore_migrator/tasks.py              | 8 ++++++++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/cms/djangoapps/modulestore_migrator/migrations/0001_initial.py b/cms/djangoapps/modulestore_migrator/migrations/0001_initial.py
index 3a74ac85d10c..b92bccd072fe 100644
--- a/cms/djangoapps/modulestore_migrator/migrations/0001_initial.py
+++ b/cms/djangoapps/modulestore_migrator/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.22 on 2025-08-21 14:17
+# Generated by Django 4.2.23 on 2025-09-04 13:02
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -12,10 +12,10 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('oel_collections', '0005_alter_collection_options_alter_collection_enabled'),
-        ('user_tasks', '0004_url_textfield'),
         ('content_staging', '0006_alter_userclipboard_source_usage_key'),
         ('oel_publishing', '0008_alter_draftchangelogrecord_options_and_more'),
+        ('user_tasks', '0004_url_textfield'),
+        ('oel_collections', '0005_alter_collection_options_alter_collection_enabled'),
     ]
 
     operations = [
@@ -32,6 +32,7 @@ class Migration(migrations.Migration):
             name='ModulestoreMigration',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('source_version', models.CharField(blank=True, help_text='Migrated content version, the hash of published content version', max_length=255, null=True)),
                 ('composition_level', models.CharField(choices=[('component', 'Component'), ('unit', 'Unit'), ('subsection', 'Subsection'), ('section', 'Section')], default='component', help_text='Maximum hierachy level at which content should be aggregated in target library', max_length=255)),
                 ('repeat_handling_strategy', models.CharField(choices=[('skip', 'Skip'), ('fork', 'Fork'), ('update', 'Update')], default='skip', help_text='If a piece of content already exists in the content library, choose how to handle it.', max_length=24)),
                 ('preserve_url_slugs', models.BooleanField(default=True, help_text='If imported blocks have hashed slugs - do we want to preserve it?')),
diff --git a/cms/djangoapps/modulestore_migrator/models.py b/cms/djangoapps/modulestore_migrator/models.py
index b63dffc112b5..b758881744c4 100644
--- a/cms/djangoapps/modulestore_migrator/models.py
+++ b/cms/djangoapps/modulestore_migrator/models.py
@@ -66,6 +66,12 @@ class ModulestoreMigration(models.Model):
         on_delete=models.CASCADE,
         related_name="migrations",
     )
+    source_version = models.CharField(
+        max_length=255,
+        blank=True,
+        null=True,
+        help_text=_('Migrated content version, the hash of published content version'),
+    )
     composition_level = models.CharField(
         max_length=255,
         choices=CompositionLevel.supported_choices(),
diff --git a/cms/djangoapps/modulestore_migrator/tasks.py b/cms/djangoapps/modulestore_migrator/tasks.py
index dbb9502836a9..bc1f1e5a2733 100644
--- a/cms/djangoapps/modulestore_migrator/tasks.py
+++ b/cms/djangoapps/modulestore_migrator/tasks.py
@@ -40,6 +40,7 @@
 from openedx.core.djangoapps.content_staging import api as staging_api
 from xmodule.modulestore import exceptions as modulestore_exceptions
 from xmodule.modulestore.django import modulestore
+from common.djangoapps.split_modulestore_django.models import SplitModulestoreCourseIndex
 
 from .constants import CONTENT_STAGING_PURPOSE_TEMPLATE
 from .data import CompositionLevel, RepeatHandlingStrategy
@@ -165,18 +166,25 @@ def migrate_from_modulestore(
     except ObjectDoesNotExist as exc:
         status.fail(str(exc))
         return
+
+    # The Model is used for Course and Legacy Library
+    course_index = SplitModulestoreCourseIndex.objects.filter(course_id=source.key).first()
     if isinstance(source.key, CourseLocator):
         source_root_usage_key = source.key.make_usage_key('course', 'course')
+        source_version = course_index.published_version if course_index else None
     elif isinstance(source.key, LibraryLocator):
         source_root_usage_key = source.key.make_usage_key('library', 'library')
+        source_version = course_index.library_version if course_index else None
     else:
         status.fail(
             f"Not a valid source context key: {source.key}. "
             "Source key must reference a course or a legacy library."
         )
         return
+
     migration = ModulestoreMigration.objects.create(
         source=source,
+        source_version=source_version,
         composition_level=composition_level,
         repeat_handling_strategy=repeat_handling_strategy,
         preserve_url_slugs=preserve_url_slugs,

From a88c5ff68d7d0c8d4bc63fa0499463dfc123de71 Mon Sep 17 00:00:00 2001
From: Maksim Sokolskiy <maksim.sokolskiy@raccoongang.com>
Date: Thu, 4 Sep 2025 19:15:58 +0300
Subject: [PATCH 36/40] feat: use forward_source_to_target from request data
 for REST API

Other changes:
- clean code
- remote TODOs
---
 cms/djangoapps/modulestore_migrator/api.py    |  2 +-
 .../migrations/0001_initial.py                |  6 +-
 cms/djangoapps/modulestore_migrator/models.py |  5 +-
 .../rest_api/v1/serializers.py                | 22 +++++-
 .../modulestore_migrator/rest_api/v1/urls.py  |  4 +-
 .../modulestore_migrator/rest_api/v1/views.py |  4 +-
 cms/djangoapps/modulestore_migrator/tasks.py  | 76 ++++++-------------
 .../modulestore_migrator/tests/test_tasks.py  | 14 +++-
 db_keyword_overrides.yml                      |  2 +
 9 files changed, 69 insertions(+), 66 deletions(-)

diff --git a/cms/djangoapps/modulestore_migrator/api.py b/cms/djangoapps/modulestore_migrator/api.py
index d921aef4ec60..bee8fefaa878 100644
--- a/cms/djangoapps/modulestore_migrator/api.py
+++ b/cms/djangoapps/modulestore_migrator/api.py
@@ -9,7 +9,7 @@
 from openedx.core.types.user import AuthUser
 
 from . import tasks
-from .data import CompositionLevel, RepeatHandlingStrategy
+from .data import RepeatHandlingStrategy
 from .models import ModulestoreSource
 
 
diff --git a/cms/djangoapps/modulestore_migrator/migrations/0001_initial.py b/cms/djangoapps/modulestore_migrator/migrations/0001_initial.py
index b92bccd072fe..42d1df5bad1b 100644
--- a/cms/djangoapps/modulestore_migrator/migrations/0001_initial.py
+++ b/cms/djangoapps/modulestore_migrator/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.23 on 2025-09-04 13:02
+# Generated by Django 4.2.24 on 2025-09-10 15:14
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -13,9 +13,9 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('content_staging', '0006_alter_userclipboard_source_usage_key'),
+        ('oel_collections', '0005_alter_collection_options_alter_collection_enabled'),
         ('oel_publishing', '0008_alter_draftchangelogrecord_options_and_more'),
         ('user_tasks', '0004_url_textfield'),
-        ('oel_collections', '0005_alter_collection_options_alter_collection_enabled'),
     ]
 
     operations = [
@@ -35,7 +35,7 @@ class Migration(migrations.Migration):
                 ('source_version', models.CharField(blank=True, help_text='Migrated content version, the hash of published content version', max_length=255, null=True)),
                 ('composition_level', models.CharField(choices=[('component', 'Component'), ('unit', 'Unit'), ('subsection', 'Subsection'), ('section', 'Section')], default='component', help_text='Maximum hierachy level at which content should be aggregated in target library', max_length=255)),
                 ('repeat_handling_strategy', models.CharField(choices=[('skip', 'Skip'), ('fork', 'Fork'), ('update', 'Update')], default='skip', help_text='If a piece of content already exists in the content library, choose how to handle it.', max_length=24)),
-                ('preserve_url_slugs', models.BooleanField(default=True, help_text='If imported blocks have hashed slugs - do we want to preserve it?')),
+                ('preserve_url_slugs', models.BooleanField(default=False, help_text='Should the migration preserve the location IDs of the existing blocks?If not, then new, unique human-readable IDs will be generated based on the block titles.')),
                 ('change_log', models.ForeignKey(help_text='Changelog entry in the target learning package which records this migration', null=True, on_delete=django.db.models.deletion.SET_NULL, to='oel_publishing.draftchangelog')),
             ],
         ),
diff --git a/cms/djangoapps/modulestore_migrator/models.py b/cms/djangoapps/modulestore_migrator/models.py
index b758881744c4..05bea5bfe1e9 100644
--- a/cms/djangoapps/modulestore_migrator/models.py
+++ b/cms/djangoapps/modulestore_migrator/models.py
@@ -87,9 +87,10 @@ class ModulestoreMigration(models.Model):
         ),
     )
     preserve_url_slugs = models.BooleanField(
-        default=True,
+        default=False,
         help_text=_(
-            "If imported blocks have hashed slugs - do we want to preserve it?"
+            "Should the migration preserve the location IDs of the existing blocks?"
+            "If not, then new, unique human-readable IDs will be generated based on the block titles."
         ),
     )
     target = models.ForeignKey(
diff --git a/cms/djangoapps/modulestore_migrator/rest_api/v1/serializers.py b/cms/djangoapps/modulestore_migrator/rest_api/v1/serializers.py
index 3937ee8874ed..a973da318b1b 100644
--- a/cms/djangoapps/modulestore_migrator/rest_api/v1/serializers.py
+++ b/cms/djangoapps/modulestore_migrator/rest_api/v1/serializers.py
@@ -17,7 +17,7 @@ class ModulestoreMigrationSerializer(serializers.ModelSerializer):
     Serializer for the course to library import creation API.
     """
 
-    source = serializers.CharField(
+    source = serializers.CharField(  # type: ignore[assignment]
         help_text="The source course or legacy library key to import from.",
         required=True,
     )
@@ -47,6 +47,11 @@ class ModulestoreMigrationSerializer(serializers.ModelSerializer):
         required=False,
         allow_blank=True,
     )
+    forward_source_to_target = serializers.BooleanField(
+        help_text="Forward references of this block source over to the target of this block migration.",
+        required=False,
+        default=False,
+    )
 
     class Meta:
         model = ModulestoreMigration
@@ -57,6 +62,7 @@ class Meta:
             'composition_level',
             'repeat_handling_strategy',
             'preserve_url_slugs',
+            'forward_source_to_target',
         ]
 
     def get_fields(self):
@@ -85,6 +91,20 @@ def validate_target(self, value):
         except InvalidKeyError as exc:
             raise serializers.ValidationError(f"Invalid target library key: {str(exc)}") from exc
 
+    def get_forward_source_to_target(self, obj: ModulestoreMigration):
+        """
+        Check if the source block was forwarded to the target.
+        """
+        return obj.id == obj.source.forwarded_id
+
+    def to_representation(self, instance):
+        """
+        Override to customize the serialized representation."""
+        data = super().to_representation(instance)
+        # Custom logic for forward_source_to_target during serialization
+        data['forward_source_to_target'] = self.get_forward_source_to_target(instance)
+        return data
+
 
 class StatusWithModulestoreMigrationSerializer(StatusSerializer):
     """
diff --git a/cms/djangoapps/modulestore_migrator/rest_api/v1/urls.py b/cms/djangoapps/modulestore_migrator/rest_api/v1/urls.py
index f0b4f9eb0e48..22d509f16910 100644
--- a/cms/djangoapps/modulestore_migrator/rest_api/v1/urls.py
+++ b/cms/djangoapps/modulestore_migrator/rest_api/v1/urls.py
@@ -3,9 +3,9 @@
 """
 
 from rest_framework.routers import SimpleRouter
-from .views import ImportViewSet
+from .views import MigrationViewSet
 
 ROUTER = SimpleRouter()
-ROUTER.register(r'migrations', ImportViewSet)
+ROUTER.register(r'migrations', MigrationViewSet)
 
 urlpatterns = ROUTER.urls
diff --git a/cms/djangoapps/modulestore_migrator/rest_api/v1/views.py b/cms/djangoapps/modulestore_migrator/rest_api/v1/views.py
index 4dfe94eae66d..07ade1925f02 100644
--- a/cms/djangoapps/modulestore_migrator/rest_api/v1/views.py
+++ b/cms/djangoapps/modulestore_migrator/rest_api/v1/views.py
@@ -20,7 +20,7 @@
 log = logging.getLogger(__name__)
 
 
-class ImportViewSet(StatusViewSet):
+class MigrationViewSet(StatusViewSet):
     """
     Import course content from modulestore into a content library.
 
@@ -125,7 +125,7 @@ def create(self, request, *args, **kwargs):
                 composition_level=validated_data['composition_level'],
                 repeat_handling_strategy=validated_data['repeat_handling_strategy'],
                 preserve_url_slugs=validated_data['preserve_url_slugs'],
-                forward_source_to_target=False,  # @@TODO - Set to False for now. Explain this better.
+                forward_source_to_target=validated_data['forward_source_to_target'],
             )
         except NotImplementedError as e:
             log.exception(str(e))
diff --git a/cms/djangoapps/modulestore_migrator/tasks.py b/cms/djangoapps/modulestore_migrator/tasks.py
index bc1f1e5a2733..0dab4d090bf0 100644
--- a/cms/djangoapps/modulestore_migrator/tasks.py
+++ b/cms/djangoapps/modulestore_migrator/tasks.py
@@ -12,7 +12,6 @@
 
 from celery import shared_task
 from celery.utils.log import get_task_logger
-from django.db import IntegrityError
 from django.core.exceptions import ObjectDoesNotExist
 from django.utils.text import slugify
 from edx_django_utils.monitoring import set_code_owner_attribute_from_module
@@ -27,14 +26,14 @@
 from openedx_learning.api.authoring_models import (
     Collection,
     Component,
-    ComponentVersionContent,
+    ComponentType,
     LearningPackage,
     PublishableEntity,
     PublishableEntityVersion,
 )
 from user_tasks.tasks import UserTask, UserTaskStatus
 
-from openedx.core.djangoapps.content_libraries.api import ContainerType, blocks
+from openedx.core.djangoapps.content_libraries.api import ContainerType
 from openedx.core.djangoapps.content_libraries import api as libraries_api
 from openedx.core.djangoapps.content_libraries.models import ContentLibrary
 from openedx.core.djangoapps.content_staging import api as staging_api
@@ -86,7 +85,12 @@ def calculate_total_steps(arguments_dict):
 
 @dataclass(frozen=True)
 class _MigrationContext:
-    existing_source_to_target_keys: dict[UsageKey, PublishableEntity]  # Note: This data is intended to be mutable to reflect changes in the migration process.
+    """
+    Context for the migration process.
+    """
+    existing_source_to_target_keys: dict[  # Note: It's intended to be mutable to reflect changes during migration.
+        UsageKey, PublishableEntity
+    ]
     target_package_id: int
     target_library_key: LibraryLocatorV2
     source_context_key: CourseKey  # Note: This includes legacy LibraryLocators, which are sneakily CourseKeys.
@@ -100,8 +104,8 @@ class _MigrationContext:
     def is_already_migrated(self, source_key: UsageKey) -> bool:
         return source_key in self.existing_source_to_target_keys
 
-    def get_existing_target(self, source_key: UsageKey) -> PublishableEntity | None:
-        return self.existing_source_to_target_keys.get(source_key)
+    def get_existing_target(self, source_key: UsageKey) -> PublishableEntity:
+        return self.existing_source_to_target_keys[source_key]
 
     def add_migration(self, source_key: UsageKey, target: PublishableEntity) -> None:
         """Update the context with a new migration (keeps it current)"""
@@ -375,9 +379,9 @@ def _migrate_node(
     source_node: XmlTree,
 ) -> _MigratedNode:
     """
-    Migrate an OLX node (source_node) from a legacy course or library (source_context_key) to a
-    learning package (context.target_library). If the node is a container, create it in the target if
-    it is at or above the requested composition_level; otherwise, just import its contents.
+    Migrate an OLX node (source_node) from a legacy course or library (context.source_context_key)
+    to a learning package (context.target_library). If the node is a container, create it in the
+    target if it is at or above the requested composition_level; otherwise, just import its contents.
     Recursively apply the same logic to all children.
     """
     # The OLX tag will map to one of the following...
@@ -422,12 +426,13 @@ def _migrate_node(
         source_olx = etree.tostring(source_node).decode('utf-8')
         if source_block_id := source_node.get('url_name'):
             source_key: UsageKey = context.source_context_key.make_usage_key(source_node.tag, source_block_id)
+            title = source_node.get('display_name', source_block_id)
             target_entity_version = (
                 _migrate_container(
                     context=context,
                     source_key=source_key,
                     container_type=container_type,
-                    title=source_node.get('display_name', source_block_id),
+                    title=title,
                     children=[
                         migrated_child.source_to_target[1]
                         for migrated_child in migrated_children if
@@ -439,21 +444,11 @@ def _migrate_node(
                     context=context,
                     source_key=source_key,
                     olx=source_olx,
+                    title=title,
                 )
             )
             if target_entity_version:
                 source_to_target = (source_key, target_entity_version)
-                # Update the existing_source_to_target_keys dictionary with the new mapping
-                #
-                # This step is critical because it ensures we have an up-to-date mapping of source keys
-                # to target entities.
-                #
-                # While we could re-fetch entity versions from the database to guarantee this,
-                # it's currently unnecessary as the required target entities are actually available.
-                #
-                # @@TODO: Implement a stricter enforcement mechanism.
-                # The system should prevent a node from being migrated without an update
-                # to the `existing_source_to_target_keys` dictionary.
                 context.add_migration(source_key, target_entity_version.entity)
         else:
             log.warning(
@@ -526,6 +521,7 @@ def _migrate_component(
     context: _MigrationContext,
     source_key: UsageKey,
     olx: str,
+    title: str,
 ) -> PublishableEntityVersion | None:
     """
     Create, update, or replace a component in a library based on a source key and OLX.
@@ -539,7 +535,7 @@ def _migrate_component(
         context,
         source_key,
         component_type,
-        olx,
+        title,
     )
 
     try:
@@ -631,8 +627,8 @@ def _get_distinct_target_container_key(
 def _get_distinct_target_usage_key(
     context: _MigrationContext,
     source_key: UsageKey,
-    component_type: str,
-    olx: str,
+    component_type: ComponentType,
+    title: str,
 ) -> LibraryUsageLocatorV2:
     """
     Find a unique key for block_id by appending a unique identifier if necessary.
@@ -653,15 +649,7 @@ def _get_distinct_target_usage_key(
     if context.is_already_migrated(source_key):
         log.debug(f"Block {source_key} already exists, reusing existing target")
         existing_target = context.get_existing_target(source_key)
-
-        # Parse the key more safely
-        try:
-            key_parts = existing_target.key.split(":")
-            if len(key_parts) < 2:
-                raise ValueError(f"Invalid key format: {existing_target.key}")
-            block_id = key_parts[-1]
-        except (AttributeError, IndexError) as e:
-            raise ValueError(f"Failed to parse existing key: {existing_target.key}") from e
+        block_id = existing_target.component.local_key
 
         # mypy thinks LibraryUsageLocatorV2 is abstract. It's not.
         return LibraryUsageLocatorV2(  # type: ignore[abstract]
@@ -671,7 +659,6 @@ def _get_distinct_target_usage_key(
         )
 
     # Generate new unique block ID
-    title = _get_title_from_olx(olx) or source_key.block_id
     base_slug = (
         source_key.block_id
         if context.preserve_url_slugs
@@ -690,7 +677,7 @@ def _get_distinct_target_usage_key(
 def _find_unique_slug(
     context: _MigrationContext,
     base_slug: str,
-    component_type: str = "",
+    component_type: ComponentType | None = None,
     max_attempts: int = 1000
 ) -> str:
     """
@@ -730,25 +717,6 @@ def _find_unique_slug(
     raise RuntimeError(f"Unable to find unique slug after {max_attempts} attempts for base: {base_slug}")
 
 
-def _get_title_from_olx(olx_str: str) -> str | None:
-    """
-    Extract the title from an OLX string.
-
-    Args:
-        olx_str: The OLX content string to extract title from
-
-    Returns:
-        The extracted title string
-    """
-    try:
-        olx_node = etree.fromstring(olx_str)
-        return blocks._title_from_olx_node(olx_node)
-    except (etree.XMLSyntaxError, AttributeError, TypeError) as e:
-        log.debug(f"Failed to parse OLX for title extraction: {e}")
-    except Exception as e:
-        log.warning(f"Unexpected error during title extraction: {e}")
-
-
 def _create_migration_artifacts_incrementally(
     root_migrated_node: _MigratedNode,
     source: ModulestoreSource,
diff --git a/cms/djangoapps/modulestore_migrator/tests/test_tasks.py b/cms/djangoapps/modulestore_migrator/tests/test_tasks.py
index 6b219c088ef7..ddca250ccd8e 100644
--- a/cms/djangoapps/modulestore_migrator/tests/test_tasks.py
+++ b/cms/djangoapps/modulestore_migrator/tests/test_tasks.py
@@ -5,7 +5,6 @@
 from unittest.mock import Mock
 import ddt
 from django.utils import timezone
-from django.utils.text import slugify
 from lxml import etree
 from opaque_keys.edx.keys import CourseKey
 from opaque_keys.edx.locator import LibraryLocator, LibraryLocatorV2
@@ -367,6 +366,7 @@ def test_migrate_component_success(self):
             context=context,
             source_key=source_key,
             olx=olx,
+            title="test_problem"
         )
 
         self.assertIsNotNone(result)
@@ -407,6 +407,7 @@ def test_migrate_component_with_static_content(self):
             context=context,
             source_key=source_key,
             olx=olx,
+            title="test_problem"
         )
 
         self.assertIsNotNone(result)
@@ -440,6 +441,7 @@ def test_migrate_component_replace_existing_false(self):
             context=context,
             source_key=source_key,
             olx=olx,
+            title="test_problem"
         )
 
         context.existing_source_to_target_keys[source_key] = first_result.entity
@@ -448,6 +450,7 @@ def test_migrate_component_replace_existing_false(self):
             context=context,
             source_key=source_key,
             olx='<problem display_name="Updated Problem"><multiplechoiceresponse></multiplechoiceresponse></problem>',
+            title="updated_problem"
         )
 
         self.assertEqual(first_result.entity_id, second_result.entity_id)
@@ -480,6 +483,7 @@ def test_migrate_component_same_title(self):
             context=context,
             source_key=source_key_1,
             olx=olx,
+            title="test_problem"
         )
 
         context.existing_source_to_target_keys[source_key_1] = first_result.entity
@@ -488,6 +492,7 @@ def test_migrate_component_same_title(self):
             context=context,
             source_key=source_key_2,
             olx=olx,
+            title="test_problem"
         )
 
         self.assertNotEqual(first_result.entity_id, second_result.entity_id)
@@ -516,6 +521,7 @@ def test_migrate_component_replace_existing_true(self):
             context=context,
             source_key=source_key,
             olx=original_olx,
+            title="original"
         )
 
         context.existing_source_to_target_keys[source_key] = first_result.entity
@@ -525,6 +531,7 @@ def test_migrate_component_replace_existing_true(self):
             context=context,
             source_key=source_key,
             olx=updated_olx,
+            title="updated"
         )
 
         self.assertEqual(first_result.entity_id, second_result.entity_id)
@@ -556,6 +563,7 @@ def test_migrate_component_different_block_types(self):
                 context=context,
                 source_key=source_key,
                 olx=olx,
+                title="test"
             )
 
             self.assertIsNotNone(result, f"Failed to migrate {block_type}")
@@ -608,6 +616,7 @@ def test_migrate_component_content_filename_not_in_olx(self):
             context=context,
             source_key=source_key,
             olx=olx,
+            title="test_problem"
         )
 
         self.assertIsNotNone(result)
@@ -650,6 +659,7 @@ def test_migrate_component_library_source_key(self):
             context=context,
             source_key=source_key,
             olx=olx,
+            title="library_problem"
         )
 
         self.assertIsNotNone(result)
@@ -692,6 +702,7 @@ def test_migrate_component_duplicate_content_integrity_error(self):
             context=context,
             source_key=source_key,
             olx=olx,
+            title="test_problem"
         )
 
         context.existing_source_to_target_keys[source_key] = first_result.entity
@@ -700,6 +711,7 @@ def test_migrate_component_duplicate_content_integrity_error(self):
             context=context,
             source_key=source_key,
             olx=olx,
+            title="test_problem"
         )
 
         self.assertIsNotNone(first_result)
diff --git a/db_keyword_overrides.yml b/db_keyword_overrides.yml
index f2dda1e59337..2932198016c0 100644
--- a/db_keyword_overrides.yml
+++ b/db_keyword_overrides.yml
@@ -27,6 +27,8 @@ MYSQL:
     - UserOrgTag.key
     - UserPreference.key
     - XAPILRSConfiguration.key
+    - ModulestoreSource.key
+    - ModulestoreBlockSource.key
 SNOWFLAKE:
     - CourseOverview.start
     - HistoricalCourseOverview.start

From 642d2b45a9f4498bd013f40258fa80584c0a9450 Mon Sep 17 00:00:00 2001
From: Maksim Sokolskiy <maksim.sokolskiy@raccoongang.com>
Date: Wed, 10 Sep 2025 18:41:09 +0300
Subject: [PATCH 37/40] fix: resolve import linting complains

Get content library directly from learning package.
---
 cms/djangoapps/modulestore_migrator/tasks.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/cms/djangoapps/modulestore_migrator/tasks.py b/cms/djangoapps/modulestore_migrator/tasks.py
index 0dab4d090bf0..6849e3543f03 100644
--- a/cms/djangoapps/modulestore_migrator/tasks.py
+++ b/cms/djangoapps/modulestore_migrator/tasks.py
@@ -35,7 +35,6 @@
 
 from openedx.core.djangoapps.content_libraries.api import ContainerType
 from openedx.core.djangoapps.content_libraries import api as libraries_api
-from openedx.core.djangoapps.content_libraries.models import ContentLibrary
 from openedx.core.djangoapps.content_staging import api as staging_api
 from xmodule.modulestore import exceptions as modulestore_exceptions
 from xmodule.modulestore.django import modulestore
@@ -165,7 +164,7 @@ def migrate_from_modulestore(
     try:
         source = ModulestoreSource.objects.get(pk=source_pk)
         target_package = LearningPackage.objects.get(pk=target_package_pk)
-        target_library = ContentLibrary.objects.get(learning_package_id=target_package_pk)
+        target_library = target_package.contentlibrary
         target_collection = Collection.objects.get(pk=target_collection_pk) if target_collection_pk else None
     except ObjectDoesNotExist as exc:
         status.fail(str(exc))

From f52e171c4be5a149ebc46a7fddaa1b6743643166 Mon Sep 17 00:00:00 2001
From: Maksim Sokolskiy <maksim.sokolskiy@raccoongang.com>
Date: Thu, 11 Sep 2025 23:10:51 +0300
Subject: [PATCH 38/40] refactor: use content_libraries.api.get_library to get
 a library in a task

Added new `target_library_key` arg to pass into migrate_from_modulestore
task to re-construct the target library.
---
 cms/djangoapps/modulestore_migrator/api.py       |  1 +
 cms/djangoapps/modulestore_migrator/tasks.py     | 10 ++++++----
 .../modulestore_migrator/tests/test_tasks.py     | 16 +++++++++++++---
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/cms/djangoapps/modulestore_migrator/api.py b/cms/djangoapps/modulestore_migrator/api.py
index bee8fefaa878..838c86939669 100644
--- a/cms/djangoapps/modulestore_migrator/api.py
+++ b/cms/djangoapps/modulestore_migrator/api.py
@@ -48,6 +48,7 @@ def start_migration_to_library(
         user_id=user.id,
         source_pk=source.id,
         target_package_pk=target_package_id,
+        target_library_key=str(target_library_key),
         target_collection_pk=target_collection_id,
         composition_level=composition_level,
         repeat_handling_strategy=repeat_handling_strategy,
diff --git a/cms/djangoapps/modulestore_migrator/tasks.py b/cms/djangoapps/modulestore_migrator/tasks.py
index 6849e3543f03..806f251d633f 100644
--- a/cms/djangoapps/modulestore_migrator/tasks.py
+++ b/cms/djangoapps/modulestore_migrator/tasks.py
@@ -17,6 +17,7 @@
 from edx_django_utils.monitoring import set_code_owner_attribute_from_module
 from lxml import etree
 from lxml.etree import _ElementTree as XmlTree
+from opaque_keys import InvalidKeyError
 from opaque_keys.edx.keys import CourseKey, UsageKey
 from opaque_keys.edx.locator import (
     CourseLocator, LibraryLocator,
@@ -33,7 +34,7 @@
 )
 from user_tasks.tasks import UserTask, UserTaskStatus
 
-from openedx.core.djangoapps.content_libraries.api import ContainerType
+from openedx.core.djangoapps.content_libraries.api import ContainerType, get_library
 from openedx.core.djangoapps.content_libraries import api as libraries_api
 from openedx.core.djangoapps.content_staging import api as staging_api
 from xmodule.modulestore import exceptions as modulestore_exceptions
@@ -141,6 +142,7 @@ def migrate_from_modulestore(
     user_id: int,
     source_pk: int,
     target_package_pk: int,
+    target_library_key: str,
     target_collection_pk: int,
     repeat_handling_strategy: str,
     preserve_url_slugs: bool,
@@ -164,9 +166,9 @@ def migrate_from_modulestore(
     try:
         source = ModulestoreSource.objects.get(pk=source_pk)
         target_package = LearningPackage.objects.get(pk=target_package_pk)
-        target_library = target_package.contentlibrary
+        target_library = get_library(LibraryLocatorV2.from_string(target_library_key))
         target_collection = Collection.objects.get(pk=target_collection_pk) if target_collection_pk else None
-    except ObjectDoesNotExist as exc:
+    except (ObjectDoesNotExist, InvalidKeyError) as exc:
         status.fail(str(exc))
         return
 
@@ -285,7 +287,7 @@ def migrate_from_modulestore(
     migration_context = _MigrationContext(
         existing_source_to_target_keys=existing_source_to_target_keys,
         target_package_id=target_package_pk,
-        target_library_key=target_library.library_key,
+        target_library_key=target_library.key,
         source_context_key=source_root_usage_key.course_key,
         content_by_filename=content_by_filename,
         composition_level=CompositionLevel(composition_level),
diff --git a/cms/djangoapps/modulestore_migrator/tests/test_tasks.py b/cms/djangoapps/modulestore_migrator/tests/test_tasks.py
index ddca250ccd8e..b1c5890e11a4 100644
--- a/cms/djangoapps/modulestore_migrator/tests/test_tasks.py
+++ b/cms/djangoapps/modulestore_migrator/tests/test_tasks.py
@@ -45,15 +45,15 @@ def setUp(self):
         super().setUp()
         self.user = UserFactory()
         self.organization = OrganizationFactory(short_name="testorg")
-        lib_key = LibraryLocatorV2.from_string(
+        self.lib_key = LibraryLocatorV2.from_string(
             f"lib:{self.organization.short_name}:test-key"
         )
         lib_api.create_library(
             org=self.organization,
-            slug=lib_key.slug,
+            slug=self.lib_key.slug,
             title="Test Library",
         )
-        self.library = lib_api.ContentLibrary.objects.get(slug=lib_key.slug)
+        self.library = lib_api.ContentLibrary.objects.get(slug=self.lib_key.slug)
         self.learning_package = self.library.learning_package
         self.course = CourseFactory(
             org=self.organization.short_name,
@@ -273,6 +273,7 @@ def test_migrate_from_modulestore_invalid_source(self):
                 "user_id": self.user.id,
                 "source_pk": 999999,  # Non-existent source
                 "target_package_pk": self.learning_package.id,
+                "target_library_key": str(self.lib_key),
                 "target_collection_pk": self.collection.id,
                 "repeat_handling_strategy": RepeatHandlingStrategy.Skip.value,
                 "preserve_url_slugs": True,
@@ -298,6 +299,7 @@ def test_migrate_from_modulestore_invalid_target_package(self):
                 "user_id": self.user.id,
                 "source_pk": source.id,
                 "target_package_pk": 999999,  # Non-existent package
+                "target_library_key": str(self.lib_key),
                 "target_collection_pk": self.collection.id,
                 "repeat_handling_strategy": RepeatHandlingStrategy.Skip.value,
                 "preserve_url_slugs": True,
@@ -323,6 +325,7 @@ def test_migrate_from_modulestore_invalid_collection(self):
                 "user_id": self.user.id,
                 "source_pk": source.id,
                 "target_package_pk": self.learning_package.id,
+                "target_library_key": str(self.lib_key),
                 "target_collection_pk": 999999,  # Non-existent collection
                 "repeat_handling_strategy": RepeatHandlingStrategy.Skip.value,
                 "preserve_url_slugs": True,
@@ -1245,6 +1248,7 @@ def test_migrate_from_modulestore_success_course(self):
                 "user_id": self.user.id,
                 "source_pk": source.id,
                 "target_package_pk": self.learning_package.id,
+                "target_library_key": str(self.lib_key),
                 "target_collection_pk": self.collection.id,
                 "repeat_handling_strategy": RepeatHandlingStrategy.Skip.value,
                 "preserve_url_slugs": True,
@@ -1275,6 +1279,7 @@ def test_migrate_from_modulestore_library_validation_failure(self):
                 "user_id": self.user.id,
                 "source_pk": source.id,
                 "target_package_pk": self.learning_package.id,
+                "target_library_key": str(self.lib_key),
                 "target_collection_pk": None,
                 "repeat_handling_strategy": RepeatHandlingStrategy.Update.value,
                 "preserve_url_slugs": True,
@@ -1305,6 +1310,7 @@ def test_migrate_from_modulestore_invalid_source_key_type(self):
                 "user_id": self.user.id,
                 "source_pk": source.id,
                 "target_package_pk": self.learning_package.id,
+                "target_library_key": str(self.lib_key),
                 "target_collection_pk": self.collection.id,
                 "repeat_handling_strategy": RepeatHandlingStrategy.Skip.value,
                 "preserve_url_slugs": True,
@@ -1334,6 +1340,7 @@ def test_migrate_from_modulestore_nonexistent_modulestore_item(self):
                 "user_id": self.user.id,
                 "source_pk": source.id,
                 "target_package_pk": self.learning_package.id,
+                "target_library_key": str(self.lib_key),
                 "target_collection_pk": self.collection.id,
                 "repeat_handling_strategy": RepeatHandlingStrategy.Skip.value,
                 "preserve_url_slugs": True,
@@ -1359,6 +1366,7 @@ def test_migrate_from_modulestore_task_status_progression(self):
                 "user_id": self.user.id,
                 "source_pk": source.id,
                 "target_package_pk": self.learning_package.id,
+                "target_library_key": str(self.lib_key),
                 "target_collection_pk": self.collection.id,
                 "repeat_handling_strategy": RepeatHandlingStrategy.Skip.value,
                 "preserve_url_slugs": True,
@@ -1389,6 +1397,7 @@ def test_migrate_from_modulestore_multiple_users_no_interference(self):
                 "user_id": self.user.id,
                 "source_pk": source.id,
                 "target_package_pk": self.learning_package.id,
+                "target_library_key": str(self.lib_key),
                 "target_collection_pk": self.collection.id,
                 "repeat_handling_strategy": RepeatHandlingStrategy.Skip.value,
                 "preserve_url_slugs": True,
@@ -1402,6 +1411,7 @@ def test_migrate_from_modulestore_multiple_users_no_interference(self):
                 "user_id": other_user.id,
                 "source_pk": source.id,
                 "target_package_pk": self.learning_package.id,
+                "target_library_key": str(self.lib_key),
                 "target_collection_pk": self.collection.id,
                 "repeat_handling_strategy": RepeatHandlingStrategy.Skip.value,
                 "preserve_url_slugs": True,

From e991a677c381c0b9713105cfb552918b8dea3589 Mon Sep 17 00:00:00 2001
From: Maksim Sokolskiy <maksim.sokolskiy@raccoongang.com>
Date: Tue, 16 Sep 2025 19:10:00 +0300
Subject: [PATCH 39/40] fix: add missed uuid field to migrator REST API
 response

Default StatusSerializer explicitly excludes the uuid field so
we have to add it to StatusWithModulestoreMigrationSerializer
---
 .../modulestore_migrator/rest_api/v1/serializers.py           | 2 +-
 cms/djangoapps/modulestore_migrator/rest_api/v1/views.py      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cms/djangoapps/modulestore_migrator/rest_api/v1/serializers.py b/cms/djangoapps/modulestore_migrator/rest_api/v1/serializers.py
index a973da318b1b..beb72729cdca 100644
--- a/cms/djangoapps/modulestore_migrator/rest_api/v1/serializers.py
+++ b/cms/djangoapps/modulestore_migrator/rest_api/v1/serializers.py
@@ -115,7 +115,7 @@ class StatusWithModulestoreMigrationSerializer(StatusSerializer):
 
     class Meta:
         model = StatusSerializer.Meta.model
-        fields = [*StatusSerializer.Meta.fields, 'parameters']
+        fields = [*StatusSerializer.Meta.fields, 'uuid', 'parameters']
 
     def get_fields(self):
         """
diff --git a/cms/djangoapps/modulestore_migrator/rest_api/v1/views.py b/cms/djangoapps/modulestore_migrator/rest_api/v1/views.py
index 07ade1925f02..feeafb1b40d7 100644
--- a/cms/djangoapps/modulestore_migrator/rest_api/v1/views.py
+++ b/cms/djangoapps/modulestore_migrator/rest_api/v1/views.py
@@ -53,7 +53,6 @@ class MigrationViewSet(StatusViewSet):
 
         Example response:
             {
-                "name": migrate_from_modulestore",
                 "state": "Succeeded",
                 "state_text": "Succeeded",  # Translation into the current language of the current state
                 "completed_steps": 11,
@@ -62,6 +61,7 @@ class MigrationViewSet(StatusViewSet):
                 "created": "2025-05-14T22:24:37.048539Z",
                 "modified": "2025-05-14T22:24:59.128068Z",
                 "artifacts": [],
+                "uuid": "3de23e5d-fd34-4a6f-bf02-b183374120f0",
                 "parameters": {
                     "source": "course-v1:OpenedX+DemoX+DemoCourse",
                     "composition_level": "unit",
@@ -75,7 +75,6 @@ class MigrationViewSet(StatusViewSet):
 
         Example response:
             {
-                "name": "migrate_from_modulestore",
                 "state": "Importing staged content structure",
                 "state_text": "Importing staged content structure",
                 "completed_steps": 6,
@@ -84,6 +83,7 @@ class MigrationViewSet(StatusViewSet):
                 "created": "2025-05-14T22:24:37.048539Z",
                 "modified": "2025-05-14T22:24:59.128068Z",
                 "artifacts": [],
+                "uuid": "3de23e5d-fd34-4a6f-bf02-b183374120f0",
                 "parameters": {
                     "source": "course-v1:OpenedX+DemoX+DemoCourse2",
                     "composition_level": "component",

From f122096429e919105cca432f5137d40796167f73 Mon Sep 17 00:00:00 2001
From: Maksim Sokolskiy <maksim.sokolskiy@raccoongang.com>
Date: Wed, 24 Sep 2025 12:19:54 +0300
Subject: [PATCH 40/40] style: update return type hint for
 start_migration_to_library

---
 cms/djangoapps/modulestore_migrator/api.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cms/djangoapps/modulestore_migrator/api.py b/cms/djangoapps/modulestore_migrator/api.py
index 838c86939669..5f6ca543a091 100644
--- a/cms/djangoapps/modulestore_migrator/api.py
+++ b/cms/djangoapps/modulestore_migrator/api.py
@@ -4,6 +4,7 @@
 from opaque_keys.edx.locator import LibraryLocatorV2
 from opaque_keys.edx.keys import LearningContextKey
 from openedx_learning.api.authoring import get_collection
+from celery.result import AsyncResult
 
 from openedx.core.djangoapps.content_libraries.api import get_library
 from openedx.core.types.user import AuthUser
@@ -28,7 +29,7 @@ def start_migration_to_library(
     repeat_handling_strategy: str,
     preserve_url_slugs: bool,
     forward_source_to_target: bool,
-) -> None:
+) -> AsyncResult:
     """
     Import a course or legacy library into a V2 library (or, a collection within a V2 library).
     """