Add SQL queries for conditional states (#2013)

hasgeek · Apr 8, 2024 · f95564e · f95564e
1 parent b9f1763
commit f95564e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/funnel/models/account.py b/funnel/models/account.py
@@ -998,6 +998,7 @@ def ticket_followers(self) -> Query[Account]:
         'ACTIVE_AND_PUBLIC',
         profile_state.PUBLIC,
         lambda account: bool(account.state.ACTIVE),
+        lambda account: account.state.ACTIVE.__clause_element__(),
     )
 
     @classmethod

diff --git a/funnel/models/project.py b/funnel/models/project.py
@@ -634,12 +634,14 @@ def rooms(self) -> list[VenueRoom]:
         'HAS_PROPOSALS',
         cfp_state.ANY,
         lambda project: db.session.query(project.proposals.exists()).scalar(),
+        lambda project: project.proposals.exists(),
         label=('has_proposals', __("Has submissions")),
     )
     cfp_state.add_conditional_state(
         'HAS_SESSIONS',
         cfp_state.ANY,
         lambda project: db.session.query(project.sessions.exists()).scalar(),
+        lambda project: project.sessions.exists(),
         label=('has_sessions', __("Has sessions")),
     )
     cfp_state.add_conditional_state(

diff --git a/funnel/models/proposal.py b/funnel/models/proposal.py
@@ -355,6 +355,9 @@ def __format__(self, format_spec: str) -> str:
         'SCHEDULED',
         state.CONFIRMED,
         lambda proposal: proposal.session is not None and proposal.session.scheduled,
+        lambda proposal: sa.and_(
+            proposal.session.isnot(None), proposal.session.scheduled
+        ),
         label=('scheduled', __("Confirmed &amp; scheduled")),
     )