Discarding global lottery buttons

Author: bitbyt3r

uber/automated_emails.py

@@ -861,22 +861,20 @@ def __init__(self, subject, template, filter, ident, **kwargs):
 
 
 if c.HOTEL_LOTTERY_FORM_START:
-    earliest_hotel_deadline = c.HOTEL_LOTTERY_FORM_WAITLIST if c.HOTEL_LOTTERY_FORM_WAITLIST else c.HOTEL_LOTTERY_FORM_DEADLINE
-
     AutomatedEmailFixture(
         Attendee,
         'Did you want to enter the {EVENT_NAME} {EVENT_YEAR} hotel lottery?',
         'hotel/enter_lottery.html',
         lambda a: a.hotel_lottery_eligible and not a.lottery_application and days_after(1, a.registered)(),
-        when=[days_before(7, earliest_hotel_deadline)],
+        when=[days_before(7, c.HOTEL_LOTTERY_FORM_DEADLINE)],
         sender=c.HOTEL_LOTTERY_EMAIL,
         ident='enter_hotel_lottery')
 
     HotelLotteryEmailFixture(
         'Last chance to complete your hotel lottery entry',
         'hotel/lottery_reminder.html',
         lambda a: a.status == c.PARTIAL and days_after(1, a.entry_started)(),
-        when=[days_before(3, earliest_hotel_deadline)],
+        when=[days_before(3, c.HOTEL_LOTTERY_FORM_DEADLINE)],
         ident='hotel_lottery_reminder',
     )
 
@@ -885,26 +883,17 @@ def __init__(self, subject, template, filter, ident, **kwargs):
     HotelLotteryEmailFixture(
         f'{c.EVENT_NAME_AND_YEAR} Hotel Lottery Notification',
         'hotel/award_notification.html',
-        lambda a: a.status == c.AWARDED and not a.final_status_hidden and a.booking_url_ready,
+        lambda a: a.status == c.AWARDED and a.booking_url_ready,
         ident='hotel_lottery_awarded'
     )
 
     HotelLotteryEmailFixture(
         f'{c.EVENT_NAME_AND_YEAR} Hotel Lottery Notification',
         'hotel/reject_notification.html',
-        lambda a: a.status == c.REJECTED and not a.final_status_hidden,
+        lambda a: a.status == c.REJECTED,
         ident='hotel_lottery_rejected'
     )
 
-    if c.HOTEL_LOTTERY_FORM_WAITLIST:
-        HotelLotteryEmailFixture(
-            f'{c.EVENT_NAME_AND_YEAR} Hotel Lottery Notification',
-            'hotel/reject_notification.html',
-            lambda a: a.status == c.COMPLETE and a.qualifies_for_first_round,
-            when=[after(c.HOTEL_LOTTERY_FORM_WAITLIST)],
-            ident='hotel_lottery_first_round_rejected'
-        )
-
     HotelLotteryEmailFixture(
         f'Reminder to confirm your {c.EVENT_NAME_AND_YEAR} hotel reservation',
         'hotel/guarantee_reminder.html',

uber/configspec.ini

@@ -1266,10 +1266,6 @@ hotel_lottery_form_deadline = string(default="")
 hotel_lottery_staff_start = string(default="%(hotel_lottery_form_start)s")
 hotel_lottery_staff_deadline = string(default="%(hotel_lottery_form_deadline)s")
 
-# If set, this is considered a 'first run' deadline and communicated as such on our forms
-# It is for display only
-hotel_lottery_form_waitlist = string(default="")
-
 hotel_lottery_staff_guarantee_due = string(default="")
 hotel_lottery_guarantee_due = string(default="")
 

uber/forms/hotel_lottery.py

@@ -103,8 +103,6 @@ class LotteryAdminInfo(SuiteLottery):
     current_step = IntegerField('Current Step')
     confirmation_num = StringField('Confirmation Number', render_kw={'readonly': "true"})
     can_edit = BooleanField(f'Make this application editable even after its lottery is closed.')
-    final_status_hidden = BooleanField(f"This application's final award status is hidden.")
-    booking_url_hidden = BooleanField(f"This application's booking URL is hidden.")
     is_staff_entry = BooleanField(f'This application is entered into the staff lottery.')
     legal_first_name = LotteryInfo.legal_first_name
     legal_last_name = LotteryInfo.legal_last_name

uber/models/hotel.py

@@ -167,8 +167,6 @@ class LotteryApplication(MagModel, table=True):
     suite_terms_accepted: bool = False
     guarantee_policy_accepted: bool = False
     can_edit: bool = False
-    final_status_hidden: bool = True
-    booking_url_hidden: bool = True
 
     # If this is set then the above values are ignored
     parent_application_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='lottery_application.id', nullable=True)
