Revert "DEV ONLY Issue to join data from other table in hybrid expression in CourseEvent"

This reverts commit e6fcdb1.

Author: Tschuppi81

src/onegov/ballot/models/election/election.py

@@ -137,7 +137,6 @@ def counted(self) -> bool:
 
         return (sum(1 for r in self.results if r.counted) == count)
 
-    # tschupre example for expression
     @counted.expression  # type:ignore[no-redef]
     def counted(cls) -> 'ColumnElement[bool]':
         expr = select([

src/onegov/core/orm/session_manager.py

@@ -675,9 +675,6 @@ def ensure_schema_exists(self, schema: str) -> None:
                     base.metadata.create_all(conn)
 
                     declared_classes.update(base._decl_class_registry.values())
-                    # declared_classes.update(
-                    #     base.registry._class_registry.values())  # upgrading
-                    # to sqlalchemy 1.4.x
 
                 conn.execute('COMMIT')
             finally:

src/onegov/directory/models/directory_entry.py

@@ -23,16 +23,15 @@ class DirectoryEntry(Base, ContentMixin, CoordinatesMixin, TimestampMixin,
     __tablename__ = 'directory_entries'
 
     es_properties = {
-        # 'keywords': {'type': 'keyword'},  # produce a literal issue when
-        # using sqlalchemy 1.4
+        'keywords': {'type': 'keyword'},
         'title': {'type': 'localized'},
         'lead': {'type': 'localized'},
         '_directory_id': {'type': 'keyword'},
 
         # since the searchable text might include html, we remove it
         # even if there's no html -> possibly decreasing the search
         # quality a bit
-        # 'text': {'type': 'localized_html'}
+        'text': {'type': 'localized_html'}
     }
 
     @property
@@ -104,25 +103,14 @@ def keywords(self):
     def keywords(self, value):
         self._keywords = {k: '' for k in value} if value else None
 
-    # @property
     @hybrid_property
     def text(self):
         return self.directory.configuration.extract_searchable(self.values)
 
-    # @text.expression
-    # def text(cls):
-    #     expr = ''
-    #     print(f'*** hybrid prop text: {expr}')
-    #     return expr
-
     @property
     def values(self):
         return self.content and self.content.get('values', {})
 
-    @hybrid_property
-    def values(cls):
-        return cls.content['values']
-
     @values.setter
     def values(self, values):
         self.content = self.content or {}

src/onegov/feriennet/models/activity.py

@@ -1,8 +1,6 @@
 from functools import cached_property
 
-from sqlalchemy import func, text, select, alias, Column, and_
 from sqlalchemy.ext.hybrid import hybrid_property
-from sqlalchemy.orm import Query, column_property
 
 from onegov.activity import Activity, ActivityCollection, Occasion
 from onegov.activity import PublicationRequestCollection
@@ -14,7 +12,6 @@
 from onegov.org.models.ticket import OrgTicketMixin
 from onegov.search import SearchableContent
 from onegov.ticket import handlers, Handler, Ticket
-from onegov.user import User
 
 
 class VacationActivity(Activity, CoordinatesExtension, SearchableContent):
@@ -27,7 +24,7 @@ class VacationActivity(Activity, CoordinatesExtension, SearchableContent):
         'title': {'type': 'localized'},
         'lead': {'type': 'localized'},
         'text': {'type': 'localized_html'},
-        # 'organiser': {'type': 'text'}
+        'organiser': {'type': 'text'}
     }
 
     @property
@@ -42,18 +39,8 @@ def es_public(self):
     def es_skip(self):
         return self.state == 'preview'
 
-    @hybrid_property
-    def lead(self):
-        return self.meta['lead'].astext
-
-    @hybrid_property
-    def text(self):
-        return self.content['text'].astext
-
-    # @property
     @hybrid_property
     def organiser(self):
-        print('   *** tschupre property organizer()')
         organiser = [
             self.user.username,
             self.user.realname
@@ -80,18 +67,6 @@ def organiser(self):
 
         return organiser
 
-    @organiser.expression
-    def organiser(cls):
-        expr = (
-            Query(User.username, User.realname).
-            select_from(cls).join(User).
-            filter(cls.username == User.username).
-            filter(func.concat_ws(' ', User.username, User.realname)).
-            as_scalar()
-        )
-        print(expr)
-        return expr.label('organizer')
-
     def ordered_tags(self, request, durations=None):
         tags = [request.translate(_(tag)) for tag in self.tags]
 

src/onegov/fsi/models/course_attendee.py

@@ -2,20 +2,20 @@
 
 from onegov.core.orm import Base
 from onegov.core.orm.types import UUID, JSON
-from onegov.user import User
-from sqlalchemy import Boolean, case, select, and_, func
+from sqlalchemy import Boolean
 from onegov.search import ORMSearchable
 from sedate import utcnow
 from sqlalchemy import Column, Text, ForeignKey, ARRAY, desc
 from sqlalchemy.orm import relationship, object_session, backref
 from uuid import uuid4
 
-from typing import TYPE_CHECKING
 
+from typing import TYPE_CHECKING
 if TYPE_CHECKING:
     from onegov.user import User
     from .course_subscription import CourseSubscription
 
+
 external_attendee_org = "Externe Kursteilnehmer"
 
 
@@ -43,8 +43,8 @@ class CourseAttendee(Base, ORMSearchable):
         'first_name': {'type': 'text'},
         'last_name': {'type': 'text'},
         'organisation': {'type': 'text'},
-        # 'email': {'type': 'text'},
-        # 'title': {'type': 'text'},
+        'email': {'type': 'text'},
+        'title': {'type': 'text'},
     }
 
     es_public = False
@@ -118,21 +118,6 @@ def title(self):
             ) if p
         )) or self.email
 
