use current user as actor for delete events

Author: valentijnscholten

dojo/product_type/signals.py

@@ -1,6 +1,7 @@
 import contextlib
 
 from auditlog.models import LogEntry
+from crum import get_current_user
 from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.contrib.contenttypes.models import ContentType
@@ -58,6 +59,12 @@ def product_type_post_delete(sender, instance, **kwargs):
                 ).order_by("-id").first():
                     user = le.actor
 
+            # Since adding pghistory as auditlog option, this signal here runs before the django-auditlog signal
+            # Fallback to the current user of the request (Which might be not available for ASYNC_OBJECT_DELETE scenario's)
+            if not user:
+                current_user = get_current_user()
+                user = current_user
+
             # Update description with user if found
             if user:
                 description = _('The product type "%(name)s" was deleted by %(user)s') % {

unittests/test_notifications.py

@@ -407,7 +407,6 @@ def setUp(self):
         self.client.credentials(HTTP_AUTHORIZATION="Token " + token.key)
 
     @patch("dojo.notifications.helper.NotificationManager._process_notifications")
-    @override_settings(ENABLE_AUDITLOG=True)
     def test_auditlog_on(self, mock):
         prod_type = Product_Type.objects.create(name="notif prod type API")
         self.client.delete(reverse("product_type-detail", args=(prod_type.pk,)), format="json")