Runs celery task on_commit

Author: jlariza

django_opensearch_dsl/signals.py

@@ -1,10 +1,11 @@
 """Attach django-opensearch-dsl to Django's signals and cause things to index."""
 
 import abc
+from functools import partial
 
 from django.apps import apps
 from django.core.serializers import deserialize, serialize
-from django.db import models
+from django.db import models, transaction
 from django.dispatch import Signal
 
 from .apps import DODConfig
@@ -95,7 +96,11 @@ def handle_save_task(app_label, model, pk):
     @shared_task()
     def handle_pre_delete_task(data):
         """Delete the instance from model and associated model indices."""
-        instance = next(deserialize("json", data, cls=DODConfig.signal_processor_deserializer_class())).object
+        instance = next(
+            deserialize(
+                "json", data, cls=DODConfig.signal_processor_deserializer_class()
+            )
+        ).object
         registry.delete(instance, raise_on_error=False)
         registry.delete_related(instance, raise_on_error=False)
 
@@ -109,8 +114,21 @@ class CelerySignalProcessor(RealTimeSignalProcessor):
         def handle_save(self, sender, instance, **kwargs):
             """Update the instance in model and associated model indices."""
             if instance.__class__ in registry.get_models():
-                handle_save_task.delay(instance._meta.app_label, instance.__class__.__name__, instance.pk)
+                transaction.on_commit(
+                    partial(
+                        handle_save_task.delay,
+                        app_label=instance._meta.app_label,
+                        model=instance.__class__.__name__,
+                        pk=instance.pk,
+                    )
+                )
 
         def handle_pre_delete(self, sender, instance, **kwargs):
             """Delete the instance from model and associated model indices."""
-            handle_pre_delete_task.delay(serialize("json", [instance], cls=DODConfig.signal_processor_serializer_class()))
+            handle_pre_delete_task.delay(
+                serialize(
+                    "json",
+                    [instance],
+                    cls=DODConfig.signal_processor_serializer_class(),
+                )
+            )