-    @title.expression
-    def title(cls):
-        return case((
-            (
-                and_(
-                    cls.first_name != '',
-                     cls.last_name != ''
-                ),
-                # cls.first_name + ' ' + cls.last_name
-                func.concat(cls.first_name + ' ' + cls.last_name)
-            )
-        ),
-            else_=cls.email,
-        )
-
     @property
     def lead(self):
         return self.organisation
@@ -155,22 +140,6 @@ def email(self):
             return self._email
         return self.user.username
 
-    @email.expression
-    def email(cls):
-        from onegov.user import User
-
-        return case((
-            (
-                # cls.user_id.isnot(None),
-                cls.user_id != '',
-                cls._email
-            ),
-        ), else_=(
-            select([User.username]).
-            where(cls.user_id == User.id).
-            label('email'))
-        )
-
     @email.setter
     def email(self, value):
         self._email = value
@@ -225,7 +194,7 @@ def repeating_courses(self):
 
         session = object_session(self)
 
-        result = session.query(CourseEvent).join(Course) \
+        result = session.query(CourseEvent).join(Course)\
             .filter(Course.mandatory_refresh == True)
 
         result = result.join(CourseSubscription)

src/onegov/fsi/models/course_event.py

@@ -7,25 +7,22 @@
 from icalendar import Event as vEvent
 from sedate import utcnow, to_timezone
 from sqlalchemy import (
-    Column, Boolean, SmallInteger, Enum, Text, Interval, ForeignKey, or_, and_,
-    select)
+    Column, Boolean, SmallInteger, Enum, Text, Interval, ForeignKey, or_, and_)
 from sqlalchemy.ext.hybrid import hybrid_property
-from sqlalchemy.orm import relationship, backref, object_session, join
+from sqlalchemy.orm import relationship, backref, object_session
 from uuid import uuid4
 
 from onegov.core.mail import Attachment
 from onegov.core.orm import Base
 from onegov.core.orm.mixins import TimestampMixin
 from onegov.core.orm.types import UUID, UTCDateTime
 from onegov.fsi import _