@@ -369,10 +367,7 @@ def staff_award_status_str(self):
     @property
     def award_status_str(self):
         app_or_parent = self.parent_application if self.entry_type == c.GROUP_ENTRY else self
-        if self.final_status_hidden and not self.status in [c.SECURED, c.CANCELLED]:
-            return ''
-        if not self.finalized and (
-                not c.HOTEL_LOTTERY_FORM_WAITLIST or not self.qualifies_for_first_round or c.BEFORE_HOTEL_LOTTERY_FORM_WAITLIST):
+        if not self.finalized:
             return ''
         if self.staff_award_status_str:
             return self.staff_award_status_str
@@ -403,10 +398,7 @@ def award_status_str(self):
         elif app_or_parent.assigned_hotel:
             return f"Congratulations! {you_str} entry for the {c.EVENT_NAME_AND_YEAR} {room_type} lottery was chosen."
         else:
-            base_str = f"Unfortunately, {you_str.lower()} entry for the {c.EVENT_NAME_AND_YEAR} hotel lottery was not chosen"
-            if c.HOTEL_LOTTERY_FORM_WAITLIST and not app_or_parent.finalized and c.AFTER_HOTEL_LOTTERY_FORM_WAITLIST:
-                return base_str + " in the first round of the lottery."
-            return base_str + "."
+            return f"Unfortunately, {you_str.lower()} entry for the {c.EVENT_NAME_AND_YEAR} hotel lottery was not chosen."
 
     @property
     def can_reenter(self):
@@ -418,9 +410,7 @@ def finalized(self):
 
     @property
     def locked(self):
-        return self.current_lottery_closed or (
-            self.qualifies_for_first_round and c.AFTER_HOTEL_LOTTERY_FORM_WAITLIST
-        ) or (self.finalized and not self.final_status_hidden)
+        return self.current_lottery_closed or self.finalized
 
     @property
     def declined(self):
@@ -430,15 +420,10 @@ def declined(self):
     def complete_or_processed(self):
         return self.status in [c.COMPLETE, c.PROCESSED] or self.finalized
 
-    @property
-    def qualifies_for_first_round(self):
-        if c.HOTEL_LOTTERY_FORM_WAITLIST:
-            return self.complete_or_processed and self.last_submitted and self.last_submitted < c.HOTEL_LOTTERY_FORM_WAITLIST
-
     @property
     def booking_url_ready(self):
         app_or_parent = self.parent_application if self.entry_type == c.GROUP_ENTRY else self
-        return app_or_parent.booking_url and not app_or_parent.booking_url_hidden
+        return bool(app_or_parent.booking_url)
 
     @property
     def group_status_str(self):
@@ -507,7 +492,7 @@ def last_step(self):
     @property
     def homepage_link(self):
         entry_text = 'Suite Lottery Entry' if self.entry_type == c.SUITE_ENTRY else 'Room Lottery Entry'
-        if self.status in [c.COMPLETE, c.PROCESSED] or self.finalized and self.final_status_hidden:
+        if self.status in [c.COMPLETE, c.PROCESSED]:
             prepend = "View " if c.ATTENDEE_ACCOUNTS_ENABLED else ""
             return f'index?attendee_id={self.attendee.id}', f'{prepend}{entry_text}'
         elif self.finalized:

uber/site_sections/hotel_lottery.py

