Merge pull request #37769 from mitodl/marslan/9456-delete-moved-sub-section

fix: try deleting the XBlock from draft-branch if not in published

Author: pdpinch

xmodule/modulestore/split_mongo/split.py

@@ -2529,10 +2529,36 @@ def delete_item(self, usage_locator, user_id, force=False):  # lint-amnesty, pyl
             if original_structure['root'] == block_key:
                 raise ValueError("Cannot delete the root of a course")
             if block_key not in original_structure['blocks']:
-                raise ValueError("Cannot delete block_key {} from course {}, because that block does not exist.".format(
-                    block_key,
-                    usage_locator,
-                ))
+                # When user move a full sub-section to another section
+                # These changes are in draft-branch only and when user delete this moved
+                # section, we need to delete it from draft-branch
+                draft_course_key = usage_locator.course_key.for_branch(ModuleStoreEnum.BranchName.draft)
+                try:
+                    draft_structure = self._lookup_course(draft_course_key).structure
+                    if block_key in draft_structure['blocks']:
+                        # Block exists in draft, use draft structure instead
+                        original_structure = draft_structure
+                        log.info("Block %s found in draft branch, proceeding with deletion from draft", block_key)
+                    else:
+                        raise ValueError(
+                            (
+                                "Cannot delete block_key {} from course {}, "
+                                "because that block does not exist in either branch."
+                            ).format(
+                                block_key,
+                                usage_locator,
+                            )
+                        )
+                except ItemNotFoundError as exc:
+                    raise ValueError(
+                        (
+                            "Cannot delete block_key {} from course {}, "
+                            "because that block does not exist."
+                        ).format(
+                            block_key,
+                            usage_locator,
+                        )
+                    ) from exc
             index_entry = self._get_index_if_valid(usage_locator.course_key, force)
             new_structure = self.version_structure(usage_locator.course_key, original_structure, user_id)
             new_blocks = new_structure['blocks']

xmodule/modulestore/tests/test_publish.py

@@ -810,14 +810,8 @@ def test_delete_draft_unit(self, modulestore_builder, revision_and_result):
             self.assertOLXIsDraftOnly(block_list_to_delete)
             # MODULESTORE_DIFFERENCE:
             if self.is_split_modulestore:
-                if revision in (ModuleStoreEnum.RevisionOption.published_only, ModuleStoreEnum.RevisionOption.all):
-                    # Split throws an exception when trying to delete an item from the published branch
-                    # that isn't yet published.
-                    with pytest.raises(ValueError):
-                        self.delete_item(block_list_to_delete, revision=revision)
-                else:
-                    self.delete_item(block_list_to_delete, revision=revision)
-                    self._check_for_item_deletion(block_list_to_delete, result)
+                self.delete_item(block_list_to_delete, revision=revision)
+                self._check_for_item_deletion(block_list_to_delete, result)
             else:
                 raise Exception("Must test either Old Mongo or Split modulestore!")
 
@@ -846,11 +840,8 @@ def test_split_delete_draft_vertical(self, modulestore_builder, revision_and_res
             # The vertical is a draft.
             self.assertOLXIsDraftOnly(block_list_to_delete)
             if revision in (ModuleStoreEnum.RevisionOption.published_only, ModuleStoreEnum.RevisionOption.all):
-                # MODULESTORE_DIFFERENCE:
-                # Split throws an exception when trying to delete an item from the published branch
-                # that isn't yet published.
-                with pytest.raises(ValueError):
-                    self.delete_item(block_list_to_delete, revision=revision)
+                self.delete_item(block_list_to_delete, revision=revision)
+                self._check_for_item_deletion(block_list_to_delete, result)
             else:
                 self.delete_item(block_list_to_delete, revision=revision)
                 self._check_for_item_deletion(block_list_to_delete, result)