[#3889] Add more fields

open-formulieren · Apr 3, 2024 · 06aec02 · 06aec02
1 parent e99afaf
commit 06aec02
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 3 deletions.
diff --git a/src/openforms/logging/admin.py b/src/openforms/logging/admin.py
@@ -12,6 +12,7 @@ class TimelineLogProxyResource(resources.ModelResource):
     user = Field(attribute="user")
     related_object = Field(attribute="content_object")
     message = Field(attribute="message")
+    event = Field(attribute="extra_data")
 
     class Meta:
         model = TimelineLogProxy
@@ -32,6 +33,11 @@ def dehydrate_message(self, obj: TimelineLogProxy) -> str:
     def dehydrate_timestamp(self, obj: TimelineLogProxy) -> str:
         return obj.timestamp.isoformat()
 
+    def dehydrate_event(self, obj: TimelineLogProxy) -> str | None:
+        if not obj.extra_data:
+            return None
+        return obj.extra_data.get("log_event")
+
 
 @admin.register(TimelineLogProxy)
 class TimelineLogProxyAdmin(ExportActionModelAdmin):

diff --git a/src/openforms/logging/tests/test_admin.py b/src/openforms/logging/tests/test_admin.py
@@ -99,10 +99,31 @@ def test_deleted_submission_doesnt_crash_logs(self):
 
 
 class TimelineLogExportsTest(TestCase):
-    def test_timelinelog_exports(self):
+    def test_bare_timelinelog_export(self):
+        user = StaffUserFactory.create()
+        bare_log = TimelineLogProxyFactory.create(user=user)
+
+        dataset = TimelineLogProxyResource().export()
+
+        self.assertEqual(
+            json.loads(dataset.json),
+            [
+                {
+                    "message": bare_log.message().strip(),
+                    "user": bare_log.fmt_user,
+                    "related_object": None,
+                    "timestamp": bare_log.timestamp.isoformat(),
+                    "event": None,
+                }
+            ],
+        )
+
+    def test_timelinelog_export(self):
         submission = SubmissionFactory.create()
         user = StaffUserFactory.create()
-        log = TimelineLogProxyFactory.create(content_object=submission, user=user)
+        log = TimelineLogProxyFactory.create(
+            content_object=submission, user=user, extra_data={"log_event": "test_event"}
+        )
 
         dataset = TimelineLogProxyResource().export()
 
@@ -112,8 +133,9 @@ def test_timelinelog_exports(self):
                 {
                     "message": log.message().strip(),
                     "user": log.fmt_user,
-                    "related_object": str(log.content_object),
+                    "related_object": str(submission),
                     "timestamp": log.timestamp.isoformat(),
+                    "event": "test_event",
                 }
             ],
         )