Sync with backend updates

Updates the magprime plugin with changes for the new file service and other major updates

Author: kitsuta

alembic/versions/3b1f31ec9f24_add_external_sync_created_and_last_.py

@@ -16,7 +16,6 @@
 from alembic import op
 import sqlalchemy as sa
 from sqlalchemy.dialects import postgresql
-import residue
 
 
 try:
@@ -53,12 +52,12 @@ def sqlite_column_reflect_listener(inspector, table, column_info):
 
 
 def upgrade():
-    op.add_column('prev_season_supporter', sa.Column('created', residue.UTCDateTime(), server_default=sa.text("timezone('utc', current_timestamp)"), nullable=False))
-    op.add_column('prev_season_supporter', sa.Column('last_updated', residue.UTCDateTime(), server_default=sa.text("timezone('utc', current_timestamp)"), nullable=False))
+    op.add_column('prev_season_supporter', sa.Column('created', sa.DateTime(timezone=True), server_default=sa.text("timezone('utc', current_timestamp)"), nullable=False))
+    op.add_column('prev_season_supporter', sa.Column('last_updated', sa.DateTime(timezone=True), server_default=sa.text("timezone('utc', current_timestamp)"), nullable=False))
     op.add_column('prev_season_supporter', sa.Column('external_id', postgresql.JSONB(astext_type=sa.Text()), server_default='{}', nullable=False))
     op.add_column('prev_season_supporter', sa.Column('last_synced', postgresql.JSONB(astext_type=sa.Text()), server_default='{}', nullable=False))
-    op.add_column('season_pass_ticket', sa.Column('created', residue.UTCDateTime(), server_default=sa.text("timezone('utc', current_timestamp)"), nullable=False))
-    op.add_column('season_pass_ticket', sa.Column('last_updated', residue.UTCDateTime(), server_default=sa.text("timezone('utc', current_timestamp)"), nullable=False))
+    op.add_column('season_pass_ticket', sa.Column('created', sa.DateTime(timezone=True), server_default=sa.text("timezone('utc', current_timestamp)"), nullable=False))
+    op.add_column('season_pass_ticket', sa.Column('last_updated', sa.DateTime(timezone=True), server_default=sa.text("timezone('utc', current_timestamp)"), nullable=False))
     op.add_column('season_pass_ticket', sa.Column('external_id', postgresql.JSONB(astext_type=sa.Text()), server_default='{}', nullable=False))
     op.add_column('season_pass_ticket', sa.Column('last_synced', postgresql.JSONB(astext_type=sa.Text()), server_default='{}', nullable=False))
 

alembic/versions/e68ef1dc43fc_initial_migration.py

@@ -15,7 +15,6 @@
 
 from alembic import op
 import sqlalchemy as sa
-import residue
 
 
 try:
@@ -32,15 +31,15 @@
 
 def upgrade():
     op.create_table('prev_season_supporter',
-    sa.Column('id', residue.UUID(), nullable=False),
+    sa.Column('id', sa.Uuid(as_uuid=False), nullable=False),
     sa.Column('first_name', sa.Unicode(), server_default='', nullable=False),
     sa.Column('last_name', sa.Unicode(), server_default='', nullable=False),
     sa.Column('email', sa.Unicode(), server_default='', nullable=False),
     sa.PrimaryKeyConstraint('id', name=op.f('pk_prev_season_supporter'))
     )
     op.create_table('season_pass_ticket',
-    sa.Column('id', residue.UUID(), nullable=False),
-    sa.Column('fk_id', residue.UUID(), nullable=False),
+    sa.Column('id', sa.Uuid(as_uuid=False), nullable=False),
+    sa.Column('fk_id', sa.Uuid(as_uuid=False), nullable=False),
     sa.Column('slug', sa.Unicode(), server_default='', nullable=False),
     sa.PrimaryKeyConstraint('id', name=op.f('pk_season_pass_ticket'))
     )

