Add audit log entries for bulk actions on grants

Author: estyxx

backend/custom_admin/admin.py

@@ -6,6 +6,8 @@
 from django.contrib import admin
 from django.urls import path
 
+from custom_admin.audit import create_change_admin_log_entry
+
 SITE_NAME = "PyCon Italia"
 
 admin.site.site_header = SITE_NAME
@@ -58,15 +60,50 @@ def wrapper(modeladmin, request, queryset):
 @admin.action(description="Confirm pending status change")
 @validate_single_conference_selection
 def confirm_pending_status(modeladmin, request, queryset):
+    """
+    Efficiently bulk-update status with pending_status, and accurately log the change per object.
+    """
+    # Use values_list to fetch ids and old statuses before updating.
+    changed_objs_info = list(queryset.values_list("pk", "status", "pending_status"))
+
+    # Perform the bulk update.
     queryset.update(
         status=F("pending_status"),
         pending_status=None,
     )
 
+    model = queryset.model
+    for pk, old_status, pending_status in changed_objs_info:
+        obj = model.objects.get(pk=pk)
+        create_change_admin_log_entry(
+            request.user,
+            obj,
+            change_message=(
+                f"[Bulk Admin Action] Status changed from '{old_status}' to '{pending_status}'."
+            ),
+        )
+
 
 @admin.action(description="Reset pending status to status")
 @validate_single_conference_selection
 def reset_pending_status_back_to_status(modeladmin, request, queryset):
+    """
+    Efficiently bulk-reset pending_status to None, and accurately log the change per object.
+    """
+    changed_objs_info = list(queryset.values_list("pk", "pending_status"))
+
     queryset.update(
         pending_status=None,
     )
+
+    model = queryset.model
+    for pk, old_pending_status in changed_objs_info:
+        if old_pending_status is not None:
+            obj = model.objects.get(pk=pk)
+            create_change_admin_log_entry(
+                request.user,
+                obj,
+                change_message=(
+                    f"[Bulk Admin Action] pending_status reset from '{old_pending_status}' to None."
+                ),
+            )

backend/grants/tests/test_admin.py

@@ -586,7 +586,7 @@ def test_mark_rejected_and_send_email(rf, mocker, admin_user):
     ).exists()
 
 
-def test_confirm_pending_status_action(rf):
+def test_confirm_pending_status_action(rf, admin_user):
     grant_1 = GrantFactory(
         status=Grant.Status.pending,
         pending_status=Grant.Status.confirmed,
@@ -611,6 +611,7 @@ def test_confirm_pending_status_action(rf):
     )
 
     request = rf.get("/")
+    request.user = admin_user
     confirm_pending_status(
         None, request, Grant.objects.filter(id__in=[grant_1.id, grant_2.id, grant_3.id])
     )
@@ -628,11 +629,28 @@ def test_confirm_pending_status_action(rf):
     assert grant_2.pending_status is None
     assert grant_3.pending_status is None
 
+    # Verify audit log entries were created correctly
+    assert LogEntry.objects.filter(
+        object_id=grant_1.id,
+        change_message="[Bulk Admin Action] Status changed from 'pending' to 'confirmed'.",
+    ).exists()
+    assert LogEntry.objects.filter(
+        object_id=grant_2.id,
+        change_message="[Bulk Admin Action] Status changed from 'rejected' to 'waiting_list'.",
+    ).exists()
+    assert LogEntry.objects.filter(
+        object_id=grant_3.id,
+        change_message="[Bulk Admin Action] Status changed from 'waiting_list' to 'waiting_list_maybe'.",
+    ).exists()
+
     # Left out from the action
     assert grant_4.status == Grant.Status.waiting_list_maybe
+    assert not LogEntry.objects.filter(
+        object_id=grant_4.id,
+    ).exists()
 
 
-def test_reset_pending_status_back_to_status_action(rf):
+def test_reset_pending_status_back_to_status_action(rf, admin_user):
     grant_1 = GrantFactory(
         status=Grant.Status.pending,
         pending_status=Grant.Status.confirmed,
@@ -657,6 +675,7 @@ def test_reset_pending_status_back_to_status_action(rf):
     )
 
     request = rf.get("/")
+    request.user = admin_user
     reset_pending_status_back_to_status(
         None, request, Grant.objects.filter(id__in=[grant_1.id, grant_2.id, grant_3.id])
     )
@@ -675,9 +694,26 @@ def test_reset_pending_status_back_to_status_action(rf):
     assert grant_3.status == Grant.Status.waiting_list
     assert grant_3.pending_status is None
 
+    # Verify audit log entries were created correctly
+    assert LogEntry.objects.filter(
+        object_id=grant_1.id,
+        change_message="[Bulk Admin Action] pending_status reset from 'confirmed' to None.",
+    ).exists()
+    assert LogEntry.objects.filter(
+        object_id=grant_2.id,
+        change_message="[Bulk Admin Action] pending_status reset from 'waiting_list' to None.",
+    ).exists()
+    assert LogEntry.objects.filter(
+        object_id=grant_3.id,
+        change_message="[Bulk Admin Action] pending_status reset from 'waiting_list_maybe' to None.",
+    ).exists()
+
     # Left out from the action
     assert grant_4.status == Grant.Status.waiting_list_maybe
     assert grant_4.pending_status == Grant.Status.confirmed
+    assert not LogEntry.objects.filter(
+        object_id=grant_4.id,
+    ).exists()
 
 
 def test_delete_reimbursement_from_admin_logs_audit_log_entry(rf, admin_user):