From aa901ce1d4389a650f8e042743a47936da921bf6 Mon Sep 17 00:00:00 2001
From: Matti Lamppu <matti.lamppu@vincit.fi>
Date: Wed, 4 Dec 2024 16:21:50 +0200
Subject: [PATCH] Fix search vector update

Add output fields and better null caching
---
 .../models/reservation_unit/queryset.py           | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/tilavarauspalvelu/models/reservation_unit/queryset.py b/tilavarauspalvelu/models/reservation_unit/queryset.py
index 0e9acccf4..3e71160e5 100644
--- a/tilavarauspalvelu/models/reservation_unit/queryset.py
+++ b/tilavarauspalvelu/models/reservation_unit/queryset.py
@@ -156,14 +156,19 @@ def update_search_vectors(self, reservation_unit_pk: int | None = None) -> None:
                         models.F(f"description_{lang}"),
                         #
                         # Additional search terms
-                        models.Value(" ".join(term for term in reservation_unit.search_terms)),
+                        models.Value(
+                            " ".join(term for term in reservation_unit.search_terms),
+                            output_field=models.CharField(),
+                        ),
                         #
                         # Joins are not allowed in search vectors, so we compute them as values beforehand.
                         models.Value(
-                            getattr(reservation_unit.unit, f"name_{lang}", ""),
+                            getattr(reservation_unit.unit, f"name_{lang}", "") or "",
+                            output_field=models.CharField(),
                         ),
                         models.Value(
-                            getattr(reservation_unit.reservation_unit_type, f"name_{lang}", ""),
+                            getattr(reservation_unit.reservation_unit_type, f"name_{lang}", "") or "",
+                            output_field=models.CharField(),
                         ),
                         models.Value(
                             " ".join(
@@ -171,6 +176,7 @@ def update_search_vectors(self, reservation_unit_pk: int | None = None) -> None:
                                 for inst in reservation_unit.spaces.all()
                                 if (name := getattr(inst, f"name_{lang}", ""))
                             ),
+                            output_field=models.CharField(),
                         ),
                         models.Value(
                             " ".join(
@@ -178,6 +184,7 @@ def update_search_vectors(self, reservation_unit_pk: int | None = None) -> None:
                                 for inst in reservation_unit.resources.all()
                                 if (name := getattr(inst, f"name_{lang}", ""))
                             ),
+                            output_field=models.CharField(),
                         ),
                         models.Value(
                             " ".join(
@@ -185,6 +192,7 @@ def update_search_vectors(self, reservation_unit_pk: int | None = None) -> None:
                                 for inst in reservation_unit.purposes.all()
                                 if (name := getattr(inst, f"name_{lang}", ""))
                             ),
+                            output_field=models.CharField(),
                         ),
                         models.Value(
                             " ".join(
@@ -192,6 +200,7 @@ def update_search_vectors(self, reservation_unit_pk: int | None = None) -> None:
                                 for inst in reservation_unit.equipments.all()
                                 if (name := getattr(inst, f"name_{lang}", ""))
                             ),
+                            output_field=models.CharField(),
                         ),
                         #
                         config=config,