@@ -700,7 +700,7 @@ def transfer_leadership(self, session, id=None, member_id=None, message="", **pa
         if new_leader not in application.valid_group_members:
             raise HTTPRedirect('index?attendee_id={}&message={}', application.attendee.id,
                                f"{new_leader.attendee.full_name} is not a member of your {c.HOTEL_LOTTERY_GROUP_TERM.lower()}")
-        elif application.locked and not (application.finalized and not application.final_status_hidden):
+        elif application.locked:
             raise HTTPRedirect('index?id={}&message={}', application.id,
                                "You cannot transfer group leadership at this time.")
 
@@ -843,7 +843,7 @@ def join_group(self, session, id=None, message="", **params):
     def leave_group(self, session, id=None, message="", **params):
         application = session.lottery_application(id)
 
-        if application.locked and not (application.finalized and not application.final_status_hidden):
+        if application.locked:
             raise HTTPRedirect('index?id={}&message={}', application.id,
                                f"You cannot leave your {c.HOTEL_LOTTERY_GROUP_TERM.lower()} at this time.")
 
@@ -885,7 +885,7 @@ def confirm(self, session, id, message='', **params):
 
         if not application.status in [c.AWARDED, c.SECURED]:
             message = f"{you_str} entry does not have a room or suite award."
-        if not application.booking_url or application.booking_url_hidden:
+        if not application.booking_url:
             message = f"{you_str} entry is still being processed and the booking link is not available yet."
 
         if application.parent_application:

uber/site_sections/hotel_lottery_admin.py

@@ -7,6 +7,7 @@
 from copy import deepcopy
 from collections import defaultdict
 from datetime import datetime, timedelta
+from pytz import UTC
 from dateutil import parser as dateparser
 from sqlalchemy import and_, func, or_
 from sqlalchemy.orm import joinedload
@@ -256,16 +257,6 @@ def feed(self, session, message='', page='1', who='', what='', action=''):
                     Tracking.model == 'LotteryApplication').distinct().order_by(Tracking.who).values(Tracking.who)]
         }
 
-    def mark_staff_processed(self, session, **params):
-        for app in session.query(LotteryApplication).filter(LotteryApplication.is_staff_entry,
-                                                            LotteryApplication.status == c.COMPLETE):
-            app.status = c.PROCESSED
-            session.add(app)
-            session.commit()
-
-        raise HTTPRedirect('index?message={}',
-                           "All complete staff entries marked as processed.")
-    
     @ajax
     def validate_hotel_lottery(self, session, id=None, form_list=[], **params):
         application = session.lottery_application(id)
@@ -333,41 +324,6 @@ def history(self, session, id):
                                                                 ).order_by(PageViewTracking.when).all(),
         }
 
-    def show_awards(self, session, **params):
-        applications = session.query(LotteryApplication).filter(LotteryApplication.status.in_([c.AWARDED, c.REJECTED, c.REMOVED]),
-                                                                LotteryApplication.final_status_hidden == True)
-        total = applications.count()
-        for app in applications:
-            app.final_status_hidden = False
-            session.add(app)
-
-        raise HTTPRedirect('index?message={}',
-                           f"{total} awarded, rejected, and removed from group lottery entries can now see their status.")
-        
-
-    def publish_booking_links(self, session, **params):
-        applications = session.query(LotteryApplication).filter(LotteryApplication.booking_url != '',
-                                                                LotteryApplication.booking_url_hidden == True)
-        total = applications.count()
-        for app in applications:
-            app.booking_url_hidden = False
-            session.add(app)
-
-        raise HTTPRedirect('index?message={}',
-                           f"{total} lottery entries can now see their booking link.")
-
-    def close_waitlist(self, session, **params):
-        applications = session.query(LotteryApplication).filter(LotteryApplication.status == c.COMPLETE,
-                                                                LotteryApplication.last_submitted < c.HOTEL_LOTTERY_FORM_WAITLIST)
-
-        total = applications.count()
-        for app in applications:
-            app.last_submitted = localized_now()
-            session.add(app)
-        
-        raise HTTPRedirect('index?message={}',
-                           f"{total} locked 'first-round' lottery entries are now unlocked.")
-
     def lottery_runs(self, session, message=''):
         runs = session.query(LotteryRun).order_by(LotteryRun.run_at.desc()).all()
         hotels = session.query(LotteryHotel).filter_by(active=True).order_by(LotteryHotel.name).all()
@@ -451,6 +407,16 @@ def revert_run(self, session, id, **params):
         raise HTTPRedirect('lottery_runs?message={}',
                            f"Run '{lottery_run.name}' reverted. {len(applications)} entries reset to complete.")
 
+    def delete_run(self, session, id, **params):
+        lottery_run = session.query(LotteryRun).get(id)
+        if lottery_run.status != c.LOTTERY_REVERTED:
+            raise HTTPRedirect('lottery_run_detail?id={}&message={}', id, 'Only reverted runs can be deleted.')
+
+        name = lottery_run.name
+        session.delete(lottery_run)
+        session.commit()
+        raise HTTPRedirect('lottery_runs?message={}', f"Run '{name}' has been deleted.")
+
     def manage_inventory(self, session, message=''):
         inventory = session.query(HotelRoomInventory).order_by(
             HotelRoomInventory.hotel_id, HotelRoomInventory.is_suite, HotelRoomInventory.name).all()
