[#1023] Fixed logging regression, applied improvements

src/open_inwoner/accounts/tests/test_logging.py

@@ -1,3 +1,4 @@
+import logging
 from datetime import timedelta
 
 from django.contrib.admin.models import ADDITION, CHANGE, DELETION
@@ -240,7 +241,7 @@ def test_password_reset_access_is_logged(self):
             log_entry.extra_data,
             {
                 "message": _("password reset was accessed"),
-                "log_level": None,
+                "log_level": logging.INFO,
                 "action_flag": list(LOG_ACTIONS[5]),
                 "content_object_repr": "",
             },
@@ -270,7 +271,7 @@ def test_password_reset_confirm_is_logged(self):
             log_entry.extra_data,
             {
                 "message": _("password reset was completed"),
-                "log_level": None,
+                "log_level": logging.INFO,
                 "action_flag": list(LOG_ACTIONS[5]),
                 "content_object_repr": self.user.email,
             },
@@ -298,7 +299,7 @@ def test_accepted_invite_is_logged(self):
             log_entry.extra_data,
             {
                 "message": _("invitation accepted"),
-                "log_level": None,
+                "log_level": logging.INFO,
                 "action_flag": list(LOG_ACTIONS[5]),
                 "content_object_repr": _("For: {invitee} (2021-10-18)").format(
                     invitee=self.invitee.email
@@ -324,7 +325,7 @@ def test_expired_invite_is_logged(self):
             log_entry.extra_data,
             {
                 "message": _("invitation expired"),
-                "log_level": None,
+                "log_level": logging.INFO,
                 "action_flag": list(LOG_ACTIONS[5]),
                 "content_object_repr": _("For: {invitee} (2021-09-18)").format(
                     invitee=self.invitee.email

src/open_inwoner/haalcentraal/signals.py

@@ -25,7 +25,9 @@ def on_bsn_change(instance, **kwargs):
         and instance.is_prepopulated is False
         and instance.login_type == LoginTypeChoices.digid
     ):
-        system_action("Retrieving data from haal centraal based on BSN", user=instance)
+        system_action(
+            "Retrieving data from haal centraal based on BSN", content_object=instance
+        )
         data = fetch_brp_data(instance, brp_version)
 
         # we have a different response depending on brp version
@@ -46,4 +48,6 @@ def on_bsn_change(instance, **kwargs):
             instance.city = glom(data, "verblijfplaats.woonplaats", default="")
             instance.is_prepopulated = True
 
-            system_action(_("data was retrieved from haal centraal"), user=instance)
+            system_action(
+                _("data was retrieved from haal centraal"), content_object=instance
+            )

src/open_inwoner/haalcentraal/tests/test_signal.py

@@ -1,3 +1,4 @@
+import logging
 from datetime import date
 
 from django.test import TestCase, override_settings
@@ -221,17 +222,17 @@ def test_signal_updates_logging(self, m):
         user.bsn = "999993847"
         user.save()
 
-        log_entry = TimelineLog.objects.filter(object_id=user.id)[0]
+        log_entry = TimelineLog.objects.filter(object_id=user.id)[1]
 
         self.assertEquals(
             log_entry.timestamp.strftime("%m/%d/%Y, %H:%M:%S"), "10/18/2021, 13:00:00"
         )
-        self.assertEquals(log_entry.content_object.id, user.id)
+        self.assertEquals(log_entry.object_id, str(user.id))
         self.assertEquals(
             log_entry.extra_data,
             {
                 "message": _("data was retrieved from haal centraal"),
-                "log_level": None,
+                "log_level": logging.INFO,
                 "action_flag": list(LOG_ACTIONS[5]),
                 "content_object_repr": user.email,
             },

src/open_inwoner/pdc/tests/test_logging.py

@@ -1,3 +1,5 @@
+import logging
+
 from django.urls import reverse
 from django.utils.translation import gettext as _
 
@@ -147,14 +149,14 @@ def test_export_is_logged(self):
         self.assertEqual(
             log_entry.timestamp.strftime("%m/%d/%Y, %H:%M:%S"), "10/18/2021, 13:00:00"
         )
-        self.assertEqual(log_entry.content_object.id, self.user.id)
+        self.assertEqual(log_entry.user.id, self.user.id)
         self.assertEqual(
             log_entry.extra_data,
             {
                 "message": _("products were exported"),
-                "log_level": None,
+                "log_level": logging.INFO,
                 "action_flag": list(LOG_ACTIONS[5]),
-                "content_object_repr": self.user.email,
+                "content_object_repr": "",
             },
         )
 
@@ -272,13 +274,13 @@ def test_export_is_logged(self):
         self.assertEqual(
             log_entry.timestamp.strftime("%m/%d/%Y, %H:%M:%S"), "10/18/2021, 13:00:00"
         )
-        self.assertEqual(log_entry.content_object.id, self.user.id)
+        self.assertEqual(log_entry.user.id, self.user.id)
         self.assertEqual(
             log_entry.extra_data,
             {
                 "message": _("categories were exported"),
-                "log_level": None,
+                "log_level": logging.INFO,
                 "action_flag": list(LOG_ACTIONS[5]),
-                "content_object_repr": self.user.email,
+                "content_object_repr": "",
             },
         )