More hybrid properties and fixes for such

src/onegov/agency/models/agency.py

@@ -49,7 +49,7 @@ def es_public(self) -> bool:
 
     @es_public.expression  # ignore[no-redef]
     def es_public(cls) -> 'ClauseElement':
-        and_(
+        return and_(
             cls.access == 'public',
             cls.published == True
         )

src/onegov/agency/models/person.py

@@ -61,15 +61,15 @@
         digits = org.agency_phone_internal_digits
         return number.replace(' ', '')[-digits:] if number and digits else ''
 
-    @phone_internal.expression
+    @phone_internal.expression  # type:ignore[no-redef]
     def phone_internal(cls) -> 'ClauseElement':
         org_subquery = (
             select([Organisation.agency_phone_internal_field,
                     Organisation.agency_phone_internal_digits])
             .limit(1)
             .scalar_subquery()
         )
         return func.substr(
             func.replace(getattr(
                 cls, org_subquery.c.agency_phone_internal_field), ' ', ''),
             -org_subquery.c.agency_phone_internal_field_digits

src/onegov/feriennet/models/activity.py

@@ -1,4 +1,6 @@
 from functools import cached_property
+
+from sqlalchemy import func
 from sqlalchemy.ext.hybrid import hybrid_property
 
 from onegov.activity import Activity, ActivityCollection, Occasion
@@ -17,6 +19,8 @@
 if TYPE_CHECKING:
     from collections.abc import Iterator, Sequence
     from markupsafe import Markup
+    from sqlalchemy.sql import ClauseElement
+
     from onegov.activity.models import PublicationRequest
     from onegov.feriennet.request import FeriennetRequest
 
@@ -42,7 +46,7 @@
     def es_skip(self) -> bool:
         return self.state == 'preview'
 
-    @property
+    @hybrid_property
     def organiser(self) -> list[str]:
         organiser: list[str] = [
             self.user.username,
@@ -73,6 +77,23 @@
 
         return organiser
 
+    @organiser.expression  # ignore[no-redef]
+    def organizer(cls) -> 'ClauseElement':
+        return func.array([
+            cls.user.username,
+            cls.user.realname,
+            cls.user.data.get('organisation', ''),
+            cls.user.data.get('address', ''),
+            cls.user.data.get('zip_code', ''),
+            cls.user.data.get('place', ''),
+            cls.user.data.get('email', ''),
+            cls.user.data.get('phone', ''),
+            cls.user.data.get('emergency', ''),
+            cls.user.data.get('website', ''),
+            cls.user.data.get('bank_account', ''),
+            cls.user.data.get('bank_beneficiary', ''),
+        ])
+
     def ordered_tags(
         self,
         request: 'FeriennetRequest',

src/onegov/fsi/models/course_attendee.py

@@ -2,7 +2,7 @@
 
 from onegov.core.orm import Base
 from onegov.core.orm.types import UUID, JSON
-from sqlalchemy import Boolean
+from sqlalchemy import Boolean, case, and_
 from onegov.search import ORMSearchable
 from sedate import utcnow
 from sqlalchemy import Column, Text, ForeignKey, ARRAY, desc
@@ -16,6 +16,7 @@
     from onegov.core.types import AppenderQuery
     from onegov.user import User
     from sqlalchemy.orm import Query
+    from sqlalchemy.sql import ClauseElement
     from .course_event import CourseEvent
     from .course_subscription import CourseSubscription
 
@@ -132,14 +133,23 @@
         cascade='all, delete-orphan'
     )
 
-    @property
+    @hybrid_property
     def title(self) -> str:
         return ' '.join(
             part
             for part in (self.first_name, self.last_name)
             if part
         ) or self.email
 
+    @title.expression
+    def title(cls) -> 'ClauseElement':
+        has_name = and_(cls.first_name != None, cls.last_name != None)
+        return case([
+            (has_name, cls.first_name + ' ' + cls.last_name),
+            (cls.first_name != None, cls.first_name),
+            (cls.last_name != None, cls.last_name)
+        ], else_=cls._email)
+
     @property
     def lead(self) -> str | None:
         return self.organisation
@@ -156,7 +166,7 @@
         assert self.user is not None
         return self.user.role
 
-    @property
+    @hybrid_property
     def email(self) -> str:
         """Needs a switch for external users"""
         if not self.user_id:
@@ -169,6 +179,12 @@
         assert self.user is not None
         return self.user.username
 
+    @email.expression
+    def email(cls) -> 'ClauseElement':
+        return case([
+            (cls.user_id == None, cls._email)
+        ], else_=cls.user.username)
+
     @email.setter
     def email(self, value: str) -> None:
         self._email = value

src/onegov/fsi/models/course_event.py

@@ -7,7 +7,8 @@
 from icalendar import Event as vEvent
 from sedate import utcnow, to_timezone
 from sqlalchemy import (
-    Column, Boolean, SmallInteger, Enum, Text, Interval, ForeignKey, or_, and_)
+    Column, Boolean, SmallInteger, Enum, Text, Interval, ForeignKey, or_, and_,
+    select)
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.orm import relationship, object_session
 from uuid import uuid4
@@ -31,6 +32,7 @@
     from onegov.core.types import AppenderQuery
     from onegov.fsi.request import FsiRequest
     from sqlalchemy.orm import Query
+    from sqlalchemy.sql import ClauseElement
     from typing_extensions import Self, TypeAlias
     from wtforms.fields.choices import _Choice
     from .course import Course
@@ -129,10 +131,18 @@
     def title(self) -> str:
         return str(self)
 
-    @property
+    @hybrid_property
     def name(self) -> str:
         return self.course.name
 
+    @name.expression  # type:ignore
+    def name(cls) -> 'ClauseElement':
+        from .course import Course
+
+        return select([Course.name]).where(
+            Course.id == cls.course_id
+        ).as_scalar()
+
     @property
     def lead(self) -> str:
         return (
@@ -141,10 +151,18 @@
             f'{self.presenter_company}'
         )
 
-    @property
+    @hybrid_property
     def description(self) -> 'Markup':
         return self.course.description
 
+    @description.expression
+    def description(cls) -> 'ClauseElement':
+        from .course import Course
+
+        return select([Course.description]).where(
+            Course.id == cls.course_id
+        ).as_scalar()
+
     def __str__(self) -> str:
         start = to_timezone(
             self.start, 'Europe/Zurich').strftime('%d.%m.%Y %H:%M')

src/onegov/org/models/file.py

@@ -255,7 +255,7 @@ def es_public(self) -> bool:
 
     @es_public.expression  # ignore[no-redef]
     def es_public(cls) -> 'ClauseElement':
-        and_(
+        return and_(
             cls.published == True,
             cls.access == 'public'
         )