Refactor the implementation to fit with the same pattern as other log…

…s mechanisms, fix tests

kobo/apps/audit_log/base_views.py

@@ -39,6 +39,7 @@ class AuditLoggedViewSet(viewsets.GenericViewSet):
     def initialize_request(self, request, *args, **kwargs):
         request = super().initialize_request(request, *args, **kwargs)
         request._request.log_type = self.log_type
+        request._request._data = request.data.copy()
         return request
 
     def get_object(self):

kobo/apps/audit_log/middleware.py

@@ -1,3 +1,5 @@
+from rest_framework import status
+
 from kobo.apps.audit_log.models import AuditType, ProjectHistoryLog
 
 
@@ -7,7 +9,10 @@ def create_audit_logs(request):
         if request.method in ['GET', 'HEAD']:
             return response
         log_type = getattr(request, 'log_type', None)
-        if log_type == AuditType.PROJECT_HISTORY:
+        if (
+            status.is_success(response.status_code) and
+            log_type == AuditType.PROJECT_HISTORY
+        ):
             ProjectHistoryLog.create_from_request(request)
         return response
 

kobo/apps/audit_log/models.py

@@ -335,6 +335,7 @@ def create_from_request(cls, request):
             'asset-file-list': cls.create_from_file_request,
             'asset-export-list': cls.create_from_export_request,
             'exporttask-list': cls.create_from_v1_export,
+            'asset-bulk': cls.create_from_bulk_request,
         }
         url_name = request.resolver_match.url_name
         method = url_name_to_action.get(url_name, None)
@@ -343,22 +344,31 @@ def create_from_request(cls, request):
         method(request)
 
     @staticmethod
-    def create_from_bulk_action(request, payload):
+    def create_from_bulk_request(request):
+        try:
+            payload = request._data['payload']
+            action = payload['action']
+            asset_uids = payload['asset_uids']
+        except KeyError:
+            return  # Incorrect payload
+
+        if type(asset_uids) is not list or len(asset_uids) == 0:  # Nothing to do
+            return
+
         bulk_action_to_audit_action = {
             'archive': AuditAction.ARCHIVE,
             'unarchive': AuditAction.UNARCHIVE,
             'delete': AuditAction.DELETE,
             'undelete': AuditAction.UNDELETE,
         }
-        audit_action = bulk_action_to_audit_action[payload.get('action')]
+        audit_action = bulk_action_to_audit_action[action]
         if audit_action is None:
-            # Unsupported action
-            return
+            return  # Unsupported action
 
         source = get_human_readable_client_user_agent(request)
         client_ip = get_client_ip(request)
 
-        for asset_uid in payload.get('asset_uids', []):
+        for asset_uid in asset_uids:
             asset = Asset.all_objects.get(uid=asset_uid)
             object_id = asset.pk
             metadata = {

kobo/apps/audit_log/tests/test_project_history_logs.py

@@ -882,7 +882,6 @@ def test_export_v1_creates_log(self):
         self.assertEqual(log.object_id, self.asset.id)
 
     @data(
-        # File or url, change asset name?, use v2?
         ('archive', AuditAction.ARCHIVE),
         ('unarchive', AuditAction.UNARCHIVE),
         ('undelete', AuditAction.UNDELETE),
@@ -909,8 +908,11 @@ def test_bulk_actions(self, bulk_action, audit_action):
 
         uids = [asset.uid for asset in assets]
 
+        if bulk_action == 'undelete':
+            self._make_bulk_request(uids, 'delete')
+
         self._make_bulk_request(uids, bulk_action)
-        archived_logs = ProjectHistoryLog.objects.filter(
+        project_hist_logs = ProjectHistoryLog.objects.filter(
             object_id__in=[asset.id for asset in assets], action=audit_action
         )
-        self.assertEqual(archived_logs.count(), 2)
+        self.assertEqual(project_hist_logs.count(), 2)

kpi/serializers/v2/asset.py

@@ -18,7 +18,6 @@
 from rest_framework.reverse import reverse
 from rest_framework.utils.serializer_helpers import ReturnList
 
-from kobo.apps.audit_log.models import ProjectHistoryLog
 from kobo.apps.organizations.constants import ORG_ADMIN_ROLE
 from kobo.apps.reports.constants import FUZZY_VERSION_PATTERN
 from kobo.apps.reports.report_data import build_formpack
@@ -89,11 +88,6 @@ def __init__(
         super().__init__(instance=instance, data=data, **kwargs)
 
     def create(self, validated_data):
-        ProjectHistoryLog.create_from_bulk_action(
-            self.context['request'],
-            validated_data['payload'],
-        )
-
         delete_request, put_back_ = self._get_action_type_and_direction(
             validated_data['payload']
         )