-from onegov.fsi.models.course import Course
 from onegov.fsi.models.course_attendee import CourseAttendee
 from onegov.fsi.models.course_subscription import CourseSubscription
 from onegov.fsi.models.course_subscription import subscription_table
 from onegov.search import ORMSearchable
 
 from typing import TYPE_CHECKING
-
 if TYPE_CHECKING:
     from .course import Course
     from .course_notification_template import (
@@ -43,6 +40,7 @@
 
 # for forms...
 def course_status_choices(request=None, as_dict=False):
+
     if request:
         translations = (
             request.translate(v) for v in COURSE_EVENT_STATUSES_TRANSLATIONS)
@@ -56,14 +54,14 @@ def course_status_choices(request=None, as_dict=False):
 
 
 class CourseEvent(Base, TimestampMixin, ORMSearchable):
+
     default_reminder_before = datetime.timedelta(days=14)
 
     __tablename__ = 'fsi_course_events'
 
     es_properties = {
-        # expression for name and desc implementiert aber subquery issue
         'name': {'type': 'localized'},
-        # 'description': {'type': 'localized'},
+        'description': {'type': 'localized'},
         'location': {'type': 'localized'},
         'presenter_name': {'type': 'text'},
         'presenter_company': {'type': 'text'},
@@ -91,41 +89,6 @@ def title(self):
     def name(self):
         return self.course.name
 
-    @name.expression
-    def name(cls):
-        # both variants lead to the same error:
-        # sqlalchemy.exc.NotSupportedError: (psycopg2.errors.FeatureNotSupported) cannot use subquery in column generation expression
-        # subquery issue probably produced due where clause
-
-        # expr = select([Course.name])
-        # expr = expr.where(Course.id == cls.course_id)
-        # expr = expr.label('name')
-        # return expr
-
-        # expr = (select([Course.name]).where(Course.id == cls.course_id).
-        #         select_from(join(cls, Course)).label('name'))
-
-        # the variant below are closer to the final version (explicit
-        # join) but throw: 'Can't find any foreign key relationships between
-        # 'Select object' and 'fsi_courses'
-        expr = select([Course.name]).select_from(cls).join(
-            Course).where(Course.id == cls.course_id).label('name')
-
-        # throws: subquery in FROM must-have an alias
-        # j = select([cls.course_id]).join(Course, Course.id ==
-        #                                  cls.course_id).alias('j')
-        # expr = select([Course.name]).select_from(j).label('name')
-
-        # example https://docs.sqlalchemy.org/en/20/orm/queryguide/select.html#joining-to-subqueries
-        # throwing: TypeError: 'DeclarativeMeta' object is not iterable
-        # subq = select(Address).where(Address.email_address == "[email protected]").subquery()
-        # stmt = select(User).join(subq, User.id == subq.c.user_id)
-        # subquery = select(cls).where(cls.course_id == Course.id).subquery()
-        # expr = select(Course).join(subquery, Course.id == subquery.course_id)
-
-        print(expr)
-        return expr
-
     @property
     def lead(self):
         return (
@@ -138,13 +101,6 @@ def lead(self):
     def description(self):
         return self.course.description
 
-    @description.expression
-    def description(cls):
-        expr = select([Course.description])
-        expr = expr.where(Course.id == cls.course_id)
-        expr = expr.label('description')
-        return expr
-
     def __str__(self):
         start = to_timezone(
             self.start, 'Europe/Zurich').strftime('%d.%m.%Y %H:%M')

src/onegov/org/models/page.py

@@ -45,10 +45,6 @@ class Topic(Page, TraitInfo, SearchableContent, AccessExtension,
     lead_when_child = content_property(default=True)
 
     @hybrid_property
-    def lead(self):  # noqa: F811
-        return self.content['lead']
-
-    @lead.expression
     def lead(self):  # noqa: F811
         return self.content['lead'].astext