Create Proposal.is_accepted columnproperty to avoid duplication

apps/admin/email.py

@@ -46,9 +46,7 @@ def get_users(dest: str) -> list[User]:
     elif dest == "purchasers":
         query = query.join(User.payments).filter(Payment.state == "paid")
     elif dest == "cfp":
-        query = query.join(User.proposals).filter(
-            Proposal.state.in_(("accepted", "finished"))
-        )
+        query = query.join(User.proposals).filter(Proposal.is_accepted)
     elif dest == "villages":
         query = query.join(User.village_membership).filter(VillageMember.admin)
 

apps/api/installations.py

@@ -28,7 +28,7 @@ class Installations(Resource):
     def get(self):
         result = []
         proposals = InstallationProposal.query.filter(
-            InstallationProposal.state.in_(["accepted", "finished"])
+            InstallationProposal.is_accepted
         ).all()
         for proposal in proposals:
             result.append(render_installation(proposal))

apps/cfp/schedule_tasks.py

@@ -161,7 +161,7 @@ def apply_potential_schedule(email, type):
             | (Proposal.potential_time != None)  # noqa: E711
         )
         .filter(Proposal.scheduled_duration.isnot(None))
-        .filter(Proposal.state.in_(["accepted", "finished"]))
+        .filter(Proposal.is_accepted)
         .all()
     )
 

apps/cfp/scheduler.py

@@ -24,7 +24,7 @@ class Scheduler(object):
     def set_rough_durations(self):
         proposals = (
             Proposal.query.filter_by(scheduled_duration=None, type="talk")
-            .filter(Proposal.state.in_(["accepted", "finished"]))
+            .filter(Proposal.is_accepted)
             .all()
         )
 
