From 6f6b77dbee41199c7b38a46425dce860575879a2 Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Mon, 18 Mar 2019 22:33:07 +0100
Subject: [PATCH] Fix through beloved ContentType (don't pass objects to celery
tasks!)
---
SciPost_v1/signalprocessors.py | 56 ++++++++++++++++++----------------
1 file changed, 30 insertions(+), 26 deletions(-)
diff --git a/SciPost_v1/signalprocessors.py b/SciPost_v1/signalprocessors.py
index 5340543d5..733872de6 100644
--- a/SciPost_v1/signalprocessors.py
+++ b/SciPost_v1/signalprocessors.py
@@ -2,6 +2,8 @@ __copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
+from django.contrib.contenttypes.models import ContentType
+
from haystack import signals
from haystack.exceptions import NotHandled
@@ -11,13 +13,27 @@ from submissions.models import Submission
class AutoSearchIndexingProcessor(signals.RealtimeSignalProcessor):
- @app.task(bind=True, name='signalprocessors.remove_object_indexes',
- serializer='yaml')
- def remove_objects_indexes(self, sender, objects):
+ @app.task(bind=True, name='signalprocessors.remove_object_indexes')
+ def remove_objects_indexes(self, sender_type_id, object_type_id, object_id):
"""
Given a set of `objects` model instances, remove them from the index as preparation
for the new index.
"""
+ sender = ContentType.get_for_id(sender_type_id)
+ object_type = ContentType.get_for_id(object_type_id)
+ instance = object_type.get_object_for_this_type(pk=object_id)
+
+ if isinstance(instance, Submission):
+ # Submission have complex status handling, so a status change should lead to
+ # more drastic reindexing.
+ ids_list = [k['id'] for k in list(instance.thread.public().values('id'))]
+ objects = Submission.objects.filter(pk__in=ids_list)
+ else:
+ # Objects such as Reports, Comments, Commentaries, etc. may get rejected. This
+ # does not remove them from the index. Therefore, do a complete rebuild_index
+ # action on that specific instance every time the index signal is triggered.
+ objects = [instance]
+
try:
using_backends = self.connection_router.for_write(instance=objects[0])
except IndexError:
@@ -33,12 +49,15 @@ class AutoSearchIndexingProcessor(signals.RealtimeSignalProcessor):
# TODO: Maybe log it or let the exception bubble?
pass
- @app.task(bind=True, name='signalprocessors.update_instance_indexes',
- serializer='yaml')
- def update_instance_indexes(self, sender, instance):
+ @app.task(bind=True, name='signalprocessors.update_instance_indexes')
+ def update_instance_indexes(self, sender_type_id, object_type_id, object_id):
"""
Given an individual model instance, update its entire indexes.
"""
+ sender = ContentType.get_for_id(sender_type_id)
+ object_type = ContentType.get_for_id(object_type_id)
+ instance = object_type.get_object_for_this_type(pk=object_id)
+
try:
using_backends = self.connection_router.for_write(instance=instance)
except IndexError:
@@ -54,23 +73,8 @@ class AutoSearchIndexingProcessor(signals.RealtimeSignalProcessor):
pass
def handle_save(self, sender, instance, **kwargs):
- if isinstance(instance, Submission):
- # Submission have complex status handling, so a status change should lead to
- # more drastic reindexing.
- chain = (
- self.remove_objects_indexes.s(sender, instance.thread.public())
- |
- self.update_instance_indexes.s(sender, instance)
- )
- chain()
-
- else:
- # Objects such as Reports, Comments, Commentaries, etc. may get rejected. This
- # does not remove them from the index. Therefore, do a complete rebuild_index
- # action on that specific instance every time the index signal is triggered.
- chain = (
- self.remove_objects_indexes.s(sender, [instance])
- |
- self.update_instance_indexes.s(sender, instance)
- )
- chain()
+ sender_type_id = ContentType.objects.get_for_model(sender).id
+ instance_type_id = ContentType.objects.get_for_model(instance).id
+ chain = (self.remove_objects_indexes.s(sender_type_id, instance_type_id, instance.id)
+ | self.update_instance_indexes.s(sender_type_id, instance_type_id, instance.id))
+ chain()
--
GitLab