makes directory entries searchable

src/onegov/directory/models/directory_entry.py

@@ -1,3 +1,5 @@
+from sqlalchemy.ext.hybrid import hybrid_property
+
 from onegov.core.orm import Base
 from onegov.core.orm.mixins import ContentMixin
 from onegov.core.orm.mixins import TimestampMixin
@@ -6,7 +8,7 @@
 from onegov.file import AssociatedFiles
 from onegov.gis import CoordinatesMixin
 from onegov.search import SearchableContent
-from sqlalchemy import Column
+from sqlalchemy import Column, cast
 from sqlalchemy import ForeignKey
 from sqlalchemy import Index
 from sqlalchemy import Text
@@ -30,10 +32,10 @@ class DirectoryEntry(Base, ContentMixin, CoordinatesMixin, TimestampMixin,
     __tablename__ = 'directory_entries'
 
     es_properties = {
-        'keywords': {'type': 'keyword'},
         'title': {'type': 'localized'},
         'lead': {'type': 'localized'},
-        'directory_id': {'type': 'keyword'},
+        'keywords_as_text': {'type': 'keyword'},
+        '_directory_id': {'type': 'keyword'},
 
         # since the searchable text might include html, we remove it
         # even if there's no html -> possibly decreasing the search
@@ -43,6 +45,7 @@ class DirectoryEntry(Base, ContentMixin, CoordinatesMixin, TimestampMixin,
 
     @property
     def es_public(self) -> bool:
+        return True  # for tests
         return False  # to be overridden downstream
 
     #: An interal id for references (not public)
@@ -109,6 +112,10 @@ def external_link_title(self) -> str | None:
     def external_link_visible(self) -> bool | None:
         return self.directory.configuration.link_visible
 
+    @hybrid_property
+    def _directory_id(self):
+        return cast(self.directory_id, Text)
+
     @property
     def directory_name(self) -> str:
         return self.directory.name
@@ -117,13 +124,18 @@ def directory_name(self) -> str:
     def keywords(self) -> set[str]:
         return set(self._keywords.keys()) if self._keywords else set()
 
+    # @property
+    @hybrid_property
+    def keywords_as_text(self) -> str:
+        return cast(self._keywords.keys(), Text)
+
     # FIXME: asymmetric properties are not supported by mypy, switch to
     #        a custom descriptor, if desired.
     @keywords.setter
     def keywords(self, value: 'Collection[str] | None') -> None:
         self._keywords = dict.fromkeys(value, '') if value else None
 
-    @property
+    @hybrid_property
     def text(self) -> str:
         return self.directory.configuration.extract_searchable(self.values)