@@ -49,7 +49,7 @@ def get_scheduler_data(
     ):
         proposals = (
             Proposal.query.filter(Proposal.scheduled_duration.isnot(None))
-            .filter(Proposal.state.in_(["finished", "accepted"]))
+            .filter(Proposal.is_accepted)
             .filter(Proposal.type.in_(type))
             .order_by(Proposal.favourite_count.desc())
             .all()

apps/cfp/tasks.py

@@ -76,7 +76,7 @@ def email_check():
     """Email speakers about their slot"""
     proposals = (
         Proposal.query.filter(Proposal.scheduled_duration.isnot(None))
-        .filter(Proposal.state.in_(["accepted", "finished"]))
+        .filter(Proposal.is_accepted)
         .filter(Proposal.type.in_(["talk", "workshop", "youthworkshop", "performance"]))
         .all()
     )

apps/cfp/views.py

@@ -139,7 +139,7 @@ class LightningTalkProposalForm(ProposalForm):
 
     def set_session_choices(self, remaining_lightning_slots):
         self.session.choices = []
-        for (day_id, day_count) in remaining_lightning_slots.items():
+        for day_id, day_count in remaining_lightning_slots.items():
             if day_count <= 0:
                 continue
             self.session.choices.append(
@@ -533,7 +533,6 @@ def withdraw_proposal(proposal_id):
     form = WithdrawalForm()
     if form.validate_on_submit():
         if form.confirm_withdrawal.data:
-
             app.logger.info("Proposal %s is being withdrawn.", proposal_id)
             proposal.set_state("withdrawn")
 
@@ -653,7 +652,7 @@ def finalise_proposal(proposal_id):
     if proposal.user != current_user:
         abort(404)
 
-    if proposal.state not in ("accepted", "finished"):
+    if not proposal.is_accepted:
         return redirect(url_for(".edit_proposal", proposal_id=proposal_id))
 
     # This is horrendous, but is a lot cleaner than having shitloads of classes and fields

apps/cfp_review/base.py

@@ -869,7 +869,7 @@ def close_round():
     if form.validate_on_submit():
         if form.confirm.data:
             min_votes = session["min_votes"]
-            for (prop, vote_count) in proposals:
+            for prop, vote_count in proposals:
                 if vote_count >= min_votes and prop.state != "reviewed":
                     prop.set_state("reviewed")
 
@@ -896,7 +896,7 @@ def close_round():
     # Find proposals where the submitter has already had an accepted proposal
     # or another proposal in this list
     duplicates = {}
-    for (prop, _) in proposals:
+    for prop, _ in proposals:
         if prop.user.proposals.count() > 1:
             # Only add each proposal once
             if prop.user not in duplicates:
@@ -937,8 +937,7 @@ def rank():
         if form.confirm.data:
             min_score = session["min_score"]
             count = 0
-            for (prop, score) in scored_proposals:
-
+            for prop, score in scored_proposals:
                 if score >= min_score:
                     count += 1
                     prop.set_state("accepted")
@@ -975,19 +974,15 @@ def rank():
         elif form.cancel.data and "min_score" in session:
             del session["min_score"]
 
-    accepted_proposals = Proposal.query.filter(
-        Proposal.state.in_(["accepted", "finished"])
-    )
+    accepted_proposals = Proposal.query.filter(Proposal.is_accepted)
     accepted_counts = defaultdict(int)
     for proposal in accepted_proposals:
         accepted_counts[proposal.type] += 1
 
     allocated_minutes = defaultdict(int)
     unknown_lengths = defaultdict(int)
 
-    accepted_proposals = Proposal.query.filter(
-        Proposal.state.in_(["accepted", "finished"])
-    ).all()
+    accepted_proposals = Proposal.query.filter(Proposal.is_accepted).all()
     for proposal in accepted_proposals:
         length = None
         if proposal.scheduled_duration:
@@ -1060,7 +1055,7 @@ def potential_schedule_changes():
 def scheduler():
     proposals = (
         Proposal.query.filter(Proposal.scheduled_duration.isnot(None))
-        .filter(Proposal.state.in_(["finished", "accepted"]))
+        .filter(Proposal.state.is_accepted)
         .filter(Proposal.type.in_(["talk", "workshop", "youthworkshop", "performance"]))
         .all()
     )
@@ -1168,7 +1163,7 @@ def clashfinder():
 
     clashes = []
     offset = 0
-    for ((id1, id2), count) in popularity.most_common()[:1000]:
+    for (id1, id2), count in popularity.most_common()[:1000]:
         offset += 1
         prop1 = Proposal.query.get(id1)
         prop2 = Proposal.query.get(id2)

apps/cfp_review/venues.py

@@ -82,8 +82,7 @@ def edit_venue(venue_id):
     if form.validate_on_submit():
         if form.delete.data:
             scheduled_content = Proposal.query.filter(
-                Proposal.scheduled_venue_id == venue.id,
-                Proposal.state.in_(["accepted", "finished"]),
+                Proposal.scheduled_venue_id == venue.id, Proposal.is_accepted
             ).count()
 
             if scheduled_content > 0:

apps/schedule/attendee_content.py

@@ -119,7 +119,7 @@ def attendee_content():
         or_(
             Proposal.user_scheduled is True, Proposal.scheduled_venue_id.in_(venue_ids)
         ),
-        Proposal.state.in_(["accepted", "finished"]),
+        Proposal.is_accepted,
     ).all()
 
     form = ContentForm()

apps/schedule/base.py

@@ -66,7 +66,7 @@ def schedule_current():
 def line_up():
     proposals = Proposal.query.filter(
         Proposal.scheduled_duration.isnot(None),
-        Proposal.state.in_(["accepted", "finished"]),
+        Proposal.is_accepted,
         Proposal.type.in_(["talk", "workshop", "youthworkshop", "performance"]),
         Proposal.hide_from_schedule.isnot(True),
     ).all()
@@ -172,7 +172,7 @@ def item(year, proposal_id, slug=None):
 def item_current(year, proposal_id, slug=None):
     """Display a detail page for a talk from the current event"""
     proposal = Proposal.query.get_or_404(proposal_id)
-    if proposal.state not in ("accepted", "finished") or proposal.hide_from_schedule:
+    if not proposal.is_accepted or proposal.hide_from_schedule:
         abort(404)
 
     if not current_user.is_anonymous:
@@ -308,7 +308,7 @@ def herald_message(message, proposal):
         Proposal.query.join(Venue, Venue.id == Proposal.scheduled_venue_id)
         .filter(
             Venue.name == venue_name,
-            Proposal.state.in_(["accepted", "finished"]),
+            Proposal.is_accepted,
             Proposal.scheduled_time > pendulum.now(event_tz),
             Proposal.scheduled_duration.isnot(None),
             Proposal.hide_from_schedule.isnot(True),
@@ -394,7 +394,7 @@ def greenroom_message(message):
     upcoming = (
         Proposal.query.filter(
             Proposal.type.in_(["talk", "workshop", "youthworkshop", "performance"]),
-            Proposal.state.in_(["accepted", "finished"]),
+            Proposal.is_accepted,
             Proposal.scheduled_time > pendulum.now(event_tz),
             Proposal.scheduled_duration.isnot(None),
             Proposal.hide_from_schedule.isnot(True),

apps/schedule/data.py

@@ -107,7 +107,7 @@ def _get_scheduled_proposals(filter_obj={}, override_user=None):
         external_favourites = [f.id for f in user.calendar_favourites]
 
     schedule = Proposal.query.filter(
-        Proposal.state.in_(["accepted", "finished"]),
+        Proposal.is_accepted,
         Proposal.scheduled_time.isnot(None),
         Proposal.scheduled_venue_id.isnot(None),
         Proposal.scheduled_duration.isnot(None),

apps/schedule/feeds.py

@@ -50,7 +50,7 @@ def schedule_frab(year):
 
     schedule = (
         Proposal.query.filter(
-            Proposal.state.in_(["accepted", "finished"]),
+            Proposal.is_accepted,
             Proposal.scheduled_time.isnot(None),
             Proposal.scheduled_venue_id.isnot(None),
             Proposal.scheduled_duration.isnot(None),
@@ -169,7 +169,7 @@ def item_json(year, proposal_id, slug=None):
     if year != event_year():
         abort(404)
     proposal = Proposal.query.get_or_404(proposal_id)
-    if proposal.state not in ("accepted", "finished"):
+    if not proposal.is_accepted:
         abort(404)
 
     if not current_user.is_anonymous:

apps/volunteer/tasks.py

@@ -47,7 +47,7 @@ def run(self):
 
                 events = (
                     Proposal.query.join(Venue, Proposal.scheduled_venue_id == Venue.id)
-                    .filter(Venue.name == venue.name, Proposal.state == "finished")
+                    .filter(Venue.name == venue.name, Proposal.is_accepted)
                     .all()
                 )
                 for e in events:

models/cfp.py

@@ -363,6 +363,8 @@ class Proposal(BaseModel):
     state = db.Column(db.String, nullable=False, default="new")
     type = db.Column(db.String, nullable=False)  # talk, workshop or installation
 
+    is_accepted = column_property(state.in_(["accepted", "finished"]))
+
     # Core information
     title = db.Column(db.String, nullable=False)
     description = db.Column(db.String, nullable=False)
@@ -525,16 +527,16 @@ def get_export_data(cls):
             Venue.name,
         )
         accepted_proposals = (
-            proposals.filter(cls.state.in_(["accepted", "finished"]))
+            proposals.filter(cls.is_accepted)
             .outerjoin(cls.scheduled_venue)
             .join(cls.user)
             .add_columns(*accepted_columns)
         )
 
-        other_proposals = proposals.filter(~cls.state.in_(["accepted", "finished"]))
+        other_proposals = proposals.filter(~cls.is_accepted)
 
         user_favourites = (
-            cls.query.filter(cls.state.in_(["accepted", "finished"]))
+            cls.query.filter(cls.is_accepted)
             .join(cls.favourites)
             .with_entities(User.id.label("user_id"), cls.id)
             .order_by(User.id)
@@ -556,7 +558,7 @@ def get_export_data(cls):
             Venue.name.label("venue"),
         )
         accepted_public = (
-            cls.query.filter(cls.state.in_(["accepted", "finished"]))
+            cls.query.filter(cls.is_accepted)
             .outerjoin(cls.scheduled_venue)
             .with_entities(*public_columns)
         )

templates/cfp/edit.html

@@ -27,7 +27,7 @@ <h2>Proposal Detail</h2>
   {% include "cfp/edit-form.html" %}
 {% else %}
   <div class="well"><div class="row">
-    {% if feature_enabled('CFP_FINALISE') and proposal.state in ['accepted', 'finished']  %}
+    {% if feature_enabled('CFP_FINALISE') and proposal.is_accepted %}
       <div class="col-md-12">
         Your {{ proposal.human_type }} has been accepted! If you haven't already, please
         <a href="{{ url_for('.finalise_proposal', proposal_id=proposal.id ) }}">finalise your details</a>.

templates/cfp/proposals.html

@@ -52,12 +52,12 @@ <h4><a href="{{ url_for('.edit_proposal', proposal_id=proposal.id) }}">{{ propos
             {{ proposal.get_unread_count(current_user) }} unread of {{ proposal.messages | length }}
           </a>
         </dd>
-        {% if proposal.state != 'accepted' and proposal.state != 'finished' %}
+        {% if not proposal.is_accepted %}
           <dt>Required notice</dt>
           <dd>{{ proposal.notice_required }}</dd>
         {% endif %}
         {% if (proposal.type == 'talk' or proposal.type == 'workshop') %}
-            {% if (proposal.state == 'accepted' or proposal.state == 'finished') %}
+            {% if proposal.is_accepted %}
               <dt>Slot length</dt><dd>{{proposal.scheduled_duration}} minutes</dd>
               <dt>Slot time</dt><dd>{% if proposal.scheduled_time %}<b><font color="green">{{proposal.scheduled_time.strftime('%A at %-I:%M %p')}}</font></b>{% else %}Not yet scheduled{% endif %}</dd>
               <dt>Venue</dt><dd>{{proposal.scheduled_venue_name or "Not yet scheduled"}}</dd>

templates/cfp_review/update_proposal.html

@@ -116,7 +116,7 @@ <h4 class="panel-title">
                     </div>
                 </div>
             </div>
-            {% if proposal.state in ('accepted', 'finished') %}
+            {% if proposal.is_accepted %}
                 <div class="panel panel-default">
                     <div class="panel-heading" role="tab" id="publishedPanelHeading">
                         <h4 class="panel-title">