chore: Remove duplicate reference to process hook (#51)

Author: mrbazzan

djangocms_transfer/__init__.py

@@ -9,7 +9,7 @@ def get_serializer_name(default="python"):
     return getattr(settings, "DJANGO_CMS_TRANSFER_SERIALIZER", default)
 
 
-def custom_process_hook(transfer_hook, plugin, plugin_data=None):
+def custom_process_hook(transfer_hook, plugin, plugin_data):
     from importlib import import_module
 
     from django.conf import settings
@@ -24,7 +24,4 @@ def custom_process_hook(transfer_hook, plugin, plugin_data=None):
     except (ImportError, AttributeError) as e:
         raise ImportError(f"Could not import '{hook}': {e}")
 
-    if plugin_data:
-        return func(plugin, plugin_data)
-    else:
-        return func(plugin)
+    return func(plugin, plugin_data)

djangocms_transfer/datastructures.py

@@ -1,10 +1,7 @@
-import importlib
 from collections import namedtuple
-from typing import Callable
 
 from cms.api import add_plugin
 from cms.models import CMSPlugin
-from django.conf import settings
 from django.core.serializers import deserialize
 from django.db import transaction
 from django.utils.encoding import force_str
@@ -68,7 +65,6 @@ def restore(self, placeholder, language, parent=None):
             target=parent,
             **data,
         )
-        self._call_user_site_import_processor_if_necessary(plugin, self.data)
 
         field = ("target",) if plugin_target else ()
         # An empty *update_fields* iterable will skip the save
@@ -89,28 +85,6 @@ def restore(self, placeholder, language, parent=None):
         # customize plugin-data on import with configured function
         custom_process_hook(
             "DJANGOCMS_TRANSFER_PROCESS_IMPORT_PLUGIN_DATA",
-            plugin
+            plugin, self.data
         )
-
-        plugin.save()
         return plugin
-
-    def _call_user_site_import_processor_if_necessary(
-        self, plugin: CMSPlugin, plugin_data: dict
-    ):
-        # customize plugin-data on import with configured function
-        if processor_symbol := getattr(
-            settings, "DJANGOCMS_TRANSFER_PROCESS_IMPORT_PLUGIN_DATA", None
-        ):
-            function = self._resolve_function_from_full_path(processor_symbol)
-            function(plugin, plugin_data)
-
-    def _resolve_function_from_full_path(
-        self, fully_qualified_path: str
-    ) -> Callable:
-        try:
-            module_name, function_name = fully_qualified_path.rsplit(".", 1)
-            module = importlib.import_module(module_name)
-            return getattr(module, function_name)
-        except (AttributeError, ImportError):
-            raise ImportError(f"could not resolve {fully_qualified_path}")

tests/transfer/test_helper.py

@@ -27,7 +27,7 @@ def test_nonexistent_module(self):
             ImportError,
             custom_process_hook,
             "DJANGOCMS_TRANSFER_PROCESS_IMPORT_PLUGIN_DATA",
-            self.plugin
+            self.plugin, self.plugin_data
         )
         self.assertRaises(
             ImportError,
@@ -41,9 +41,9 @@ def test_existent_module(self):
         self.assertTrue(
             custom_process_hook(
                 "DJANGOCMS_TRANSFER_PROCESS_IMPORT_PLUGIN_DATA",
-                self.plugin
+                self.plugin, {}
             ),
-            self.plugin
+            (self.plugin, {})
         )
         self.assertTrue(
             custom_process_hook(