chore: remove unused code block (#673)

* chore: remove unused code block * Fixed test. * fixed test
tj-django · Nov 1, 2022 · d8e82e8 · d8e82e8
1 parent c838d0e
commit d8e82e8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 17 deletions.
diff --git a/model_clone/mixin.py b/model_clone/mixin.py
@@ -232,9 +232,9 @@ def make_clone(self, attrs=None, sub_clone=False, using=None, parent=None):
             setattr(duplicate, name, value)
 
         duplicate = self.pre_save_duplicate(duplicate)
+        duplicate = self.__duplicate_m2o_fields(duplicate, using=using)
         duplicate.save(using=using)
 
-        duplicate = self.__duplicate_m2o_fields(duplicate, using=using)
         duplicate = self.__duplicate_o2o_fields(duplicate, using=using)
         duplicate = self.__duplicate_o2m_fields(duplicate, using=using)
         duplicate = self.__duplicate_m2m_fields(duplicate, using=using)
@@ -440,19 +440,6 @@ def _create_copy_of_instance(
                         max_length=f.max_length,
                     )
 
-            if (f.many_to_one or f.one_to_many) and instance._state.db != using:
-                sub_instance = getattr(instance, f.name, None) or f.get_default()
-
-                if sub_instance is not None:
-                    sub_instance = CloneMixin._create_copy_of_instance(
-                        sub_instance,
-                        force=True,
-                        sub_clone=True,
-                        using=using,
-                    )
-                    sub_instance.save(using=using)
-                    value = sub_instance.pk
-
             setattr(new_instance, f.attname, value)
 
         return new_instance
@@ -571,8 +558,13 @@ def __duplicate_m2o_fields(self, duplicate, using=None):
                     elif item is None:
                         item_clone = None
                     else:
-                        item.pk = None  # pragma: no cover
-                        item_clone = item.save(using=using)  # pragma: no cover
+                        item_clone = CloneMixin._create_copy_of_instance(
+                            item,
+                            force=True,
+                            sub_clone=True,
+                            using=using,
+                        )
+                        item_clone.save(using=using)
 
                     setattr(duplicate, f.name, item_clone)
 

diff --git a/model_clone/tests/test_clone_mixin.py b/model_clone/tests/test_clone_mixin.py
@@ -183,8 +183,9 @@ def test_cloning_model_with_a_different_db_alias_is_valid(self):
         self.assertNotEqual(instance.name, clone.name)
 
     @patch("sample.models.Book._clone_m2m_fields", new_callable=PropertyMock)
+    @patch("sample.models.Book._clone_m2o_or_o2m_fields", new_callable=PropertyMock)
     def test_cloning_m2m_fields_with_different_db_alias_is_valid(
-        self, _clone_m2m_fields_mock
+        self, _clone_m2o_fields_mock, _clone_m2m_fields_mock
     ):
         author_1 = Author(
             first_name="Ruby", last_name="Jack", age=26, sex="F", created_by=self.user1
@@ -207,6 +208,7 @@ def test_cloning_m2m_fields_with_different_db_alias_is_valid(
         editor_2.save(using=DEFAULT_DB_ALIAS)
 
         _clone_m2m_fields_mock.return_value = ["authors", "editors"]
+        _clone_m2o_fields_mock.return_value = ["created_by"]
 
         name = "New Book"
         book = Book(name=name, created_by=self.user1, slug=slugify(name))