magprime/__init__.py

@@ -25,7 +25,7 @@
 @Session.model_mixin
 class SessionMixin:
     def season_pass(self, id):
-        pss = self.query(PrevSeasonSupporter).filter_by(id=id).all()
+        pss = self.get(PrevSeasonSupporter, id).all()
         if pss:
             return pss[0]
         else:

magprime/automated_emails.py

@@ -57,7 +57,7 @@ def __init__(self, event):
                 subject='Claim your {} badges with your MAGFest Season Pass'.format(event.name),
                 ident='magprime_season_supporter_{}_invite'.format(event.slug),
                 template='season_supporter_event_invite.txt',
-                when=before(event.deadline),
+                when=[before(event.deadline)],
                 extra_data={'event': event})
 
     for _event in SeasonEvent.instances.values():
@@ -68,15 +68,15 @@ def __init__(self, event):
     Attendee, 'MAGFest schedule, map, and other FAQs', 'precon_faqs.html',
     filter=lambda a: not a.cannot_check_in_reason,
     ident='magprime_precon_faqs',
-    when=days_before(7, c.EPOCH),
+    when=[days_before(7, c.EPOCH)],
     sender='MAGFest <contact@magfest.org>')
 
 AutomatedEmailFixture(
     Attendee, 'Thank you for your Super MAGFest Superstars Donation!',
     'superstar_intro.html',
     filter=lambda a: a.extra_donation >= c.SUPERSTAR_MINIMUM and a.active_receipt and not a.amount_unpaid,
     ident='superstar_intro',
-    when=before(c.SUPERSTAR_DEADLINE),
+    when=[before(c.SUPERSTAR_DEADLINE)],
     sender='MAGFest Superstar Program <superstars@magfest.org>'
 )
 
@@ -96,14 +96,14 @@ def __init__(self, event):
     Attendee, 'Department Heads', 'food/department_heads.txt',
     lambda a: a.is_dept_head,
     ident='magprime_department_water_and_food_info',
-   # when=days_before(7, c.UBER_TAKEDOWN),
+    #when=[days_before(7, c.UBER_TAKEDOWN)],
     sender='MAGFest Staff Suite <chefs@magfest.org>')
 
 AutomatedEmailFixture(
     Attendee, 'MAGFest Volunteer Food', 'volunteer_food_info.txt',
     lambda a: a.staffing,
     ident='magprime_volunteer_food_info',
-    when=days_before(7, c.UBER_TAKEDOWN),
+    when=[days_before(7, c.UBER_TAKEDOWN)],
     sender='MAGFest Staff Suite <chefs@magfest.org>')
 
 AutomatedEmailFixture(
@@ -119,67 +119,14 @@ def __init__(self, event):
     needs_approval=True,
     sender='MAGFest LAN <lan@magfest.org>')
 
