audit log improvement

catalog/common/models.py

@@ -377,13 +377,7 @@ class Item(SoftDeleteMixin, PolymorphicModel):
             with connection.cursor() as cursor:
                 cursor.execute(f"DELETE FROM {tbl} WHERE item_ptr_id = %s", [self.pk])
         obj = model.objects.get(pk=obj.pk)
-        LogEntry.objects.log_create(
-            obj,
-            action=LogEntry.Action.UPDATE,
-            changes={
-                "!recast": [[old_ct.model, old_ct.id], [ct.model, ct.id]],
-            },
-        )
+        obj.log_action({"!recast": [old_ct.model, ct.model]})
         return obj
 
     @property
@@ -536,13 +530,7 @@ class ExternalResource(models.Model):
         return f"{self.pk}:{self.id_type}:{self.id_value or ''} ({self.url})"
 
     def unlink_from_item(self):
-        LogEntry.objects.log_create(
-            self.item,
-            action=LogEntry.Action.UPDATE,
-            changes={
-                "__unlink__": [str(self), None],
-            },
-        )
+        self.item.log_action({"!unlink": [str(self), None]})
         self.item = None
         self.save()
 

catalog/common/sites.py

@@ -138,6 +138,9 @@ class AbstractSite:
             obj["primary_lookup_id_value"] = v
             resource.item = model.objects.create(**obj)
         if previous_item != resource.item:
+            if previous_item:
+                previous_item.log_action({"unmatch": [str(resource), ""]})
+            resource.item.log_action({"!match": ["", str(resource)]})
             resource.save(update_fields=["item"])
         return resource.item
 
@@ -149,11 +152,7 @@ class AbstractSite:
         if not p.ready:
             # raise ValueError(f'resource not ready for {self.url}')
             return None
-        last_item = p.item
-        item = self.match_or_create_item_for_resource(p)
-        if last_item != p.item:
-            p.save()
-        return item
+        return self.match_or_create_item_for_resource(p)
 
     @property
     def ready(self):

catalog/models.py

@@ -71,7 +71,20 @@ def init_catalog_audit_log():
     for cls in Item.__subclasses__():
         auditlog.register(
             cls,
-            exclude_fields=["metadata", "created_time", "edited_time", "last_editor"],
+            exclude_fields=[
+                "id",
+                "item_ptr",
+                "polymorphic_ctype",
+                "metadata",
+                "created_time",
+                "edited_time",
+                "last_editor",
+                # related fields are not supported in django-auditlog yet
+                "lookup_ids",
+                "external_resources",
+                "merged_from_items",
+                "focused_comments",
+            ],
         )
 
     auditlog.register(

catalog/search/models.py

@@ -8,6 +8,7 @@ from rq.job import Job
 from django.core.cache import cache
 import hashlib
 from .typesense import Indexer as TypeSenseIndexer
+from auditlog.context import set_actor
 
 # from .meilisearch import Indexer as MeiliSearchIndexer
 
@@ -85,7 +86,7 @@ def query_index(keywords, category=None, tag=None, page=1, prepare_external=True
     return items, result.num_pages, result.count, duplicated_items
 
 
-def enqueue_fetch(url, is_refetch):
+def enqueue_fetch(url, is_refetch, user=None):
     job_id = "fetch_" + hashlib.md5(url.encode()).hexdigest()
     in_progress = False
     try:
@@ -95,13 +96,14 @@ def enqueue_fetch(url, is_refetch):
         in_progress = False
     if not in_progress:
         django_rq.get_queue("fetch").enqueue(
-            _fetch_task, url, is_refetch, job_id=job_id
+            _fetch_task, url, is_refetch, user, job_id=job_id
         )
     return job_id
 
 
-def _fetch_task(url, is_refetch):
+def _fetch_task(url, is_refetch, user):
     item_url = "-"
+    with set_actor(user):
         try:
             site = SiteManager.get_site_by_url(url)
             if not site:

catalog/search/views.py

@@ -68,7 +68,7 @@ def fetch(request, url, is_refetch: bool = False, site: AbstractSite | None = No
                 "!refetch": [url, None],
             }
         )
-    job_id = enqueue_fetch(url, is_refetch)
+    job_id = enqueue_fetch(url, is_refetch, request.user)
     return render(
         request,
         "fetch_pending.html",

journal/importers/douban.py

@@ -9,6 +9,7 @@ from user_messages import api as msg
 import django_rq
 from common.utils import GenerateDateUUIDMediaFilePath
 import os
+from auditlog.context import set_actor
 from catalog.common import *
 from catalog.common.downloaders import *
 from catalog.sites.douban import DoubanDownloader
@@ -188,6 +189,7 @@ class DoubanImporter:
         print(f"{self.user} import start")
         msg.info(self.user, f"开始导入豆瓣标记和评论")
         self.update_user_import_status(1)
+        with set_actor(self.user):
             self.load_sheets()
             print(f"{self.user} sheet loaded, {self.total} lines total")
             self.update_user_import_status(1)

journal/importers/goodreads.py

@@ -3,6 +3,7 @@ from datetime import datetime
 from user_messages import api as msg
 import django_rq
 from django.utils.timezone import make_aware
+from auditlog.context import set_actor
 from catalog.common import *
 from catalog.models import *
 from journal.models import *
@@ -42,6 +43,7 @@ class GoodreadsImporter:
         match_profile = re.match(re_profile, url)
         total = 0
         visibility = user.preference.default_visibility
+        with set_actor(user):
             if match_list or match_shelf:
                 shelf = (
                     cls.parse_shelf(match_shelf[0], user)