also index num and type of provision

laws-africa · Apr 24, 2024 · 8fa876d · 8fa876d
1 parent ec7c7bd
commit 8fa876d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/peachjam_search/documents.py b/peachjam_search/documents.py
@@ -113,6 +113,8 @@ class SearchableDocument(Document):
         properties={
             "title": fields.TextField(),
             "id": fields.KeywordField(),
+            "num": fields.KeywordField(),
+            "type": fields.KeywordField(),
             "parent_titles": fields.TextField(),
             "parent_ids": fields.KeywordField(),
             "body": fields.TextField(fields={"exact": Text()}),
@@ -301,6 +303,8 @@ def prepare_provision(item, parents):
                 provision = {
                     "title": item["title"],
                     "id": provision_id,
+                    "num": (item["num"] or "").rstrip("."),
+                    "type": item["type"],
                     "parent_titles": [
                         p["title"] for p in parents if p["title"] and p["id"]
                     ],

diff --git a/peachjam_search/serializers.py b/peachjam_search/serializers.py
@@ -70,7 +70,9 @@ def get_pages(self, obj):
     def get_provisions(self, obj):
         """Serialize nested provision hits and highlights."""
         provisions = []
-        if hasattr(obj.meta, "inner_hits"):
+        if hasattr(obj.meta, "inner_hits") and hasattr(
+            obj.meta.inner_hits, "provisions"
+        ):
             for provision in obj.meta.inner_hits.provisions.hits.hits:
                 info = provision._source.to_dict()
                 info["highlight"] = (