-MarketplaceEmailFixture(
-        'Your {} {} has been waitlisted'.format(c.EVENT_NAME, c.DEALER_APP_TERM.capitalize()),
-        'dealers/waitlisted.txt',
-        lambda g: g.status == c.WAITLISTED,
-        # query=Group.status == c.WAITLISTED,
-        needs_approval=True,
-        ident='dealer_reg_waitlisted')
-
-MarketplaceEmailFixture(
-        'Your {} {} has been declined'.format(c.EVENT_NAME, c.DEALER_APP_TERM.capitalize()),
-        'dealers/declined.txt',
-        lambda g: g.status == c.DECLINED,
-        # query=Group.status == c.DECLINED,
-        needs_approval=True,
-        ident='dealer_reg_declined')
-
-"""
-AutomatedEmailFixture(
-    Attendee, 'MAGFest Tech Ops volunteering', 'techops.txt',
-    lambda a: a.staffing and a.assigned_to(c.TECH_OPS),
-    ident='magprime_techops_volunteer',
-    sender='MAGFest TechOps <techops@magfest.org>')
-
-AutomatedEmailFixture(
-    Attendee, 'MAGFest Chipspace volunteering', 'chipspace.txt',
-    lambda a: a.staffing and a.assigned_to(c.CHIPSPACE),
-    ident='magprime_chipspace_volunteer',
-    sender='MAGFest ChipSpace <chipspace@magfest.org>')
-
-AutomatedEmailFixture(
-    Attendee, 'MAGFest Chipspace shifts', 'chipspace_trusted.txt',
-    lambda a: a.staffing and a.has_shifts_in(c.CHIPSPACE) and a.trusted_in(c.CHIPSPACE),
-    ident='magprime_chipspace_trusted_volunteer',
-    sender='MAGFest ChipSpace <chipspace@magfest.org>')
-
-AutomatedEmailFixture(
-    Attendee, 'MAGFest Chipspace', 'chipspace_untrusted.txt',
-    lambda a: a.staffing and a.has_shifts_in(c.CHIPSPACE) and not a.trusted_in(c.CHIPSPACE),
-    ident='magprime_chipspace_untrusted_volunteer',
-    sender='MAGFest ChipSpace <chipspace@magfest.org>')
-
-AutomatedEmailFixture(
-    Attendee, 'Want to help run MAGFest poker tournaments?', 'poker.txt',
-    lambda a: a.has_shifts_in(c.TABLETOP),
-    ident='magprime_tabletop_volunteer_poker_inquiry',
-    sender='MAGFest Tabletop <tabletop@magfest.org>')
-
 StopsEmailFixture(
-    'MAGFest Staff Support', 'staff_support.txt',
-    lambda a: a.assigned_to(c.STAFF_SUPPORT) and not a.trusted_in(c.STAFF_SUPPORT),
-    ident='magprime_staff_support_volunteer')
-"""
-
-StopsEmailFixture(
-    '{EVENT_NAME} ({EVENT_DATE}) shifts are live tomorrow!',
+    f'{c.EVENT_NAME} ({c.EPOCH.strftime('%b %Y')}) shifts are live tomorrow!',
     'shifts/shifts_created.txt',
     lambda a: (
         a.badge_type != c.CONTRACTOR_BADGE
         and a.takes_shifts
         and a.registered_local <= c.SHIFTS_CREATED),
-    when=before(c.PREREG_TAKEDOWN),
+    when=[before(c.PREREG_TAKEDOWN)],
     ident='volunteer_shift_signup_notification')
 
 StopsEmailFixture(
@@ -192,11 +139,11 @@ def __init__(self, event):
     StopsEmailFixture(
         'Last Chance to enter your MAGFest staff shirt preferences', 'second_shirt.html',
         lambda a: a.gets_staff_shirt and not a.shirt_info_marked,
-        when=days_before(21, c.SHIRT_DEADLINE),
+        when=[days_before(21, c.SHIRT_DEADLINE)],
         ident='magprime_second_shirt')
 
 AutomatedEmailFixture(
-    Attendee, 'Last Chance for MAGFest ' + c.EVENT_YEAR + ' bonus swag!', 'attendee_swag_promo.html',
+    Attendee, f'Last Chance for MAGFest {c.EVENT_YEAR} bonus swag!', 'attendee_swag_promo.html',
     lambda a: (
         a.can_spam
         and (a.paid == c.HAS_PAID or a.paid == c.NEED_NOT_PAY or (a.group and a.group.amount_paid))
@@ -208,9 +155,8 @@ def __init__(self, event):
 # who kicked in at the shirt level or above). Should not be sent after the t-shirt
 # size deadline.
 AutomatedEmailFixture(
-    Attendee, 'MAGFest ' + c.EVENT_YEAR + ' t-shirt size confirmation', 'confirm_shirt_size.html',
+    Attendee, f'MAGFest {c.EVENT_YEAR} t-shirt size confirmation', 'confirm_shirt_size.html',
     lambda a: days_after(3, a.registered)() and a.gets_any_kind_of_shirt,
-    when=before(c.SHIRT_DEADLINE),
+    when=[before(c.SHIRT_DEADLINE)],
     sender='MAGFest Merch Team <merch@magfest.org>',
     ident='magprime_shirt_size_confirmation')
-

magprime/forms.py

@@ -1,16 +1,20 @@
+import logging 
+
 from markupsafe import Markup
 from wtforms import (BooleanField, DecimalField, EmailField, Form, FormField,
                      HiddenField, SelectField, SelectMultipleField, IntegerField,
                      StringField, TelField, validators, TextAreaField)
 from wtforms.validators import ValidationError, StopValidation
 from wtforms.widgets import html_params
-from pockets.autolog import log
 
 from uber.config import c
 from uber.forms import AddressForm, NumberInputGroup, MagForm, IntSelect, SwitchInput, HiddenIntField
 from uber.custom_tags import popup_link, format_currency, pluralize, table_prices, email_to_link
 
 
+log = logging.getLogger(__name__)
+
+
 class NumberInputGroupChoices(NumberInputGroup):
     def __init__(self, choices=None, **kwargs):
         self.choices = choices

magprime/models.py

@@ -1,16 +1,21 @@
-from pockets import classproperty
-from pockets.autolog import log
-from residue import CoerceUTF8 as UnicodeText, UUID
+import logging
+
+from sqlalchemy import String, Uuid
 from markupsafe import Markup
+from typing import ClassVar
 
 from uber.config import c
 from uber.custom_tags import readable_join, format_image_size, email_only, email_to_link
 from uber.decorators import presave_adjustment, render
-from uber.models import Boolean, MagModel, Choice, DefaultColumn as Column, Session, GuestImage
+from uber.models import Boolean, MagModel, Choice, DefaultColumn as Column, Session
 from uber.tasks.email import send_email
+from uber.models.types import DefaultField as Field
 from uber.utils import add_opt, check, localized_now, remove_opt, GuidebookUtils
 
 
+log = logging.getLogger(__name__)
+
+
 @Session.model_mixin
 class LotteryApplication:
     @property
@@ -33,9 +38,9 @@ def staff_award_status_str(self):
 
 @Session.model_mixin
 class PanelApplication:
-    magscouts_opt_in = Column(Choice(c.PANEL_MAGSCOUTS_OPTS), default=c.NO_CHOICE)
-    broadcast_title = Column(UnicodeText)
-    broadcast_subtitle = Column(UnicodeText)
+    magscouts_opt_in: int = Field(sa_column=Column(Choice(c.PANEL_MAGSCOUTS_OPTS), default=c.NO_CHOICE))
+    broadcast_title: str = Field(sa_type=String, default='')
+    broadcast_subtitle: str = Field(sa_type=String, default='')
 
     @presave_adjustment
     def no_magscouts_mature_panel(self):
@@ -59,69 +64,23 @@ def email_when_dept_changes(self):
                 log.error('unable to send panel dept changed email', exc_info=True)
 
 
-@Session.model_mixin
-class GuestGroup:
-    def handle_images_from_params(self, session, **params):
-        header_image = params.get('header_image')
-        thumbnail_image = params.get('thumbnail_image')
-        bio_image = params.get('bio_pic')
-        header_pic, thumbnail_pic, bio_pic = None, None, None
-        message = ''
-
-        if bio_image and bio_image.filename:
-            bio_pic = GuestImage.upload_image(bio_image, guest_id=self.id)
-            if bio_pic.extension not in c.ALLOWED_BIO_PIC_EXTENSIONS:
-                message = 'Bio pic must be one of ' + ', '.join(c.ALLOWED_BIO_PIC_EXTENSIONS)
-
-        if not message:
-            if header_image and header_image.filename:
-                message = GuidebookUtils.check_guidebook_image_filetype(header_image)
-                if not message:
-                    header_pic = GuestImage.upload_image(header_image, guest_id=self.id,
-                                                            is_header=True)
-                    if not header_pic.check_image_size():
-                        message = f"Your header image must be {format_image_size(c.GUIDEBOOK_HEADER_SIZE)}."
-            elif not self.guidebook_header:
-                message = f"You must upload a {format_image_size(c.GUIDEBOOK_HEADER_SIZE)} header image."
-        
-        if not message:
-            if thumbnail_image and thumbnail_image.filename:
-                message = GuidebookUtils.check_guidebook_image_filetype(thumbnail_image)
-                if not message:
-                    thumbnail_pic = GuestImage.upload_image(thumbnail_image, guest_id=self.id,
-                                                            is_thumbnail=True)
-                    if not thumbnail_pic.check_image_size():
-                        message = f"Your thumbnail image must be {format_image_size(c.GUIDEBOOK_THUMBNAIL_SIZE)}."
-            elif not self.guidebook_thumbnail:
-                message = f"You must upload a {format_image_size(c.GUIDEBOOK_THUMBNAIL_SIZE)} thumbnail image."
-        
-        if not message:
-            if bio_pic:
-                if self.bio_pic:
-                    session.delete(self.bio_pic)
-                session.add(bio_pic)
-            if header_pic:
-                if self.guidebook_header:
-                    session.delete(self.guidebook_header)
-                session.add(header_pic)
-            if thumbnail_pic:
-                if self.guidebook_thumbnail:
-                    session.delete(self.guidebook_thumbnail)
-                session.add(thumbnail_pic)
-
-        return message
-
-
 @Session.model_mixin
 class Group:
-    prior_name = Column(UnicodeText)
-    has_permit = Column(Boolean, default=False)
-    license = Column(UnicodeText)
+    prior_name: str = Field(sa_type=String, default='')
+    has_permit: bool = Field(sa_type=Boolean, default=False)
+    license: str = Field(sa_type=String, default='')
 
 @Session.model_mixin
 class Attendee:
-    special_merch = Column(Choice(c.SPECIAL_MERCH_OPTS), default=c.NO_MERCH)
-    donate_badge_cost = Column(Boolean, default=False)
+    special_merch: int = Field(sa_column=Column(Choice(c.SPECIAL_MERCH_OPTS)), default=c.NO_MERCH)
+    donate_badge_cost: bool = Field(sa_type=Boolean, default=False)
+
+    @presave_adjustment
+    def defaults(self):
+        if not self.special_merch:
+            self.special_merch = c.NO_MERCH
+        if not self.donate_badge_cost:
+            self.donate_badge_cost = False
 
     @presave_adjustment
     def indie_ribbon(self):
@@ -296,20 +255,20 @@ def is_not_ready_to_checkin(self):
         return message
 
 
-class SeasonPassTicket(MagModel):
-    fk_id = Column(UUID)
-    slug = Column(UnicodeText)
+class SeasonPassTicket(MagModel, table=True):
+    fk_id: str = Field(sa_type=Uuid(as_uuid=False))
+    slug: str = Field(sa_type=String, default='')
 
     @property
     def fk(self):
         return self.session.season_pass(self.fk_id)
 
 
-class PrevSeasonSupporter(MagModel):
-    first_name = Column(UnicodeText)
-    last_name = Column(UnicodeText)
-    email = Column(UnicodeText)
+class PrevSeasonSupporter(MagModel, table=True):
+    first_name: str = Field(sa_type=String, default='')
+    last_name: str = Field(sa_type=String, default='')
+    email: str = Field(sa_type=String, default='')
 
-    email_model_name = 'attendee'  # used by AutomatedEmailFixture code
+    email_model_name: ClassVar = 'attendee'  # used by AutomatedEmailFixture code
 
     _repr_attr_names = ['first_name', 'last_name', 'email']