@@ -760,30 +726,32 @@ def hotel_inventory(self, session, message=''):
         for hotel_id, room_type_id, status, count in assigned_applications:
             assigned_applications_dict[(hotel_id, room_type_id)].append((status, count))
 
+        hotel_lookup = {str(h.id): h for h in session.query(LotteryHotel).all()}
+        room_type_lookup = {str(rt.id): rt for rt in session.query(LotteryRoomType).all()}
+
         room_inventory = defaultdict(list)
-        for inventory_info in HotelRoomInventory.get_inventory(session, is_suite=False):
-            hotel, room_type = inventory_info['id'], inventory_info['room_type']
-            info_for_room = {'room_type': room_type, 'quantity': inventory_info['quantity']}
-            if assigned_applications_dict.get((hotel, room_type)):
-                for status, count in assigned_applications_dict[(hotel, room_type)]:
+        for inv in session.query(HotelRoomInventory).filter_by(is_suite=False, active=True).all():
+            hotel_obj = hotel_lookup.get(str(inv.hotel_id))
+            rt_obj = room_type_lookup.get(str(inv.room_type_id))
+            info_for_room = {'room_type': rt_obj, 'quantity': inv.quantity}
+            if assigned_applications_dict.get((str(inv.hotel_id), str(inv.room_type_id))):
+                for status, count in assigned_applications_dict[(str(inv.hotel_id), str(inv.room_type_id))]:
                     info_for_room[status] = count
-            room_inventory[hotel].append(info_for_room)
+            room_inventory[hotel_obj].append(info_for_room)
 
         suite_inventory = defaultdict(list)
-        for inventory_info in HotelRoomInventory.get_inventory(session, is_suite=True):
-            hotel, room_type = inventory_info['id'], inventory_info['room_type']
-            info_for_room = {'room_type': room_type, 'quantity': inventory_info['quantity']}
-            if assigned_applications_dict.get((hotel, room_type)):
-                for status, count in assigned_applications_dict[(hotel, room_type)]:
+        for inv in session.query(HotelRoomInventory).filter_by(is_suite=True, active=True).all():
+            hotel_obj = hotel_lookup.get(str(inv.hotel_id))
+            st_obj = room_type_lookup.get(str(inv.suite_type_id))
+            info_for_room = {'room_type': st_obj, 'quantity': inv.quantity}
+            if assigned_applications_dict.get((str(inv.hotel_id), str(inv.suite_type_id))):
+                for status, count in assigned_applications_dict[(str(inv.hotel_id), str(inv.suite_type_id))]:
                     info_for_room[status] = count
-            suite_inventory[hotel].append(info_for_room)
+            suite_inventory[hotel_obj].append(info_for_room)
 
         return {
             'room_inventory': room_inventory,
             'suite_inventory': suite_inventory,
-            'hotels': session.query(LotteryHotel).filter_by(active=True).order_by(LotteryHotel.name).all(),
-            'room_types': session.query(LotteryRoomType).filter_by(is_suite=False, active=True).order_by(LotteryRoomType.name).all(),
-            'suite_types': session.query(LotteryRoomType).filter_by(is_suite=True, active=True).order_by(LotteryRoomType.name).all(),
             'now': localized_now(),
         }
 

uber/templates/confirm_tabs.html

@@ -70,7 +70,7 @@
 <li class="nav-item" role="presentation">
   <a href="../hotel_lottery/index?attendee_id={{ attendee.id }}" class="nav-link{% if 'hotel_lottery' in c.PAGE_PATH %} active{% endif %}">
     <span class="fa fa-hotel"></span>
-    {% if attendee.lottery_application and attendee.lottery_application.finalized and not attendee.lottery_application.final_status_hidden %}
+    {% if attendee.lottery_application and attendee.lottery_application.finalized %}
       Hotel Lottery Results
     {% elif attendee.lottery_application and attendee.lottery_application.complete_or_processed %}
       {% set app_or_parent = attendee.lottery_application.parent_application if attendee.lottery_application.entry_type == c.GROUP_ENTRY else attendee.lottery_application %}

uber/templates/emails/hotel/enter_lottery.html

@@ -4,11 +4,7 @@
 <p>
     {{ attendee.full_name }},<br/>
     Your registration qualifies for entering the {{ c.EVENT_NAME_AND_YEAR }} hotel lottery, but you haven't entered yet. 
