check labels first; correct model to re-index; re-index related

peachjam/models/generic_document.py

@@ -99,10 +99,14 @@ def apply_labels(self):
             code="repealed",
             defaults={"name": "Repealed", "code": "repealed", "level": "danger"},
         )
+
+        labels = list(self.labels.all())
+
         # apply label if repealed
         if self.repealed:
-            self.labels.add(label.pk)
-        else:
+            if label not in labels:
+                self.labels.add(label.pk)
+        elif label in labels:
             # not repealed, remove label
             self.labels.remove(label.pk)
 

peachjam/models/judgment.py

@@ -319,11 +319,14 @@ def apply_labels(self):
             defaults={"name": "Reported", "code": "reported", "level": "success"},
         )
 
+        labels = list(self.labels.all())
+
         # if the judgment has alternative_names, apply the "reported" label
         if self.alternative_names.exists():
-            self.labels.add(label.pk)
+            if label not in labels:
+                self.labels.add(label.pk)
         # if the judgment no alternative_names, remove the "reported" label
-        else:
+        elif label in labels:
             self.labels.remove(label.pk)
 
         super().apply_labels()

peachjam_search/tasks.py

@@ -22,6 +22,15 @@ class BackgroundTaskSearchProcessor(RealTimeSignalProcessor):
     """
 
     def handle_save(self, sender, instance, **kwargs):
+        self.update_if_core_document(sender, instance, **kwargs)
+
+    def handle_pre_delete(self, sender, instance, **kwargs):
+        # an instance of a model potentially related to a CoreDocument (but not a CoreDocument itself) is being deleted
+        # if it's related, queue up a re-index of the CoreDocument
+        self.update_if_core_document(sender, instance, **kwargs)
+
+    def update_if_core_document(self, sender, instance, **kwargs):
+        """If the instance is a CoreDocument or a model related to a CoreDocument, queue up a re-index."""
         if not DEDConfig.autosync_enabled() or kwargs.get("raw"):
             return
 
@@ -30,7 +39,7 @@ def handle_save(self, sender, instance, **kwargs):
         if any(isinstance(instance, cls) for cls in [CoreDocument, *related_models]):
             # queue up the task for 60 seconds from now, so that quick edits to the document don't all trigger
             # a re-index
-            search_model_saved(sender._meta.label, instance.pk, schedule=60)
+            search_model_saved(instance.__class__._meta.label, instance.pk, schedule=60)
 
 
 def get_processor():