-    {% if c.HOTEL_LOTTERY_FORM_WAITLIST %}
-    The deadline for entering the first run of the lottery is in {{ ((c.HOTEL_LOTTERY_FORM_WAITLIST - now_localized()).total_seconds() // 86400)|int }} days, on {{ c.HOTEL_LOTTERY_FORM_WAITLIST|datetime_local("%B %-d, %Y at %-I:%M%p %Z") }},
-    {% else %}
     The lottery closes in {{ ((c.HOTEL_LOTTERY_FORM_DEADLINE - now_localized()).total_seconds() // 86400)|int }} days, on {{ c.HOTEL_LOTTERY_FORM_DEADLINE|datetime_local("%B %-d, %Y at %-I:%M%p %Z") }},
-    {% endif %}
     so hurry and <a href="{{ c.URL_BASE }}/hotel_lottery/start?attendee_id={{ attendee.id }}" target="_blank">enter your preferences</a> before then!
 </p>
 <p>

uber/templates/emails/hotel/lottery_reminder.html

@@ -6,11 +6,7 @@
 <p>
     {{ app.attendee.full_name }},<br/>
     Your entry into the {{ c.EVENT_NAME }} {% if staff_lottery %}staff {% endif %}hotel lottery is not complete!
-    {% if c.HOTEL_LOTTERY_FORM_WAITLIST and not (c.STAFF_HOTEL_LOTTERY_OPEN and app_or_parent.qualifies_for_staff_lottery) %}
-    The deadline for entering the first run of the lottery is in {{ ((c.HOTEL_LOTTERY_FORM_WAITLIST - now_localized()).total_seconds() // 86400)|int }} days, on {{ c.HOTEL_LOTTERY_FORM_WAITLIST|datetime_local("%B %-d, %Y at %-I:%M%p %Z") }}.
-    {% else %}
     The lottery closes in {{ ((app.current_lottery_deadline - now_localized()).total_seconds() // 86400)|int }} days, on {{ app.current_lottery_deadline|datetime_local("%B %-d, %Y at %-I:%M%p %Z") }}.
-    {% endif %}
 </p>
 <p>
     You can complete your entry or withdraw from the lottery by {% if c.ATTENDEE_ACCOUNTS_ENABLED %}logging into{% else %}visiting{% endif %} your <a href="{{ c.URL_BASE }}/hotel_lottery/index?attendee_id={{ app.attendee.id }}" target="_blank">lottery options page</a>.

uber/templates/emails/hotel/reject_notification.html

@@ -6,21 +6,6 @@
     {{ app.attendee.full_name }},<br/>
     <strong><span class="text-danger">{{ app.award_status_str }}</span></strong>
 </p>
-{% block reject_info %}
-    {% if not app_or_parent.finalized and c.HOTEL_LOTTERY_OPEN and c.HOTEL_LOTTERY_FORM_WAITLIST and c.AFTER_HOTEL_LOTTERY_FORM_WAITLIST %}
-    <p>
-    Your{% if app.parent_application %} {{ c.HOTEL_LOTTERY_GROUP_TERM|lower }}'s{% endif %} lottery entry is still active and will be considered when allocating cancelled rooms.
-    If you{% if app.parent_application %}r {{ c.HOTEL_LOTTERY_GROUP_TERM|lower }} is{% else %} are{% endif %} chosen for one of these rooms, you will receive an email and
-    you{% if app.parent_application %}r {{ c.HOTEL_LOTTERY_GROUP_TERM|lower }} leader{% endif %} will be given the chance to confirm or decline the reservation.
-    </p>
-    {% endif %}
-{% endblock %}
-{% if not app_or_parent.finalized and c.HOTEL_LOTTERY_OPEN and c.HOTEL_LOTTERY_FORM_WAITLIST and c.AFTER_HOTEL_LOTTERY_FORM_WAITLIST %}
-    <p>
-        You can also
-        {% if not app.parent_application %}edit your lottery entry details{% else %}view your {{ c.HOTEL_LOTTERY_GROUP_TERM|lower }}'s entry or leave your {{ c.HOTEL_LOTTERY_GROUP_TERM|lower }}{% endif %}
-        by {% if c.ATTENDEE_ACCOUNTS_ENABLED %}logging into{% else %}visiting{% endif %} your <a href="{{ c.URL_BASE }}/hotel_lottery/index?attendee_id={{ app.attendee.id }}" target="_blank">lottery options page</a>.
-    </p>
-{% endif %}
+{% block reject_info %}{% endblock %}
 </body>
 </html>