From a6462f42ce0d47bfa1002e6862e4cdcc60f71875 Mon Sep 17 00:00:00 2001 From: Victoria Earl Date: Fri, 6 Feb 2026 13:38:57 +0100 Subject: [PATCH 01/20] Add basic relationship loading strategies Changes the default relationship loading strategy to raise in order to avoid generating N+1 queries. We also override this default on many relationships based on how we use those relationships. You can currently load and save the attendee form and load the attendee shifts page. --- .pythonstartup.py | 2 +- alembic/env.py | 2 +- ...fc_add_missing_columns_from_sqlalchemy_.py | 65 +++++++++++ .../d0c15c44a031_add_extra_donation_column.py | 2 +- docs/script_example.py | 2 +- tests/uber/models/test_badge_funcs.py | 2 +- tests/uber/models/test_config.py | 20 ++-- tests/uber/models/test_group.py | 2 +- tests/uber/models/test_job.py | 2 +- tests/uber/models/test_watchlist.py | 2 +- uber/models/__init__.py | 15 +++ uber/models/admin.py | 11 +- uber/models/art_show.py | 15 +-- uber/models/attendee.py | 103 +++++------------- uber/models/attraction.py | 30 +++-- uber/models/commerce.py | 12 +- uber/models/department.py | 25 +++-- uber/models/email.py | 6 +- uber/models/group.py | 6 +- uber/models/guests.py | 30 ++--- uber/models/hotel.py | 5 +- uber/models/marketplace.py | 2 +- uber/models/mits.py | 13 ++- uber/models/panels.py | 12 +- uber/models/promo_code.py | 5 +- uber/models/showcase.py | 17 +-- uber/models/tabletop.py | 3 +- uber/models/types.py | 1 + uber/payments.py | 4 +- uber/site_sections/registration.py | 24 ++-- uber/site_sections/staffing_reports.py | 10 +- 31 files changed, 250 insertions(+), 200 deletions(-) create mode 100644 alembic/versions/3d942ce689fc_add_missing_columns_from_sqlalchemy_.py diff --git a/.pythonstartup.py b/.pythonstartup.py index 6cbbea964..cc846f946 100644 --- a/.pythonstartup.py +++ b/.pythonstartup.py @@ -11,7 +11,7 @@ initialize_db() # Make it easier to do session stuff at the command line - session = Session().session + session = Session() if c.DEV_BOX: admin = session.query(AdminAccount).filter( diff --git a/alembic/env.py b/alembic/env.py index 424c0d2b5..76b031b03 100644 --- a/alembic/env.py +++ b/alembic/env.py @@ -24,7 +24,7 @@ logger = logging.getLogger('alembic.env') # Add the model's MetaData object here for "autogenerate" support. -target_metadata = Session.BaseClass.metadata +target_metadata = uber.models.MagModel.metadata def include_object(object, name, type_, reflected, compare_to): diff --git a/alembic/versions/3d942ce689fc_add_missing_columns_from_sqlalchemy_.py b/alembic/versions/3d942ce689fc_add_missing_columns_from_sqlalchemy_.py new file mode 100644 index 000000000..cd4ebc7db --- /dev/null +++ b/alembic/versions/3d942ce689fc_add_missing_columns_from_sqlalchemy_.py @@ -0,0 +1,65 @@ +"""Add missing columns from SQLAlchemy upgrade + +Revision ID: 3d942ce689fc +Revises: 5a0e898174d4 +Create Date: 2026-02-05 16:34:19.803186 + +""" + + +# revision identifiers, used by Alembic. +revision = '3d942ce689fc' +down_revision = '5a0e898174d4' +branch_labels = None +depends_on = None + +from alembic import op +import sqlalchemy as sa +from sqlalchemy.dialects import postgresql + + +try: + is_sqlite = op.get_context().dialect.name == 'sqlite' +except Exception: + is_sqlite = False + +if is_sqlite: + op.get_context().connection.execute('PRAGMA foreign_keys=ON;') + utcnow_server_default = "(datetime('now', 'utc'))" +else: + utcnow_server_default = "timezone('utc', current_timestamp)" + +def sqlite_column_reflect_listener(inspector, table, column_info): + """Adds parenthesis around SQLite datetime defaults for utcnow.""" + if column_info['default'] == "datetime('now', 'utc')": + column_info['default'] = utcnow_server_default + +sqlite_reflect_kwargs = { + 'listeners': [('column_reflect', sqlite_column_reflect_listener)] +} + +# =========================================================================== +# HOWTO: Handle alter statements in SQLite +# +# def upgrade(): +# if is_sqlite: +# with op.batch_alter_table('table_name', reflect_kwargs=sqlite_reflect_kwargs) as batch_op: +# batch_op.alter_column('column_name', type_=sa.Unicode(), server_default='', nullable=False) +# else: +# op.alter_column('table_name', 'column_name', type_=sa.Unicode(), server_default='', nullable=False) +# +# =========================================================================== + + +def upgrade(): + op.add_column('panel_applicant', sa.Column('social_media_info', sa.String(), server_default='', nullable=False)) + op.drop_column('panel_applicant', 'social_media') + op.drop_index(op.f('uq_promo_code_word_normalized_word_part_of_speech'), table_name='promo_code_word') + op.create_index('uq_promo_code_word_normalized_word_part_of_speech', 'promo_code_word', [sa.literal_column('lower(trim(word))'), 'part_of_speech'], unique=True) + + +def downgrade(): + op.drop_index('uq_promo_code_word_normalized_word_part_of_speech', table_name='promo_code_word') + op.create_index(op.f('uq_promo_code_word_normalized_word_part_of_speech'), 'promo_code_word', [sa.literal_column('lower(TRIM(BOTH FROM word))'), 'part_of_speech'], unique=True) + op.add_column('panel_applicant', sa.Column('social_media', postgresql.JSON(astext_type=sa.Text()), server_default=sa.text("'{}'::json"), autoincrement=False, nullable=False)) + op.drop_column('panel_applicant', 'social_media_info') diff --git a/alembic/versions/d0c15c44a031_add_extra_donation_column.py b/alembic/versions/d0c15c44a031_add_extra_donation_column.py index 6c2495ea9..7d51943f6 100644 --- a/alembic/versions/d0c15c44a031_add_extra_donation_column.py +++ b/alembic/versions/d0c15c44a031_add_extra_donation_column.py @@ -58,7 +58,7 @@ def upgrade(): batch_op.add_column(sa.Column('extra_donation', sa.Integer(), server_default='0', nullable=False)) else: # Because this column used to be in an event plugin, we check for its existence before making it - exists = conn.execute("SELECT COLUMN_NAME FROM information_schema.columns where TABLE_NAME = 'attendee' and COLUMN_NAME = 'extra_donation'").fetchall() + exists = conn.execute(sa.text("SELECT COLUMN_NAME FROM information_schema.columns where TABLE_NAME = 'attendee' and COLUMN_NAME = 'extra_donation'")).fetchall() if not exists: op.add_column('attendee', sa.Column('extra_donation', sa.Integer(), server_default='0', nullable=False)) diff --git a/docs/script_example.py b/docs/script_example.py index 4d3ab8544..585018a67 100644 --- a/docs/script_example.py +++ b/docs/script_example.py @@ -6,4 +6,4 @@ with Session() as session: initialize_db() - session = Session().session \ No newline at end of file + session = Session() \ No newline at end of file diff --git a/tests/uber/models/test_badge_funcs.py b/tests/uber/models/test_badge_funcs.py index afccca8a6..3c50abfae 100644 --- a/tests/uber/models/test_badge_funcs.py +++ b/tests/uber/models/test_badge_funcs.py @@ -12,7 +12,7 @@ @pytest.fixture def session(request): - session = Session().session + session = Session() request.addfinalizer(session.close) check_ranges(session) for badge_type, badge_name in [(c.STAFF_BADGE, 'Staff'), (c.CONTRACTOR_BADGE, 'Contractor')]: diff --git a/tests/uber/models/test_config.py b/tests/uber/models/test_config.py index 19bb22059..774f652db 100644 --- a/tests/uber/models/test_config.py +++ b/tests/uber/models/test_config.py @@ -44,7 +44,7 @@ def test_under_limit_no_price_bump(self): def test_over_limit_price_bump_before_event(self, monkeypatch): monkeypatch.setattr(c, 'EPOCH', localized_now() + timedelta(days=1)) - session = Session().session + session = Session() assert c.BADGES_SOLD == 0 with request_cached_context(): @@ -57,7 +57,7 @@ def test_over_limit_price_bump_before_event(self, monkeypatch): def test_over_limit_price_bump_during_event(self, monkeypatch): monkeypatch.setattr(c, 'EPOCH', localized_now() - timedelta(days=1)) - session = Session().session + session = Session() assert c.BADGES_SOLD == 0 with request_cached_context(): @@ -69,7 +69,7 @@ def test_over_limit_price_bump_during_event(self, monkeypatch): def test_refunded_badge_price_bump_before_event(self, monkeypatch): monkeypatch.setattr(c, 'EPOCH', localized_now() + timedelta(days=1)) - session = Session().session + session = Session() assert c.BADGES_SOLD == 0 with request_cached_context(): @@ -81,7 +81,7 @@ def test_refunded_badge_price_bump_before_event(self, monkeypatch): def test_refunded_badge_price_bump_during_event(self, monkeypatch): monkeypatch.setattr(c, 'EPOCH', localized_now() - timedelta(days=1)) - session = Session().session + session = Session() assert c.BADGES_SOLD == 0 with request_cached_context(): @@ -92,7 +92,7 @@ def test_refunded_badge_price_bump_during_event(self, monkeypatch): assert 40 == c.get_attendee_price() def test_invalid_badge_no_price_bump(self): - session = Session().session + session = Session() assert c.BADGES_SOLD == 0 with request_cached_context(): @@ -103,7 +103,7 @@ def test_invalid_badge_no_price_bump(self): assert 40 == c.get_attendee_price() def test_free_badge_no_price_bump(self): - session = Session().session + session = Session() assert c.BADGES_SOLD == 0 with request_cached_context(): @@ -249,7 +249,7 @@ def test_dealer_reg_soft_closed_after_deadline(self, monkeypatch): assert c.DEALER_REG_SOFT_CLOSED def test_dealer_app(self): - session = Session().session + session = Session() with request_cached_context(): session.add(Group(tables=1, cost=10, status=c.UNAPPROVED)) session.commit() @@ -257,7 +257,7 @@ def test_dealer_app(self): assert c.DEALER_APPS == 1 def test_waitlisted_dealer_not_app(self): - session = Session().session + session = Session() with request_cached_context(): session.add(Group(tables=1, cost=10, status=c.WAITLISTED)) session.commit() @@ -265,7 +265,7 @@ def test_waitlisted_dealer_not_app(self): assert c.DEALER_APPS == 0 def test_free_dealer_no_app(self): - session = Session().session + session = Session() with request_cached_context(): session.add(Group(tables=1, cost=0, auto_recalc=False, status=c.UNAPPROVED)) session.commit() @@ -273,7 +273,7 @@ def test_free_dealer_no_app(self): assert c.DEALER_APPS == 0 def test_not_a_dealer_no_app(self): - session = Session().session + session = Session() with request_cached_context(): session.add(Group(tables=0, cost=10, status=c.UNAPPROVED)) session.commit() diff --git a/tests/uber/models/test_group.py b/tests/uber/models/test_group.py index 9a3cecb30..fff71f65b 100644 --- a/tests/uber/models/test_group.py +++ b/tests/uber/models/test_group.py @@ -11,7 +11,7 @@ @pytest.fixture def session(request, monkeypatch): - session = Session().session + session = Session() request.addfinalizer(session.close) monkeypatch.setattr(session, 'add', Mock()) monkeypatch.setattr(session, 'delete', Mock()) diff --git a/tests/uber/models/test_job.py b/tests/uber/models/test_job.py index 420f2fc45..22509235b 100644 --- a/tests/uber/models/test_job.py +++ b/tests/uber/models/test_job.py @@ -31,7 +31,7 @@ def test_total_hours(monkeypatch): @pytest.fixture def session(request): - session = Session().session + session = Session() for num in ['One', 'Two', 'Three', 'Four', 'Five', 'Six']: setattr(session, 'job_' + num.lower(), session.job(name='Job ' + num)) for num in ['One', 'Two', 'Three', 'Four', 'Five']: diff --git a/tests/uber/models/test_watchlist.py b/tests/uber/models/test_watchlist.py index b643a37e2..536c9fcc3 100644 --- a/tests/uber/models/test_watchlist.py +++ b/tests/uber/models/test_watchlist.py @@ -8,7 +8,7 @@ @pytest.fixture() def session(request): - session = Session().session + session = Session() request.addfinalizer(session.close) setattr(session, 'watchlist_entry', session.watch_list(first_names='Banned, Alias, Nickname', last_name='Attendee')) return session diff --git a/uber/models/__init__.py b/uber/models/__init__.py index 5c340f090..b30aa4f70 100644 --- a/uber/models/__init__.py +++ b/uber/models/__init__.py @@ -185,6 +185,13 @@ def _class_attr_names(cls): def _class_attrs(cls): return {s: getattr(cls, s) for s in cls._class_attr_names} + @cached_classproperty + def to_dict_default_attrs(cls): + try: + return list(cls.__table__.columns.keys()) + except AttributeError: + raise NotImplementedError("to_dict_default_attrs is only availale for tables") + def _invoke_adjustment_callbacks(self, label): callbacks = [] for name, attr in self._class_attrs.items(): @@ -2217,6 +2224,13 @@ def collect_subclasses(klass): return list(subclasses) return collect_subclasses(cls.BaseClass) + @classmethod + def resolve_model(cls, name): + models_by_class = {ModelClass.__name__: ModelClass for ModelClass in cls.all_models()} + if name in models_by_class: + return models_by_class[name] + raise ValueError('Unrecognized model: {}'.format(name)) + @classmethod def model_mixin(cls, model): if model.__name__ in ['SessionMixin', 'QuerySubclass']: @@ -2251,6 +2265,7 @@ def model_mixin(cls, model): _ScopedSession = scoped_session(SessionFactory) _ScopedSession.model_mixin = UberSession.model_mixin _ScopedSession.all_models = UberSession.all_models +_ScopedSession.resolve_model = UberSession.resolve_model _ScopedSession.engine = engine _ScopedSession.BaseClass = DeclarativeBase _ScopedSession.SessionMixin = UberSession.SessionMixin diff --git a/uber/models/admin.py b/uber/models/admin.py index 7ed3864ef..9d3cc8a69 100644 --- a/uber/models/admin.py +++ b/uber/models/admin.py @@ -34,13 +34,13 @@ class AdminAccount(MagModel): attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), unique=True) access_groups = relationship( - 'AccessGroup', backref='admin_accounts', cascade='save-update,merge,refresh-expire,expunge', + 'AccessGroup', backref='admin_accounts', lazy='selectin', cascade='save-update,merge,refresh-expire,expunge', secondary='admin_access_group') hashed = Column(String, private=True) - password_reset = relationship('PasswordReset', backref='admin_account', uselist=False) + password_reset = relationship('PasswordReset', backref='admin_account', lazy='select', uselist=False) - api_tokens = relationship('ApiToken', backref='admin_account') + api_tokens = relationship('ApiToken', backref=backref('admin_account', lazy='joined')) active_api_tokens = relationship( 'ApiToken', primaryjoin='and_(' @@ -342,7 +342,8 @@ class WatchList(MagModel): action = Column(String) expiration = Column(Date, nullable=True, default=None) active = Column(Boolean, default=True) - attendees = relationship('Attendee', backref=backref('watch_list'), cascade='save-update,merge,refresh-expire,expunge') + attendees = relationship('Attendee', lazy='selectin', + backref=backref('watch_list'), cascade='save-update,merge,refresh-expire,expunge') @property def full_name(self): @@ -372,7 +373,7 @@ def fix_birthdate(self): class EscalationTicket(MagModel): attendees = relationship( - 'Attendee', backref='escalation_tickets', order_by='Attendee.full_name', + 'Attendee', lazy='selectin', backref='escalation_tickets', order_by='Attendee.full_name', cascade='save-update,merge,refresh-expire,expunge', secondary='attendee_escalation_ticket') ticket_id_seq = Sequence('escalation_ticket_ticket_id_seq') diff --git a/uber/models/art_show.py b/uber/models/art_show.py index 85d9252da..261129e7b 100644 --- a/uber/models/art_show.py +++ b/uber/models/art_show.py @@ -28,7 +28,7 @@ class ArtShowAgentCode(MagModel): app_id = Column(Uuid(as_uuid=False), ForeignKey('art_show_application.id')) - app = relationship('ArtShowApplication', + app = relationship('ArtShowApplication', lazy='joined', backref=backref('agent_codes', cascade='merge,refresh-expire,expunge'), foreign_keys=app_id, cascade='merge,refresh-expire,expunge') @@ -57,7 +57,7 @@ def attendee_first_name(self): class ArtShowApplication(MagModel): attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), nullable=True) - attendee = relationship('Attendee', foreign_keys=attendee_id, cascade='save-update, merge', + attendee = relationship('Attendee', lazy='joined', foreign_keys=attendee_id, cascade='save-update, merge', backref=backref('art_show_applications', cascade='save-update, merge')) checked_in = Column(DateTime(timezone=True), nullable=True) checked_out = Column(DateTime(timezone=True), nullable=True) @@ -98,10 +98,11 @@ class ArtShowApplication(MagModel): primaryjoin='and_(remote(ModelReceipt.owner_id) == foreign(ArtShowApplication.id),' 'ModelReceipt.owner_model == "ArtShowApplication",' 'ModelReceipt.closed == None)', + lazy='select', uselist=False) default_cost = Column(Integer, nullable=True) - assignments = relationship('ArtPanelAssignment', backref='app') + assignments = relationship('ArtPanelAssignment', backref=backref('app', lazy='joined')) email_model_name = 'app' @@ -438,7 +439,7 @@ def check_total(self): class ArtShowPiece(MagModel): app_id = Column(Uuid(as_uuid=False), ForeignKey('art_show_application.id', ondelete='SET NULL'), nullable=True) app = relationship('ArtShowApplication', foreign_keys=app_id, - cascade='save-update, merge', + cascade='save-update, merge', lazy='joined', backref=backref('art_show_pieces', cascade='save-update, merge')) receipt_id = Column(Uuid(as_uuid=False), ForeignKey('art_show_receipt.id', ondelete='SET NULL'), nullable=True) @@ -590,7 +591,7 @@ class ArtShowPanel(MagModel): start_label = Column(String) end_label = Column(String) - assignments = relationship('ArtPanelAssignment', backref='panel') + assignments = relationship('ArtPanelAssignment', lazy='selectin', backref=backref('panel', lazy='joined')) __table_args__ = ( UniqueConstraint('gallery', 'surface_type', 'origin_x', 'origin_y', 'terminus_x', 'terminus_y'), @@ -654,9 +655,9 @@ def assignment_str(self): class ArtShowPayment(MagModel): receipt_id = Column(Uuid(as_uuid=False), ForeignKey('art_show_receipt.id', ondelete='SET NULL'), nullable=True) - receipt = relationship('ArtShowReceipt', foreign_keys=receipt_id, + receipt = relationship('ArtShowReceipt', lazy='joined', foreign_keys=receipt_id, cascade='save-update, merge', - backref=backref('art_show_payments', + backref=backref('art_show_payments', lazy='selectin', cascade='save-update, merge')) amount = Column(Integer, default=0) type = Column(Choice(c.ART_SHOW_PAYMENT_OPTS), default=c.STRIPE, admin_only=True) diff --git a/uber/models/attendee.py b/uber/models/attendee.py index 5f1dd339e..f8bad388b 100644 --- a/uber/models/attendee.py +++ b/uber/models/attendee.py @@ -149,7 +149,7 @@ class BadgeInfo(MagModel): attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), nullable=True, default=None) attendee = relationship('Attendee', backref=backref('allocated_badges', cascade='merge,refresh-expire,expunge'), - foreign_keys=attendee_id, + foreign_keys=attendee_id, lazy='joined', cascade='save-update,merge,refresh-expire,expunge', single_parent=True) active = Column(Boolean, default=False) picked_up = Column(DateTime(timezone=True), nullable=True, default=None) @@ -204,11 +204,12 @@ class Attendee(MagModel, TakesPaymentMixin): watchlist_id = Column(Uuid(as_uuid=False), ForeignKey('watch_list.id', ondelete='set null'), nullable=True, default=None) group_id = Column(Uuid(as_uuid=False), ForeignKey('group.id', ondelete='SET NULL'), nullable=True) group = relationship( - Group, backref='attendees', foreign_keys=group_id, cascade='save-update,merge,refresh-expire,expunge') + Group, backref=(backref('attendees', lazy='selectin')), + foreign_keys=group_id, lazy='select', cascade='save-update,merge,refresh-expire,expunge') badge_pickup_group_id = Column(Uuid(as_uuid=False), ForeignKey('badge_pickup_group.id', ondelete='SET NULL'), nullable=True) badge_pickup_group = relationship( - 'BadgePickupGroup', backref=backref('attendees', order_by='Attendee.full_name'), foreign_keys=badge_pickup_group_id, + 'BadgePickupGroup', backref=backref('attendees', lazy='selectin', order_by='Attendee.full_name'), foreign_keys=badge_pickup_group_id, cascade='save-update,merge,refresh-expire,expunge', single_parent=True) creator_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='set null'), nullable=True) @@ -235,6 +236,7 @@ class Attendee(MagModel, TakesPaymentMixin): primaryjoin='and_(BadgeInfo.attendee_id == Attendee.id,' 'BadgeInfo.active == True)', uselist=False, + lazy='joined', overlaps="allocated_badges,attendee") # NOTE: The cascade relationships for promo_code do NOT include @@ -250,6 +252,7 @@ class Attendee(MagModel, TakesPaymentMixin): promo_code_id = Column(Uuid(as_uuid=False), ForeignKey('promo_code.id'), nullable=True, index=True) promo_code = relationship( 'PromoCode', + lazy='select', backref=backref('used_by', cascade='merge,refresh-expire,expunge'), foreign_keys=promo_code_id, cascade='merge,refresh-expire,expunge') @@ -325,18 +328,12 @@ class Attendee(MagModel, TakesPaymentMixin): primaryjoin='and_(remote(ModelReceipt.owner_id) == foreign(Attendee.id),' 'ModelReceipt.owner_model == "Attendee",' 'ModelReceipt.closed == None)', + lazy='select', uselist=False) default_cost = Column(Integer, nullable=True) - dept_memberships = relationship('DeptMembership', backref='attendee') + dept_memberships = relationship('DeptMembership', backref='attendee', lazy='select') dept_membership_requests = relationship('DeptMembershipRequest', backref='attendee') - anywhere_dept_membership_request = relationship( - 'DeptMembershipRequest', - primaryjoin='and_(' - 'DeptMembershipRequest.attendee_id == Attendee.id, ' - 'DeptMembershipRequest.department_id == None)', - uselist=False, - viewonly=True) dept_roles = relationship( 'DeptRole', backref='attendees', @@ -346,20 +343,13 @@ class Attendee(MagModel, TakesPaymentMixin): secondary='join(DeptMembership, dept_membership_dept_role)', order_by='DeptRole.name', viewonly=True) - shifts = relationship('Shift', backref='attendee') + shifts = relationship('Shift', backref=backref('attendee', lazy='joined')) jobs = relationship( 'Job', backref='attendees_working_shifts', secondary='shift', order_by='Job.name', viewonly=True) - jobs_in_assigned_depts = relationship( - 'Job', - backref='attendees_in_dept', - secondaryjoin='DeptMembership.department_id == Job.department_id', - secondary='dept_membership', - order_by='Job.name', - viewonly=True) depts_where_working = relationship( 'Department', backref='attendees_working_shifts', @@ -384,18 +374,6 @@ class Attendee(MagModel, TakesPaymentMixin): 'Attendee.id == DeptMembership.attendee_id, ' 'DeptMembership.has_role)', viewonly=True) - dept_memberships_as_dept_head = relationship( - 'DeptMembership', - primaryjoin='and_(' - 'Attendee.id == DeptMembership.attendee_id, ' - 'DeptMembership.is_dept_head == True)', - viewonly=True) - dept_memberships_as_poc = relationship( - 'DeptMembership', - primaryjoin='and_(' - 'Attendee.id == DeptMembership.attendee_id, ' - 'DeptMembership.is_poc == True)', - viewonly=True) dept_memberships_where_can_admin_checklist = relationship( 'DeptMembership', primaryjoin='and_(' @@ -410,26 +388,6 @@ class Attendee(MagModel, TakesPaymentMixin): 'Attendee.id == DeptMembership.attendee_id, ' 'DeptMembership.is_checklist_admin == True)', viewonly=True) - pocs_for_depts_where_working = relationship( - 'Attendee', - primaryjoin='Attendee.id == Shift.attendee_id', - secondaryjoin='and_(' - 'DeptMembership.attendee_id == Attendee.id, ' - 'DeptMembership.is_poc == True)', - secondary='join(Shift, Job).join(DeptMembership, ' - 'DeptMembership.department_id == Job.department_id)', - order_by='Attendee.full_name', - viewonly=True) - dept_heads_for_depts_where_working = relationship( - 'Attendee', - primaryjoin='Attendee.id == Shift.attendee_id', - secondaryjoin='and_(' - 'DeptMembership.attendee_id == Attendee.id, ' - 'DeptMembership.is_dept_head == True)', - secondary='join(Shift, Job).join(DeptMembership, ' - 'DeptMembership.department_id == Job.department_id)', - order_by='Attendee.full_name', - viewonly=True) staffing = Column(Boolean, default=False) agreed_to_volunteer_agreement = Column(Boolean, default=False) @@ -444,23 +402,23 @@ class Attendee(MagModel, TakesPaymentMixin): # TODO: a record of when an attendee is unable to pickup a shirt # (which type? swag or staff? prob swag) - no_shirt = relationship('NoShirt', backref=backref('attendee', load_on_pending=True), uselist=False) + no_shirt = relationship('NoShirt', backref=backref('attendee'), uselist=False) - admin_account = relationship('AdminAccount', backref=backref('attendee', load_on_pending=True), uselist=False) + admin_account = relationship('AdminAccount', backref=backref('attendee', lazy='joined'), uselist=False) food_restrictions = relationship( - 'FoodRestrictions', backref=backref('attendee', load_on_pending=True), uselist=False) + 'FoodRestrictions', backref=backref('attendee', lazy='joined'), uselist=False) sales = relationship('Sale', backref='attendee', cascade='save-update,merge,refresh-expire,expunge') mpoints_for_cash = relationship('MPointsForCash', backref='attendee') old_mpoint_exchanges = relationship('OldMPointExchange', backref='attendee') - dept_checklist_items = relationship('DeptChecklistItem', backref=backref('attendee', lazy='subquery')) + dept_checklist_items = relationship('DeptChecklistItem', backref=backref('attendee', lazy='selectin')) indie_developer = relationship( - 'IndieDeveloper', backref=backref('attendee', load_on_pending=True), uselist=False) + 'IndieDeveloper', backref=backref('attendee'), uselist=False) hotel_eligible = Column(Boolean, default=False, admin_only=True) - hotel_requests = relationship('HotelRequests', backref=backref('attendee', load_on_pending=True), uselist=False) - room_assignments = relationship('RoomAssignment', backref=backref('attendee', load_on_pending=True)) + hotel_requests = relationship('HotelRequests', backref=backref('attendee', lazy='joined'), uselist=False) + room_assignments = relationship('RoomAssignment', backref=backref('attendee', lazy='joined')) # The PIN/password used by third party hotel reservation systems hotel_pin = SQLAlchemyColumn(String, nullable=True, unique=True) @@ -473,8 +431,8 @@ class Attendee(MagModel, TakesPaymentMixin): # ========================= # panels # ========================= - assigned_panelists = relationship('AssignedPanelist', backref='attendee') - panel_applicants = relationship('PanelApplicant', backref='attendee', cascade='save-update,merge,refresh-expire,expunge') + assigned_panelists = relationship('AssignedPanelist', backref=backref('attendee', lazy='joined')) + panel_applicants = relationship('PanelApplicant', backref=backref('attendee', lazy='joined'), cascade='save-update,merge,refresh-expire,expunge') panel_applications = relationship('PanelApplication', backref='poc') panel_feedback = relationship('EventFeedback', backref='attendee') submitted_panels = relationship( @@ -499,34 +457,34 @@ class Attendee(MagModel, TakesPaymentMixin): notification_pref = Column(Choice(_NOTIFICATION_PREF_OPTS), default=_NOTIFICATION_EMAIL) attractions_opt_out = Column(Boolean, default=False) - attraction_signups = relationship('AttractionSignup', backref='attendee', order_by='AttractionSignup.signup_time') + attraction_signups = relationship('AttractionSignup', backref=backref('attendee', lazy='joined'), order_by='AttractionSignup.signup_time') attraction_event_signups = association_proxy('attraction_signups', 'event') attraction_notifications = relationship( - 'AttractionNotification', backref='attendee', order_by='AttractionNotification.sent_time') + 'AttractionNotification', backref=backref('attendee', lazy='joined'), order_by='AttractionNotification.sent_time') # ========================= # tabletop # ========================= - games = relationship('TabletopGame', backref='attendee') - checkouts = relationship('TabletopCheckout', backref='attendee') + games = relationship('TabletopGame', backref=backref('attendee', lazy='joined')) + checkouts = relationship('TabletopCheckout', backref=backref('attendee', lazy='joined')) # ========================= # badge printing # ========================= - print_requests = relationship('PrintJob', backref='attendee', order_by='desc(PrintJob.last_updated)') + print_requests = relationship('PrintJob', backref=backref('attendee', lazy='joined'), order_by='desc(PrintJob.last_updated)') # ========================= # art show # ========================= - art_show_bidder = relationship('ArtShowBidder', backref=backref('attendee', load_on_pending=True), uselist=False) + art_show_bidder = relationship('ArtShowBidder', backref=backref('attendee', lazy='joined'), uselist=False) art_show_purchases = relationship( 'ArtShowPiece', - backref='buyer', + backref=backref('buyer', lazy='joined'), cascade='save-update,merge,refresh-expire,expunge', secondary='art_show_receipt') art_agent_apps = relationship( 'ArtShowApplication', - backref='agents', + backref=backref('agents', lazy='joined'), secondaryjoin='and_(ArtShowAgentCode.app_id == ArtShowApplication.id, ArtShowAgentCode.cancelled == None)', secondary='art_show_agent_code', viewonly=True) @@ -2294,13 +2252,6 @@ def staffer_hotel_eligibility(self): if self.badge_type == c.STAFF_BADGE and (self.is_new or self.orig_value_of('badge_type') != c.STAFF_BADGE): self.hotel_eligible = True - @presave_adjustment - def staffer_setup_teardown(self): - if self.setup_hotel_approved: - self.can_work_setup = True - if self.teardown_hotel_approved: - self.can_work_teardown = True - @property def hotel_shifts_required(self): return bool(c.VOLUNTEER_CHECKLIST_OPEN and self.hotel_nights and not self.is_dept_head and self.takes_shifts) @@ -2563,7 +2514,7 @@ class AttendeeAccount(MagModel): public_id = Column(Uuid(as_uuid=False), default=lambda: str(uuid4()), nullable=True) email = Column(String) hashed = Column(String, private=True) - password_reset = relationship('PasswordReset', backref='attendee_account', uselist=False) + password_reset = relationship('PasswordReset', backref='attendee_account', lazy='select', uselist=False) attendees = relationship( 'Attendee', backref='managers', order_by='Attendee.registered', cascade='save-update,merge,refresh-expire,expunge', diff --git a/uber/models/attraction.py b/uber/models/attraction.py index 9a1417860..e2e4e587c 100644 --- a/uber/models/attraction.py +++ b/uber/models/attraction.py @@ -166,8 +166,8 @@ class Attraction(MagModel, AttractionMixin): uselist=True), order_by='Department.name') features = relationship( - 'AttractionFeature', - backref='attraction', + 'AttractionFeature', lazy='selectin', + backref=backref('attraction', lazy='joined'), order_by='[AttractionFeature.name, AttractionFeature.id]') public_features = relationship( 'AttractionFeature', @@ -178,11 +178,11 @@ class Attraction(MagModel, AttractionMixin): order_by='[AttractionFeature.name, AttractionFeature.id]') events = relationship( 'AttractionEvent', - backref='attraction', + backref=backref('attraction', lazy='joined'), order_by='[AttractionEvent.start_time, AttractionEvent.id]') signups = relationship( 'AttractionSignup', - backref='attraction', + backref=backref('attraction', lazy='joined'), viewonly=True, order_by='[AttractionSignup.checkin_time, AttractionSignup.id]') @@ -351,7 +351,8 @@ class AttractionFeature(MagModel, AttractionMixin): attraction_id = Column(Uuid(as_uuid=False), ForeignKey('attraction.id')) events = relationship( - 'AttractionEvent', backref='feature', order_by='[AttractionEvent.start_time, AttractionEvent.id]') + 'AttractionEvent', backref=backref('feature', lazy='joined'), lazy='selectin', + order_by='[AttractionEvent.start_time, AttractionEvent.id]') __table_args__ = ( UniqueConstraint('name', 'attraction_id'), @@ -467,14 +468,6 @@ def available_events_by_day(self): return groupify(self.available_events, 'start_day_local') -# ===================================================================== -# TODO: This, along with the panels.models.Event class, should be -# refactored into a more generic "SchedulableMixin". Any model -# class that has a location, a start time, and a duration would -# inherit from the SchedulableMixin. Unfortunately the -# panels.models.Event stores its duration as an integer number -# of half hours, thus is not usable by Attractions. -# ===================================================================== class AttractionEvent(MagModel, AttractionMixin): attraction_feature_id = Column(Uuid(as_uuid=False), ForeignKey('attraction_feature.id')) attraction_id = Column(Uuid(as_uuid=False), ForeignKey('attraction.id'), index=True) @@ -483,14 +476,17 @@ class AttractionEvent(MagModel, AttractionMixin): start_time = Column(DateTime(timezone=True), default=c.EPOCH) duration = Column(Integer, default=60) - signups = relationship('AttractionSignup', backref='event', order_by='AttractionSignup.checkin_time') + signups = relationship('AttractionSignup', backref=backref('event', lazy='joined'), + order_by='AttractionSignup.checkin_time') attendee_signups = association_proxy('signups', 'attendee') - notifications = relationship('AttractionNotification', backref='event', order_by='AttractionNotification.sent_time') + notifications = relationship('AttractionNotification', backref=backref('event', lazy='joined'), + order_by='AttractionNotification.sent_time') notification_replies = relationship( - 'AttractionNotificationReply', backref='event', order_by='AttractionNotificationReply.sid') + 'AttractionNotificationReply', backref=backref('event', lazy='joined'), + order_by='AttractionNotificationReply.sid') attendees = relationship( 'Attendee', @@ -765,7 +761,7 @@ class AttractionSignup(MagModel): notifications = relationship( 'AttractionNotification', backref=backref( - 'signup', + 'signup', lazy='joined', cascade='merge', uselist=False, viewonly=True), diff --git a/uber/models/commerce.py b/uber/models/commerce.py index f9950c49f..ad0e28a8c 100644 --- a/uber/models/commerce.py +++ b/uber/models/commerce.py @@ -331,12 +331,12 @@ class ReceiptTransaction(MagModel): receipt_id = Column(Uuid(as_uuid=False), ForeignKey('model_receipt.id', ondelete='SET NULL'), nullable=True) receipt = relationship('ModelReceipt', foreign_keys=receipt_id, - cascade='save-update, merge', - backref=backref('receipt_txns', cascade='save-update, merge')) + cascade='save-update, merge', lazy='joined', + backref=backref('receipt_txns', lazy='selectin', cascade='save-update, merge')) receipt_info_id = Column(Uuid(as_uuid=False), ForeignKey('receipt_info.id', ondelete='SET NULL'), nullable=True) receipt_info = relationship('ReceiptInfo', foreign_keys=receipt_info_id, cascade='save-update, merge', - backref=backref('receipt_txns', cascade='save-update, merge')) + backref=backref('receipt_txns', lazy='selectin', cascade='save-update, merge')) refunded_txn_id = Column(Uuid(as_uuid=False), ForeignKey('receipt_transaction.id', ondelete='SET NULL'), nullable=True) refunded_txn = relationship('ReceiptTransaction', foreign_keys='ReceiptTransaction.refunded_txn_id', backref=backref('refund_txns', order_by='ReceiptTransaction.added'), @@ -539,11 +539,11 @@ class ReceiptItem(MagModel): purchaser_id = Column(Uuid(as_uuid=False), index=True, nullable=True) receipt_id = Column(Uuid(as_uuid=False), ForeignKey('model_receipt.id', ondelete='SET NULL'), nullable=True) receipt = relationship('ModelReceipt', foreign_keys=receipt_id, - cascade='save-update, merge', - backref=backref('receipt_items', cascade='save-update, merge')) + cascade='save-update, merge', lazy='joined', + backref=backref('receipt_items', lazy='selectin', cascade='save-update, merge')) txn_id = Column(Uuid(as_uuid=False), ForeignKey('receipt_transaction.id', ondelete='SET NULL'), nullable=True) receipt_txn = relationship('ReceiptTransaction', foreign_keys=txn_id, - cascade='save-update, merge', + cascade='save-update, merge', lazy='joined', backref=backref('receipt_items', cascade='save-update, merge')) fk_id = Column(Uuid(as_uuid=False), index=True, nullable=True) fk_model = Column(String) diff --git a/uber/models/department.py b/uber/models/department.py index 9e2d463da..6a85724e1 100644 --- a/uber/models/department.py +++ b/uber/models/department.py @@ -157,7 +157,7 @@ class DeptRole(MagModel): dept_memberships = relationship( 'DeptMembership', - backref='dept_roles', + backref=backref('dept_roles', lazy='selectin'), cascade='save-update,merge,refresh-expire,expunge', secondary='dept_membership_dept_role') @@ -211,13 +211,13 @@ class Department(MagModel): handles_cash = Column(Boolean, default=False) panels_desc = Column(String) - jobs = relationship('Job', backref='department') - job_templates = relationship('JobTemplate', backref='department') + jobs = relationship('Job', backref=backref('department', lazy='joined')) + job_templates = relationship('JobTemplate', backref=backref('department', lazy='joined')) locations = relationship('EventLocation', backref='department') events = relationship('Event', backref='department') - dept_checklist_items = relationship('DeptChecklistItem', backref='department') - dept_roles = relationship('DeptRole', backref='department') + dept_checklist_items = relationship('DeptChecklistItem', backref=backref('department', lazy='joined')) + dept_roles = relationship('DeptRole', backref=backref('department', lazy='joined')) dept_heads = relationship( 'Attendee', backref=backref('headed_depts', order_by='Department.name'), @@ -272,8 +272,9 @@ class Department(MagModel): order_by='Attendee.full_name', overlaps="attendee,dept_memberships", secondary='dept_membership') - memberships = relationship('DeptMembership', backref=backref('department', overlaps="assigned_depts,members"), overlaps="assigned_depts,members") - membership_requests = relationship('DeptMembershipRequest', backref='department') + memberships = relationship('DeptMembership', backref=backref('department', lazy='joined', overlaps="assigned_depts,members"), + overlaps="assigned_depts,members") + membership_requests = relationship('DeptMembershipRequest', backref=backref('department', lazy='joined')) explicitly_requesting_attendees = relationship( 'Attendee', backref=backref('explicitly_requested_depts', order_by='Department.name', overlaps="attendee,dept_membership_requests,department,membership_requests"), @@ -422,8 +423,9 @@ class Job(MagModel): all_roles_required = Column(Boolean, default=True) required_roles = relationship( - 'DeptRole', backref='jobs', cascade='save-update,merge,refresh-expire,expunge', secondary='job_required_role') - shifts = relationship('Shift', backref='job') + 'DeptRole', backref='jobs', lazy='selectin', + cascade='save-update,merge,refresh-expire,expunge', secondary='job_required_role') + shifts = relationship('Shift', backref=backref('job', lazy='joined'), lazy='selectin') __table_args__ = ( Index('ix_job_department_id', department_id), @@ -700,8 +702,9 @@ class JobTemplate(MagModel): interval = Column(Integer, nullable=True) required_roles = relationship( - 'DeptRole', backref='job_templates', cascade='save-update,merge,refresh-expire,expunge', secondary='job_template_required_role') - jobs = relationship('Job', backref='template', cascade='save-update,merge,refresh-expire,expunge') + 'DeptRole', backref='job_templates', lazy='selectin', + cascade='save-update,merge,refresh-expire,expunge', secondary='job_template_required_role') + jobs = relationship('Job', backref=backref('template', lazy='select'), cascade='save-update,merge,refresh-expire,expunge') @presave_adjustment def zero_slots(self): diff --git a/uber/models/email.py b/uber/models/email.py index cbbeff7be..9ce674fa3 100644 --- a/uber/models/email.py +++ b/uber/models/email.py @@ -10,7 +10,7 @@ from sqlalchemy.dialects.postgresql.json import JSONB from sqlalchemy.ext.hybrid import hybrid_property from sqlalchemy.ext.mutable import MutableDict -from sqlalchemy.orm import relationship +from sqlalchemy.orm import backref from sqlalchemy.schema import ForeignKey from sqlalchemy.types import Boolean, Integer, String, Uuid, DateTime @@ -19,7 +19,7 @@ from uber.decorators import presave_adjustment, renderable_data, cached_property, classproperty from uber.jinja import JinjaEnv from uber.models import MagModel -from uber.models.types import DefaultColumn as Column +from uber.models.types import DefaultColumn as Column, default_relationship as relationship from uber.utils import normalize_newlines, request_cached_context, groupify log = logging.getLogger(__name__) @@ -86,7 +86,7 @@ class AutomatedEmail(MagModel, BaseEmailMixin): active_before = Column(DateTime(timezone=True), nullable=True, default=None) revert_changes = Column(MutableDict.as_mutable(JSONB), default={}) - emails = relationship('Email', backref='automated_email', order_by='Email.id') + emails = relationship('Email', backref=backref('automated_email', lazy='joined'), order_by='Email.id') @presave_adjustment def date_adjustments(self): diff --git a/uber/models/group.py b/uber/models/group.py index 95f9d1b5d..224759984 100644 --- a/uber/models/group.py +++ b/uber/models/group.py @@ -70,14 +70,16 @@ class Group(MagModel, TakesPaymentMixin): remote_side='Attendee.id', single_parent=True) leader = relationship('Attendee', foreign_keys=leader_id, post_update=True, cascade='all') - studio = relationship('IndieStudio', uselist=False, backref='group', cascade='save-update,merge,refresh-expire,expunge') - guest = relationship('GuestGroup', backref='group', uselist=False) + studio = relationship('IndieStudio', uselist=False, backref='group', + cascade='save-update,merge,refresh-expire,expunge') + guest = relationship('GuestGroup', backref=backref('group', lazy='joined'), uselist=False) active_receipt = relationship( 'ModelReceipt', cascade='save-update,merge,refresh-expire,expunge', primaryjoin='and_(remote(ModelReceipt.owner_id) == foreign(Group.id),' 'ModelReceipt.owner_model == "Group",' 'ModelReceipt.closed == None)', + lazy='select', uselist=False) terms_conditions_doc = relationship( 'SignedDocument', diff --git a/uber/models/guests.py b/uber/models/guests.py index ea56abead..c16aefcbc 100644 --- a/uber/models/guests.py +++ b/uber/models/guests.py @@ -41,21 +41,21 @@ class GuestGroup(MagModel): wants_mc = Column(Boolean, nullable=True) needs_rehearsal = Column(Choice(c.GUEST_REHEARSAL_OPTS), nullable=True) badges_assigned = Column(Boolean, default=False) - info = relationship('GuestInfo', backref=backref('guest', load_on_pending=True), uselist=False) + info = relationship('GuestInfo', backref=backref('guest', lazy='joined'), uselist=False) images = relationship( - 'GuestImage', backref=backref('guest', load_on_pending=True), order_by='GuestImage.id') - bio = relationship('GuestBio', backref=backref('guest', load_on_pending=True), uselist=False) - taxes = relationship('GuestTaxes', backref=backref('guest', load_on_pending=True), uselist=False) - stage_plot = relationship('GuestStagePlot', backref=backref('guest', load_on_pending=True), uselist=False) - panel = relationship('GuestPanel', backref=backref('guest', load_on_pending=True), uselist=False) - merch = relationship('GuestMerch', backref=backref('guest', load_on_pending=True), uselist=False) - tracks = relationship('GuestTrack', backref=backref('guest', load_on_pending=True)) - charity = relationship('GuestCharity', backref=backref('guest', load_on_pending=True), uselist=False) - autograph = relationship('GuestAutograph', backref=backref('guest', load_on_pending=True), uselist=False) - interview = relationship('GuestInterview', backref=backref('guest', load_on_pending=True), uselist=False) - travel_plans = relationship('GuestTravelPlans', backref=backref('guest', load_on_pending=True), uselist=False) - hospitality = relationship('GuestHospitality', backref=backref('guest', load_on_pending=True), uselist=False) - media_request = relationship('GuestMediaRequest', backref=backref('guest', load_on_pending=True), uselist=False) + 'GuestImage', backref=backref('guest'), order_by='GuestImage.id') + bio = relationship('GuestBio', backref=backref('guest', lazy='joined'), uselist=False) + taxes = relationship('GuestTaxes', backref=backref('guest', lazy='joined'), uselist=False) + stage_plot = relationship('GuestStagePlot', backref=backref('guest', lazy='joined'), uselist=False) + panel = relationship('GuestPanel', backref=backref('guest', lazy='joined'), uselist=False) + merch = relationship('GuestMerch', backref=backref('guest', lazy='joined'), uselist=False) + tracks = relationship('GuestTrack', backref=backref('guest', lazy='joined')) + charity = relationship('GuestCharity', backref=backref('guest', lazy='joined'), uselist=False) + autograph = relationship('GuestAutograph', backref=backref('guest', lazy='joined'), uselist=False) + interview = relationship('GuestInterview', backref=backref('guest', lazy='joined'), uselist=False) + travel_plans = relationship('GuestTravelPlans', backref=backref('guest', lazy='joined'), uselist=False) + hospitality = relationship('GuestHospitality', backref=backref('guest', lazy='joined'), uselist=False) + media_request = relationship('GuestMediaRequest', backref=backref('guest', lazy='joined'), uselist=False) email_model_name = 'guest' @@ -801,7 +801,7 @@ class GuestMediaRequest(MagModel): class GuestDetailedTravelPlan(MagModel): travel_plans_id = Column(Uuid(as_uuid=False), ForeignKey('guest_travel_plans.id'), nullable=True) travel_plans = relationship('GuestTravelPlans', foreign_keys=travel_plans_id, single_parent=True, - backref=backref('detailed_travel_plans'), + backref=backref('detailed_travel_plans', lazy='selectin'), lazy='joined', cascade='save-update,merge,refresh-expire,expunge') mode = Column(Choice(c.GUEST_TRAVEL_OPTS)) mode_text = Column(String) diff --git a/uber/models/hotel.py b/uber/models/hotel.py index f1fb36772..c8a37f02e 100644 --- a/uber/models/hotel.py +++ b/uber/models/hotel.py @@ -91,7 +91,7 @@ class Room(MagModel, NightsMixin): locked_in = Column(Boolean, default=False) nights = Column(MultiChoice(c.NIGHT_OPTS)) created = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) - assignments = relationship('RoomAssignment', backref='room') + assignments = relationship('RoomAssignment', backref=backref('room', lazy='joined')) @property def email(self): @@ -122,7 +122,7 @@ class RoomAssignment(MagModel): class LotteryApplication(MagModel): attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), unique=True, nullable=True) - attendee = relationship('Attendee', backref=backref('lottery_application', uselist=False), + attendee = relationship('Attendee', lazy='joined', backref=backref('lottery_application', uselist=False), cascade='save-update,merge,refresh-expire,expunge', uselist=False) invite_code = Column(String) # Not used for now but we're keeping it for later @@ -168,6 +168,7 @@ class LotteryApplication(MagModel): parent_application_id = Column(Uuid(as_uuid=False), ForeignKey('lottery_application.id'), nullable=True) parent_application = relationship( 'LotteryApplication', + lazy='joined', foreign_keys='LotteryApplication.parent_application_id', backref=backref('group_members'), cascade='save-update,merge,refresh-expire,expunge', diff --git a/uber/models/marketplace.py b/uber/models/marketplace.py index 6df027134..5fe977a6d 100644 --- a/uber/models/marketplace.py +++ b/uber/models/marketplace.py @@ -19,7 +19,7 @@ class ArtistMarketplaceApplication(MagModel): MATCHING_DEALER_FIELDS = ['email_address', 'website', 'name'] attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) - attendee = relationship('Attendee', backref=backref('marketplace_application', uselist=False), + attendee = relationship('Attendee', lazy='joined', backref=backref('marketplace_application', uselist=False), cascade='save-update,merge,refresh-expire,expunge', uselist=False) name = Column(String) diff --git a/uber/models/mits.py b/uber/models/mits.py index ea7f6fbc7..3183552fb 100644 --- a/uber/models/mits.py +++ b/uber/models/mits.py @@ -5,6 +5,7 @@ from pytz import UTC from sqlalchemy import and_ +from sqlalchemy.orm import backref from sqlalchemy.schema import ForeignKey from sqlalchemy.types import Boolean, Integer, Uuid, DateTime, String from sqlalchemy.ext.hybrid import hybrid_property @@ -35,10 +36,10 @@ class MITSTeam(MagModel): applied = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) status = Column(Choice(c.MITS_APP_STATUS), default=c.PENDING, admin_only=True) - applicants = relationship('MITSApplicant', backref='team') - games = relationship('MITSGame', backref='team') - schedule = relationship('MITSTimes', uselist=False, backref='team') - panel_app = relationship('MITSPanelApplication', uselist=False, backref='team') + applicants = relationship('MITSApplicant', backref=backref('team', lazy='joined')) + games = relationship('MITSGame', lazy='selectin', backref=backref('team', lazy='joined')) + schedule = relationship('MITSTimes', uselist=False, backref=backref('team', lazy='joined')) + panel_app = relationship('MITSPanelApplication', uselist=False, backref=backref('team', lazy='joined')) duplicate_of = Column(Uuid(as_uuid=False), nullable=True) deleted = Column(Boolean, default=False) @@ -175,8 +176,8 @@ class MITSGame(MagModel): unlicensed = Column(Boolean, default=False) professional = Column(Boolean, default=False) tournament = Column(Boolean, default=False) - pictures = relationship('MITSPicture', backref='game') - documents = relationship('MITSDocument', backref='game') + pictures = relationship('MITSPicture', lazy='selectin', backref=backref('game', lazy='joined')) + documents = relationship('MITSDocument', lazy='selectin', backref=backref('game', lazy='joined')) @hybrid_property def has_been_accepted(self): diff --git a/uber/models/panels.py b/uber/models/panels.py index 0bad7a37d..9ee8ff1cb 100644 --- a/uber/models/panels.py +++ b/uber/models/panels.py @@ -35,9 +35,9 @@ class EventLocation(MagModel): room = Column(String) tracks = Column(MultiChoice(c.EVENT_TRACK_OPTS)) - events = relationship('Event', backref=backref('location', cascade="save-update,merge"), + events = relationship('Event', backref=backref('location', lazy='joined', cascade="save-update,merge"), cascade="save-update,merge", single_parent=True) - attractions = relationship('AttractionEvent', backref=backref('location', cascade="save-update,merge"), + attractions = relationship('AttractionEvent', backref=backref('location', lazy='joined', cascade="save-update,merge"), cascade="save-update,merge", single_parent=True) @property @@ -89,14 +89,14 @@ class Event(MagModel): public_description = Column(String) tracks = Column(MultiChoice(c.EVENT_TRACK_OPTS)) - assigned_panelists = relationship('AssignedPanelist', backref='event') - applications = relationship('PanelApplication', backref=backref('event', cascade="save-update,merge"), + assigned_panelists = relationship('AssignedPanelist', backref=backref('event', lazy='joined')) + applications = relationship('PanelApplication', backref=backref('event', lazy='joined', cascade="save-update,merge"), cascade="save-update,merge") panel_feedback = relationship('EventFeedback', backref='event') guest = relationship('GuestGroup', backref=backref('event', cascade="save-update,merge"), cascade='save-update,merge') attraction = relationship('AttractionEvent', backref=backref( - 'schedule_item', cascade="save-update,merge", uselist=False + 'schedule_item', lazy='joined', cascade="save-update,merge", uselist=False ), cascade='save-update,merge') @property @@ -205,7 +205,7 @@ class PanelApplication(MagModel): comments = Column(String, admin_only=True) tags = Column(UniqueList, admin_only=True) - applicants = relationship('PanelApplicant', backref='applications', + applicants = relationship('PanelApplicant', lazy='selectin', backref=backref('applications', lazy='selectin'), cascade='save-update,merge,refresh-expire,expunge', secondary='panel_applicant_application') diff --git a/uber/models/promo_code.py b/uber/models/promo_code.py index 81fcdc44f..244a2a1fa 100644 --- a/uber/models/promo_code.py +++ b/uber/models/promo_code.py @@ -9,6 +9,7 @@ from dateutil import parser as dateparser from sqlalchemy import exists, func, select, CheckConstraint from sqlalchemy.ext.hybrid import hybrid_property +from sqlalchemy.orm import backref from sqlalchemy.schema import Index, ForeignKey from sqlalchemy.types import Integer, Uuid, String, DateTime @@ -136,7 +137,7 @@ class PromoCodeGroup(MagModel): registered = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) buyer_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), nullable=True) buyer = relationship( - 'Attendee', backref='promo_code_groups', + 'Attendee', backref='promo_code_groups', lazy='joined', foreign_keys=buyer_id, cascade='save-update,merge,refresh-expire,expunge') @@ -318,7 +319,7 @@ class PromoCode(MagModel): group_id = Column(Uuid(as_uuid=False), ForeignKey('promo_code_group.id', ondelete='SET NULL'), nullable=True) group = relationship( - PromoCodeGroup, backref='promo_codes', + PromoCodeGroup, backref=backref('promo_codes', lazy='selectin'), lazy='joined', foreign_keys=group_id, cascade='save-update,merge,refresh-expire,expunge') diff --git a/uber/models/showcase.py b/uber/models/showcase.py index 1b2508660..b4d5bef15 100644 --- a/uber/models/showcase.py +++ b/uber/models/showcase.py @@ -8,6 +8,7 @@ from markupsafe import Markup from pytz import UTC from sqlalchemy import func, case, or_ +from sqlalchemy.orm import backref from sqlalchemy.schema import ForeignKey, UniqueConstraint from sqlalchemy.types import Boolean, Integer, String, DateTime, Uuid from sqlalchemy.ext.hybrid import hybrid_property @@ -46,8 +47,8 @@ class IndieJudge(MagModel, ReviewMixin): vr_text = Column(String) staff_notes = Column(String) - codes = relationship('IndieGameCode', backref='judge') - reviews = relationship('IndieGameReview', backref='judge') + codes = relationship('IndieGameCode', lazy='selectin', backref=backref('judge', lazy='joined')) + reviews = relationship('IndieGameReview', lazy='selectin', backref=backref('judge', lazy='joined')) email_model_name = 'judge' @@ -152,10 +153,10 @@ class IndieStudio(MagModel): logistics_updated = Column(Boolean, default=False) games = relationship( - 'IndieGame', backref='studio', order_by='IndieGame.title') + 'IndieGame', backref=backref('studio', lazy='joined'), lazy='selectin', order_by='IndieGame.title') developers = relationship( 'IndieDeveloper', - backref='studio', + backref=backref('studio', lazy='joined'), order_by='IndieDeveloper.last_name') email_model_name = 'studio' @@ -347,7 +348,7 @@ def matching_attendee(self): class IndieGame(MagModel, ReviewMixin): studio_id = Column(Uuid(as_uuid=False), ForeignKey('indie_studio.id')) primary_contact_id = Column(Uuid(as_uuid=False), ForeignKey('indie_developer.id', ondelete='SET NULL'), nullable=True) - primary_contact = relationship(IndieDeveloper, backref='arcade_games', + primary_contact = relationship(IndieDeveloper, backref='arcade_games', lazy='joined', foreign_keys=primary_contact_id, cascade='save-update,merge,refresh-expire,expunge') title = Column(String) @@ -417,10 +418,10 @@ class IndieGame(MagModel, ReviewMixin): waitlisted = Column(DateTime(timezone=True), nullable=True) accepted = Column(DateTime(timezone=True), nullable=True) - codes = relationship('IndieGameCode', backref='game') - reviews = relationship('IndieGameReview', backref='game') + codes = relationship('IndieGameCode', lazy='selectin', backref=backref('game', lazy='joined')) + reviews = relationship('IndieGameReview', backref=backref('game', lazy='joined')) images = relationship( - 'IndieGameImage', backref='game', order_by='IndieGameImage.id') + 'IndieGameImage', lazy='selectin', backref=backref('game', lazy='joined'), order_by='IndieGameImage.id') email_model_name = 'game' diff --git a/uber/models/tabletop.py b/uber/models/tabletop.py index 510616649..dcc98fb9f 100644 --- a/uber/models/tabletop.py +++ b/uber/models/tabletop.py @@ -1,6 +1,7 @@ from datetime import datetime from pytz import UTC +from sqlalchemy.orm import backref from sqlalchemy.schema import ForeignKey from sqlalchemy.types import Boolean, DateTime, String, Uuid @@ -16,7 +17,7 @@ class TabletopGame(MagModel): name = Column(String) attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) returned = Column(Boolean, default=False) - checkouts = relationship('TabletopCheckout', order_by='TabletopCheckout.checked_out', backref='game') + checkouts = relationship('TabletopCheckout', order_by='TabletopCheckout.checked_out', backref=backref('game', lazy='joined')) _repr_attr_names = ['name'] diff --git a/uber/models/types.py b/uber/models/types.py index 1fbf2cb74..fe53fce54 100644 --- a/uber/models/types.py +++ b/uber/models/types.py @@ -67,6 +67,7 @@ def default_relationship(*args, **kwargs): kwargs.setdefault('cascade', 'expunge,refresh-expire,merge') else: kwargs.setdefault('cascade', 'all,delete-orphan') + kwargs.setdefault('lazy', 'raise') return SQLAlchemy_relationship(*args, **kwargs) diff --git a/uber/payments.py b/uber/payments.py index fcdaf11ba..2a7ad5d6b 100644 --- a/uber/payments.py +++ b/uber/payments.py @@ -723,7 +723,7 @@ def send_authorizenet_txn(self, txn_type=c.AUTHCAPTURE, **params): def log_authorizenet_response(self, intent_id, txn_info, card_info): from uber.models import ReceiptInfo, ReceiptTransaction, Session - session = Session().session + session = Session() matching_txns = session.query(ReceiptTransaction).filter_by(intent_id=intent_id).all() # AuthNet returns "StringElement" but we want strings @@ -1808,7 +1808,7 @@ def mark_paid_from_ids(intent_id, charge_id, put_on_hold=False): from uber.tasks.email import send_email from uber.decorators import render - session = Session().session + session = Session() matching_txns = session.query(ReceiptTransaction).filter_by(intent_id=intent_id).filter( ReceiptTransaction.charge_id == '').all() diff --git a/uber/site_sections/registration.py b/uber/site_sections/registration.py index 0832c40e5..a255c2b31 100644 --- a/uber/site_sections/registration.py +++ b/uber/site_sections/registration.py @@ -13,7 +13,7 @@ from aztec_code_generator import AztecCode from pytz import UTC from sqlalchemy import and_, func, or_ -from sqlalchemy.orm import joinedload +from sqlalchemy.orm import joinedload, selectinload from sqlalchemy.orm.exc import NoResultFound from uber.config import c @@ -42,14 +42,20 @@ def checking_at_the_door(self, *args, **kwargs): return checking_at_the_door -def load_attendee(session, params): +def load_attendee(session, params, add_to_session=True,): id = params.get('id', None) if id in [None, '', 'None']: attendee = Attendee() - session.add(attendee) + if add_to_session: + session.add(attendee) else: - attendee = session.attendee(id) + attendee = session.query(Attendee).filter(Attendee.id == id).options( + selectinload(Attendee.dept_membership_requests), + selectinload(Attendee.dept_memberships_with_inherent_role), + joinedload(Attendee.shifts), + joinedload(Attendee.panel_applicants), + joinedload(Attendee.admin_account)).one() return attendee @@ -156,10 +162,7 @@ def index(self, session, message='', page='0', search_text='', uploaded_id='', o @ajax @any_admin_access def validate_attendee(self, session, form_list=[], **params): - if params.get('id') in [None, '', 'None']: - attendee = Attendee() - else: - attendee = session.attendee(params.get('id')) + attendee = load_attendee(session, params, add_to_session=False) if not form_list: form_list = ['PersonalInfo', 'AdminBadgeExtras', 'AdminConsents', 'AdminStaffingInfo', 'AdminBadgeFlags', @@ -1514,7 +1517,10 @@ def attendee_history(self, session, id, **params): @attendee_view @cherrypy.expose(['shifts']) def attendee_shifts(self, session, id, **params): - attendee = session.attendee(id, allow_invalid=True) + attendee = session.query(Attendee).filter(Attendee.id == id).options( + joinedload(Attendee.shifts), + selectinload(Attendee.dept_membership_requests), + selectinload(Attendee.dept_memberships_with_dept_role)).first() attrs = Shift.to_dict_default_attrs + ['worked_label'] return_dict = { diff --git a/uber/site_sections/staffing_reports.py b/uber/site_sections/staffing_reports.py index 3122678e6..eaf1a86b7 100644 --- a/uber/site_sections/staffing_reports.py +++ b/uber/site_sections/staffing_reports.py @@ -6,12 +6,12 @@ from datetime import timedelta from dateutil import parser as dateparser -from sqlalchemy import or_ +from sqlalchemy import and_ from sqlalchemy.orm import subqueryload from uber.config import c from uber.decorators import all_renderable, csv_file, render -from uber.models import Attendee, Department, Job +from uber.models import Attendee, Department, DeptMembership, Job def volunteer_checklists(session): @@ -152,7 +152,11 @@ def volunteer_food(self, session, message='', department_id=None, start_time=Non @csv_file def dept_head_contact_info(self, out, session): out.writerow(["Full Name", "Email", "Phone", "Department(s)"]) - for a in session.query(Attendee).filter(Attendee.dept_memberships_as_dept_head.any()).order_by('last_name'): + dept_heads = session.query(Attendee).join(DeptMembership, + and_( + Attendee.id == DeptMembership.attendee_id, + DeptMembership.is_dept_head == True)) + for a in dept_heads.order_by(Attendee.last_name): for label in a.assigned_depts_labels: out.writerow([a.full_name, a.email, a.cellphone, label]) From d9b6210dc448e6a8406a9a8be6d925f3111c9e13 Mon Sep 17 00:00:00 2001 From: Victoria Earl Date: Wed, 11 Feb 2026 02:17:02 +0100 Subject: [PATCH 02/20] Fix server-side pagination 500 errors A lot of paginated pages would break if they had 0 rows to display. This fixes that. --- uber/templates/hotel_lottery_admin/index.html | 2 +- uber/templates/reg_admin/attendee_accounts.html | 2 +- uber/templates/reg_admin/automated_transactions.html | 2 +- uber/templates/registration/index_base.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/uber/templates/hotel_lottery_admin/index.html b/uber/templates/hotel_lottery_admin/index.html index 1edd57afa..396508189 100644 --- a/uber/templates/hotel_lottery_admin/index.html +++ b/uber/templates/hotel_lottery_admin/index.html @@ -109,7 +109,7 @@

Hotel Lottery Applications

{% endif %} {% block table %} -{% set page_count = pages[-1] %} +{% set page_count = pages[-1] if pages else 1 %} {% if page_count <= 50 %} {% set skip_pages = 1 %} {% else %} diff --git a/uber/templates/reg_admin/attendee_accounts.html b/uber/templates/reg_admin/attendee_accounts.html index 30f7f0a46..d2e4ed8fd 100644 --- a/uber/templates/reg_admin/attendee_accounts.html +++ b/uber/templates/reg_admin/attendee_accounts.html @@ -47,7 +47,7 @@ {% endif %} -{% set page_count = pages[-1] %} +{% set page_count = pages[-1] if pages else 1 %} {% if page_count <= 50 %} {% set skip_pages = 1 %} {% else %} diff --git a/uber/templates/reg_admin/automated_transactions.html b/uber/templates/reg_admin/automated_transactions.html index a879f1445..95d38ade3 100644 --- a/uber/templates/reg_admin/automated_transactions.html +++ b/uber/templates/reg_admin/automated_transactions.html @@ -75,7 +75,7 @@

Automated Transactions

{% endif %} {% block table %} -{% set page_count = pages[-1] %} +{% set page_count = pages[-1] if pages else 1 %} {% if page_count <= 50 %} {% set skip_pages = 1 %} {% else %} diff --git a/uber/templates/registration/index_base.html b/uber/templates/registration/index_base.html index 5c1b6dd4a..8adf932fd 100644 --- a/uber/templates/registration/index_base.html +++ b/uber/templates/registration/index_base.html @@ -209,7 +209,7 @@
{% endif %} {% endblock admin_controls %} {% block table %} -{% set page_count = pages[-1] %} +{% set page_count = pages[-1] if pages else 1 %} {% if page_count <= 50 %} {% set skip_pages = 1 %} {% else %} From 0a0d4db315114560cdcc2c5f0dc5945bf62f239d Mon Sep 17 00:00:00 2001 From: Victoria Earl Date: Wed, 11 Feb 2026 02:17:39 +0100 Subject: [PATCH 03/20] Add missing default API testing functions Noticed this while testing the API reference page -- several services didn't have prefilled suggestions. --- uber/templates/api/reference.html | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/uber/templates/api/reference.html b/uber/templates/api/reference.html index 8b7c3c86a..cbad590c4 100644 --- a/uber/templates/api/reference.html +++ b/uber/templates/api/reference.html @@ -354,10 +354,17 @@

Note on 404 Not Found

{%- set examples = { 'attendee': '{"method": "attendee.search", "params": ["' ~ admin_account.attendee.full_name ~ '"]}', + 'attendee_account': '{"method": "attendee_account.export", "params": ["query", "all"]}', + 'attraction': '{"method": "attraction.list"}', 'barcode': '{"method": "barcode.lookup_attendee_from_barcode", "params": ["~v22pcw"]}', 'config': '{"method": "config.info"}', 'dept': '{"method": "dept.jobs", "params": {"department_id": "' ~ c.DEFAULT_DEPARTMENT_ID ~ '"}}', + 'group': '{"method": "group.dealers", "params": ["New"]}', 'guest': '{"method": "guest.list", "params": ["guest"]}', + 'hotel': '{"method": "hotel.eligible_attendees"}', + 'mivs': '{"method": "mivs.list", "params": [""]}', + 'print_job': '{"method": "print_job.get_pending", "params": ["", "", "true"]}', + 'schedule': '{"method": "schedule.schedule"}', 'shifts': '{"method": "shifts.lookup", "params": {"department_id": "' ~ c.DEFAULT_DEPARTMENT_ID ~ '", "start_time": "now"}}' } -%} From bdd9a5ddbee92d55cfb0b41de9bbeeed277030da Mon Sep 17 00:00:00 2001 From: Victoria Earl Date: Wed, 11 Feb 2026 02:18:15 +0100 Subject: [PATCH 04/20] Fix page tracking for budget pages --- uber/models/tracking.py | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/uber/models/tracking.py b/uber/models/tracking.py index 72a5257a9..e6a9f1cf0 100644 --- a/uber/models/tracking.py +++ b/uber/models/tracking.py @@ -78,28 +78,28 @@ def track_pageview(cls): which = "Budget page" else: # Only log the page view if there's a valid model ID - if 'id' not in params or params['id'] == 'None': + if 'id' not in params or params['id'] in [None, '', 'None']: return - from uber.models import Session - with Session() as session: - # Get instance repr - model = None - id = params.get('id') - try: - model = session.attendee(id) - except NoResultFound: + from uber.models import Session + with Session() as session: + # Get instance repr + model = None + id = params.get('id') try: - model = session.group(id) + model = session.attendee(id) except NoResultFound: try: - model = session.art_show_application(id) + model = session.group(id) except NoResultFound: - pass - if model: - which = repr(model) - else: - return + try: + model = session.art_show_application(id) + except NoResultFound: + pass + if model: + which = repr(model) + else: + return session.add(PageViewTracking( who=AdminAccount.admin_or_volunteer_name(), From 0688a1ecd3f731e439b41b46e3f11521aa7c37ea Mon Sep 17 00:00:00 2001 From: Victoria Earl Date: Wed, 11 Feb 2026 02:21:19 +0100 Subject: [PATCH 05/20] Add and fix missing functions from residue We still want the old behavior for repr as that makes the Tracking table much easier to read. Also fixes issues with passing fields to to_dict. --- uber/models/__init__.py | 52 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 48 insertions(+), 4 deletions(-) diff --git a/uber/models/__init__.py b/uber/models/__init__.py index b30aa4f70..da85c352a 100644 --- a/uber/models/__init__.py +++ b/uber/models/__init__.py @@ -25,7 +25,7 @@ from sqlalchemy.orm import Query, joinedload, subqueryload, DeclarativeBase, declared_attr, sessionmaker, scoped_session import sqlalchemy.orm from sqlalchemy.orm.attributes import get_history, instance_state -from sqlalchemy.schema import MetaData +from sqlalchemy.schema import MetaData, UniqueConstraint from sqlalchemy.types import Boolean, Integer, Float, Date, Numeric, DateTime, Uuid, JSON import uber @@ -143,14 +143,14 @@ def to_dict(self, fields=None): elif isinstance(fields, dict): enabled_fields = [x for x in fields.keys() if fields[x]] - for col in (enabled_fields or self.__table__.columns): - val = getattr(self, col.name) + for field in (enabled_fields or self.to_dict_default_attrs): + val = getattr(self, field) if isinstance(val, (datetime, date)): val = val.isoformat() elif isinstance(val, uuid.UUID): val = str(val) - data[col.name] = val + data[field] = val return data id = Column(Uuid(as_uuid=False), primary_key=True, default=lambda: str(uuid4())) @@ -169,6 +169,50 @@ def to_dict(self, fields=None): required = () is_actually_old = False # Set to true to force preview models to return False for `is_new` + _repr_attr_names = () + + def __repr__(self): + """ + Useful string representation for logging. + + Note: + __repr__ does NOT return unicode on Python 2, since python decodes + it using the default encoding: http://bugs.python.org/issue5876. + + """ + # If no repr attr names have been set, default to the set of all + # unique constraints. This is unordered normally, so we'll order and + # use it here. + if not self._repr_attr_names: + unique_constraint_column_names = [[column.name for column in constraint.columns] + for constraint in self.__table__.constraints + if isinstance(constraint, UniqueConstraint)] + + # this flattens the unique constraint list + _unique_attrs = chain.from_iterable(unique_constraint_column_names) + _primary_keys = [column.name for column in self.__table__.primary_key.columns] + + attr_names = tuple(sorted(set(chain(_unique_attrs, + _primary_keys)))) + else: + attr_names = self._repr_attr_names + + if not attr_names and hasattr(self, 'id'): + # there should be SOMETHING, so use id as a fallback + attr_names = ('id',) + + if attr_names: + _kwarg_list = ' '.join('%s=%s' % (name, repr(getattr(self, name, 'undefined'))) + for name in attr_names) + kwargs_output = ' %s' % _kwarg_list + else: + kwargs_output = '' + + # specifically using the string interpolation operator and the repr of + # getattr so as to avoid any "hilarious" encode errors for non-ascii + # characters + u = '<%s%s>' % (self.__class__.__name__, kwargs_output) + return u if six.PY3 else u.encode('utf-8') @cached_classproperty def NAMESPACE(cls): From 6c9c06921bdd4a00fae8f4226366f9b2fd35011f Mon Sep 17 00:00:00 2001 From: Victoria Earl Date: Wed, 11 Feb 2026 02:24:08 +0100 Subject: [PATCH 06/20] Fix basic relationship loading for most pages Adds required loading to pages accessible from the site map. Not all reports were checked, and forms are not working right now so testing was quite basic (e.g. most pages had no data to display). Also adds relationship hints to each model because I got tired of jumping around different relationship definitions to remember which relationships were set to be joined/selected in by default. --- uber/config.py | 13 +-- uber/models/__init__.py | 33 ++++--- uber/models/admin.py | 13 +++ uber/models/api.py | 4 + uber/models/art_show.py | 40 ++++++++- uber/models/attendee.py | 60 +++++++++---- uber/models/attraction.py | 32 +++++++ uber/models/badge_printing.py | 4 + uber/models/commerce.py | 14 +++ uber/models/department.py | 45 +++++++++- uber/models/email.py | 6 +- uber/models/group.py | 5 ++ uber/models/guests.py | 61 +++++++++++++ uber/models/hotel.py | 14 +++ uber/models/marketplace.py | 4 + uber/models/mits.py | 30 +++++++ uber/models/panels.py | 19 ++++ uber/models/promo_code.py | 7 ++ uber/models/showcase.py | 34 ++++++++ uber/models/tabletop.py | 5 ++ uber/site_sections/accounts.py | 8 +- uber/site_sections/api.py | 6 +- uber/site_sections/art_show_admin.py | 92 +++++++++++--------- uber/site_sections/art_show_reports.py | 8 +- uber/site_sections/attractions_admin.py | 23 +++-- uber/site_sections/budget.py | 6 +- uber/site_sections/dept_admin.py | 29 +++--- uber/site_sections/devtools.py | 2 +- uber/site_sections/panels_admin.py | 8 +- uber/site_sections/preregistration.py | 6 +- uber/site_sections/reg_admin.py | 1 + uber/site_sections/reg_reports.py | 27 +++--- uber/site_sections/registration.py | 15 ++-- uber/site_sections/schedule.py | 31 ++++--- uber/site_sections/shifts_admin.py | 43 ++++++--- uber/site_sections/staffing_admin.py | 16 +++- uber/site_sections/staffing_reports.py | 7 +- uber/templates/schedule/schedule_macros.html | 32 ------- uber/templates/shifts_admin/template.html | 4 +- 39 files changed, 603 insertions(+), 204 deletions(-) delete mode 100644 uber/templates/schedule/schedule_macros.html diff --git a/uber/config.py b/uber/config.py index ad7e4b90d..f489b1b98 100644 --- a/uber/config.py +++ b/uber/config.py @@ -28,7 +28,7 @@ import cherrypy import signnow_python_sdk from sqlalchemy import or_, func -from sqlalchemy.orm import joinedload, subqueryload +from sqlalchemy.orm import joinedload, selectinload import uber @@ -1033,11 +1033,12 @@ def CURRENT_ADMIN(self): from uber.models import Session, AdminAccount, Attendee with Session() as session: attrs = Attendee.to_dict_default_attrs + ['admin_account', 'assigned_depts', 'logged_in_name'] - admin_account = session.query(AdminAccount) \ - .filter_by(id=cherrypy.session.get('account_id')) \ - .options(subqueryload(AdminAccount.attendee).subqueryload(Attendee.assigned_depts)).one() - - return admin_account.attendee.to_dict(attrs) + admin_attendee = session.query(Attendee).join(Attendee.admin_account) \ + .filter(AdminAccount.id == cherrypy.session.get('account_id')) \ + .options( + joinedload(Attendee.admin_account), + selectinload(Attendee.assigned_depts)).one() + return admin_attendee.to_dict(attrs) except Exception: return {} diff --git a/uber/models/__init__.py b/uber/models/__init__.py index da85c352a..e993efc9a 100644 --- a/uber/models/__init__.py +++ b/uber/models/__init__.py @@ -22,7 +22,7 @@ from sqlalchemy.event import listen from sqlalchemy.exc import IntegrityError, NoResultFound from sqlalchemy.ext.mutable import MutableDict -from sqlalchemy.orm import Query, joinedload, subqueryload, DeclarativeBase, declared_attr, sessionmaker, scoped_session +from sqlalchemy.orm import Query, joinedload, selectinload, subqueryload, contains_eager, DeclarativeBase, declared_attr, sessionmaker, scoped_session import sqlalchemy.orm from sqlalchemy.orm.attributes import get_history, instance_state from sqlalchemy.schema import MetaData, UniqueConstraint @@ -848,7 +848,10 @@ def current_supervisor_admin(self): def admin_attendee(self): if getattr(cherrypy, 'session', {}).get('account_id'): try: - return self.admin_account(cherrypy.session.get('account_id')).attendee + return self.query(Attendee).join(Attendee.admin_account).filter( + AdminAccount.id == cherrypy.session.get('account_id')).options( + contains_eager(Attendee.admin_account) + ).one() except NoResultFound: return @@ -878,7 +881,10 @@ def get_attendee_account_by_attendee(self, attendee): return attendee.managers[0] def logged_in_volunteer(self): - return self.attendee(cherrypy.session.get('staffer_id')) + return self.query(Attendee).filter(Attendee.id == cherrypy.session.get('staffer_id')).options( + selectinload(Attendee.hotel_requests), selectinload(Attendee.food_restrictions), + selectinload(Attendee.shifts) + ).one() def admin_has_staffer_access(self, staffer, access="view"): admin = self.current_admin_account() @@ -1060,7 +1066,9 @@ def checklist_status(self, slug, department_id): if not department_id: return {'conf': conf, 'relevant': False, 'completed': None} - department = self.query(Department).get(department_id) + department = self.query(Department).filter(Department.id == department_id).options( + selectinload(Department.dept_checklist_items) + ).first() if department: return { 'conf': conf, @@ -2154,14 +2162,15 @@ def bulk_insert(self, models): # ======================== def logged_in_judge(self): - judge = self.admin_attendee().admin_account.judge - if judge: - return judge - else: - raise HTTPRedirect( - '../accounts/homepage?message={}', - 'You have been given judge access but not had a judge entry created for you - ' - 'please contact a MIVS admin to correct this.') + if getattr(cherrypy, 'session', {}).get('account_id'): + try: + return self.query(IndieJudge).join(IndieJudge.admin_account).filter( + AdminAccount.id == cherrypy.session.get('account_id')).one() + except NoResultFound: + raise HTTPRedirect( + '../accounts/homepage?message={}', + 'You have been given judge access but not had a judge entry created for you - ' + 'please contact a MIVS admin to correct this.') def code_for(self, game): if game.unlimited_code: diff --git a/uber/models/admin.py b/uber/models/admin.py index 9d3cc8a69..fcbec2256 100644 --- a/uber/models/admin.py +++ b/uber/models/admin.py @@ -32,6 +32,12 @@ class AdminAccount(MagModel): + """ + Attendee: joined + AccessGroup: selectin + PasswordReset: select + """ + attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), unique=True) access_groups = relationship( 'AccessGroup', backref='admin_accounts', lazy='selectin', cascade='save-update,merge,refresh-expire,expunge', @@ -334,6 +340,10 @@ def has_access_level(self, access_to, access_level, read_only=False, max_level=F class WatchList(MagModel): + """ + Attendee: selectin + """ + first_names = Column(String) last_name = Column(String) email = Column(String, default='') @@ -372,6 +382,9 @@ def fix_birthdate(self): class EscalationTicket(MagModel): + """ + Attendee: selectin + """ attendees = relationship( 'Attendee', lazy='selectin', backref='escalation_tickets', order_by='Attendee.full_name', cascade='save-update,merge,refresh-expire,expunge', diff --git a/uber/models/api.py b/uber/models/api.py index fb1a40015..537286b89 100644 --- a/uber/models/api.py +++ b/uber/models/api.py @@ -16,6 +16,10 @@ class ApiToken(MagModel): + """ + AdminAccount: joined + """ + admin_account_id = Column(Uuid(as_uuid=False), ForeignKey('admin_account.id')) token = Column(Uuid(as_uuid=False), default=lambda: str(uuid.uuid4()), private=True) access = Column(MultiChoice(c.API_ACCESS_OPTS)) diff --git a/uber/models/art_show.py b/uber/models/art_show.py index 261129e7b..2f32ab869 100644 --- a/uber/models/art_show.py +++ b/uber/models/art_show.py @@ -27,6 +27,9 @@ class ArtShowAgentCode(MagModel): + """ + ArtShowApplication: joined + """ app_id = Column(Uuid(as_uuid=False), ForeignKey('art_show_application.id')) app = relationship('ArtShowApplication', lazy='joined', backref=backref('agent_codes', cascade='merge,refresh-expire,expunge'), @@ -55,6 +58,11 @@ def attendee_first_name(self): class ArtShowApplication(MagModel): + """ + Attendee: joined + ModelReceipt: select + """ + attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), nullable=True) attendee = relationship('Attendee', lazy='joined', foreign_keys=attendee_id, cascade='save-update, merge', @@ -437,6 +445,11 @@ def check_total(self): class ArtShowPiece(MagModel): + """ + ArtShowApplication: joined + Attendee (buyer): joined + """ + app_id = Column(Uuid(as_uuid=False), ForeignKey('art_show_application.id', ondelete='SET NULL'), nullable=True) app = relationship('ArtShowApplication', foreign_keys=app_id, cascade='save-update, merge', lazy='joined', @@ -446,7 +459,7 @@ class ArtShowPiece(MagModel): receipt = relationship('ArtShowReceipt', foreign_keys=receipt_id, cascade='save-update, merge', overlaps="art_show_purchases,buyer", - backref=backref('pieces', cascade='save-update, merge', overlaps="art_show_purchases,buyer")) + backref=backref('pieces', lazy='selectin', cascade='save-update, merge', overlaps="art_show_purchases,buyer")) winning_bidder_id = Column(Uuid(as_uuid=False), ForeignKey('art_show_bidder.id', ondelete='SET NULL'), nullable=True) winning_bidder = relationship('ArtShowBidder', foreign_keys=winning_bidder_id, cascade='save-update, merge', @@ -581,6 +594,10 @@ def print_bidsheet(self, pdf, sheet_num, normal_font_name, bold_font_name, set_f class ArtShowPanel(MagModel): + """ + ArtPanelAssignment: selectin + """ + gallery = Column(Choice(c.ART_PIECE_GALLERY_OPTS), default=c.GENERAL) surface_type = Column(Choice(c.ART_SHOW_PANEL_TYPE_OPTS), default=c.PANEL) origin_x = Column(Integer, default=0) @@ -622,6 +639,11 @@ def directional_usability(self): class ArtPanelAssignment(MagModel): + """ + ArtShowApplication: joined + ArtShowPanel: joined + """ + panel_id = Column(Uuid(as_uuid=False), ForeignKey('art_show_panel.id')) app_id = Column(Uuid(as_uuid=False), ForeignKey('art_show_application.id')) manual = Column(Boolean, default=False) @@ -654,6 +676,10 @@ def assignment_str(self): class ArtShowPayment(MagModel): + """ + ArtShowReceipt: joined + """ + receipt_id = Column(Uuid(as_uuid=False), ForeignKey('art_show_receipt.id', ondelete='SET NULL'), nullable=True) receipt = relationship('ArtShowReceipt', lazy='joined', foreign_keys=receipt_id, cascade='save-update, merge', @@ -665,10 +691,16 @@ class ArtShowPayment(MagModel): class ArtShowReceipt(MagModel): + """ + Attendee: joined + ArtShowPiece: selectin + ArtShowPayment: selectin + """ + invoice_num = Column(Integer, default=0) attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), nullable=True) attendee = relationship('Attendee', foreign_keys=attendee_id, - cascade='save-update, merge', + cascade='save-update, merge', lazy='joined', overlaps="art_show_purchases,buyer", backref=backref('art_show_receipts', cascade='save-update, merge', @@ -728,6 +760,10 @@ def cash_total(self): class ArtShowBidder(MagModel): + """ + Attendee: joined + """ + attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), nullable=True) bidder_num = Column(String) admin_notes = Column(String) diff --git a/uber/models/attendee.py b/uber/models/attendee.py index f8bad388b..72b6d0d39 100644 --- a/uber/models/attendee.py +++ b/uber/models/attendee.py @@ -9,7 +9,7 @@ from sqlalchemy import and_, case, exists, func, or_, select, not_ from sqlalchemy.ext.associationproxy import association_proxy from sqlalchemy.ext.hybrid import hybrid_property -from sqlalchemy.orm import backref, subqueryload, aliased +from sqlalchemy.orm import backref, subqueryload, aliased, selectinload, joinedload from sqlalchemy.schema import Column as SQLAlchemyColumn, ForeignKey, Index, Table, UniqueConstraint from sqlalchemy.types import Boolean, Date, Integer, Uuid, String, DateTime @@ -147,6 +147,10 @@ class BadgeInfo(MagModel): + """ + Attendee: joined + """ + attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), nullable=True, default=None) attendee = relationship('Attendee', backref=backref('allocated_badges', cascade='merge,refresh-expire,expunge'), foreign_keys=attendee_id, lazy='joined', @@ -201,6 +205,14 @@ def check_in(self): class Attendee(MagModel, TakesPaymentMixin): + """ + Group: select + AdminAccount: select + PromoCode: select + ModelReceipt: select + DeptMembership: select + """ + watchlist_id = Column(Uuid(as_uuid=False), ForeignKey('watch_list.id', ondelete='set null'), nullable=True, default=None) group_id = Column(Uuid(as_uuid=False), ForeignKey('group.id', ondelete='SET NULL'), nullable=True) group = relationship( @@ -253,7 +265,7 @@ class Attendee(MagModel, TakesPaymentMixin): promo_code = relationship( 'PromoCode', lazy='select', - backref=backref('used_by', cascade='merge,refresh-expire,expunge'), + backref=backref('used_by', lazy='selectin', cascade='merge,refresh-expire,expunge'), foreign_keys=promo_code_id, cascade='merge,refresh-expire,expunge') @@ -332,8 +344,8 @@ class Attendee(MagModel, TakesPaymentMixin): uselist=False) default_cost = Column(Integer, nullable=True) - dept_memberships = relationship('DeptMembership', backref='attendee', lazy='select') - dept_membership_requests = relationship('DeptMembershipRequest', backref='attendee') + dept_memberships = relationship('DeptMembership', backref=backref('attendee', lazy='joined'), lazy='select') + dept_membership_requests = relationship('DeptMembershipRequest', backref=backref('attendee', lazy='joined')) dept_roles = relationship( 'DeptRole', backref='attendees', @@ -404,14 +416,14 @@ class Attendee(MagModel, TakesPaymentMixin): # (which type? swag or staff? prob swag) no_shirt = relationship('NoShirt', backref=backref('attendee'), uselist=False) - admin_account = relationship('AdminAccount', backref=backref('attendee', lazy='joined'), uselist=False) + admin_account = relationship('AdminAccount', lazy='select', backref=backref('attendee', lazy='joined'), uselist=False) food_restrictions = relationship( 'FoodRestrictions', backref=backref('attendee', lazy='joined'), uselist=False) sales = relationship('Sale', backref='attendee', cascade='save-update,merge,refresh-expire,expunge') mpoints_for_cash = relationship('MPointsForCash', backref='attendee') old_mpoint_exchanges = relationship('OldMPointExchange', backref='attendee') - dept_checklist_items = relationship('DeptChecklistItem', backref=backref('attendee', lazy='selectin')) + dept_checklist_items = relationship('DeptChecklistItem', backref=backref('attendee', lazy='joined')) indie_developer = relationship( 'IndieDeveloper', backref=backref('attendee'), uselist=False) @@ -465,7 +477,7 @@ class Attendee(MagModel, TakesPaymentMixin): # ========================= # tabletop # ========================= - games = relationship('TabletopGame', backref=backref('attendee', lazy='joined')) + games = relationship('TabletopGame', backref='attendee') checkouts = relationship('TabletopCheckout', backref=backref('attendee', lazy='joined')) # ========================= @@ -484,7 +496,7 @@ class Attendee(MagModel, TakesPaymentMixin): secondary='art_show_receipt') art_agent_apps = relationship( 'ArtShowApplication', - backref=backref('agents', lazy='joined'), + backref='agents', secondaryjoin='and_(ArtShowAgentCode.app_id == ArtShowApplication.id, ArtShowAgentCode.cancelled == None)', secondary='art_show_agent_code', viewonly=True) @@ -529,8 +541,8 @@ def _misc_adjustments(self): self.age_group = self.age_group_conf['val'] for attr in ['first_name', 'last_name']: - value = getattr(self, attr) - if (value.isupper() or value.islower()): + value = getattr(self, attr, '') + if value and (value.isupper() or value.islower()): setattr(self, attr, value.title()) if self.legal_name and self.full_name == self.legal_name: @@ -1709,7 +1721,7 @@ def has_personalized_badge(self): @property def donation_swag(self): donation_items = [ - desc for amount, desc in sorted(c.DONATION_TIERS.items()) if amount and self.amount_extra >= amount] + desc for amount, desc in sorted(c.DONATION_TIERS.items()) if amount and (self.amount_extra or 0) >= amount] extra_donations = ['Extra donation of ${}'.format(self.extra_donation)] if self.extra_donation else [] return donation_items + extra_donations @@ -1750,7 +1762,7 @@ def merch_items(self): """ merch = [] for amount, desc in sorted(c.DONATION_TIERS.items()): - if amount and self.amount_extra >= amount: + if amount and (self.amount_extra or 0) >= amount: merch.append(desc) items = c.DONATION_TIER_ITEMS.get(amount, []) if len(items) == 1: @@ -2031,12 +2043,12 @@ def worked_shifts(self): @property def weighted_hours(self): weighted_hours = sum(s.job.weighted_hours for s in self.shifts) - return weighted_hours + self.nonshift_minutes / 60 + return weighted_hours + (self.nonshift_minutes or 0) / 60 @property def unweighted_hours(self): unweighted_hours = sum(s.job.real_duration for s in self.shifts) / 60 - return unweighted_hours + self.nonshift_minutes / 60 + return unweighted_hours + (self.nonshift_minutes or 0) / 60 def weighted_hours_in(self, department_id): if not department_id: @@ -2051,12 +2063,12 @@ def unweighted_hours_in(self, department_id): @property def worked_hours(self): weighted_hours = sum(s.job.weighted_hours for s in self.worked_shifts) - return weighted_hours + self.nonshift_minutes / 60 + return weighted_hours + (self.nonshift_minutes or 0) / 60 @property def unweighted_worked_hours(self): unweighted_hours = sum(s.job.real_duration / 60 for s in self.worked_shifts) - return unweighted_hours + self.nonshift_minutes / 60 + return unweighted_hours + (self.nonshift_minutes or 0) / 60 def worked_hours_in(self, department_id): if not department_id: @@ -2183,7 +2195,9 @@ def has_role_somewhere(self): def depts_where_can_admin(self): if self.admin_account and self.admin_account.full_dept_admin: from uber.models.department import Department - return self.session.query(Department).order_by(Department.name).all() + return self.session.query(Department).options( + selectinload(Department.dept_roles), selectinload(Department.job_templates) + ).order_by(Department.name).all() return self.depts_with_inherent_role def has_shifts_in(self, department): @@ -2511,6 +2525,10 @@ def guest_group(self): class AttendeeAccount(MagModel): + """ + PasswordReset: select + """ + public_id = Column(Uuid(as_uuid=False), default=lambda: str(uuid4()), nullable=True) email = Column(String) hashed = Column(String, private=True) @@ -2637,6 +2655,10 @@ def refunded_deferred_attendees(self): class BadgePickupGroup(MagModel): + """ + Attendee: selectin + """ + public_id = Column(Uuid(as_uuid=False), default=lambda: str(uuid4()), nullable=True) account_id = Column(String) @@ -2714,6 +2736,10 @@ def under_18_badges(self): class FoodRestrictions(MagModel): + """ + Attendee: joined + """ + attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), unique=True) standard = Column(MultiChoice(c.FOOD_RESTRICTION_OPTS)) sandwich_pref = Column(MultiChoice(c.SANDWICH_OPTS)) diff --git a/uber/models/attraction.py b/uber/models/attraction.py index e2e4e587c..eb90df550 100644 --- a/uber/models/attraction.py +++ b/uber/models/attraction.py @@ -93,6 +93,10 @@ def get_updated_signup_vals(self): return same_time_settings, update_attrs class Attraction(MagModel, AttractionMixin): + """ + AttractionFeature: selectin + """ + _NONE = 0 _PER_FEATURE = 1 _PER_ATTRACTION = 2 @@ -343,6 +347,11 @@ def signups_requiring_notification(self, session, from_time, to_time, options=No class AttractionFeature(MagModel, AttractionMixin): + """ + Attraction: joined + AttractionEvent: selectin + """ + name = Column(String) slug = Column(String) description = Column(String) @@ -469,6 +478,13 @@ def available_events_by_day(self): class AttractionEvent(MagModel, AttractionMixin): + """ + Attraction: joined + AttractionFeature: joined + EventLocation: joined + Event: joined + """ + attraction_feature_id = Column(Uuid(as_uuid=False), ForeignKey('attraction_feature.id')) attraction_id = Column(Uuid(as_uuid=False), ForeignKey('attraction.id'), index=True) event_location_id = Column(Uuid(as_uuid=False), ForeignKey('event_location.id', ondelete='SET NULL'), nullable=True) @@ -750,6 +766,12 @@ def overlap(self, event): class AttractionSignup(MagModel): + """ + Attendee: joined + Attraction: joined + AttractionEvent: joined + """ + attraction_event_id = Column(Uuid(as_uuid=False), ForeignKey('attraction_event.id')) attraction_id = Column(Uuid(as_uuid=False), ForeignKey('attraction.id')) attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) @@ -849,6 +871,12 @@ def notify_waitlist(self): class AttractionNotification(MagModel): + """ + Attendee: joined + AttractionEvent: joined + AttractionSignup: joined + """ + attraction_event_id = Column(Uuid(as_uuid=False), ForeignKey('attraction_event.id')) attraction_id = Column(Uuid(as_uuid=False), ForeignKey('attraction.id')) attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) @@ -867,6 +895,10 @@ def _fix_attraction_id(self): class AttractionNotificationReply(MagModel): + """ + AttractionEvent: joined + """ + attraction_event_id = Column(Uuid(as_uuid=False), ForeignKey('attraction_event.id'), nullable=True) attraction_id = Column(Uuid(as_uuid=False), ForeignKey('attraction.id'), nullable=True) attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), nullable=True) diff --git a/uber/models/badge_printing.py b/uber/models/badge_printing.py index a35382fd2..8e2ba68b4 100644 --- a/uber/models/badge_printing.py +++ b/uber/models/badge_printing.py @@ -12,6 +12,10 @@ class PrintJob(MagModel): + """ + Attendee: joined + """ + attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) admin_id = Column(Uuid(as_uuid=False), ForeignKey('admin_account.id'), nullable=True) admin_name = Column(String) # Preserve admin's name in case their account is removed diff --git a/uber/models/commerce.py b/uber/models/commerce.py index ad0e28a8c..e18c6377e 100644 --- a/uber/models/commerce.py +++ b/uber/models/commerce.py @@ -88,6 +88,9 @@ class Sale(MagModel): class ModelReceipt(MagModel): """ + ReceiptTransaction: selectin + ReceiptItem: selectin + Attendees, groups, and art show apps have a running receipt that has items and transactions added to it dynamically. Receipt items can be purchases or credits added to the receipt. They do not involve money changing hands. @@ -314,6 +317,8 @@ def process_full_refund(self, session, model, who='non-admin', exclude_fees=Fals class ReceiptTransaction(MagModel): """ + ModelReceipt: joined + Transactions have two key properties: whether or not they were done through Stripe, and whether they represent a payment or a refund. @@ -536,6 +541,11 @@ def cannot_delete_reason(self): class ReceiptItem(MagModel): + """ + ModelReceipt: joined + ReceiptTransaction: joined + """ + purchaser_id = Column(Uuid(as_uuid=False), index=True, nullable=True) receipt_id = Column(Uuid(as_uuid=False), ForeignKey('model_receipt.id', ondelete='SET NULL'), nullable=True) receipt = relationship('ModelReceipt', foreign_keys=receipt_id, @@ -619,6 +629,10 @@ def cannot_delete_reason(self): class ReceiptInfo(MagModel): + """ + ReceiptTransaction: selectin + """ + fk_email_model = Column(String) fk_email_id = Column(String) terminal_id = Column(String) diff --git a/uber/models/department.py b/uber/models/department.py index 6a85724e1..030220a4e 100644 --- a/uber/models/department.py +++ b/uber/models/department.py @@ -62,6 +62,11 @@ class DeptChecklistItem(MagModel): + """ + Attendee: joined + Department: joined + """ + department_id = Column(Uuid(as_uuid=False), ForeignKey('department.id')) attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) slug = Column(String) @@ -91,6 +96,12 @@ class BulkPrintingRequest(MagModel): class DeptMembership(MagModel): + """ + Attendee: joined + Department: joined + DeptRole: selectin + """ + is_dept_head = Column(Boolean, default=False) is_poc = Column(Boolean, default=False) is_checklist_admin = Column(Boolean, default=False) @@ -135,6 +146,11 @@ def dept_roles_names(self): class DeptMembershipRequest(MagModel): + """ + Attendee: joined + Department: joined + """ + attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) # A NULL value for the department_id indicates the attendee is willing @@ -151,6 +167,10 @@ class DeptMembershipRequest(MagModel): class DeptRole(MagModel): + """ + Department: joined + """ + name = Column(String) description = Column(String) department_id = Column(Uuid(as_uuid=False), ForeignKey('department.id')) @@ -376,7 +396,7 @@ def normalized_name(cls): @classmethod def normalize_name(cls, name): return name.lower().replace('_', '').replace(' ', '') - + @property def dept_roles_choices(self): return [(role.id, role.name) for role in self.dept_roles] @@ -403,6 +423,13 @@ def job_templates_by_name(self): class Job(MagModel): + """ + Department: joined + DeptRole: selectin + Shift: selectin + JobTemplate: select + """ + _ONLY_MEMBERS = 0 _ALL_VOLUNTEERS = 2 _VISIBILITY_OPTS = [ @@ -474,7 +501,7 @@ def restricted(self): @restricted.expression def restricted(cls): - return exists([job_required_role.c.dept_role_id]) \ + return exists(job_required_role.c.dept_role_id) \ .where(job_required_role.c.job_id == cls.id).label('restricted') @property @@ -646,10 +673,10 @@ def _potential_volunteers(self, staffing_only=False, order_by=Attendee.full_name query = query.filter(Attendee.staffing == True) # noqa: E712 if self.required_roles: - query = query.join(Attendee.dept_roles, aliased=True).filter( + query = query.join(Attendee.dept_roles).filter( and_(*[DeptRole.id == r.id for r in self.required_roles])) else: - query = query.join(Attendee.dept_memberships, aliased=True).filter( + query = query.join(Attendee.dept_memberships).filter( DeptMembership.department_id == self.department_id) return query.order_by(order_by).all() @@ -683,6 +710,11 @@ def available_volunteers(self): class JobTemplate(MagModel): + """ + Department: joined + DeptRole: selectin + """ + department_id = Column(Uuid(as_uuid=False), ForeignKey('department.id')) template_name = Column(String) @@ -915,6 +947,11 @@ def real_cutoff_time(self, day_int): class Shift(MagModel): + """ + Attendee: joined + Job: joined + """ + job_id = Column(Uuid(as_uuid=False), ForeignKey('job.id', ondelete='cascade')) attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='cascade')) worked = Column(Choice(c.WORKED_STATUS_OPTS), default=c.SHIFT_UNMARKED) diff --git a/uber/models/email.py b/uber/models/email.py index 9ce674fa3..a3a7bef56 100644 --- a/uber/models/email.py +++ b/uber/models/email.py @@ -347,6 +347,10 @@ def would_send_if_approved(self, model_instance): class Email(MagModel, BaseEmailMixin): + """ + AutomatedEmail: joined + """ + automated_email_id = Column( Uuid(as_uuid=False), ForeignKey('automated_email.id', ondelete='set null'), nullable=True, default=None, index=True) @@ -357,7 +361,7 @@ class Email(MagModel, BaseEmailMixin): @cached_property def fk(self): - return self.session.query(self.model_class).filter_by(id=self.fk_id).first() \ + return self.session.query(self.model_class).filter(self.model_class.id == self.fk_id).first() \ if self.session and self.fk_id else None @property diff --git a/uber/models/group.py b/uber/models/group.py index 224759984..58dbf3c51 100644 --- a/uber/models/group.py +++ b/uber/models/group.py @@ -22,6 +22,11 @@ class Group(MagModel, TakesPaymentMixin): + """ + Attendee: selectin + ModelReceipt: select + """ + public_id = Column(Uuid(as_uuid=False), default=lambda: str(uuid4())) shared_with_id = Column(Uuid(as_uuid=False), ForeignKey('group.id', ondelete='SET NULL'), nullable=True) shared_with = relationship( diff --git a/uber/models/guests.py b/uber/models/guests.py index c16aefcbc..272e79558 100644 --- a/uber/models/guests.py +++ b/uber/models/guests.py @@ -29,6 +29,10 @@ class GuestGroup(MagModel): + """ + Group: joined + """ + group_id = Column(Uuid(as_uuid=False), ForeignKey('group.id')) event_id = Column(Uuid(as_uuid=False), ForeignKey('event.id', ondelete='SET NULL'), nullable=True) group_type = Column(Choice(c.GROUP_TYPE_OPTS), default=c.BAND) @@ -291,6 +295,10 @@ def guidebook_images(self): class GuestInfo(MagModel): + """ + GuestGroup: joined + """ + guest_id = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) poc_phone = Column(String) performer_count = Column(Integer, default=0) @@ -321,6 +329,10 @@ def download_filename(self): class GuestBio(MagModel): + """ + GuestGroup: joined + """ + guest_id = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) desc = Column(String) member_info = Column(String) @@ -341,6 +353,10 @@ def status(self): class GuestTaxes(MagModel): + """ + GuestGroup: joined + """ + guest_id = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) w9_sent = Column(Boolean, default=False) @@ -350,6 +366,10 @@ def status(self): class GuestStagePlot(MagModel): + """ + GuestGroup: joined + """ + guest_id = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) filename = Column(String) content_type = Column(String) @@ -386,6 +406,10 @@ def status(self): class GuestPanel(MagModel): + """ + GuestGroup: joined + """ + guest_id = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) wants_panel = Column(Choice(c.GUEST_PANEL_OPTS), nullable=True) name = Column(String) @@ -400,6 +424,10 @@ def status(self): class GuestTrack(MagModel): + """ + GuestGroup: joined + """ + guest_id = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id')) filename = Column(String) content_type = Column(String) @@ -438,6 +466,10 @@ def filepath(self): class GuestMerch(MagModel): + """ + GuestGroup: joined + """ + _inventory_file_regex = re.compile(r'^(audio|image)(|\-\d+)$') _inventory_filename_regex = re.compile(r'^(audio|image)(|\-\d+)_filename$') @@ -736,6 +768,10 @@ def update_inventory(self, inventory, *, persist_files=True): class GuestCharity(MagModel): + """ + GuestGroup: joined + """ + guest_id = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) donating = Column(Choice(c.GUEST_CHARITY_OPTS), nullable=True) desc = Column(String) @@ -751,6 +787,10 @@ def no_desc_if_not_donating(self): class GuestAutograph(MagModel): + """ + GuestGroup: joined + """ + guest_id = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) num = Column(Integer, default=0) length = Column(Integer, default=60) # session length in minutes @@ -764,6 +804,10 @@ def no_length_if_zero_autographs(self): class GuestInterview(MagModel): + """ + GuestGroup: joined + """ + guest_id = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) will_interview = Column(Boolean, default=False) email = Column(String) @@ -777,6 +821,11 @@ def no_details_if_no_interview(self): class GuestTravelPlans(MagModel): + """ + GuestGroup: joined + GuestDetailedTravelPlan: selectin + """ + guest_id = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) modes = Column(MultiChoice(c.GUEST_TRAVEL_OPTS), default=c.OTHER) modes_text = Column(String) @@ -789,16 +838,28 @@ def num_detailed_travel_plans(self): class GuestHospitality(MagModel): + """ + GuestGroup: joined + """ + guest_id = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) completed = Column(Boolean, default=False) class GuestMediaRequest(MagModel): + """ + GuestGroup: joined + """ + guest_id = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) completed = Column(Boolean, default=False) class GuestDetailedTravelPlan(MagModel): + """ + GuestTravelPlans: joined + """ + travel_plans_id = Column(Uuid(as_uuid=False), ForeignKey('guest_travel_plans.id'), nullable=True) travel_plans = relationship('GuestTravelPlans', foreign_keys=travel_plans_id, single_parent=True, backref=backref('detailed_travel_plans', lazy='selectin'), lazy='joined', diff --git a/uber/models/hotel.py b/uber/models/hotel.py index c8a37f02e..f171a74ea 100644 --- a/uber/models/hotel.py +++ b/uber/models/hotel.py @@ -66,6 +66,10 @@ def setup_teardown(self): class HotelRequests(MagModel, NightsMixin): + """ + Attendee: joined + """ + attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), unique=True) nights = Column(MultiChoice(c.NIGHT_OPTS)) wanted_roommates = Column(String) @@ -116,11 +120,21 @@ def check_out_date(self): class RoomAssignment(MagModel): + """ + Attendee: joined + Room: joined + """ + room_id = Column(Uuid(as_uuid=False), ForeignKey('room.id')) attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) class LotteryApplication(MagModel): + """ + Attendee: joined + LotteryApplication (parent_application): joined + """ + attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), unique=True, nullable=True) attendee = relationship('Attendee', lazy='joined', backref=backref('lottery_application', uselist=False), cascade='save-update,merge,refresh-expire,expunge', diff --git a/uber/models/marketplace.py b/uber/models/marketplace.py index 5fe977a6d..5b84a2e2b 100644 --- a/uber/models/marketplace.py +++ b/uber/models/marketplace.py @@ -16,6 +16,10 @@ class ArtistMarketplaceApplication(MagModel): + """ + Attendee: joined + """ + MATCHING_DEALER_FIELDS = ['email_address', 'website', 'name'] attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) diff --git a/uber/models/mits.py b/uber/models/mits.py index 3183552fb..35439e700 100644 --- a/uber/models/mits.py +++ b/uber/models/mits.py @@ -21,6 +21,10 @@ class MITSTeam(MagModel): + """ + MITSGame: selectin + """ + name = Column(String) days_available = Column(Integer, nullable=True) hours_available = Column(Integer, nullable=True) @@ -132,6 +136,10 @@ def completion_percentage(self): class MITSApplicant(MagModel): + """ + MITSTeam: joined + """ + team_id = Column(ForeignKey('mits_team.id')) attendee_id = Column(ForeignKey('attendee.id'), nullable=True) primary_contact = Column(Boolean, default=False) @@ -161,6 +169,12 @@ def has_requested(self, night): class MITSGame(MagModel): + """ + MITSTeam: joined + MITSPicture: selectin + MITSDocument: selectin + """ + team_id = Column(ForeignKey('mits_team.id')) name = Column(String) promo_blurb = Column(String) @@ -232,6 +246,10 @@ def guidebook_images(self): class MITSPicture(MagModel, GuidebookImageMixin): + """ + MITSGame: joined + """ + game_id = Column(Uuid(as_uuid=False), ForeignKey('mits_game.id')) description = Column(String) @@ -245,6 +263,10 @@ def filepath(self): class MITSDocument(MagModel): + """ + MITSGame: joined + """ + game_id = Column(Uuid(as_uuid=False), ForeignKey('mits_game.id')) filename = Column(String) description = Column(String) @@ -259,12 +281,20 @@ def filepath(self): class MITSTimes(MagModel): + """ + MITSTeam: joined + """ + team_id = Column(ForeignKey('mits_team.id')) showcase_availability = Column(MultiChoice(c.MITS_SHOWCASE_SCHEDULE_OPTS)) availability = Column(MultiChoice(c.MITS_SCHEDULE_OPTS)) class MITSPanelApplication(MagModel): + """ + MITSTeam: joined + """ + team_id = Column(ForeignKey('mits_team.id')) name = Column(String) description = Column(String) diff --git a/uber/models/panels.py b/uber/models/panels.py index 9ee8ff1cb..7302b2c85 100644 --- a/uber/models/panels.py +++ b/uber/models/panels.py @@ -79,6 +79,10 @@ def update_events(self, session): class Event(MagModel): + """ + EventLocation: joined + """ + event_location_id = Column(Uuid(as_uuid=False), ForeignKey('event_location.id', ondelete='SET NULL'), nullable=True) department_id = Column(Uuid(as_uuid=False), ForeignKey('department.id', ondelete='SET NULL'), nullable=True) attraction_event_id = Column(Uuid(as_uuid=False), ForeignKey('attraction_event.id', ondelete='SET NULL'), nullable=True) @@ -154,6 +158,11 @@ def guidebook_desc(self): class AssignedPanelist(MagModel): + """ + Attendee: joined + Event: joined + """ + attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='cascade')) event_id = Column(Uuid(as_uuid=False), ForeignKey('event.id', ondelete='cascade')) @@ -166,6 +175,11 @@ def __repr__(self): class PanelApplication(MagModel): + """ + Event: joined + PanelApplicant: selectin + """ + event_id = Column(Uuid(as_uuid=False), ForeignKey('event.id', ondelete='SET NULL'), nullable=True) poc_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), nullable=True) submitter_id = Column(Uuid(as_uuid=False), ForeignKey('panel_applicant.id', ondelete='SET NULL'), nullable=True) @@ -318,6 +332,11 @@ def has_been_accepted(self): class PanelApplicant(MagModel): + """ + Attendee: joined + PanelApplicant: selectin + """ + attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), nullable=True) submitter = Column(Boolean, default=False) first_name = Column(String) diff --git a/uber/models/promo_code.py b/uber/models/promo_code.py index 244a2a1fa..4822381d2 100644 --- a/uber/models/promo_code.py +++ b/uber/models/promo_code.py @@ -132,6 +132,11 @@ def normalize_word(cls, word): class PromoCodeGroup(MagModel): + """ + Attendee: joined + PromoCode: selectin + """ + name = Column(String) code = Column(String, admin_only=True) registered = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) @@ -226,6 +231,8 @@ def min_badges_addable(self): class PromoCode(MagModel): """ Promo codes used by attendees to purchase badges at discounted prices. + Attendee: selectin + PromoCodeGroup: joined Attributes: code (str): The actual textual representation of the promo code. This diff --git a/uber/models/showcase.py b/uber/models/showcase.py index b4d5bef15..fc00947b1 100644 --- a/uber/models/showcase.py +++ b/uber/models/showcase.py @@ -36,6 +36,11 @@ def game_reviews(self): class IndieJudge(MagModel, ReviewMixin): + """ + IndieGameCode: selectin + IndieGameReview: selectin + """ + admin_id = Column(Uuid(as_uuid=False), ForeignKey('admin_account.id')) status = Column(Choice(c.MIVS_JUDGE_STATUS_OPTS), default=c.UNCONFIRMED) assignable_showcases = Column(MultiChoice(c.SHOWCASE_GAME_TYPE_OPTS)) @@ -129,6 +134,10 @@ def get_code_for(self, game_id): class IndieStudio(MagModel): + """ + IndieGame: selectin + """ + group_id = Column(Uuid(as_uuid=False), ForeignKey('group.id'), nullable=True) name = Column(String, unique=True) website = Column(String) @@ -313,6 +322,10 @@ def unclaimed_badges(self): class IndieDeveloper(MagModel): + """ + IndieStudio: joined + """ + studio_id = Column(Uuid(as_uuid=False), ForeignKey('indie_studio.id')) attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), nullable=True) @@ -346,6 +359,13 @@ def matching_attendee(self): class IndieGame(MagModel, ReviewMixin): + """ + IndieStudio: joined + IndieDeveloper: joined + IndieGameCode: selectin + IndieGameImage: selectin + """ + studio_id = Column(Uuid(as_uuid=False), ForeignKey('indie_studio.id')) primary_contact_id = Column(Uuid(as_uuid=False), ForeignKey('indie_developer.id', ondelete='SET NULL'), nullable=True) primary_contact = relationship(IndieDeveloper, backref='arcade_games', lazy='joined', @@ -657,6 +677,10 @@ def guidebook_images(self): class IndieGameImage(MagModel, GuidebookImageMixin): + """ + IndieGame: joined + """ + game_id = Column(Uuid(as_uuid=False), ForeignKey('indie_game.id')) description = Column(String) use_in_promo = Column(Boolean, default=False) @@ -697,6 +721,11 @@ def filepath(self): class IndieGameCode(MagModel): + """ + IndieGame: joined + IndieJudge: joined + """ + game_id = Column(Uuid(as_uuid=False), ForeignKey('indie_game.id')) judge_id = Column(Uuid(as_uuid=False), ForeignKey('indie_judge.id'), nullable=True) code = Column(String) @@ -709,6 +738,11 @@ def type_label(self): class IndieGameReview(MagModel): + """ + IndieGame: joined + IndieJudge: joined + """ + game_id = Column(Uuid(as_uuid=False), ForeignKey('indie_game.id')) judge_id = Column(Uuid(as_uuid=False), ForeignKey('indie_judge.id')) video_status = Column( diff --git a/uber/models/tabletop.py b/uber/models/tabletop.py index dcc98fb9f..bafa7601a 100644 --- a/uber/models/tabletop.py +++ b/uber/models/tabletop.py @@ -30,6 +30,11 @@ def checked_out(self): class TabletopCheckout(MagModel): + """ + Attendee: joined + TabletopGame: joined + """ + game_id = Column(Uuid(as_uuid=False), ForeignKey('tabletop_game.id')) attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) checked_out = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) diff --git a/uber/site_sections/accounts.py b/uber/site_sections/accounts.py index 096407022..9e9089860 100644 --- a/uber/site_sections/accounts.py +++ b/uber/site_sections/accounts.py @@ -2,7 +2,7 @@ import bcrypt import cherrypy -from sqlalchemy.orm import subqueryload +from sqlalchemy.orm import joinedload, selectinload from sqlalchemy.orm.exc import NoResultFound from uber.config import c @@ -46,7 +46,7 @@ def index(self, session, message=''): 'message': message, 'accounts': (session.query(AdminAccount) .join(Attendee) - .options(subqueryload(AdminAccount.attendee).subqueryload(Attendee.assigned_depts)) + .options(joinedload(AdminAccount.attendee).selectinload(Attendee.assigned_depts)) .order_by(Attendee.last_first).all()), 'all_attendees': attendees, } @@ -112,7 +112,9 @@ def delete(self, session, id, **params): def bulk(self, session, department_id=None, **params): department_id = None if department_id == 'All' else department_id attendee_filters = [Attendee.dept_memberships.any(department_id=department_id)] if department_id else [] - attendees = session.staffers().filter(*attendee_filters).all() + attendees = session.staffers().filter(*attendee_filters).options( + selectinload(Attendee.dept_memberships_with_role) + ).all() for attendee in attendees: attendee.trusted_here = attendee.trusted_in(department_id) if department_id else attendee.has_role_somewhere attendee.hours_here = attendee.weighted_hours_in(department_id) diff --git a/uber/site_sections/api.py b/uber/site_sections/api.py index 444da0204..3ce3751a9 100644 --- a/uber/site_sections/api.py +++ b/uber/site_sections/api.py @@ -5,7 +5,7 @@ import pytz import inspect import stripe -from sqlalchemy.orm import subqueryload +from sqlalchemy.orm import joinedload from uber.config import c from uber.decorators import ajax, all_renderable, not_site_mappable, public, site_mappable @@ -26,8 +26,8 @@ def index(self, session, show_revoked=False, message='', **params): if not show_revoked: api_tokens = api_tokens.filter(ApiToken.revoked_time == None) # noqa: E711 api_tokens = api_tokens.options( - subqueryload(ApiToken.admin_account) - .subqueryload(AdminAccount.attendee)) \ + joinedload(ApiToken.admin_account) + .selectinload(AdminAccount.attendee)) \ .order_by(ApiToken.issued_time).all() return { 'message': message, diff --git a/uber/site_sections/art_show_admin.py b/uber/site_sections/art_show_admin.py index e74d6bae8..b25328f3c 100644 --- a/uber/site_sections/art_show_admin.py +++ b/uber/site_sections/art_show_admin.py @@ -12,7 +12,7 @@ from datetime import datetime from decimal import Decimal from sqlalchemy import or_, and_ -from sqlalchemy.orm import joinedload, contains_eager +from sqlalchemy.orm import joinedload, selectinload from sqlalchemy.orm.exc import NoResultFound from io import BytesIO @@ -35,18 +35,18 @@ class Root: def index(self, session, message=''): return { 'message': message, - 'applications': session.query(ArtShowApplication).options(joinedload(ArtShowApplication.attendee)) + 'applications': session.query(ArtShowApplication).options(joinedload(ArtShowApplication.active_receipt)) } def form(self, session, new_app='', message='', **params): if new_app and 'attendee_id' in params: - app = session.art_show_application(params, ignore_csrf=True, bools=['us_only']) + app = ArtShowApplication(attendee_id = params['attendee_id']) else: + app = session.query(ArtShowApplication).filter(ArtShowApplication.id == params['id']).options( + selectinload(ArtShowApplication.art_show_pieces), joinedload(ArtShowApplication.active_receipt)).one() if cherrypy.request.method == 'POST' and params.get('id') not in [None, '', 'None']: - app = session.art_show_application(params.get('id')) - receipt_items = ReceiptManager.auto_update_receipt(app, session.get_receipt_by_model(app), params.copy()) + receipt_items = ReceiptManager.auto_update_receipt(app, app.active_receipt, params.copy()) session.add_all(receipt_items) - app = session.art_show_application(params, bools=['us_only']) attendee = None app_paid = 0 if new_app else app.amount_paid @@ -71,7 +71,6 @@ def form(self, session, new_app='', message='', **params): session.attendee_from_art_show_app(**params) else: attendee = app.attendee - message = message or check(app) if not message: if attendee: @@ -121,7 +120,8 @@ def validate_app(self, session, form_list=[], **params): return {"success": True} def pieces(self, session, id, message=''): - app = session.art_show_application(id) + app = session.query(ArtShowApplication).filter(ArtShowApplication.id == id).options( + selectinload(ArtShowApplication.art_show_pieces)).one() return { 'app': app, 'message': message, @@ -250,12 +250,12 @@ def close_out(self, session, message='', piece_code='', bidder_num='', winning_b message = "ERROR: This bidder number does not have an attendee attached so we cannot sell anything to them." if found_bidder and not message: - if not found_bidder.attendee.art_show_receipt: + receipt = session.query(ArtShowReceipt).filter( + ArtShowReceipt.attendee_id == found_bidder.attendee.id).first() + if not receipt: receipt = ArtShowReceipt(attendee=found_bidder.attendee) session.add(receipt) session.commit() - else: - receipt = found_bidder.attendee.art_show_receipt if not message: found_piece.status = c.SOLD @@ -311,7 +311,7 @@ def artist_check_in_out(self, session, checkout=False, hanging=False, mailin=Fal applications = session.query(ArtShowApplication).join(ArtShowApplication.attendee)\ .filter(*filters).filter(or_(*search_filters))\ .order_by(Attendee.first_name.desc() if '-' in str(order) else Attendee.first_name).options( - joinedload(ArtShowApplication.art_show_pieces)) + selectinload(ArtShowApplication.art_show_pieces)) count = applications.count() page = int(page) or 1 @@ -358,7 +358,8 @@ def artist_check_in_out(self, session, checkout=False, hanging=False, mailin=Fal @public def print_check_in_out_form(self, session, id, checkout='', **params): - app = session.art_show_application(id) + app = session.query(ArtShowApplication).filter(ArtShowApplication.id == id).options( + selectinload(ArtShowApplication.art_show_pieces)).one() attendee = app.attendee # We want to always use these properties for the printed forms as they have useful fallbacks @@ -581,7 +582,9 @@ def assignment_map(self, session, message='', gallery=c.GENERAL, surface_type=c. artists_json = [] valid_panel_ids = [] - valid_apps = session.query(ArtShowApplication).filter(ArtShowApplication.status == c.APPROVED) + valid_apps = session.query(ArtShowApplication).filter(ArtShowApplication.status == c.APPROVED).options( + selectinload(ArtShowApplication.assignments) + ) panels = session.query(ArtShowPanel).filter(ArtShowPanel.gallery == gallery, ArtShowPanel.surface_type == surface_type) for panel in panels: @@ -692,8 +695,7 @@ def check_new_assignments(origin, terminus, panel): # Update/remove existing panel assignments for assignment in session.query(ArtPanelAssignment).join(ArtPanelAssignment.panel - ).filter(ArtShowPanel.gallery == gallery, ArtShowPanel.surface_type == surface_type - ).options(contains_eager(ArtPanelAssignment.panel)): + ).filter(ArtShowPanel.gallery == gallery, ArtShowPanel.surface_type == surface_type): panel_json_str = f"{assignment.panel.origin_x}_{assignment.panel.origin_y}|{assignment.panel.terminus_x}_{assignment.panel.terminus_y}" json_str = f"{panel_json_str}|{assignment.assigned_side}" # We might have assignments uploaded with no corresponding panels @@ -771,7 +773,7 @@ def bid_sheet_barcode_generator(self, data): def bid_sheet_pdf(self, session, id, **params): import fpdf - app = session.art_show_application(id) + app = session.query(ArtShowApplication.id == id).options(selectinload(ArtShowApplication.art_show_pieces)).one() if 'piece_id' in params: pieces = [session.art_show_piece(params['piece_id'])] @@ -846,6 +848,8 @@ def bidder_signup(self, session, message='', page=1, search_text='', order=''): if error: raise HTTPRedirect('bidder_signup?search_text={}&order={}&message={}' ).format(search_text, order, error) + else: + attendees = attendees.options(joinedload(Attendee.art_show_bidder)) else: # For systems that run registration, search is limited for data privacy try: @@ -857,7 +861,8 @@ def bidder_signup(self, session, message='', page=1, search_text='', order=''): and_(Attendee.art_show_bidder != None, ArtShowBidder.bidder_num.ilike('%{search_text}%')))) attendees = session.query(Attendee).join(BadgeInfo).outerjoin( - ArtShowBidder).filter(*filters).filter(Attendee.is_valid == True) # noqa: E712 + ArtShowBidder).filter(*filters).filter(Attendee.is_valid == True).options( # noqa: E712 + joinedload(Attendee.art_show_bidder)) else: attendees = session.query(Attendee).join(Attendee.art_show_bidder) @@ -900,7 +905,8 @@ def bidder_signup(self, session, message='', page=1, search_text='', order=''): @ajax def validate_bidder_signup(self, session, form_list=[], **params): try: - attendee = session.attendee(params['attendee_id']) + attendee = session.query(Attendee).filter( + Attendee.id == params['attendee_id']).options(joinedload(Attendee.art_show_bidder)).one() except NoResultFound: if c.INDEPENDENT_ART_SHOW: attendee = Attendee( @@ -938,7 +944,8 @@ def validate_bidder_signup(self, session, form_list=[], **params): @ajax def sign_up_bidder(self, session, **params): try: - attendee = session.attendee(params['attendee_id']) + attendee = session.query(Attendee).filter( + Attendee.id == params['attendee_id']).options(joinedload(Attendee.art_show_bidder)).one() except NoResultFound: if c.INDEPENDENT_ART_SHOW: attendee = Attendee( @@ -946,12 +953,12 @@ def sign_up_bidder(self, session, **params): placeholder=True, badge_status=c.NOT_ATTENDING, ) - session.add(attendee) else: return {'success': False, 'error': "No attendee found for this bidder!"} bidder = attendee.art_show_bidder or ArtShowBidder(attendee_id=attendee.id) attendee.art_show_bidder = bidder + session.add(attendee) success = 'Bidder updated.' signed_up_str = '' @@ -979,7 +986,8 @@ def sign_up_bidder(self, session, **params): } def print_bidder_form(self, session, attendee_id, **params): - attendee = session.attendee(attendee_id) + attendee = attendee = session.query(Attendee).filter( + Attendee.id == attendee_id).options(joinedload(Attendee.art_show_bidder)).one() bidder = attendee.art_show_bidder forms = load_forms(params, bidder, ['AdminBidderSignup'], field_prefix=attendee.id, @@ -1008,7 +1016,9 @@ def sales_search(self, session, message='', page=1, search_text='', order='badge raise HTTPRedirect('sales_search?message={}', 'Please search by bidder number or badge number.') else: filters.append(or_(BadgeInfo.ident == badge_num)) - attendees = session.query(Attendee).filter(*filters) + attendees = session.query(Attendee).filter(*filters).options( + joinedload(Attendee.art_show_bidder), + selectinload(Attendee.art_show_receipts)) else: attendees = session.query(Attendee).join(Attendee.art_show_receipts) @@ -1045,17 +1055,17 @@ def sales_search(self, session, message='', page=1, search_text='', order='badge def pieces_bought(self, session, id, search_text='', message='', **params): try: - receipt = session.art_show_receipt(id) - except Exception: - attendee = session.attendee(id) - if not attendee.art_show_receipt: - receipt = ArtShowReceipt(attendee=attendee) - session.add(receipt) - session.commit() - else: - receipt = attendee.art_show_receipt + receipt = session.query(ArtShowReceipt).filter(or_(ArtShowReceipt.id == id, + ArtShowReceipt.attendee_id == id)).one() + except NoResultFound: + attendee = session.query(Attendee).filter(Attendee.id == id).options( + selectinload(Attendee.art_show_purchases)).one() + receipt = ArtShowReceipt(attendee=attendee) + session.add(receipt) + session.commit() else: - attendee = receipt.attendee + attendee = session.query(Attendee).filter(Attendee.id == receipt.attendee_id).options( + selectinload(Attendee.art_show_purchases)).first() must_choose = False unclaimed_pieces = [] @@ -1076,12 +1086,14 @@ def pieces_bought(self, session, id, search_text='', message='', **params): else: pieces = session.query(ArtShowPiece).filter(ArtShowPiece.name.ilike('%{}%'.format(search_text))) - unclaimed_pieces = pieces.filter(ArtShowPiece.buyer == None, # noqa: E711 - ArtShowPiece.status != c.RETURN) - unclaimed_pieces = [piece for piece in unclaimed_pieces if piece.sale_price > 0] - unpaid_pieces = pieces.join(ArtShowReceipt).filter(ArtShowReceipt.closed != None, # noqa: E711 - ArtShowPiece.status != c.PAID) - unpaid_pieces = [piece for piece in unpaid_pieces if piece.sale_price > 0] + unpaid_pieces_query = pieces.join(ArtShowReceipt).filter(ArtShowReceipt.closed != None, # noqa: E711 + ArtShowPiece.status != c.PAID) + unpaid_pieces = [piece for piece in unpaid_pieces_query if piece.sale_price > 0] + + pieces = pieces.options(joinedload(ArtShowPiece.receipt)) + unclaimed_pieces_query = pieces.filter(ArtShowPiece.buyer == None, # noqa: E711 + ArtShowPiece.status != c.RETURN) + unclaimed_pieces = [piece for piece in unclaimed_pieces_query if piece.sale_price > 0] if pieces.count() == 0: message = "No pieces found with ID or title {}.".format(search_text) @@ -1135,7 +1147,7 @@ def pieces_bought(self, session, id, search_text='', message='', **params): def unclaim_piece(self, session, id, piece_id, **params): receipt = session.art_show_receipt(id) - piece = session.art_show_piece(piece_id) + piece = session.query(ArtShowPiece).filter(ArtShowPiece.id == piece_id).options(joinedload(ArtShowPiece.receipt)) if receipt.closed: raise HTTPRedirect('pieces_bought?id={}&message={}', receipt.id, diff --git a/uber/site_sections/art_show_reports.py b/uber/site_sections/art_show_reports.py index dd4a19fe9..93b1a6df5 100644 --- a/uber/site_sections/art_show_reports.py +++ b/uber/site_sections/art_show_reports.py @@ -3,7 +3,7 @@ from collections import defaultdict from sqlalchemy import func, or_, and_ -from sqlalchemy.orm import joinedload +from sqlalchemy.orm import joinedload, lazyload from uber.custom_tags import format_currency from uber.models import ArtShowApplication, ArtShowBidder, ArtShowPiece, ArtShowReceipt, Attendee, ModelReceipt @@ -252,7 +252,9 @@ def artist_receipt_discrepancies(self, session): ArtShowApplication.status == c.APPROVED ).join(ArtShowApplication.active_receipt).outerjoin(ModelReceipt.receipt_items).group_by( ModelReceipt.id).group_by(ArtShowApplication.id).having( - ArtShowApplication.true_default_cost_cents != ModelReceipt.fkless_item_total_sql) + ArtShowApplication.true_default_cost_cents != ModelReceipt.fkless_item_total_sql).options( + lazyload("*") + ) return { 'apps': apps, @@ -274,7 +276,7 @@ def artists_nonzero_balance(self, session, include_no_receipts=False, include_di ModelReceipt.receipt_txns).join(item_subquery, ArtShowApplication.id == item_subquery.c.owner_id).group_by( ModelReceipt.id).group_by(ArtShowApplication.id).group_by(item_subquery.c.item_total).having( and_((ModelReceipt.payment_total_sql - ModelReceipt.refund_total_sql) != item_subquery.c.item_total, - filter)) + filter)).options(lazyload("*")) if include_no_receipts: apps_no_receipts = session.query(ArtShowApplication).outerjoin( diff --git a/uber/site_sections/attractions_admin.py b/uber/site_sections/attractions_admin.py index 953d2892a..184788b6c 100644 --- a/uber/site_sections/attractions_admin.py +++ b/uber/site_sections/attractions_admin.py @@ -4,7 +4,7 @@ import cherrypy from dateutil import parser as dateparser import pytz -from sqlalchemy.orm import subqueryload +from sqlalchemy.orm import subqueryload, joinedload, selectinload, defaultload from uber.config import c from uber.custom_tags import readable_join @@ -216,7 +216,10 @@ def form(self, session, message='', **params): if not attraction_id or attraction_id == 'None': raise HTTPRedirect('index') - attraction = session.attraction(attraction_id) + attraction = session.query(Attraction).filter(Attraction.id == attraction_id).options( + joinedload(Attraction.department), selectinload(Attraction.events), + defaultload(Attraction.features).defaultload(AttractionFeature.events).selectinload(AttractionEvent.signups), + ).first() forms = load_forms(params, attraction, ['AttractionInfo']) @@ -234,15 +237,6 @@ def form(self, session, message='', **params): 'form?id={}&message={}', attraction.id, '{} updated successfully.'.format(attraction.name)) - else: - attraction = session.query(Attraction) \ - .filter_by(id=attraction_id) \ - .options( - subqueryload(Attraction.department), - subqueryload(Attraction.features) - .subqueryload(AttractionFeature.events) - .subqueryload(AttractionEvent.attendees)) \ - .order_by(Attraction.id).one() return { 'admin_account': session.current_admin_account(), @@ -503,7 +497,8 @@ def event(self, session, previous_id=None, delay=0, message='', **params): 'form?id={}&message={}', feature.attraction_id, message) return { - 'attraction': feature.attraction, + 'attraction': session.query(Attraction).filter(Attraction.id == feature.attraction_id).options( + selectinload(Attraction.events)).first(), 'feature': feature, 'event': event, 'forms': forms, @@ -692,7 +687,9 @@ def checkin(self, session, message='', **params): except Exception: filters = [Attraction.slug.startswith(slugify(id))] - attraction = session.query(Attraction).filter(*filters).first() + attraction = session.query(Attraction).filter(*filters).options( + joinedload(Attraction.department) + ).first() if not attraction: raise HTTPRedirect('index') diff --git a/uber/site_sections/budget.py b/uber/site_sections/budget.py index fc5dad541..7c8240b13 100644 --- a/uber/site_sections/budget.py +++ b/uber/site_sections/budget.py @@ -5,6 +5,7 @@ from collections import defaultdict from sqlalchemy.orm import joinedload from sqlalchemy import or_, func, not_, and_ +from typing import Iterable from uber.config import c from uber.decorators import all_renderable, log_pageview @@ -28,7 +29,10 @@ def get_grouped_costs(session, filters=[], joins=[], selector=Attendee.badge_cos # Returns a defaultdict with the {int(cost): count} of badges query = session.query(selector, func.count(selector)) for join in joins: - query = query.join(join) + if isinstance(join, Iterable): + query = query.join(*join) + else: + query = query.join(join) if filters: query = query.filter(*filters) return defaultdict(int, query.group_by(selector).order_by(selector).all()) diff --git a/uber/site_sections/dept_admin.py b/uber/site_sections/dept_admin.py index 6c350d07b..d00c3531a 100644 --- a/uber/site_sections/dept_admin.py +++ b/uber/site_sections/dept_admin.py @@ -1,5 +1,5 @@ import cherrypy -from sqlalchemy.orm import subqueryload +from sqlalchemy.orm import joinedload, selectinload from datetime import timedelta from uber.config import c @@ -26,8 +26,9 @@ def index(self, session, filtered=False, message='', **params): forms = load_forms({}, Department(), ['DepartmentInfo']) - departments = session.query(Department).filter(*dept_filter) \ - .order_by(Department.name).all() + departments = session.query(Department).filter(*dept_filter).options( + selectinload(Department.memberships) + ).order_by(Department.name).all() return { 'filtered': filtered, 'message': message, @@ -60,12 +61,13 @@ def form(self, session, message='', **params): .filter_by(id=department_id) \ .order_by(Department.id) \ .options( - subqueryload(Department.dept_roles).subqueryload(DeptRole.dept_memberships), - subqueryload(Department.members).subqueryload(Attendee.shifts).subqueryload(Shift.job), - subqueryload(Department.members).subqueryload(Attendee.admin_account), - subqueryload(Department.dept_heads).subqueryload(Attendee.dept_memberships), - subqueryload(Department.pocs).subqueryload(Attendee.dept_memberships), - subqueryload(Department.checklist_admins).subqueryload(Attendee.dept_memberships)) \ + selectinload(Department.memberships), + selectinload(Department.dept_roles).selectinload(DeptRole.dept_memberships), + selectinload(Department.members).selectinload(Attendee.shifts).joinedload(Shift.job), + selectinload(Department.members).joinedload(Attendee.admin_account), + selectinload(Department.dept_heads).selectinload(Attendee.dept_memberships), + selectinload(Department.pocs).selectinload(Attendee.dept_memberships), + selectinload(Department.checklist_admins).selectinload(Attendee.dept_memberships)) \ .one() return { @@ -177,7 +179,9 @@ def requests(self, session, department_id=None, requested_any=False, message='', if not department_id: raise HTTPRedirect('index') - department = session.query(Department).get(department_id) + department = session.query(Department).filter(Department.id == department_id).options( + selectinload(Department.unassigned_explicitly_requesting_attendees) + ).first() if cherrypy.request.method == 'POST': attendee_ids = [s for s in params.get('attendee_ids', []) if s] if attendee_ids: @@ -203,7 +207,10 @@ def requests(self, session, department_id=None, requested_any=False, message='', @csv_file def dept_requests_export(self, out, session, department_id, requested_any=False, message='', **params): - department = session.query(Department).get(department_id) + department = session.query(Department).filter(Department.id == department_id).options( + selectinload(Department.unassigned_explicitly_requesting_attendees), + selectinload(Department.unassigned_requesting_attendees), + ).first() requesting_attendees = department.unassigned_requesting_attendees \ if requested_any else department.unassigned_explicitly_requesting_attendees diff --git a/uber/site_sections/devtools.py b/uber/site_sections/devtools.py index b183de492..ac92353ce 100644 --- a/uber/site_sections/devtools.py +++ b/uber/site_sections/devtools.py @@ -16,7 +16,7 @@ from sqlalchemy.dialects.postgresql.json import JSONB from pytz import UTC -from sqlalchemy.types import Date, Boolean, Integer +from sqlalchemy.types import DateTime from sqlalchemy import text from uber.decorators import all_renderable, csv_file, public, site_mappable diff --git a/uber/site_sections/panels_admin.py b/uber/site_sections/panels_admin.py index 50d668e24..0a11ee5fe 100644 --- a/uber/site_sections/panels_admin.py +++ b/uber/site_sections/panels_admin.py @@ -9,7 +9,7 @@ from uber.config import c from uber.decorators import ajax, all_renderable, csrf_protected, csv_file, render from uber.errors import HTTPRedirect -from uber.models import AssignedPanelist, Attendee, AutomatedEmail, Event, EventFeedback, \ +from uber.models import AssignedPanelist, Attendee, AutomatedEmail, Event, EventFeedback, EventLocation, Department, \ PanelApplicant, PanelApplication, GuestGroup from uber.utils import add_opt, check, localized_now, validate_model, groupify from uber.forms import load_forms @@ -290,7 +290,8 @@ def associate(self, session, message='', **params): return { 'app': app, 'message': message, - 'panels': session.query(Event).filter(Event.location.in_(c.PANEL_ROOMS)).order_by('name') + 'panels': session.query(Event).join(Event.location).join( + EventLocation.department).filter(Department.manages_panels == True).order_by('name') } def badges(self, session): @@ -386,7 +387,8 @@ def feedback_report(self, session): feedback[fb.event].append(fb) events = [] - for event in session.query(Event).filter(Event.location.in_(c.PANEL_ROOMS)).order_by('name'): + for event in session.query(Event).join(Event.location).join( + EventLocation.department).filter(Department.manages_panels == True).order_by('name'): events.append([event, feedback[event]]) for event, fb in feedback.items(): diff --git a/uber/site_sections/preregistration.py b/uber/site_sections/preregistration.py index f7590fa51..2cf7b57ff 100644 --- a/uber/site_sections/preregistration.py +++ b/uber/site_sections/preregistration.py @@ -10,6 +10,7 @@ import cherrypy from collections import defaultdict from sqlalchemy import func, or_ +from sqlalchemy.orm import selectinload from sqlalchemy.orm.exc import NoResultFound from uber.config import c @@ -2176,7 +2177,10 @@ def logout(self, return_to=''): @log_pageview def confirm(self, session, message='', return_to='confirm', undoing_extra='', **params): if params.get('id') not in [None, '', 'None']: - attendee = session.attendee(params.get('id')) + attendee = session.query(Attendee).filter(Attendee.id == params.get('id')).options( + selectinload(Attendee.dept_membership_requests), + selectinload(Attendee.art_agent_apps) + ).first() receipt = session.get_receipt_by_model(attendee) if cherrypy.request.method == 'POST': receipt_items = ReceiptManager.auto_update_receipt(attendee, receipt, params.copy()) diff --git a/uber/site_sections/reg_admin.py b/uber/site_sections/reg_admin.py index c93d25a67..bc47651bb 100644 --- a/uber/site_sections/reg_admin.py +++ b/uber/site_sections/reg_admin.py @@ -333,6 +333,7 @@ def receipt_items_guide(self, session, message=''): c.MANUAL: "Stripe"} } + @not_site_mappable def create_receipt(self, session, id='', blank=False): try: model = session.attendee(id) diff --git a/uber/site_sections/reg_reports.py b/uber/site_sections/reg_reports.py index 21c7bf94a..36ba5603e 100644 --- a/uber/site_sections/reg_reports.py +++ b/uber/site_sections/reg_reports.py @@ -2,6 +2,7 @@ import calendar from collections import defaultdict from sqlalchemy import or_, and_ +from sqlalchemy.orm import lazyload, joinedload from sqlalchemy.sql import func from sqlalchemy.sql.expression import literal @@ -30,15 +31,19 @@ def checkins_by_hour_query(session): @all_renderable() class Root: def comped_badges(self, session, message='', show='all'): - regular_comped = session.attendees_with_badges().filter(Attendee.paid == c.NEED_NOT_PAY, - Attendee.promo_code == None) # noqa: E711 - promo_comped = session.query(Attendee).join(PromoCode).filter(Attendee.has_badge == True, # noqa: E712 - Attendee.paid == c.NEED_NOT_PAY, - or_(PromoCode.cost == None, # noqa: E711 - PromoCode.cost == 0)) - group_comped = session.query(Attendee).join(Group, Attendee.group_id == Group.id)\ - .filter(Attendee.has_badge == True, # noqa: E712 - Attendee.paid == c.PAID_BY_GROUP, Group.cost == 0) + regular_comped = session.attendees_with_badges().filter( + Attendee.paid == c.NEED_NOT_PAY, Attendee.promo_code == None).options( # noqa: E711 + joinedload(Attendee.creator) + ) + promo_comped = session.query(Attendee).join(PromoCode).filter( + Attendee.has_badge == True, Attendee.paid == c.NEED_NOT_PAY, # noqa: E712 + or_(PromoCode.cost == None, PromoCode.cost == 0)).options( # noqa: E711 + joinedload(Attendee.creator) + ) + group_comped = session.query(Attendee).join( + Group, Attendee.group_id == Group.id).filter( + Attendee.has_badge == True, # noqa: E712 + Attendee.paid == c.PAID_BY_GROUP, Group.cost == 0).options(joinedload(Attendee.creator)) all_comped = regular_comped.union(promo_comped, group_comped) claimed_comped = all_comped.filter(Attendee.placeholder == False) # noqa: E712 unclaimed_comped = all_comped.filter(Attendee.placeholder == True) # noqa: E712 @@ -86,7 +91,7 @@ def attendee_receipt_discrepancies(self, session, include_pending=False): attendees = session.query(Attendee).filter( filter).join(Attendee.active_receipt).outerjoin(ModelReceipt.receipt_items).group_by( ModelReceipt.id).group_by(Attendee.id).having( - Attendee.default_cost_cents != ModelReceipt.fkless_item_total_sql) + Attendee.default_cost_cents != ModelReceipt.fkless_item_total_sql).options(lazyload("*")) return { 'attendees': attendees, @@ -109,7 +114,7 @@ def attendees_nonzero_balance(self, session, include_no_receipts=False, include_ ModelReceipt.receipt_txns).join(item_subquery, Attendee.id == item_subquery.c.owner_id).group_by( ModelReceipt.id).group_by(Attendee.id).group_by(item_subquery.c.item_total).having( and_((ModelReceipt.payment_total_sql - ModelReceipt.refund_total_sql) != item_subquery.c.item_total, - filter)) + filter)).options(lazyload("*")) if include_no_receipts: attendees_no_receipts = session.query(Attendee).outerjoin( diff --git a/uber/site_sections/registration.py b/uber/site_sections/registration.py index a255c2b31..7d6da0f2a 100644 --- a/uber/site_sections/registration.py +++ b/uber/site_sections/registration.py @@ -42,16 +42,15 @@ def checking_at_the_door(self, *args, **kwargs): return checking_at_the_door -def load_attendee(session, params, add_to_session=True,): +def load_attendee(session, params): id = params.get('id', None) if id in [None, '', 'None']: attendee = Attendee() - if add_to_session: - session.add(attendee) else: attendee = session.query(Attendee).filter(Attendee.id == id).options( selectinload(Attendee.dept_membership_requests), + selectinload(Attendee.dept_memberships_with_role), selectinload(Attendee.dept_memberships_with_inherent_role), joinedload(Attendee.shifts), joinedload(Attendee.panel_applicants), @@ -61,6 +60,7 @@ def load_attendee(session, params, add_to_session=True,): def save_attendee(session, attendee, params): + session.add(attendee) if cherrypy.request.method == 'POST': receipt_items = ReceiptManager.auto_update_receipt( attendee, session.get_receipt_by_model(attendee), params.copy(), who=AdminAccount.admin_name() or 'non-admin') @@ -162,7 +162,7 @@ def index(self, session, message='', page='0', search_text='', uploaded_id='', o @ajax @any_admin_access def validate_attendee(self, session, form_list=[], **params): - attendee = load_attendee(session, params, add_to_session=False) + attendee = load_attendee(session, params) if not form_list: form_list = ['PersonalInfo', 'AdminBadgeExtras', 'AdminConsents', 'AdminStaffingInfo', 'AdminBadgeFlags', @@ -1470,12 +1470,7 @@ def price(self): @attendee_view @cherrypy.expose(['attendee_data']) def attendee_form(self, session, message='', tab_view=None, **params): - id = params.get('id', None) - - if id in [None, '', 'None']: - attendee = Attendee() - else: - attendee = session.attendee(id) + attendee = load_attendee(session, params) forms = load_forms(params, attendee, ['PersonalInfo', 'AdminBadgeExtras', 'AdminConsents', 'AdminStaffingInfo', 'AdminBadgeFlags', 'BadgeAdminNotes', 'OtherInfo']) diff --git a/uber/site_sections/schedule.py b/uber/site_sections/schedule.py index 202fb5e3f..56c5c5bbd 100644 --- a/uber/site_sections/schedule.py +++ b/uber/site_sections/schedule.py @@ -8,13 +8,13 @@ from datetime import datetime, time, timedelta from dateutil import parser as dateparser from time import mktime -from sqlalchemy.orm import joinedload +from sqlalchemy.orm import joinedload, selectinload from uber.config import c from uber.decorators import ajax, ajax_gettable, all_renderable, cached, csrf_protected, csv_file, render, schedule_view, site_mappable from uber.errors import HTTPRedirect from uber.forms import load_forms -from uber.models import AssignedPanelist, Attendee, Event, EventLocation, PanelApplication +from uber.models import AssignedPanelist, Attendee, Event, EventLocation, PanelApplication, Department from uber.utils import check, localized_now, normalize_newlines, validate_model, load_locations_from_config, listify log = logging.getLogger(__name__) @@ -121,16 +121,16 @@ def now(self, session, when=None): now = c.EVENT_TIMEZONE.localize(datetime.combine(localized_now().date(), time(localized_now().hour))) current, upcoming = [], [] - for loc, desc in c.SCHEDULE_LOCATION_OPTS: - approx = session.query(Event).filter(Event.location == loc, - Event.start_time >= now - timedelta(hours=6), - Event.start_time <= now).all() + for location_id, name in c.SCHEDULE_LOCATION_OPTS: + approx = session.query(Event).join(Event.location).filter( + EventLocation.id == location_id, + Event.start_time >= now - timedelta(hours=6), Event.start_time <= now).all() for event in approx: if now in event.minutes: current.append(event) - next_events = session.query(Event).filter( - Event.location == loc, + next_events = session.query(Event).join(Event.location).filter( + EventLocation.id == location_id, Event.start_time >= now + timedelta(minutes=30), Event.start_time <= now + timedelta(hours=4)).order_by('start_time').all() @@ -325,7 +325,9 @@ def edit(self, session, message='', view_date=c.PANELS_EPOCH.date(), view_event= locations = [] - event_locations = session.query(EventLocation) + event_locations = session.query(EventLocation).options( + selectinload(EventLocation.events) + ) if not event_locations.first(): load_locations_from_config(session) @@ -428,8 +430,13 @@ def event_panel_info(self, out, session): @csv_file def panel_tech_needs(self, out, session): panels = defaultdict(dict) - panel_applications = session.query(PanelApplication).filter( - PanelApplication.event_id == Event.id, Event.location.in_(c.PANEL_ROOMS)) + panel_applications = session.query(PanelApplication).join(PanelApplication.event).join( + Event.location).join(EventLocation.department).filter( + Department.manages_panels == True, + PanelApplication.event_id == Event.id) + + panel_rooms = session.query(EventLocation).join(EventLocation.department).filter( + Department.manages_panels == True) for panel in panel_applications: panels[panel.event.start_time_local][panel.event.event_location_id] = panel @@ -441,7 +448,7 @@ def panel_tech_needs(self, out, session): out.writerow(['Panel Starts'] + [c.SCHEDULE_LOCATIONS[room] for room in c.PANEL_ROOMS]) while curr_time <= last_time: row = [curr_time.strftime('%H:%M %a')] - for room in c.PANEL_ROOMS: + for room in panel_rooms: p = panels[curr_time].get(room) row.append('' if not p else '{}\n{}\n{}\n{}'.format( p.event.name, diff --git a/uber/site_sections/shifts_admin.py b/uber/site_sections/shifts_admin.py index e4e699216..c62421bfa 100644 --- a/uber/site_sections/shifts_admin.py +++ b/uber/site_sections/shifts_admin.py @@ -5,7 +5,7 @@ import logging from sqlalchemy import select, func, literal from sqlalchemy.dialects.postgresql import aggregate_order_by -from sqlalchemy.orm import subqueryload +from sqlalchemy.orm import selectinload, joinedload, defaultload from uber.config import c from uber.decorators import ajax, all_renderable, csrf_protected, csv_file, \ @@ -87,7 +87,12 @@ def index(self, session, department_id=None, message='', time=None): if time: initial_date = max(initial_date, datetime.strptime(time, "%Y-%m-%dT%H:%M:%S%z")) - department = session.query(Department).get(department_id) if department_id else None + if department_id: + department = session.query(Department).filter(Department.id == department_id).options( + selectinload(Department.dept_checklist_items), selectinload(Department.job_templates) + ).first() + else: + department = None by_start = defaultdict(list) times = [c.EPOCH + timedelta(hours=i) for i in range(c.CON_LENGTH)] @@ -236,14 +241,18 @@ def staffers(self, session, department_id=None, message=''): requested_count = 0 if department_id: - department = session.query(Department).filter_by(id=department_id).first() + department = session.query(Department).filter_by(id=department_id).options( + selectinload(Department.unassigned_explicitly_requesting_attendees) + ).first() if not department: department_id = '' if department_id != '': dept_filter = [] if department_id == None else [ # noqa: E711 Attendee.dept_memberships.any(department_id=department_id)] - attendees = session.staffers(pending=True).filter(*dept_filter).all() + attendees = session.staffers(pending=True).filter(*dept_filter).options( + selectinload(Attendee.dept_memberships_with_role) + ).all() requested_count = None if not department_id else len( [a for a in department.unassigned_explicitly_requesting_attendees if a.is_valid]) for attendee in attendees: @@ -318,11 +327,16 @@ def form(self, session, message='', **params): if params.get('id') in [None, '', 'None']: job = Job() else: - job = session.job(params.get('id')) + job = session.query(Job).filter(Job.id == params.get('id')).options( + defaultload(Job.department).selectinload(Department.dept_roles), + defaultload(Job.department).selectinload(Department.job_templates) + ).first() department = job.department if params.get('department_id'): - department = session.department(params['department_id']) + department = session.query(Department).filter(Department.id == params['department_id']).options( + selectinload(Department.dept_roles), selectinload(Department.job_templates) + ).first() if not department: raise HTTPRedirect('index?message={}', "Please select a department.") @@ -377,15 +391,21 @@ def validate_job(self, session, form_list=[], **params): def template(self, session, message='', **params): default_depts = session.admin_attendee().depts_where_can_admin department = default_depts[0] if default_depts else None + num_jobs = 0 if params.get('id') in [None, '', 'None']: job_template = JobTemplate() else: - job_template = session.job_template(params.get('id')) + job_template = session.query(JobTemplate).filter(JobTemplate.id == params.get('id')).options( + defaultload(JobTemplate.department).selectinload(Department.dept_roles) + ).first() + num_jobs = session.query(Job).filter(Job.job_template_id == params.get('id')).count() department = job_template.department if params.get('department_id'): - department = session.department(params['department_id']) + department = session.query(Department).filter(Department.id == params['department_id']).options( + selectinload(Department.dept_roles) + ).first() if not department: raise HTTPRedirect('index?message={}', "Please select a department.") @@ -408,6 +428,7 @@ def template(self, session, message='', **params): return { 'job_template': job_template, + 'num_jobs': num_jobs, 'department': department, 'forms': forms, 'message': message, @@ -545,10 +566,9 @@ def rate(self, session, shift_id, rating, comment=''): else: return shift_dict(shift) - def summary(self, session): departments = defaultdict(lambda: defaultdict(int)) - for job in session.jobs().options(subqueryload(Job.department)): + for job in session.jobs(): update_counts(job, departments[job.department_name]) update_counts(job, departments['All Departments Combined']) @@ -557,12 +577,11 @@ def summary(self, session): def all_shifts(self, session): departments = session.query(Department).options( - subqueryload(Department.jobs)).order_by(Department.name) + selectinload(Department.jobs)).order_by(Department.name) return { 'depts': [(d.name, d.jobs) for d in departments] } - @site_mappable @csv_file def shift_schedule_csv(self, out, session, department_id, day='all', **params): filters = [] diff --git a/uber/site_sections/staffing_admin.py b/uber/site_sections/staffing_admin.py index ec2b20ce4..9c9b2b524 100644 --- a/uber/site_sections/staffing_admin.py +++ b/uber/site_sections/staffing_admin.py @@ -3,6 +3,7 @@ import cherrypy from dateutil import parser as dateparser from pytz import UTC +from sqlalchemy.orm import joinedload, selectinload from uber.config import c from uber.decorators import all_renderable, ajax, ajax_gettable, site_mappable @@ -20,6 +21,9 @@ def _create_copy_department(from_department): # Convert old years' max hours to minutes, this can eventually be removed if 'max_consecutive_hours' in from_department: setattr(to_department, 'max_consecutive_minutes', int(from_department['max_consecutive_hours']) * 60) + to_department.dept_roles = [] + to_department.job_templates = [] + return to_department @@ -135,9 +139,15 @@ def import_shifts( api_token, "Cannot create a department with the same name as an existing department") to_department = _create_copy_department(from_department) + if shifts_text: + to_department.jobs = [] session.add(to_department) else: - to_department = session.query(Department).get(to_department_id) + to_department = session.query(Department).filter(Department.id == to_department_id).options( + selectinload(Department.dept_roles), selectinload(Department.job_templates), + selectinload(Department.jobs) + ).first() + session.add(to_department) dept_role_map = _copy_department_roles(to_department, from_department) dept_template_map = _copy_department_templates(to_department, from_department) @@ -197,7 +207,9 @@ def bulk_dept_import( for id, name in from_departments: from_department = service.dept.jobs(department_id=id) - to_department = session.query(Department).filter_by(name=from_department['name']).first() + to_department = session.query(Department).filter_by(name=from_department['name']).options( + selectinload(Department.dept_roles), selectinload(Department.job_templates), + ).first() if not to_department: to_department = _create_copy_department(from_department) session.add(to_department) diff --git a/uber/site_sections/staffing_reports.py b/uber/site_sections/staffing_reports.py index eaf1a86b7..2a4f4ceeb 100644 --- a/uber/site_sections/staffing_reports.py +++ b/uber/site_sections/staffing_reports.py @@ -7,7 +7,7 @@ from dateutil import parser as dateparser from sqlalchemy import and_ -from sqlalchemy.orm import subqueryload +from sqlalchemy.orm import subqueryload, selectinload from uber.config import c from uber.decorators import all_renderable, csv_file, render @@ -18,7 +18,10 @@ def volunteer_checklists(session): attendees = session.query(Attendee) \ .filter( Attendee.staffing == True, # noqa: E712 - Attendee.badge_status.in_([c.NEW_STATUS, c.COMPLETED_STATUS])) \ + Attendee.badge_status.in_([c.NEW_STATUS, c.COMPLETED_STATUS])).options( + selectinload(Attendee.hotel_requests), selectinload(Attendee.food_restrictions), + selectinload(Attendee.shifts) + ) \ .order_by(Attendee.full_name, Attendee.id).all() checklist_items = OrderedDict() diff --git a/uber/templates/schedule/schedule_macros.html b/uber/templates/schedule/schedule_macros.html deleted file mode 100644 index eedc42966..000000000 --- a/uber/templates/schedule/schedule_macros.html +++ /dev/null @@ -1,32 +0,0 @@ -{% macro room_class(room) -%} -{%- set is_panels = room in c.PANEL_ROOMS -%} -{%- set is_music = room in c.MUSIC_ROOMS -%} room_{{ room }} {% if is_panels %}panels{% elif is_music %}music{% else %}other{% endif -%} {% endmacro %} - -{% macro format_time(time) -%} - {% if not time.minute %} - {{ time|datetime("%-I%p")|lower }} - {% else %} - {{ time|datetime("%-I:%M") }} - {% endif %} -{%- endmacro %} - -{% macro format_day(time) -%} - {% if (not time.hour and not time.minute) or (time == c.EPOCH) or (time.hour == 12 and not time.minute) %} - {{ time|datetime("%a") }} - {% endif %} -{%- endmacro %} - -{% macro format_day_column(time) -%} - {%- set has_day = (not time.hour and not time.minute) or (time <= c.EPOCH) or (time.hour == 12 and not time.minute) -%} - -
-
- {% if has_day %}{{ time|datetime('%a') }}{% endif %} - - {{ format_time(time) }} -
-
- -{%- endmacro %} \ No newline at end of file diff --git a/uber/templates/shifts_admin/template.html b/uber/templates/shifts_admin/template.html index b049acf0a..968b006ee 100644 --- a/uber/templates/shifts_admin/template.html +++ b/uber/templates/shifts_admin/template.html @@ -135,7 +135,7 @@

var formToSubmit = this; event.preventDefault(); bootbox.confirm({ - message: "This will permanently delete this template AND {% if job_template.jobs|length > 1 %}all {{ job_template.jobs|length }} jobs{% else %}the job{% endif %} it controls. Are you sure?", + message: "This will permanently delete this template AND {% if num_jobs > 1 %}all {{ num_jobs }} jobs{% else %}the job{% endif %} it controls. Are you sure?", buttons: { confirm: { label: 'Delete Template and Jobs', @@ -180,7 +180,7 @@

- {% if job_template.jobs %} + {% if num_jobs %}
{{ csrf_token() }} From 7938b86f2764e9421464ffc7247b3b023a1be5ff Mon Sep 17 00:00:00 2001 From: Victoria Earl Date: Wed, 11 Feb 2026 20:54:00 +0100 Subject: [PATCH 07/20] Basic SQLModel conversion Adds the SQLModel library and updates all the model definitions to define their type. However, indexes seem to be broken still. --- uber/config.py | 21 -- uber/configspec.ini | 19 -- uber/model_checks.py | 31 +-- uber/models/__init__.py | 25 +- uber/models/admin.py | 114 ++++----- uber/models/api.py | 42 ++-- uber/models/art_show.py | 223 ++++++++--------- uber/models/attendee.py | 364 ++++++++++++++-------------- uber/models/attendee_tournaments.py | 46 ---- uber/models/attraction.py | 192 +++++++-------- uber/models/badge_printing.py | 35 +-- uber/models/commerce.py | 210 ++++++++-------- uber/models/department.py | 258 ++++++++++---------- uber/models/email.py | 62 ++--- uber/models/group.py | 93 +++---- uber/models/guests.py | 314 ++++++++++++------------ uber/models/hotel.py | 150 ++++++------ uber/models/legal.py | 20 +- uber/models/marketplace.py | 46 ++-- uber/models/mits.py | 144 +++++------ uber/models/panels.py | 200 +++++++-------- uber/models/promo_code.py | 70 +++--- uber/models/showcase.py | 278 ++++++++++----------- uber/models/tabletop.py | 26 +- uber/models/tracking.py | 74 +++--- uber/models/types.py | 10 +- uber/tasks/email.py | 4 +- 27 files changed, 1501 insertions(+), 1570 deletions(-) delete mode 100644 uber/models/attendee_tournaments.py diff --git a/uber/config.py b/uber/config.py index f489b1b98..be51d2785 100644 --- a/uber/config.py +++ b/uber/config.py @@ -2111,27 +2111,6 @@ def _unrepr(d): setattr(c, _attr + '_NAMES', [c.NIGHTS[night] for night in getattr(c, _attr + 'S')]) -# ============================= -# attendee_tournaments -# -# NO LONGER USED. -# -# The attendee_tournaments module is no longer used, but has been -# included for backward compatibility with legacy servers. -# ============================= - -c.TOURNAMENT_AVAILABILITY_OPTS = [] -_val = 0 -for _day in range((c.ESCHATON - c.EPOCH).days): - for _when in ['Morning (8am-12pm)', 'Afternoon (12pm-6pm)', 'Evening (6pm-10pm)', 'Night (10pm-2am)']: - c.TOURNAMENT_AVAILABILITY_OPTS.append([ - _val, - _when + ' of ' + (c.EPOCH + timedelta(days=_day)).strftime('%A %B %d') - ]) - _val += 1 -c.TOURNAMENT_AVAILABILITY_OPTS.append([_val, 'Morning (8am-12pm) of ' + c.ESCHATON.strftime('%A %B %d')]) - - # ============================= # mivs # ============================= diff --git a/uber/configspec.ini b/uber/configspec.ini index 61da7051e..74d4a3a69 100644 --- a/uber/configspec.ini +++ b/uber/configspec.ini @@ -619,16 +619,6 @@ enable_pending_emails_report = boolean(default=True) # when we have these number of attendee badges left. badges_left_alerts = string_list(default=list('1500', '250')) - -# NO LONGER USED. -# -# The attendee_tournaments module is no longer used, but has been -# included for backward compatibility with legacy servers. -# -# Side note: I'm on the fence about using "art" as an abbreviation for Attendee-Run Tournament. -art_email = string(default="MAGFest Console Department ") -art_email_signature = string(default="- The MAGFest Console Department") - # This URL is printed in the hotel lottery pages to direct attendees to read more about the lottery. hotel_lottery_url = string(default="") @@ -1735,15 +1725,6 @@ __many__ = string # Keys should be the first part of the email address to attach this signature to __many__ = string -# NO LONGER USED. -# -# The attendee_tournaments module is no longer used, but has been -# included for backward compatibility with legacy servers. -[[tournament_status]] -new = string(default="New") -accepted = string(default="Accepted") -declined = string(default="Declined") - [[showcase_game_type]] mivs = string(default="MIVS") indie_arcade = string(default="Indie Arcade") diff --git a/uber/model_checks.py b/uber/model_checks.py index 934e5983b..115430df4 100644 --- a/uber/model_checks.py +++ b/uber/model_checks.py @@ -26,7 +26,7 @@ from uber.custom_tags import format_currency, full_date_local from uber.decorators import prereg_validation, validation from uber.models import (AccessGroup, AdminAccount, ApiToken, Attendee, ArtShowApplication, ArtShowPiece, - AttendeeTournament, Attraction, AttractionFeature, ArtShowBidder, DeptRole, Event, + Attraction, AttractionFeature, ArtShowBidder, DeptRole, Event, GuestDetailedTravelPlan, IndieDeveloper, IndieGame, IndieGameCode, IndieJudge, IndieStudio, Job, ArtistMarketplaceApplication, MITSApplicant, MITSDocument, MITSGame, MITSPicture, MITSTeam, PromoCode, PromoCodeGroup, Sale, Session, WatchList) @@ -271,35 +271,6 @@ def no_dupe_code(promo_code): ('name', 'Name') ] -# ============================= -# tournaments -# ============================= - -AttendeeTournament.required = [ - ('first_name', 'First Name'), - ('last_name', 'Last Name'), - ('email', 'Email Address'), - ('game', 'Game Title'), - ('availability', 'Your Availability'), - ('format', 'Tournament Format'), - ('experience', 'Past Experience'), - ('needs', 'Your Needs'), - ('why', '"Why?"'), -] - - -@validation.AttendeeTournament -def attendee_tournament_email(app): - if not re.match(c.EMAIL_RE, app.email): - return 'You did not enter a valid email address' - - -@validation.AttendeeTournament -def attendee_tournament_cellphone(app): - if app.cellphone and invalid_phone_number(app.cellphone): - return 'You did not enter a valid cellphone number' - - @validation.LotteryApplication def room_meets_night_requirements(app): if app.any_dates_different and (app.entry_type == c.ROOM_ENTRY or diff --git a/uber/models/__init__.py b/uber/models/__init__.py index e993efc9a..82c2e64d7 100644 --- a/uber/models/__init__.py +++ b/uber/models/__init__.py @@ -9,8 +9,10 @@ from datetime import date, datetime, timedelta from functools import wraps from itertools import chain +from pydantic import ConfigDict from uuid import uuid4 from types import MethodType +from typing import Any, ClassVar import cherrypy import six @@ -21,12 +23,14 @@ from sqlalchemy.dialects.postgresql.json import JSONB from sqlalchemy.event import listen from sqlalchemy.exc import IntegrityError, NoResultFound +from sqlalchemy.ext.hybrid import hybrid_method, hybrid_property from sqlalchemy.ext.mutable import MutableDict from sqlalchemy.orm import Query, joinedload, selectinload, subqueryload, contains_eager, DeclarativeBase, declared_attr, sessionmaker, scoped_session import sqlalchemy.orm from sqlalchemy.orm.attributes import get_history, instance_state from sqlalchemy.schema import MetaData, UniqueConstraint from sqlalchemy.types import Boolean, Integer, Float, Date, Numeric, DateTime, Uuid, JSON +from sqlmodel import Field, SQLModel import uber from uber.config import c, create_namespace_uuid @@ -126,7 +130,9 @@ def uncamel(s, sep='_'): return RE_UNCAMEL.sub(r'{0}\1'.format(sep), s).lower() DeclarativeBase.metadata = MetaData() -class MagModel(DeclarativeBase): +class MagModel(SQLModel): + model_config = ConfigDict(ignored_types=(hybrid_method, hybrid_property)) + @declared_attr.directive def __tablename__(cls) -> str: # Convert the model name from camel to snake-case to name the db table @@ -153,9 +159,9 @@ def to_dict(self, fields=None): data[field] = val return data - id = Column(Uuid(as_uuid=False), primary_key=True, default=lambda: str(uuid4())) - created = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) - last_updated = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) + id: str | None = Field(sa_type=Uuid(as_uuid=False), default_factory=str(uuid4()), primary_key=True) + created: datetime = Field(sa_type=DateTime(timezone=True), sa_column_kwargs={'server_default': utcnow()}, default_factory=datetime.now(UTC)) + last_updated: datetime = Field(sa_type=DateTime(timezone=True), sa_column_kwargs={'server_default': utcnow()}, default_factory=datetime.now(UTC)) """ The two columns below allow tracking any object in external sources, @@ -164,12 +170,12 @@ def to_dict(self, fields=None): dictionary (if there are multiple objects to track in the external service) or just strings and datetime objects, respectively. """ - external_id = Column(MutableDict.as_mutable(JSONB), server_default='{}', default={}) - last_synced = Column(MutableDict.as_mutable(JSONB), server_default='{}', default={}) + external_id: dict[str, Any] = Field(sa_type=MutableDict.as_mutable(JSONB), default_factory=dict) + last_synced: dict[str, Any] = Field(sa_type=MutableDict.as_mutable(JSONB), default_factory=dict) - required = () - is_actually_old = False # Set to true to force preview models to return False for `is_new` - _repr_attr_names = () + required: ClassVar = () + is_actually_old: ClassVar = False # Set to true to force preview models to return False for `is_new` + _repr_attr_names: ClassVar = () def __repr__(self): """ @@ -738,7 +744,6 @@ def minutestr(dt): from uber.models.types import * # noqa: F401,E402,F403 from uber.models.api import * # noqa: F401,E402,F403 from uber.models.hotel import * # noqa: F401,E402,F403 -from uber.models.attendee_tournaments import * # noqa: F401,E402,F403 from uber.models.marketplace import * # noqa: F401,E402,F403 from uber.models.showcase import * # noqa: F401,E402,F403 from uber.models.mits import * # noqa: F401,E402,F403 diff --git a/uber/models/admin.py b/uber/models/admin.py index fcbec2256..9ce3ef3a2 100644 --- a/uber/models/admin.py +++ b/uber/models/admin.py @@ -8,6 +8,8 @@ from sqlalchemy.orm import backref from sqlalchemy.schema import ForeignKey, Table, UniqueConstraint, Index from sqlalchemy.types import Boolean, Date, Integer +from sqlmodel import Field, Relationship +from typing import ClassVar from uber.config import c from uber.decorators import presave_adjustment, classproperty @@ -31,33 +33,33 @@ ) -class AdminAccount(MagModel): +class AdminAccount(MagModel, table=True): """ Attendee: joined AccessGroup: selectin PasswordReset: select """ - attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), unique=True) - access_groups = relationship( + attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), unique=True) + access_groups: list['AccessGroup'] = Relationship(sa_relationship=relationship( 'AccessGroup', backref='admin_accounts', lazy='selectin', cascade='save-update,merge,refresh-expire,expunge', - secondary='admin_access_group') - hashed = Column(String, private=True) + secondary='admin_access_group')) + hashed: str = Column(String, private=True) - password_reset = relationship('PasswordReset', backref='admin_account', lazy='select', uselist=False) + password_reset: "PasswordReset" = Relationship(sa_relationship=relationship('PasswordReset', backref='admin_account', lazy='select', uselist=False)) - api_tokens = relationship('ApiToken', backref=backref('admin_account', lazy='joined')) - active_api_tokens = relationship( + api_tokens: list['ApiToken'] = Relationship(sa_relationship=relationship('ApiToken', backref=backref('admin_account', lazy='joined'))) + active_api_tokens: list['ApiToken'] = Relationship(sa_relationship=relationship( 'ApiToken', primaryjoin='and_(' 'AdminAccount.id == ApiToken.admin_account_id, ' 'ApiToken.revoked_time == None)', - overlaps="admin_account,api_tokens") + overlaps="admin_account,api_tokens")) - judge = relationship('IndieJudge', uselist=False, backref='admin_account') - print_requests = relationship('PrintJob', backref='admin_account', - cascade='save-update,merge,refresh-expire,expunge') - api_jobs = relationship('ApiJob', backref='admin_account', cascade='save-update,merge,refresh-expire,expunge') + judge: 'IndieJudge' = Relationship(sa_relationship=relationship('IndieJudge', uselist=False, backref='admin_account')) + print_requests: list['PrintJob'] = Relationship(sa_relationship=relationship('PrintJob', backref='admin_account', + cascade='save-update,merge,refresh-expire,expunge')) + api_jobs: list['ApiJob'] = Relationship(sa_relationship=relationship('ApiJob', backref='admin_account', cascade='save-update,merge,refresh-expire,expunge')) def __repr__(self): return f"" @@ -260,44 +262,44 @@ def invalid_api_accesses(self): return removed_api -class PasswordReset(MagModel): - admin_id = Column(Uuid(as_uuid=False), ForeignKey('admin_account.id'), unique=True, nullable=True) - attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee_account.id'), unique=True, nullable=True) - generated = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) - hashed = Column(String, private=True) +class PasswordReset(MagModel, table=True): + admin_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('admin_account.id'), unique=True, nullable=True) + attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee_account.id'), unique=True, nullable=True) + generated: datetime = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) + hashed: str = Column(String, private=True) @property def is_expired(self): return self.generated < datetime.now(UTC) - timedelta(hours=c.PASSWORD_RESET_HOURS) -class AccessGroup(MagModel): +class AccessGroup(MagModel, table=True): """ Sets of accesses to grant to admin accounts. """ - NONE = 0 - LIMITED = 1 - CONTACT = 2 - DEPT = 3 - FULL = 5 - READ_LEVEL_OPTS = [ + NONE: ClassVar = 0 + LIMITED: ClassVar = 1 + CONTACT: ClassVar = 2 + DEPT: ClassVar = 3 + FULL: ClassVar = 5 + READ_LEVEL_OPTS: ClassVar = [ (NONE, 'Same as Read-Write Access'), (LIMITED, 'Limited'), (CONTACT, 'Contact Info'), (DEPT, 'All Info in Own Dept(s)'), (FULL, 'All Info')] - WRITE_LEVEL_OPTS = [ + WRITE_LEVEL_OPTS: ClassVar = [ (NONE, 'No Access'), (LIMITED, 'Limited'), (CONTACT, 'Contact Info'), (DEPT, 'All Info in Own Dept(s)'), (FULL, 'All Info')] - name = Column(String) - access = Column(MutableDict.as_mutable(JSONB), default={}) - read_only_access = Column(MutableDict.as_mutable(JSONB), default={}) - start_time = Column(DateTime(timezone=True), nullable=True) - end_time = Column(DateTime(timezone=True), nullable=True) + name: str = Column(String) + access: dict[str, int] = Field(sa_type=MutableDict.as_mutable(JSONB), default_factory=dict) + read_only_access: dict[str, int] = Field(sa_type=MutableDict.as_mutable(JSONB), default_factory=dict) + start_time: datetime | None = Column(DateTime(timezone=True), nullable=True) + end_time: datetime | None = Column(DateTime(timezone=True), nullable=True) def __repr__(self): return f"" @@ -339,21 +341,21 @@ def has_access_level(self, access_to, access_level, read_only=False, max_level=F return compare(int(self.access.get(access_to, 0)), access_level) -class WatchList(MagModel): +class WatchList(MagModel, table=True): """ Attendee: selectin """ - first_names = Column(String) - last_name = Column(String) - email = Column(String, default='') - birthdate = Column(Date, nullable=True, default=None) - reason = Column(String) - action = Column(String) - expiration = Column(Date, nullable=True, default=None) - active = Column(Boolean, default=True) - attendees = relationship('Attendee', lazy='selectin', - backref=backref('watch_list'), cascade='save-update,merge,refresh-expire,expunge') + first_names: str = Column(String) + last_name: str = Column(String) + email: str = Column(String, default='') + birthdate: datetime | None = Column(Date, nullable=True, default=None) + reason: str = Column(String) + action: str = Column(String) + expiration: datetime | None = Column(Date, nullable=True, default=None) + active: bool = Column(Boolean, default=True) + attendees: list['Attendee'] = Relationship(sa_relationship=relationship('Attendee', lazy='selectin', + backref=backref('watch_list'), cascade='save-update,merge,refresh-expire,expunge')) @property def full_name(self): @@ -381,31 +383,31 @@ def fix_birthdate(self): ) -class EscalationTicket(MagModel): +class EscalationTicket(MagModel, table=True): """ Attendee: selectin """ - attendees = relationship( + attendees: list['Attendee'] = Relationship(sa_relationship=relationship( 'Attendee', lazy='selectin', backref='escalation_tickets', order_by='Attendee.full_name', cascade='save-update,merge,refresh-expire,expunge', - secondary='attendee_escalation_ticket') - ticket_id_seq = Sequence('escalation_ticket_ticket_id_seq') - ticket_id = Column(Integer, ticket_id_seq, server_default=ticket_id_seq.next_value(), unique=True) - who = Column(String) - description = Column(String) - admin_notes = Column(String) - resolved = Column(DateTime(timezone=True), nullable=True) + secondary='attendee_escalation_ticket')) + ticket_id_seq: ClassVar = Sequence('escalation_ticket_ticket_id_seq') + ticket_id: int = Column(Integer, ticket_id_seq, server_default=ticket_id_seq.next_value(), unique=True) + who: str = Column(String) + description: str = Column(String) + admin_notes: str = Column(String) + resolved: datetime | None = Column(DateTime(timezone=True), nullable=True) @property def attendee_names(self): return [a.full_name for a in self.attendees] -class WorkstationAssignment(MagModel): - reg_station_id = Column(Integer) - printer_id = Column(String) - minor_printer_id = Column(String) - terminal_id = Column(String) +class WorkstationAssignment(MagModel, table=True): + reg_station_id: int = Column(Integer) + printer_id: str = Column(String) + minor_printer_id: str = Column(String) + terminal_id: str = Column(String) @property def separate_printers(self): diff --git a/uber/models/api.py b/uber/models/api.py index 537286b89..663f5e2a1 100644 --- a/uber/models/api.py +++ b/uber/models/api.py @@ -6,6 +6,8 @@ from sqlalchemy.schema import ForeignKey from sqlalchemy.dialects.postgresql.json import JSONB from sqlalchemy.ext.mutable import MutableDict +from sqlmodel import Field, Relationship +from typing import Any from uber.config import c from uber.models import MagModel @@ -15,18 +17,18 @@ __all__ = ['ApiToken', 'ApiJob'] -class ApiToken(MagModel): +class ApiToken(MagModel, table=True): """ AdminAccount: joined """ - admin_account_id = Column(Uuid(as_uuid=False), ForeignKey('admin_account.id')) - token = Column(Uuid(as_uuid=False), default=lambda: str(uuid.uuid4()), private=True) - access = Column(MultiChoice(c.API_ACCESS_OPTS)) - name = Column(String) - description = Column(String) - issued_time = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) - revoked_time = Column(DateTime(timezone=True), default=None, nullable=True) + admin_account_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('admin_account.id')) + token: str | None = Column(Uuid(as_uuid=False), default=lambda: str(uuid.uuid4()), private=True) + access: int = Column(MultiChoice(c.API_ACCESS_OPTS)) + name: str = Column(String) + description: str = Column(String) + issued_time: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) + revoked_time: datetime = Column(DateTime(timezone=True), default=None, nullable=True) @property def api_read(self): @@ -45,15 +47,15 @@ def api_delete(self): return c.API_DELETE in self.access_ints -class ApiJob(MagModel): - admin_id = Column(Uuid(as_uuid=False), ForeignKey('admin_account.id'), nullable=True) - admin_name = Column(String) # Preserve admin's name in case their account is removed - queued = Column(DateTime(timezone=True), nullable=True, default=None) - completed = Column(DateTime(timezone=True), nullable=True, default=None) - cancelled = Column(DateTime(timezone=True), nullable=True, default=None) - job_name = Column(String) - target_server = Column(String) - query = Column(String) - api_token = Column(String) - errors = Column(String) - json_data = Column(MutableDict.as_mutable(JSONB), default={}) +class ApiJob(MagModel, table=True): + admin_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('admin_account.id'), nullable=True) + admin_name: str = Column(String) # Preserve admin's name in case their account is removed + queued: datetime | None = Column(DateTime(timezone=True), nullable=True, default=None) + completed: datetime | None = Column(DateTime(timezone=True), nullable=True, default=None) + cancelled: datetime | None = Column(DateTime(timezone=True), nullable=True, default=None) + job_name: str = Column(String) + target_server: str = Column(String) + query: str = Column(String) + api_token: str = Column(String) + errors: str = Column(String) + json_data: dict[str, Any] = Field(sa_type=MutableDict.as_mutable(JSONB), default_factory=dict) diff --git a/uber/models/art_show.py b/uber/models/art_show.py index 2f32ab869..4583ac9cc 100644 --- a/uber/models/art_show.py +++ b/uber/models/art_show.py @@ -18,6 +18,7 @@ from sqlalchemy.orm import backref from sqlalchemy.types import Integer, Boolean, String, Uuid, DateTime from sqlalchemy.schema import ForeignKey, UniqueConstraint, Index +from sqlmodel import Field, Relationship log = logging.getLogger(__name__) @@ -26,23 +27,23 @@ 'ArtShowPanel', 'ArtPanelAssignment'] -class ArtShowAgentCode(MagModel): +class ArtShowAgentCode(MagModel, table=True): """ ArtShowApplication: joined """ - app_id = Column(Uuid(as_uuid=False), ForeignKey('art_show_application.id')) - app = relationship('ArtShowApplication', lazy='joined', + app_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('art_show_application.id')) + app: 'ArtShowApplication' = Relationship(sa_relationship=relationship('ArtShowApplication', lazy='joined', backref=backref('agent_codes', cascade='merge,refresh-expire,expunge'), foreign_keys=app_id, - cascade='merge,refresh-expire,expunge') - attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), + cascade='merge,refresh-expire,expunge')) + attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), nullable=True) - attendee = relationship('Attendee', + attendee: 'Attendee' = Relationship(sa_relationship=relationship('Attendee', backref=backref('agent_codes', cascade='merge,refresh-expire,expunge'), foreign_keys=attendee_id, - cascade='merge,refresh-expire,expunge') - code = Column(String) - cancelled = Column(DateTime(timezone=True), nullable=True) + cascade='merge,refresh-expire,expunge')) + code: str = Column(String) + cancelled: datetime | None = Column(DateTime(timezone=True), nullable=True) @hybrid_property def normalized_code(self): @@ -57,60 +58,60 @@ def attendee_first_name(self): return self.attendee.first_name if self.attendee else None -class ArtShowApplication(MagModel): +class ArtShowApplication(MagModel, table=True): """ Attendee: joined ModelReceipt: select """ - attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), + attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), nullable=True) - attendee = relationship('Attendee', lazy='joined', foreign_keys=attendee_id, cascade='save-update, merge', - backref=backref('art_show_applications', cascade='save-update, merge')) - checked_in = Column(DateTime(timezone=True), nullable=True) - checked_out = Column(DateTime(timezone=True), nullable=True) - locations = Column(String) - artist_name = Column(String) - artist_id = Column(String, admin_only=True) - payout_method = Column(Choice(c.ARTIST_PAYOUT_METHOD_OPTS), default=c.CHECK) - banner_name = Column(String) - banner_name_ad = Column(String) - artist_id_ad = Column(String, admin_only=True) - check_payable = Column(String) - contact_at_con = Column(String) - panels = Column(Integer, default=0) - panels_ad = Column(Integer, default=0) - tables = Column(Integer, default=0) - tables_ad = Column(Integer, default=0) - description = Column(String) - business_name = Column(String) - zip_code = Column(String) - address1 = Column(String) - address2 = Column(String) - city = Column(String) - region = Column(String) - country = Column(String) - paypal_address = Column(String) # TODO: Move to AC plugin - website = Column(String) - special_needs = Column(String) - status = Column(Choice(c.ART_SHOW_STATUS_OPTS), default=c.UNAPPROVED) - decline_reason = Column(String) - delivery_method = Column(Choice(c.ART_SHOW_DELIVERY_OPTS), default=c.BRINGING_IN) - us_only = Column(Boolean, default=False) - admin_notes = Column(String, admin_only=True) - check_in_notes = Column(String) - overridden_price = Column(Integer, nullable=True, admin_only=True) - active_receipt = relationship( + attendee: 'Attendee' = Relationship(sa_relationship=relationship('Attendee', lazy='joined', foreign_keys=attendee_id, cascade='save-update, merge', + backref=backref('art_show_applications', cascade='save-update, merge'))) + checked_in: datetime | None = Column(DateTime(timezone=True), nullable=True) + checked_out: datetime | None = Column(DateTime(timezone=True), nullable=True) + locations: str = Column(String) + artist_name: str = Column(String) + artist_id: str = Column(String, admin_only=True) + payout_method: int = Column(Choice(c.ARTIST_PAYOUT_METHOD_OPTS), default=c.CHECK) + banner_name: str = Column(String) + banner_name_ad: str = Column(String) + artist_id_ad: str = Column(String, admin_only=True) + check_payable: str = Column(String) + contact_at_con: str = Column(String) + panels: int = Column(Integer, default=0) + panels_ad: int = Column(Integer, default=0) + tables: int = Column(Integer, default=0) + tables_ad: int = Column(Integer, default=0) + description: str = Column(String) + business_name: str = Column(String) + zip_code: str = Column(String) + address1: str = Column(String) + address2: str = Column(String) + city: str = Column(String) + region: str = Column(String) + country: str = Column(String) + paypal_address: str = Column(String) # TODO: Move to AC plugin + website: str = Column(String) + special_needs: str = Column(String) + status: int = Column(Choice(c.ART_SHOW_STATUS_OPTS), default=c.UNAPPROVED) + decline_reason: str = Column(String) + delivery_method: int = Column(Choice(c.ART_SHOW_DELIVERY_OPTS), default=c.BRINGING_IN) + us_only: bool = Column(Boolean, default=False) + admin_notes: str = Column(String, admin_only=True) + check_in_notes: str = Column(String) + overridden_price: int = Column(Integer, nullable=True, admin_only=True) + active_receipt: 'ModelReceipt' = Relationship(sa_relationship=relationship( 'ModelReceipt', cascade='save-update,merge,refresh-expire,expunge', primaryjoin='and_(remote(ModelReceipt.owner_id) == foreign(ArtShowApplication.id),' 'ModelReceipt.owner_model == "ArtShowApplication",' 'ModelReceipt.closed == None)', lazy='select', - uselist=False) - default_cost = Column(Integer, nullable=True) + uselist=False)) + default_cost: int = Column(Integer, nullable=True) - assignments = relationship('ArtPanelAssignment', backref=backref('app', lazy='joined')) + assignments: list['ArtPanelAssignment'] = Relationship(sa_relationship=relationship('ArtPanelAssignment', backref=backref('app', lazy='joined'))) email_model_name = 'app' @@ -444,42 +445,42 @@ def check_total(self): return round(self.total_sales - self.commission) -class ArtShowPiece(MagModel): +class ArtShowPiece(MagModel, table=True): """ ArtShowApplication: joined Attendee (buyer): joined """ - app_id = Column(Uuid(as_uuid=False), ForeignKey('art_show_application.id', ondelete='SET NULL'), nullable=True) - app = relationship('ArtShowApplication', foreign_keys=app_id, + app_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('art_show_application.id', ondelete='SET NULL'), nullable=True) + app: 'ArtShowApplication' = Relationship(sa_relationship=relationship('ArtShowApplication', foreign_keys=app_id, cascade='save-update, merge', lazy='joined', backref=backref('art_show_pieces', - cascade='save-update, merge')) - receipt_id = Column(Uuid(as_uuid=False), ForeignKey('art_show_receipt.id', ondelete='SET NULL'), nullable=True) - receipt = relationship('ArtShowReceipt', foreign_keys=receipt_id, + cascade='save-update, merge'))) + receipt_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('art_show_receipt.id', ondelete='SET NULL'), nullable=True) + receipt: 'ArtShowReceipt' = Relationship(sa_relationship=relationship('ArtShowReceipt', foreign_keys=receipt_id, cascade='save-update, merge', overlaps="art_show_purchases,buyer", - backref=backref('pieces', lazy='selectin', cascade='save-update, merge', overlaps="art_show_purchases,buyer")) - winning_bidder_id = Column(Uuid(as_uuid=False), ForeignKey('art_show_bidder.id', ondelete='SET NULL'), nullable=True) - winning_bidder = relationship('ArtShowBidder', foreign_keys=winning_bidder_id, + backref=backref('pieces', lazy='selectin', cascade='save-update, merge', overlaps="art_show_purchases,buyer"))) + winning_bidder_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('art_show_bidder.id', ondelete='SET NULL'), nullable=True) + winning_bidder: 'ArtShowBidder' = Relationship(sa_relationship=relationship('ArtShowBidder', foreign_keys=winning_bidder_id, cascade='save-update, merge', backref=backref('art_show_pieces', - cascade='save-update, merge')) - piece_id = Column(Integer) - name = Column(String) - for_sale = Column(Boolean, default=False) - type = Column(Choice(c.ART_PIECE_TYPE_OPTS), default=c.PRINT) - gallery = Column(Choice(c.ART_PIECE_GALLERY_OPTS), default=c.GENERAL) - media = Column(String) - print_run_num = Column(Integer, default=0, nullable=True) - print_run_total = Column(Integer, default=0, nullable=True) - opening_bid = Column(Integer, default=0, nullable=True) - quick_sale_price = Column(Integer, default=0, nullable=True) - winning_bid = Column(Integer, default=0, nullable=True) - no_quick_sale = Column(Boolean, default=False) - voice_auctioned = Column(Boolean, default=False) - - status = Column(Choice(c.ART_PIECE_STATUS_OPTS), default=c.EXPECTED, + cascade='save-update, merge'))) + piece_id: int = Column(Integer) + name: str = Column(String) + for_sale: bool = Column(Boolean, default=False) + type: int = Column(Choice(c.ART_PIECE_TYPE_OPTS), default=c.PRINT) + gallery: int = Column(Choice(c.ART_PIECE_GALLERY_OPTS), default=c.GENERAL) + media: str = Column(String) + print_run_num: int | None = Column(Integer, default=0, nullable=True) + print_run_total: int | None = Column(Integer, default=0, nullable=True) + opening_bid: int | None = Column(Integer, default=0, nullable=True) + quick_sale_price: int | None = Column(Integer, default=0, nullable=True) + winning_bid: int | None = Column(Integer, default=0, nullable=True) + no_quick_sale: bool = Column(Boolean, default=False) + voice_auctioned: bool = Column(Boolean, default=False) + + status: int = Column(Choice(c.ART_PIECE_STATUS_OPTS), default=c.EXPECTED, admin_only=True) @presave_adjustment @@ -593,22 +594,22 @@ def print_bidsheet(self, pdf, sheet_num, normal_font_name, bold_font_name, set_f 53, 14, txt=('${:,.2f}'.format(self.quick_sale_price)) if self.valid_quick_sale else 'NFS', ln=1) -class ArtShowPanel(MagModel): +class ArtShowPanel(MagModel, table=True): """ ArtPanelAssignment: selectin """ - gallery = Column(Choice(c.ART_PIECE_GALLERY_OPTS), default=c.GENERAL) - surface_type = Column(Choice(c.ART_SHOW_PANEL_TYPE_OPTS), default=c.PANEL) - origin_x = Column(Integer, default=0) - origin_y = Column(Integer, default=0) - terminus_x = Column(Integer, default=0) - terminus_y = Column(Integer, default=0) - assignable_sides = Column(Choice(c.ART_SHOW_PANEL_SIDE_OPTS), default=c.BOTH) - start_label = Column(String) - end_label = Column(String) + gallery: int = Column(Choice(c.ART_PIECE_GALLERY_OPTS), default=c.GENERAL) + surface_type: int = Column(Choice(c.ART_SHOW_PANEL_TYPE_OPTS), default=c.PANEL) + origin_x: int = Column(Integer, default=0) + origin_y: int = Column(Integer, default=0) + terminus_x: int = Column(Integer, default=0) + terminus_y: int = Column(Integer, default=0) + assignable_sides: int = Column(Choice(c.ART_SHOW_PANEL_SIDE_OPTS), default=c.BOTH) + start_label: str = Column(String) + end_label: str = Column(String) - assignments = relationship('ArtPanelAssignment', lazy='selectin', backref=backref('panel', lazy='joined')) + assignments: list['ArtPanelAssignment'] = Relationship(sa_relationship=relationship('ArtPanelAssignment', lazy='selectin', backref=backref('panel', lazy='joined'))) __table_args__ = ( UniqueConstraint('gallery', 'surface_type', 'origin_x', 'origin_y', 'terminus_x', 'terminus_y'), @@ -638,16 +639,16 @@ def directional_usability(self): return 'u' if self.assignable_sides == c.START else 'd' -class ArtPanelAssignment(MagModel): +class ArtPanelAssignment(MagModel, table=True): """ ArtShowApplication: joined ArtShowPanel: joined """ - panel_id = Column(Uuid(as_uuid=False), ForeignKey('art_show_panel.id')) - app_id = Column(Uuid(as_uuid=False), ForeignKey('art_show_application.id')) - manual = Column(Boolean, default=False) - assigned_side = Column(Choice(c.ART_SHOW_PANEL_SIDE_OPTS), default=c.START) + panel_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('art_show_panel.id')) + app_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('art_show_application.id')) + manual: bool = Column(Boolean, default=False) + assigned_side: int = Column(Choice(c.ART_SHOW_PANEL_SIDE_OPTS), default=c.START) __table_args__ = ( UniqueConstraint('panel_id', 'assigned_side'), @@ -675,37 +676,37 @@ def assignment_str(self): return f"{self.panel.origin_x}_{self.panel.origin_y}|{self.panel.terminus_x}_{self.panel.terminus_y}|{self.directional_assigned_side}" -class ArtShowPayment(MagModel): +class ArtShowPayment(MagModel, table=True): """ ArtShowReceipt: joined """ - receipt_id = Column(Uuid(as_uuid=False), ForeignKey('art_show_receipt.id', ondelete='SET NULL'), nullable=True) - receipt = relationship('ArtShowReceipt', lazy='joined', foreign_keys=receipt_id, + receipt_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('art_show_receipt.id', ondelete='SET NULL'), nullable=True) + receipt: 'ArtShowReceipt' = Relationship(sa_relationship=relationship('ArtShowReceipt', lazy='joined', foreign_keys=receipt_id, cascade='save-update, merge', backref=backref('art_show_payments', lazy='selectin', - cascade='save-update, merge')) - amount = Column(Integer, default=0) - type = Column(Choice(c.ART_SHOW_PAYMENT_OPTS), default=c.STRIPE, admin_only=True) - when = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) + cascade='save-update, merge'))) + amount: int = Column(Integer, default=0) + type: int = Column(Choice(c.ART_SHOW_PAYMENT_OPTS), default=c.STRIPE, admin_only=True) + when: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) -class ArtShowReceipt(MagModel): +class ArtShowReceipt(MagModel, table=True): """ Attendee: joined ArtShowPiece: selectin ArtShowPayment: selectin """ - invoice_num = Column(Integer, default=0) - attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), nullable=True) - attendee = relationship('Attendee', foreign_keys=attendee_id, + invoice_num: int = Column(Integer, default=0) + attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), nullable=True) + attendee: 'Attendee' = Relationship(sa_relationship=relationship('Attendee', foreign_keys=attendee_id, cascade='save-update, merge', lazy='joined', overlaps="art_show_purchases,buyer", backref=backref('art_show_receipts', cascade='save-update, merge', - overlaps="art_show_purchases,buyer")) - closed = Column(DateTime(timezone=True), nullable=True) + overlaps="art_show_purchases,buyer"))) + closed: datetime | None = Column(DateTime(timezone=True), nullable=True) @presave_adjustment def add_invoice_num(self): @@ -759,17 +760,17 @@ def cash_total(self): [payment.amount for payment in self.art_show_payments if payment.type == c.REFUND]) -class ArtShowBidder(MagModel): +class ArtShowBidder(MagModel, table=True): """ Attendee: joined """ - attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), nullable=True) - bidder_num = Column(String) - admin_notes = Column(String) - signed_up = Column(DateTime(timezone=True), nullable=True) - email_won_bids = Column(Boolean, default=False) - contact_type = Column(Choice(c.ART_SHOW_CONTACT_TYPE_OPTS), default=c.EMAIL) + attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), nullable=True) + bidder_num: str = Column(String) + admin_notes: str = Column(String) + signed_up: datetime | None = Column(DateTime(timezone=True), nullable=True) + email_won_bids: bool = Column(Boolean, default=False) + contact_type: int = Column(Choice(c.ART_SHOW_CONTACT_TYPE_OPTS), default=c.EMAIL) email_model_name = 'bidder' diff --git a/uber/models/attendee.py b/uber/models/attendee.py index 72b6d0d39..75a2a5d0d 100644 --- a/uber/models/attendee.py +++ b/uber/models/attendee.py @@ -1,7 +1,7 @@ import json import math import re -from datetime import datetime, timedelta +from datetime import datetime, timedelta, date from uuid import uuid4 import logging @@ -12,6 +12,8 @@ from sqlalchemy.orm import backref, subqueryload, aliased, selectinload, joinedload from sqlalchemy.schema import Column as SQLAlchemyColumn, ForeignKey, Index, Table, UniqueConstraint from sqlalchemy.types import Boolean, Date, Integer, Uuid, String, DateTime +from sqlmodel import Field, Relationship +from typing import ClassVar import uber from uber.config import c @@ -146,19 +148,19 @@ normalized_name_suffixes = [re.sub(r'[,\.]', '', s.lower()) for s in name_suffixes] -class BadgeInfo(MagModel): +class BadgeInfo(MagModel, table=True): """ Attendee: joined """ - attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), nullable=True, default=None) - attendee = relationship('Attendee', backref=backref('allocated_badges', cascade='merge,refresh-expire,expunge'), + attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), nullable=True, default=None) + attendee: 'Attendee' = Relationship(sa_relationship=relationship('Attendee', backref=backref('allocated_badges', cascade='merge,refresh-expire,expunge'), foreign_keys=attendee_id, lazy='joined', - cascade='save-update,merge,refresh-expire,expunge', single_parent=True) - active = Column(Boolean, default=False) - picked_up = Column(DateTime(timezone=True), nullable=True, default=None) - reported_lost = Column(DateTime(timezone=True), nullable=True, default=None) - ident = Column(Integer, default=0, index=True) + cascade='save-update,merge,refresh-expire,expunge', single_parent=True)) + active: bool = Column(Boolean, default=False) + picked_up: datetime | None = Column(DateTime(timezone=True), nullable=True, default=None) + reported_lost: datetime | None = Column(DateTime(timezone=True), nullable=True, default=None) + ident: int = Column(Integer, default=0, index=True) __table_args__ = ( Index('ix_badge_info_attendee_id', attendee_id.desc()), @@ -204,7 +206,7 @@ def check_in(self): self.picked_up = self.attendee.checked_in or datetime.now(UTC) -class Attendee(MagModel, TakesPaymentMixin): +class Attendee(MagModel, TakesPaymentMixin, table=True): """ Group: select AdminAccount: select @@ -213,43 +215,43 @@ class Attendee(MagModel, TakesPaymentMixin): DeptMembership: select """ - watchlist_id = Column(Uuid(as_uuid=False), ForeignKey('watch_list.id', ondelete='set null'), nullable=True, default=None) - group_id = Column(Uuid(as_uuid=False), ForeignKey('group.id', ondelete='SET NULL'), nullable=True) - group = relationship( + watchlist_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('watch_list.id', ondelete='set null'), nullable=True, default=None) + group_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('group.id', ondelete='SET NULL'), nullable=True) + group: 'Group' = Relationship(sa_relationship=relationship( Group, backref=(backref('attendees', lazy='selectin')), - foreign_keys=group_id, lazy='select', cascade='save-update,merge,refresh-expire,expunge') + foreign_keys=group_id, lazy='select', cascade='save-update,merge,refresh-expire,expunge')) - badge_pickup_group_id = Column(Uuid(as_uuid=False), ForeignKey('badge_pickup_group.id', ondelete='SET NULL'), nullable=True) - badge_pickup_group = relationship( + badge_pickup_group_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('badge_pickup_group.id', ondelete='SET NULL'), nullable=True) + badge_pickup_group: 'BadgePickupGroup' = Relationship(sa_relationship=relationship( 'BadgePickupGroup', backref=backref('attendees', lazy='selectin', order_by='Attendee.full_name'), foreign_keys=badge_pickup_group_id, - cascade='save-update,merge,refresh-expire,expunge', single_parent=True) + cascade='save-update,merge,refresh-expire,expunge', single_parent=True)) - creator_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='set null'), nullable=True) - creator = relationship( + creator_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='set null'), nullable=True) + creator: 'Attendee' = Relationship(sa_relationship=relationship( 'Attendee', foreign_keys='Attendee.creator_id', backref=backref('created_badges', order_by='Attendee.full_name'), cascade='save-update,merge,refresh-expire,expunge', remote_side='Attendee.id', - single_parent=True) + single_parent=True)) - current_attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), nullable=True) - current_attendee = relationship( + current_attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), nullable=True) + current_attendee: 'Attendee' = Relationship(sa_relationship=relationship( 'Attendee', foreign_keys='Attendee.current_attendee_id', backref=backref('old_badges', order_by='Attendee.badge_status', cascade='all,delete-orphan'), cascade='save-update,merge,refresh-expire,expunge', remote_side='Attendee.id', - single_parent=True) + single_parent=True)) - active_badge = relationship( + active_badge: 'BadgeInfo' = Relationship(sa_relationship=relationship( 'BadgeInfo', cascade='save-update,merge,refresh-expire,expunge', primaryjoin='and_(BadgeInfo.attendee_id == Attendee.id,' 'BadgeInfo.active == True)', uselist=False, lazy='joined', - overlaps="allocated_badges,attendee") + overlaps="allocated_badges,attendee")) # NOTE: The cascade relationships for promo_code do NOT include # "save-update". During the preregistration workflow, before an Attendee @@ -261,92 +263,92 @@ class Attendee(MagModel, TakesPaymentMixin): # # The practical result of this is that we must manually set promo_code_id # in order for the relationship to be persisted. - promo_code_id = Column(Uuid(as_uuid=False), ForeignKey('promo_code.id'), nullable=True, index=True) - promo_code = relationship( + promo_code_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('promo_code.id'), nullable=True, index=True) + promo_code: 'PromoCode' = Relationship(sa_relationship=relationship( 'PromoCode', lazy='select', backref=backref('used_by', lazy='selectin', cascade='merge,refresh-expire,expunge'), foreign_keys=promo_code_id, - cascade='merge,refresh-expire,expunge') + cascade='merge,refresh-expire,expunge')) - transfer_code = Column(String) - - placeholder = Column(Boolean, default=False, admin_only=True, index=True) - first_name = Column(String) - last_name = Column(String) - legal_name = Column(String) - email = Column(String) - birthdate = Column(Date, nullable=True, default=None) - age_group = Column(Choice(c.AGE_GROUPS), default=c.AGE_UNKNOWN, nullable=True) - - international = Column(Boolean, default=False) - zip_code = Column(String) - address1 = Column(String) - address2 = Column(String) - city = Column(String) - region = Column(String) - country = Column(String) - ec_name = Column(String) - ec_phone = Column(String) - onsite_contact = Column(String) - no_onsite_contact = Column(Boolean, default=False) - cellphone = Column(String) - no_cellphone = Column(Boolean, default=False) - - requested_accessibility_services = Column(Boolean, default=False) - - interests = Column(MultiChoice(c.INTEREST_OPTS)) - found_how = Column(String) # TODO: Remove? - comments = Column(String) # TODO: Remove? - for_review = Column(String, admin_only=True) - admin_notes = Column(String, admin_only=True) - - public_id = Column(Uuid(as_uuid=False), default=lambda: str(uuid4())) - badge_type = Column(Choice(c.BADGE_OPTS), default=c.ATTENDEE_BADGE) - badge_status = Column(Choice(c.BADGE_STATUS_OPTS), default=c.NEW_STATUS, index=True, admin_only=True) - ribbon = Column(MultiChoice(c.RIBBON_OPTS), admin_only=True) - - affiliate = Column(String) # TODO: Remove + transfer_code: str = Column(String) + + placeholder: bool = Column(Boolean, default=False, admin_only=True, index=True) + first_name: str = Column(String) + last_name: str = Column(String) + legal_name: str = Column(String) + email: str = Column(String) + birthdate: date | None = Column(Date, nullable=True, default=None) + age_group: int | None = Column(Choice(c.AGE_GROUPS), default=c.AGE_UNKNOWN, nullable=True) + + international: bool = Column(Boolean, default=False) + zip_code: str = Column(String) + address1: str = Column(String) + address2: str = Column(String) + city: str = Column(String) + region: str = Column(String) + country: str = Column(String) + ec_name: str = Column(String) + ec_phone: str = Column(String) + onsite_contact: str = Column(String) + no_onsite_contact: bool = Column(Boolean, default=False) + cellphone: str = Column(String) + no_cellphone: bool = Column(Boolean, default=False) + + requested_accessibility_services: bool = Column(Boolean, default=False) + + interests: str = Column(MultiChoice(c.INTEREST_OPTS)) + found_how: str = Column(String) # TODO: Remove? + comments: str = Column(String) # TODO: Remove? + for_review: str = Column(String, admin_only=True) + admin_notes: str = Column(String, admin_only=True) + + public_id: str | None = Column(Uuid(as_uuid=False), default=lambda: str(uuid4())) + badge_type: int = Column(Choice(c.BADGE_OPTS), default=c.ATTENDEE_BADGE) + badge_status: int = Column(Choice(c.BADGE_STATUS_OPTS), default=c.NEW_STATUS, index=True, admin_only=True) + ribbon: str = Column(MultiChoice(c.RIBBON_OPTS), admin_only=True) + + affiliate: str = Column(String) # TODO: Remove # If [[staff_shirt]] is the same as [[shirt]], we only use the shirt column - shirt = Column(Choice(c.SHIRT_OPTS), default=c.NO_SHIRT) - staff_shirt = Column(Choice(c.STAFF_SHIRT_OPTS), default=c.NO_SHIRT) - num_event_shirts = Column(Choice(c.STAFF_EVENT_SHIRT_OPTS, allow_unspecified=True), default=-1) - shirt_opt_out = Column(Choice(c.SHIRT_OPT_OUT_OPTS), default=c.OPT_IN) - can_spam = Column(Boolean, default=False) - regdesk_info = Column(String, admin_only=True) - extra_merch = Column(String, admin_only=True) - got_merch = Column(Boolean, default=False, admin_only=True) - got_staff_merch = Column(Boolean, default=False, admin_only=True) - got_swadge = Column(Boolean, default=False, admin_only=True) - can_transfer = Column(Boolean, default=False, admin_only=True) - - reg_station = Column(Integer, nullable=True, admin_only=True) - registered = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) - confirmed = Column(DateTime(timezone=True), nullable=True, default=None) - checked_in = Column(DateTime(timezone=True), nullable=True) - - paid = Column(Choice(c.PAYMENT_OPTS), default=c.NOT_PAID, index=True, admin_only=True) - badge_cost = Column(Integer, nullable=True, admin_only=True) - overridden_price = Column(Integer, nullable=True, admin_only=True) - amount_extra = Column(Choice(c.DONATION_TIER_OPTS, allow_unspecified=True), default=0) - extra_donation = Column(Integer, default=0) - - badge_printed_name = Column(String) - - active_receipt = relationship( + shirt: int = Column(Choice(c.SHIRT_OPTS), default=c.NO_SHIRT) + staff_shirt: int = Column(Choice(c.STAFF_SHIRT_OPTS), default=c.NO_SHIRT) + num_event_shirts: int = Column(Choice(c.STAFF_EVENT_SHIRT_OPTS, allow_unspecified=True), default=-1) + shirt_opt_out: int = Column(Choice(c.SHIRT_OPT_OUT_OPTS), default=c.OPT_IN) + can_spam: bool = Column(Boolean, default=False) + regdesk_info: str = Column(String, admin_only=True) + extra_merch: str = Column(String, admin_only=True) + got_merch: bool = Column(Boolean, default=False, admin_only=True) + got_staff_merch: bool = Column(Boolean, default=False, admin_only=True) + got_swadge: bool = Column(Boolean, default=False, admin_only=True) + can_transfer: bool = Column(Boolean, default=False, admin_only=True) + + reg_station: int | None = Column(Integer, nullable=True, admin_only=True) + registered: datetime = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) + confirmed: datetime | None = Column(DateTime(timezone=True), nullable=True, default=None) + checked_in: datetime | None = Column(DateTime(timezone=True), nullable=True) + + paid: int = Column(Choice(c.PAYMENT_OPTS), default=c.NOT_PAID, index=True, admin_only=True) + badge_cost: int | None = Column(Integer, nullable=True, admin_only=True) + overridden_price: int | None = Column(Integer, nullable=True, admin_only=True) + amount_extra: int = Column(Choice(c.DONATION_TIER_OPTS, allow_unspecified=True), default=0) + extra_donation: int = Column(Integer, default=0) + + badge_printed_name: str = Column(String) + + active_receipt: 'ModelReceipt' = Relationship(sa_relationship=relationship( 'ModelReceipt', cascade='save-update,merge,refresh-expire,expunge', primaryjoin='and_(remote(ModelReceipt.owner_id) == foreign(Attendee.id),' 'ModelReceipt.owner_model == "Attendee",' 'ModelReceipt.closed == None)', lazy='select', - uselist=False) - default_cost = Column(Integer, nullable=True) + uselist=False)) + default_cost: int | None = Column(Integer, nullable=True) - dept_memberships = relationship('DeptMembership', backref=backref('attendee', lazy='joined'), lazy='select') - dept_membership_requests = relationship('DeptMembershipRequest', backref=backref('attendee', lazy='joined')) - dept_roles = relationship( + dept_memberships: list['DeptMembership'] = Relationship(sa_relationship=relationship('DeptMembership', backref=backref('attendee', lazy='joined'), lazy='select')) + dept_membership_requests: list['DeptMembershipRequest'] = Relationship(sa_relationship=relationship('DeptMembershipRequest', backref=backref('attendee', lazy='joined'))) + dept_roles: list['DeptRole'] = Relationship(sa_relationship=relationship( 'DeptRole', backref='attendees', secondaryjoin='and_(' @@ -354,154 +356,154 @@ class Attendee(MagModel, TakesPaymentMixin): 'dept_membership_dept_role.c.dept_membership_id == DeptMembership.id)', secondary='join(DeptMembership, dept_membership_dept_role)', order_by='DeptRole.name', - viewonly=True) - shifts = relationship('Shift', backref=backref('attendee', lazy='joined')) - jobs = relationship( + viewonly=True)) + shifts: list['Shift'] = Relationship(sa_relationship=relationship('Shift', backref=backref('attendee', lazy='joined'))) + jobs: list['Job'] = Relationship(sa_relationship=relationship( 'Job', backref='attendees_working_shifts', secondary='shift', order_by='Job.name', - viewonly=True) - depts_where_working = relationship( + viewonly=True)) + depts_where_working: list['Department'] = Relationship(sa_relationship=relationship( 'Department', backref='attendees_working_shifts', secondary='join(Shift, Job)', order_by='Department.name', - viewonly=True) - dept_memberships_with_inherent_role = relationship( + viewonly=True)) + dept_memberships_with_inherent_role: list['DeptMembership'] = Relationship(sa_relationship=relationship( 'DeptMembership', primaryjoin='and_(' 'Attendee.id == DeptMembership.attendee_id, ' 'DeptMembership.has_inherent_role)', - viewonly=True) - dept_memberships_with_dept_role = relationship( + viewonly=True)) + dept_memberships_with_dept_role: list['DeptMembership'] = Relationship(sa_relationship=relationship( 'DeptMembership', primaryjoin='and_(' 'Attendee.id == DeptMembership.attendee_id, ' 'DeptMembership.has_dept_role)', - viewonly=True) - dept_memberships_with_role = relationship( + viewonly=True)) + dept_memberships_with_role: list['DeptMembership'] = Relationship(sa_relationship=relationship( 'DeptMembership', primaryjoin='and_(' 'Attendee.id == DeptMembership.attendee_id, ' 'DeptMembership.has_role)', - viewonly=True) - dept_memberships_where_can_admin_checklist = relationship( + viewonly=True)) + dept_memberships_where_can_admin_checklist: list['DeptMembership'] = Relationship(sa_relationship=relationship( 'DeptMembership', primaryjoin='and_(' 'Attendee.id == DeptMembership.attendee_id, ' 'or_(' 'DeptMembership.is_dept_head == True,' 'DeptMembership.is_checklist_admin == True))', - viewonly=True) - dept_memberships_as_checklist_admin = relationship( + viewonly=True)) + dept_memberships_as_checklist_admin: list['DeptMembership'] = Relationship(sa_relationship=relationship( 'DeptMembership', primaryjoin='and_(' 'Attendee.id == DeptMembership.attendee_id, ' 'DeptMembership.is_checklist_admin == True)', - viewonly=True) - - staffing = Column(Boolean, default=False) - agreed_to_volunteer_agreement = Column(Boolean, default=False) - reviewed_emergency_procedures = Column(Boolean, default=False) - reviewed_cash_handling = Column(DateTime(timezone=True), nullable=True, default=None) - name_in_credits = Column(String, nullable=True) - walk_on_volunteer = Column(Boolean, default=False) - nonshift_minutes = Column(Integer, default=0, admin_only=True) - past_years = Column(String, admin_only=True) - can_work_setup = Column(Boolean, default=False, admin_only=True) - can_work_teardown = Column(Boolean, default=False, admin_only=True) + viewonly=True)) + + staffing: bool = Column(Boolean, default=False) + agreed_to_volunteer_agreement: bool = Column(Boolean, default=False) + reviewed_emergency_procedures: bool = Column(Boolean, default=False) + reviewed_cash_handling: datetime | None = Column(DateTime(timezone=True), nullable=True, default=None) + name_in_credits: str | None = Column(String, nullable=True) + walk_on_volunteer: bool = Column(Boolean, default=False) + nonshift_minutes: int = Column(Integer, default=0, admin_only=True) + past_years: str = Column(String, admin_only=True) + can_work_setup: bool = Column(Boolean, default=False, admin_only=True) + can_work_teardown: bool = Column(Boolean, default=False, admin_only=True) # TODO: a record of when an attendee is unable to pickup a shirt # (which type? swag or staff? prob swag) - no_shirt = relationship('NoShirt', backref=backref('attendee'), uselist=False) + no_shirt: 'NoShirt' = Relationship(sa_relationship=relationship('NoShirt', backref=backref('attendee'), uselist=False)) - admin_account = relationship('AdminAccount', lazy='select', backref=backref('attendee', lazy='joined'), uselist=False) - food_restrictions = relationship( - 'FoodRestrictions', backref=backref('attendee', lazy='joined'), uselist=False) + admin_account: 'AdminAccount' = Relationship(sa_relationship=relationship('AdminAccount', lazy='select', backref=backref('attendee', lazy='joined'), uselist=False)) + food_restrictions: 'FoodRestrictions' = Relationship(sa_relationship=relationship( + 'FoodRestrictions', backref=backref('attendee', lazy='joined'), uselist=False)) - sales = relationship('Sale', backref='attendee', cascade='save-update,merge,refresh-expire,expunge') - mpoints_for_cash = relationship('MPointsForCash', backref='attendee') - old_mpoint_exchanges = relationship('OldMPointExchange', backref='attendee') - dept_checklist_items = relationship('DeptChecklistItem', backref=backref('attendee', lazy='joined')) + sales: list['Sale'] = Relationship(sa_relationship=relationship('Sale', backref='attendee', cascade='save-update,merge,refresh-expire,expunge')) + mpoints_for_cash: list['MPointsForCash'] = Relationship(sa_relationship=relationship('MPointsForCash', backref='attendee')) + old_mpoint_exchanges: list['OldMPointExchange'] = Relationship(sa_relationship=relationship('OldMPointExchange', backref='attendee')) + dept_checklist_items: list['DeptChecklistItem'] = Relationship(sa_relationship=relationship('DeptChecklistItem', backref=backref('attendee', lazy='joined'))) - indie_developer = relationship( - 'IndieDeveloper', backref=backref('attendee'), uselist=False) + indie_developer: 'IndieDeveloper' = Relationship(sa_relationship=relationship( + 'IndieDeveloper', backref=backref('attendee'), uselist=False)) - hotel_eligible = Column(Boolean, default=False, admin_only=True) - hotel_requests = relationship('HotelRequests', backref=backref('attendee', lazy='joined'), uselist=False) - room_assignments = relationship('RoomAssignment', backref=backref('attendee', lazy='joined')) + hotel_eligible: bool = Column(Boolean, default=False, admin_only=True) + hotel_requests: 'HotelRequests' = Relationship(sa_relationship=relationship('HotelRequests', backref=backref('attendee', lazy='joined'), uselist=False)) + room_assignments: list['RoomAssignment'] = Relationship(sa_relationship=relationship('RoomAssignment', backref=backref('attendee', lazy='joined'))) # The PIN/password used by third party hotel reservation systems - hotel_pin = SQLAlchemyColumn(String, nullable=True, unique=True) + hotel_pin: str = Column(String, nullable=True, unique=True) # ========================= # mits # ========================= - mits_applicants = relationship('MITSApplicant', backref='attendee') + mits_applicants: list['MITSApplicant'] = Relationship(sa_relationship=relationship('MITSApplicant', backref='attendee')) # ========================= # panels # ========================= - assigned_panelists = relationship('AssignedPanelist', backref=backref('attendee', lazy='joined')) - panel_applicants = relationship('PanelApplicant', backref=backref('attendee', lazy='joined'), cascade='save-update,merge,refresh-expire,expunge') - panel_applications = relationship('PanelApplication', backref='poc') - panel_feedback = relationship('EventFeedback', backref='attendee') - submitted_panels = relationship( + assigned_panelists: list['AssignedPanelist'] = Relationship(sa_relationship=relationship('AssignedPanelist', backref=backref('attendee', lazy='joined'))) + panel_applicants: list['PanelApplicant'] = Relationship(sa_relationship=relationship('PanelApplicant', backref=backref('attendee', lazy='joined'), cascade='save-update,merge,refresh-expire,expunge')) + panel_applications: list['PanelApplications'] = Relationship(sa_relationship=relationship('PanelApplication', backref='poc')) + panel_feedback: list['EventFeedback'] = Relationship(sa_relationship=relationship('EventFeedback', backref='attendee')) + submitted_panels: list['PanelApplication'] = Relationship(sa_relationship=relationship( 'PanelApplication', secondary='panel_applicant', secondaryjoin='and_(PanelApplicant.id == PanelApplication.submitter_id)', primaryjoin='and_(Attendee.id == PanelApplicant.attendee_id, PanelApplicant.submitter == True)', viewonly=True - ) + )) # ========================= # attractions # ========================= - _NOTIFICATION_EMAIL = 0 - _NOTIFICATION_TEXT = 1 - _NOTIFICATION_NONE = 2 - _NOTIFICATION_PREF_OPTS = [ + _NOTIFICATION_EMAIL: ClassVar = 0 + _NOTIFICATION_TEXT: ClassVar = 1 + _NOTIFICATION_NONE: ClassVar = 2 + _NOTIFICATION_PREF_OPTS: ClassVar = [ (_NOTIFICATION_EMAIL, 'Email'), (_NOTIFICATION_TEXT, 'Text'), (_NOTIFICATION_NONE, 'None')] - notification_pref = Column(Choice(_NOTIFICATION_PREF_OPTS), default=_NOTIFICATION_EMAIL) - attractions_opt_out = Column(Boolean, default=False) + notification_pref: int = Column(Choice(_NOTIFICATION_PREF_OPTS), default=_NOTIFICATION_EMAIL) + attractions_opt_out: bool = Column(Boolean, default=False) - attraction_signups = relationship('AttractionSignup', backref=backref('attendee', lazy='joined'), order_by='AttractionSignup.signup_time') + attraction_signups: list['AttractionSignup'] = Relationship(sa_relationship=relationship('AttractionSignup', backref=backref('attendee', lazy='joined'), order_by='AttractionSignup.signup_time')) attraction_event_signups = association_proxy('attraction_signups', 'event') - attraction_notifications = relationship( - 'AttractionNotification', backref=backref('attendee', lazy='joined'), order_by='AttractionNotification.sent_time') + attraction_notifications: list['AttractionNotifications'] = Relationship(sa_relationship=relationship( + 'AttractionNotification', backref=backref('attendee', lazy='joined'), order_by='AttractionNotification.sent_time')) # ========================= # tabletop # ========================= - games = relationship('TabletopGame', backref='attendee') - checkouts = relationship('TabletopCheckout', backref=backref('attendee', lazy='joined')) + games: list['TabletopGame'] = Relationship(sa_relationship=relationship('TabletopGame', backref='attendee')) + checkouts: list['TabletopCheckout'] = Relationship(sa_relationship=relationship('TabletopCheckout', backref=backref('attendee', lazy='joined'))) # ========================= # badge printing # ========================= - print_requests = relationship('PrintJob', backref=backref('attendee', lazy='joined'), order_by='desc(PrintJob.last_updated)') + print_requests: list['PrintJob'] = Relationship(sa_relationship=relationship('PrintJob', backref=backref('attendee', lazy='joined'), order_by='desc(PrintJob.last_updated)')) # ========================= # art show # ========================= - art_show_bidder = relationship('ArtShowBidder', backref=backref('attendee', lazy='joined'), uselist=False) - art_show_purchases = relationship( + art_show_bidder: 'ArtShowBidder' = Relationship(sa_relationship=relationship('ArtShowBidder', backref=backref('attendee', lazy='joined'), uselist=False)) + art_show_purchases: list['ArtShowPiece'] = Relationship(sa_relationship=relationship( 'ArtShowPiece', backref=backref('buyer', lazy='joined'), cascade='save-update,merge,refresh-expire,expunge', - secondary='art_show_receipt') - art_agent_apps = relationship( + secondary='art_show_receipt')) + art_agent_apps: list['ArtShowApplication'] = Relationship(sa_relationship=relationship( 'ArtShowApplication', backref='agents', secondaryjoin='and_(ArtShowAgentCode.app_id == ArtShowApplication.id, ArtShowAgentCode.cancelled == None)', secondary='art_show_agent_code', - viewonly=True) + viewonly=True)) - _attendee_table_args = [ + _attendee_table_args: ClassVar = [ Index('ix_attendee_paid_group_id', paid, group_id), Index('ix_attendee_badge_status_badge_type', badge_status, badge_type), ] @@ -2524,23 +2526,23 @@ def guest_group(self): ) -class AttendeeAccount(MagModel): +class AttendeeAccount(MagModel, table=True): """ PasswordReset: select """ - public_id = Column(Uuid(as_uuid=False), default=lambda: str(uuid4()), nullable=True) - email = Column(String) - hashed = Column(String, private=True) - password_reset = relationship('PasswordReset', backref='attendee_account', lazy='select', uselist=False) - attendees = relationship( + public_id: str | None = Column(Uuid(as_uuid=False), default=lambda: str(uuid4()), nullable=True) + email: str = Column(String) + hashed: str = Column(String, private=True) + password_reset: 'PasswordReset' = Relationship(sa_relationship=relationship('PasswordReset', backref='attendee_account', lazy='select', uselist=False)) + attendees: list['Attendee'] = Relationship(sa_relationship=relationship( 'Attendee', backref='managers', order_by='Attendee.registered', cascade='save-update,merge,refresh-expire,expunge', - secondary='attendee_attendee_account') - imported = Column(Boolean, default=False) - unused_years = Column(Integer, default=0) + secondary='attendee_attendee_account')) + imported: bool = Column(Boolean, default=False) + unused_years: int = Column(Integer, default=0) - email_model_name = 'account' + email_model_name: ClassVar = 'account' @presave_adjustment def strip_email(self): @@ -2654,13 +2656,13 @@ def refunded_deferred_attendees(self): and not attendee.current_attendee] -class BadgePickupGroup(MagModel): +class BadgePickupGroup(MagModel, table=True): """ Attendee: selectin """ - public_id = Column(Uuid(as_uuid=False), default=lambda: str(uuid4()), nullable=True) - account_id = Column(String) + public_id: str | None = Column(Uuid(as_uuid=False), default=lambda: str(uuid4()), nullable=True) + account_id: str = Column(String) def build_from_account(self, account): for attendee in account.attendees: @@ -2735,15 +2737,15 @@ def under_18_badges(self): return [attendee for attendee in self.check_inable_attendees if attendee.age_now_or_at_con < 18] -class FoodRestrictions(MagModel): +class FoodRestrictions(MagModel, table=True): """ Attendee: joined """ - attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), unique=True) - standard = Column(MultiChoice(c.FOOD_RESTRICTION_OPTS)) - sandwich_pref = Column(MultiChoice(c.SANDWICH_OPTS)) - freeform = Column(String) + attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), unique=True) + standard: str = Column(MultiChoice(c.FOOD_RESTRICTION_OPTS)) + sandwich_pref: str = Column(MultiChoice(c.SANDWICH_OPTS)) + freeform: str = Column(String) def __getattr__(self, name): try: diff --git a/uber/models/attendee_tournaments.py b/uber/models/attendee_tournaments.py deleted file mode 100644 index f8c074389..000000000 --- a/uber/models/attendee_tournaments.py +++ /dev/null @@ -1,46 +0,0 @@ -""" -NO LONGER USED. - -The attendee_tournaments module is no longer used, but has been -included for backward compatibility with legacy servers. -""" - -from sqlalchemy import func -from sqlalchemy.types import Boolean, String - -from uber.config import c -from uber.models import MagModel, Attendee -from uber.models.types import Choice, DefaultColumn as Column, MultiChoice - - -__all__ = ['AttendeeTournament'] - - -class AttendeeTournament(MagModel): - first_name = Column(String) - last_name = Column(String) - email = Column(String) - cellphone = Column(String) - game = Column(String) - availability = Column(MultiChoice(c.TOURNAMENT_AVAILABILITY_OPTS)) - format = Column(String) - experience = Column(String) - needs = Column(String) - why = Column(String) - volunteering = Column(Boolean, default=False) - - status = Column(Choice(c.TOURNAMENT_STATUS_OPTS), default=c.NEW, admin_only=True) - - email_model_name = 'app' - - @property - def full_name(self): - return self.first_name + ' ' + self.last_name - - @property - def matching_attendee(self): - return self.session.query(Attendee).filter( - Attendee.first_name == self.first_name.title(), - Attendee.last_name == self.last_name.title(), - func.lower(Attendee.email) == self.email.lower() - ).first() diff --git a/uber/models/attraction.py b/uber/models/attraction.py index eb90df550..09fe706ab 100644 --- a/uber/models/attraction.py +++ b/uber/models/attraction.py @@ -10,6 +10,8 @@ from sqlalchemy.sql import text from sqlalchemy.sql.expression import bindparam from sqlalchemy.types import Boolean, Integer, Uuid, String, DateTime +from sqlmodel import Field, Relationship +from typing import ClassVar from uber.config import c from uber.custom_tags import humanize_timedelta, location_event_name, location_room_name @@ -25,13 +27,13 @@ class AttractionMixin(): - populate_schedule = Column(Boolean, default=True) - no_notifications = Column(Boolean, default=False) - waitlist_available = Column(Boolean, default=True) - waitlist_slots = Column(Integer, default=10) - signups_open_relative = Column(Integer, default=c.DEFAULT_ATTRACTIONS_SIGNUPS_MINUTES) - signups_open_time = Column(DateTime(timezone=True), nullable=True) - slots = Column(Integer, default=1) + populate_schedule: bool = Column(Boolean, default=True) + no_notifications: bool = Column(Boolean, default=False) + waitlist_available: bool = Column(Boolean, default=True) + waitlist_slots: int = Column(Integer, default=10) + signups_open_relative: int = Column(Integer, default=c.DEFAULT_ATTRACTIONS_SIGNUPS_MINUTES) + signups_open_time: datetime | None = Column(DateTime(timezone=True), nullable=True) + slots: int = Column(Integer, default=1) @classproperty def inherited_cols(cls): @@ -92,15 +94,15 @@ def get_updated_signup_vals(self): return same_time_settings, update_attrs -class Attraction(MagModel, AttractionMixin): +class Attraction(MagModel, AttractionMixin, table=True): """ AttractionFeature: selectin """ - _NONE = 0 - _PER_FEATURE = 1 - _PER_ATTRACTION = 2 - _RESTRICTION_OPTS = [( + _NONE: ClassVar = 0 + _PER_FEATURE: ClassVar = 1 + _PER_ATTRACTION: ClassVar = 2 + _RESTRICTION_OPTS: ClassVar = [( _NONE, 'Attendees can attend as many events as they wish ' '(least restrictive)' @@ -112,9 +114,9 @@ class Attraction(MagModel, AttractionMixin): 'Attendees can only attend one event in this attraction ' '(most restrictive)' )] - _RESTRICTIONS = dict(_RESTRICTION_OPTS) + _RESTRICTIONS: ClassVar = dict(_RESTRICTION_OPTS) - _ADVANCE_CHECKIN_OPTS = [ + _ADVANCE_CHECKIN_OPTS: ClassVar = [ (-1, 'Anytime during event'), (0, 'When the event starts'), (5, '5 minutes before'), @@ -125,7 +127,7 @@ class Attraction(MagModel, AttractionMixin): (45, '45 minutes before'), (60, '1 hour before')] - _ADVANCE_NOTICES_OPTS = [ + _ADVANCE_NOTICES_OPTS: ClassVar = [ ('', 'Never'), (0, 'When checkin starts'), (5, '5 minutes before checkin'), @@ -135,60 +137,60 @@ class Attraction(MagModel, AttractionMixin): (120, '2 hours before checkin'), (1440, '1 day before checkin')] - name = Column(String, unique=True) - slug = Column(String, unique=True) - description = Column(String) - full_description = Column(String) - is_public = Column(Boolean, default=False) - checkin_reminder = Column(Integer, default=None, nullable=True) - advance_checkin = Column(Integer, default=0) - restriction = Column(Choice(_RESTRICTION_OPTS), default=_NONE) - badge_num_required = Column(Boolean, default=False) - department_id = Column(Uuid(as_uuid=False), ForeignKey('department.id'), nullable=True) - owner_id = Column(Uuid(as_uuid=False), ForeignKey('admin_account.id'), nullable=True) - - owner = relationship( + name: str = Column(String, unique=True) + slug: str = Column(String, unique=True) + description: str = Column(String) + full_description: str = Column(String) + is_public: bool = Column(Boolean, default=False) + checkin_reminder: int | None = Column(Integer, default=None, nullable=True) + advance_checkin: int = Column(Integer, default=0) + restriction: int = Column(Choice(_RESTRICTION_OPTS), default=_NONE) + badge_num_required: bool = Column(Boolean, default=False) + department_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('department.id'), nullable=True) + owner_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('admin_account.id'), nullable=True) + + owner: 'AdminAccount' = Relationship(sa_relationship=relationship( 'AdminAccount', cascade='save-update,merge', backref=backref( 'attractions', cascade='save-update,merge,refresh-expire,expunge', uselist=True, - order_by='Attraction.name')) - owner_attendee = relationship( + order_by='Attraction.name'))) + owner_attendee: 'Attendee' = Relationship(sa_relationship=relationship( 'Attendee', cascade='merge', secondary='admin_account', uselist=False, - viewonly=True) - department = relationship( + viewonly=True)) + department: 'Department' = Relationship(sa_relationship=relationship( 'Department', cascade='save-update,merge', backref=backref( 'attractions', cascade='save-update,merge', uselist=True), - order_by='Department.name') - features = relationship( + order_by='Department.name')) + features: list['AttractionFeature'] = Relationship(sa_relationship=relationship( 'AttractionFeature', lazy='selectin', backref=backref('attraction', lazy='joined'), - order_by='[AttractionFeature.name, AttractionFeature.id]') - public_features = relationship( + order_by='[AttractionFeature.name, AttractionFeature.id]')) + public_features: list['AttractionFeature'] = Relationship(sa_relationship=relationship( 'AttractionFeature', primaryjoin='and_(' 'AttractionFeature.attraction_id == Attraction.id,' 'AttractionFeature.is_public == True)', viewonly=True, - order_by='[AttractionFeature.name, AttractionFeature.id]') - events = relationship( + order_by='[AttractionFeature.name, AttractionFeature.id]')) + events: list['AttractionEvent'] = Relationship(sa_relationship=relationship( 'AttractionEvent', backref=backref('attraction', lazy='joined'), - order_by='[AttractionEvent.start_time, AttractionEvent.id]') - signups = relationship( + order_by='[AttractionEvent.start_time, AttractionEvent.id]')) + signups: list['AttractionSignup'] = Relationship(sa_relationship=relationship( 'AttractionSignup', backref=backref('attraction', lazy='joined'), viewonly=True, - order_by='[AttractionSignup.checkin_time, AttractionSignup.id]') + order_by='[AttractionSignup.checkin_time, AttractionSignup.id]')) @presave_adjustment def slugify_name(self): @@ -346,22 +348,22 @@ def signups_requiring_notification(self, session, from_time, to_time, options=No return groupify(query, lambda x: x[0], lambda x: x[1]) -class AttractionFeature(MagModel, AttractionMixin): +class AttractionFeature(MagModel, AttractionMixin, table=True): """ Attraction: joined AttractionEvent: selectin """ - name = Column(String) - slug = Column(String) - description = Column(String) - is_public = Column(Boolean, default=False) - badge_num_required = Column(Boolean, default=False) - attraction_id = Column(Uuid(as_uuid=False), ForeignKey('attraction.id')) + name: str = Column(String) + slug: str = Column(String) + description: str = Column(String) + is_public: bool = Column(Boolean, default=False) + badge_num_required: bool = Column(Boolean, default=False) + attraction_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attraction.id')) - events = relationship( + events: list['AttractionEvent'] = Relationship(sa_relationship=relationship( 'AttractionEvent', backref=backref('feature', lazy='joined'), lazy='selectin', - order_by='[AttractionEvent.start_time, AttractionEvent.id]') + order_by='[AttractionEvent.start_time, AttractionEvent.id]')) __table_args__ = ( UniqueConstraint('name', 'attraction_id'), @@ -477,7 +479,7 @@ def available_events_by_day(self): return groupify(self.available_events, 'start_day_local') -class AttractionEvent(MagModel, AttractionMixin): +class AttractionEvent(MagModel, AttractionMixin, table=True): """ Attraction: joined AttractionFeature: joined @@ -485,32 +487,32 @@ class AttractionEvent(MagModel, AttractionMixin): Event: joined """ - attraction_feature_id = Column(Uuid(as_uuid=False), ForeignKey('attraction_feature.id')) - attraction_id = Column(Uuid(as_uuid=False), ForeignKey('attraction.id'), index=True) - event_location_id = Column(Uuid(as_uuid=False), ForeignKey('event_location.id', ondelete='SET NULL'), nullable=True) + attraction_feature_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attraction_feature.id')) + attraction_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attraction.id'), index=True) + event_location_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('event_location.id', ondelete='SET NULL'), nullable=True) - start_time = Column(DateTime(timezone=True), default=c.EPOCH) - duration = Column(Integer, default=60) + start_time: datetime = Column(DateTime(timezone=True), default=c.EPOCH) + duration: int = Column(Integer, default=60) - signups = relationship('AttractionSignup', backref=backref('event', lazy='joined'), - order_by='AttractionSignup.checkin_time') + signups: list['AttractionSignup'] = Relationship(sa_relationship=relationship('AttractionSignup', backref=backref('event', lazy='joined'), + order_by='AttractionSignup.checkin_time')) attendee_signups = association_proxy('signups', 'attendee') - notifications = relationship('AttractionNotification', backref=backref('event', lazy='joined'), - order_by='AttractionNotification.sent_time') + notifications: list['AttractionNotification'] = Relationship(sa_relationship=relationship('AttractionNotification', backref=backref('event', lazy='joined'), + order_by='AttractionNotification.sent_time')) - notification_replies = relationship( + notification_replies: list['AttractionNotificationReply'] = Relationship(sa_relationship=relationship( 'AttractionNotificationReply', backref=backref('event', lazy='joined'), - order_by='AttractionNotificationReply.sid') + order_by='AttractionNotificationReply.sid')) - attendees = relationship( + attendees: list['Attendee'] = Relationship(sa_relationship=relationship( 'Attendee', backref=backref('attraction_events', overlaps="attendee,attraction_signups,event,signups"), cascade='save-update,merge,refresh-expire,expunge', secondary='attraction_signup', order_by='attraction_signup.c.signup_time', - overlaps="signups,event,attraction_signups,attendee") + overlaps="signups,event,attraction_signups,attendee")) @presave_adjustment def _fix_attraction_id(self): @@ -765,22 +767,22 @@ def overlap(self, event): return int((earliest_end - latest_start).total_seconds()) -class AttractionSignup(MagModel): +class AttractionSignup(MagModel, table=True): """ Attendee: joined Attraction: joined AttractionEvent: joined """ - attraction_event_id = Column(Uuid(as_uuid=False), ForeignKey('attraction_event.id')) - attraction_id = Column(Uuid(as_uuid=False), ForeignKey('attraction.id')) - attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) + attraction_event_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attraction_event.id')) + attraction_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attraction.id')) + attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) - signup_time = Column(DateTime(timezone=True), default=lambda: datetime.now(pytz.UTC)) - checkin_time = Column(DateTime(timezone=True), default=lambda: utcmin.datetime, index=True) - on_waitlist = Column(Boolean, default=False) + signup_time: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(pytz.UTC)) + checkin_time: datetime = Column(DateTime(timezone=True), default=lambda: utcmin.datetime, index=True) + on_waitlist: bool = Column(Boolean, default=False) - notifications = relationship( + notifications: list['AttractionNotification'] = Relationship(sa_relationship=relationship( 'AttractionNotification', backref=backref( 'signup', lazy='joined', @@ -791,7 +793,7 @@ class AttractionSignup(MagModel): 'AttractionSignup.attendee_id == foreign(AttractionNotification.attendee_id),' 'AttractionSignup.attraction_event_id == foreign(AttractionNotification.attraction_event_id))', order_by='AttractionNotification.sent_time', - viewonly=True) + viewonly=True)) __mapper_args__ = {'confirm_deleted_rows': False} __table_args__ = (UniqueConstraint('attraction_event_id', 'attendee_id'),) @@ -870,23 +872,23 @@ def notify_waitlist(self): # TODO: Handle text notifs too -class AttractionNotification(MagModel): +class AttractionNotification(MagModel, table=True): """ Attendee: joined AttractionEvent: joined AttractionSignup: joined """ - attraction_event_id = Column(Uuid(as_uuid=False), ForeignKey('attraction_event.id')) - attraction_id = Column(Uuid(as_uuid=False), ForeignKey('attraction.id')) - attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) + attraction_event_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attraction_event.id')) + attraction_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attraction.id')) + attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) - notification_type = Column(Choice(Attendee._NOTIFICATION_PREF_OPTS)) - ident = Column(String, index=True) - sid = Column(String) - sent_time = Column(DateTime(timezone=True), default=lambda: datetime.now(pytz.UTC)) - subject = Column(String) - body = Column(String) + notification_type: int = Column(Choice(Attendee._NOTIFICATION_PREF_OPTS)) + ident: str = Column(String, index=True) + sid: str = Column(String) + sent_time: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(pytz.UTC)) + subject: str = Column(String) + body: str = Column(String) @presave_adjustment def _fix_attraction_id(self): @@ -894,22 +896,22 @@ def _fix_attraction_id(self): self.attraction_id = self.event.attraction_id -class AttractionNotificationReply(MagModel): +class AttractionNotificationReply(MagModel, table=True): """ AttractionEvent: joined """ - attraction_event_id = Column(Uuid(as_uuid=False), ForeignKey('attraction_event.id'), nullable=True) - attraction_id = Column(Uuid(as_uuid=False), ForeignKey('attraction.id'), nullable=True) - attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), nullable=True) - - notification_type = Column(Choice(Attendee._NOTIFICATION_PREF_OPTS)) - from_phonenumber = Column(String) - to_phonenumber = Column(String) - sid = Column(String, index=True) - received_time = Column(DateTime(timezone=True), default=lambda: datetime.now(pytz.UTC)) - sent_time = Column(DateTime(timezone=True), default=lambda: datetime.now(pytz.UTC)) - body = Column(String) + attraction_event_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attraction_event.id'), nullable=True) + attraction_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attraction.id'), nullable=True) + attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), nullable=True) + + notification_type: int = Column(Choice(Attendee._NOTIFICATION_PREF_OPTS)) + from_phonenumber: str = Column(String) + to_phonenumber: str = Column(String) + sid: str = Column(String, index=True) + received_time: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(pytz.UTC)) + sent_time: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(pytz.UTC)) + body: str = Column(String) @presave_adjustment def _fix_attraction_id(self): diff --git a/uber/models/badge_printing.py b/uber/models/badge_printing.py index 8e2ba68b4..e9d609ed0 100644 --- a/uber/models/badge_printing.py +++ b/uber/models/badge_printing.py @@ -1,8 +1,10 @@ +from datetime import datetime from sqlalchemy.dialects.postgresql.json import JSONB from sqlalchemy.ext.mutable import MutableDict from sqlalchemy.schema import ForeignKey from sqlalchemy.types import Boolean, Integer, Uuid, String, DateTime - +from sqlmodel import Field, Relationship +from typing import Any from uber.models import MagModel from uber.models.types import DefaultColumn as Column, default_relationship as relationship @@ -11,26 +13,27 @@ __all__ = ['PrintJob'] -class PrintJob(MagModel): +class PrintJob(MagModel, table=True): """ Attendee: joined """ - attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) - admin_id = Column(Uuid(as_uuid=False), ForeignKey('admin_account.id'), nullable=True) - admin_name = Column(String) # Preserve admin's name in case their account is removed - printer_id = Column(String) - reg_station = Column(Integer, nullable=True) - print_fee = Column(Integer, default=0) - queued = Column(DateTime(timezone=True), nullable=True, default=None) - printed = Column(DateTime(timezone=True), nullable=True, default=None) - ready = Column(Boolean, default=True) - errors = Column(String) - is_minor = Column(Boolean) - json_data = Column(MutableDict.as_mutable(JSONB), default={}) - receipt_item = relationship('ReceiptItem', + attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) + admin_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('admin_account.id'), nullable=True) + + admin_name: str = Column(String) # Preserve admin's name in case their account is removed + printer_id: str = Column(String) + reg_station: int | None = Column(Integer, nullable=True) + print_fee: int = Column(Integer, default=0) + queued: datetime | None = Column(DateTime(timezone=True), nullable=True, default=None) + printed: datetime | None = Column(DateTime(timezone=True), nullable=True, default=None) + ready: bool = Column(Boolean, default=True) + errors: str = Column(String) + is_minor: bool = Column(Boolean) + json_data: dict[str, Any] = Field(sa_type=MutableDict.as_mutable(JSONB), default_factory=dict) + receipt_item: 'ReceiptItem' = Relationship(sa_relationship=relationship('ReceiptItem', primaryjoin='and_(' 'ReceiptItem.fk_model == "PrintJob", ' 'ReceiptItem.fk_id == foreign(PrintJob.id))', viewonly=True, - uselist=False) + uselist=False)) diff --git a/uber/models/commerce.py b/uber/models/commerce.py index e18c6377e..03d1eaacb 100644 --- a/uber/models/commerce.py +++ b/uber/models/commerce.py @@ -11,6 +11,8 @@ from sqlalchemy.dialects.postgresql.json import JSONB from sqlalchemy.ext.mutable import MutableDict from sqlalchemy.orm import backref +from sqlmodel import Field, Relationship +from typing import Any from uber.config import c from uber.custom_tags import format_currency @@ -28,65 +30,65 @@ 'NoShirt', 'OldMPointExchange', 'ReceiptInfo', 'ReceiptItem', 'ReceiptTransaction', 'Sale', 'TerminalSettlement'] -class ArbitraryCharge(MagModel): - amount = Column(Integer) - what = Column(String) - when = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) - reg_station = Column(Integer, nullable=True) +class ArbitraryCharge(MagModel, table=True): + amount: int = Column(Integer) + what: str = Column(String) + when: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) + reg_station: int | None = Column(Integer, nullable=True) _repr_attr_names = ['what'] -class MerchDiscount(MagModel): +class MerchDiscount(MagModel, table=True): """Staffers can apply a single-use discount to any merch purchases.""" - attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), unique=True) - uses = Column(Integer) + attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), unique=True) + uses: int = Column(Integer) -class MerchPickup(MagModel): - picked_up_by_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) - picked_up_for_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), unique=True) - picked_up_by = relationship( +class MerchPickup(MagModel, table=True): + picked_up_by_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) + picked_up_for_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), unique=True) + picked_up_by: 'Attendee' = Relationship(sa_relationship=relationship( Attendee, primaryjoin='MerchPickup.picked_up_by_id == Attendee.id', - cascade='save-update,merge,refresh-expire,expunge') - picked_up_for = relationship( + cascade='save-update,merge,refresh-expire,expunge')) + picked_up_for: 'Attendee' = Relationship(sa_relationship=relationship( Attendee, primaryjoin='MerchPickup.picked_up_for_id == Attendee.id', - cascade='save-update,merge,refresh-expire,expunge') + cascade='save-update,merge,refresh-expire,expunge')) -class MPointsForCash(MagModel): - attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) - amount = Column(Integer) - when = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) +class MPointsForCash(MagModel, table=True): + attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) + amount: int = Column(Integer) + when: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) -class NoShirt(MagModel): +class NoShirt(MagModel, table=True): """ Used to track when someone tried to pick up a shirt they were owed when we were out of stock, so that we can contact them later. """ - attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), unique=True) + attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), unique=True) -class OldMPointExchange(MagModel): - attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) - amount = Column(Integer) - when = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) +class OldMPointExchange(MagModel, table=True): + attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) + amount: int = Column(Integer) + when: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) -class Sale(MagModel): - attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='set null'), nullable=True) - what = Column(String) - cash = Column(Integer, default=0) - mpoints = Column(Integer, default=0) - when = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) - reg_station = Column(Integer, nullable=True) - payment_method = Column(Choice(c.SALE_OPTS), default=c.MERCH) +class Sale(MagModel, table=True): + attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='set null'), nullable=True) + what: str = Column(String) + cash: int = Column(Integer, default=0) + mpoints: int = Column(Integer, default=0) + when: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) + reg_station: int | None = Column(Integer, nullable=True) + payment_method: int = Column(Choice(c.SALE_OPTS), default=c.MERCH) -class ModelReceipt(MagModel): +class ModelReceipt(MagModel, table=True): """ ReceiptTransaction: selectin ReceiptItem: selectin @@ -100,10 +102,10 @@ class ModelReceipt(MagModel): as during prereg, there may be multiple receipt transactions created with the same reference ID across multiple receipts. """ - invoice_num = Column(Integer, default=0) - owner_id = Column(Uuid(as_uuid=False), index=True) - owner_model = Column(String) - closed = Column(DateTime(timezone=True), nullable=True) + invoice_num: int = Column(Integer, default=0) + owner_id: str = Column(Uuid(as_uuid=False), index=True) + owner_model: str = Column(String) + closed: datetime | None = Column(DateTime(timezone=True), nullable=True) def close_all_items(self, session): for item in self.open_receipt_items: @@ -315,7 +317,7 @@ def process_full_refund(self, session, model, who='non-admin', exclude_fees=Fals return refund_total, '' -class ReceiptTransaction(MagModel): +class ReceiptTransaction(MagModel, table=True): """ ModelReceipt: joined @@ -334,34 +336,34 @@ class ReceiptTransaction(MagModel): plus it allows admins to refund Stripe payments per item. """ - receipt_id = Column(Uuid(as_uuid=False), ForeignKey('model_receipt.id', ondelete='SET NULL'), nullable=True) - receipt = relationship('ModelReceipt', foreign_keys=receipt_id, + receipt_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('model_receipt.id', ondelete='SET NULL'), nullable=True) + receipt: 'ModelReceipt' = Relationship(sa_relationship=relationship('ModelReceipt', foreign_keys=receipt_id, cascade='save-update, merge', lazy='joined', - backref=backref('receipt_txns', lazy='selectin', cascade='save-update, merge')) - receipt_info_id = Column(Uuid(as_uuid=False), ForeignKey('receipt_info.id', ondelete='SET NULL'), nullable=True) - receipt_info = relationship('ReceiptInfo', foreign_keys=receipt_info_id, + backref=backref('receipt_txns', lazy='selectin', cascade='save-update, merge'))) + receipt_info_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('receipt_info.id', ondelete='SET NULL'), nullable=True) + receipt_info: 'ReceiptInfo' = Relationship(sa_relationship=relationship('ReceiptInfo', foreign_keys=receipt_info_id, cascade='save-update, merge', - backref=backref('receipt_txns', lazy='selectin', cascade='save-update, merge')) - refunded_txn_id = Column(Uuid(as_uuid=False), ForeignKey('receipt_transaction.id', ondelete='SET NULL'), nullable=True) - refunded_txn = relationship('ReceiptTransaction', foreign_keys='ReceiptTransaction.refunded_txn_id', + backref=backref('receipt_txns', lazy='selectin', cascade='save-update, merge'))) + refunded_txn_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('receipt_transaction.id', ondelete='SET NULL'), nullable=True) + refunded_txn: 'ReceiptTransaction' = Relationship(sa_relationship=relationship('ReceiptTransaction', foreign_keys='ReceiptTransaction.refunded_txn_id', backref=backref('refund_txns', order_by='ReceiptTransaction.added'), cascade='save-update,merge,refresh-expire,expunge', remote_side='ReceiptTransaction.id', - single_parent=True) - refunded = Column(Integer, default=0) - intent_id = Column(String) - charge_id = Column(String) - refund_id = Column(String) - method = Column(Choice(c.PAYMENT_METHOD_OPTS), default=c.STRIPE) - department = Column(Choice(c.RECEIPT_ITEM_DEPT_OPTS), default=c.OTHER_RECEIPT_ITEM) - amount = Column(Integer) - txn_total = Column(Integer, default=0) - processing_fee = Column(Integer, default=0) - added = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) - on_hold = Column(Boolean, default=False) - cancelled = Column(DateTime(timezone=True), nullable=True) - who = Column(String) - desc = Column(String) + single_parent=True)) + refunded: int = Column(Integer, default=0) + intent_id: str = Column(String) + charge_id: str = Column(String) + refund_id: str = Column(String) + method: int = Column(Choice(c.PAYMENT_METHOD_OPTS), default=c.STRIPE) + department: int = Column(Choice(c.RECEIPT_ITEM_DEPT_OPTS), default=c.OTHER_RECEIPT_ITEM) + amount: int = Column(Integer) + txn_total: int = Column(Integer, default=0) + processing_fee: int = Column(Integer, default=0) + added: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) + on_hold: bool = Column(Boolean, default=False) + cancelled: datetime | None = Column(DateTime(timezone=True), nullable=True) + who: str = Column(String) + desc: str = Column(String) @property def available_actions(self): @@ -540,35 +542,35 @@ def cannot_delete_reason(self): return "You cannot delete Stripe transactions." -class ReceiptItem(MagModel): +class ReceiptItem(MagModel, table=True): """ ModelReceipt: joined ReceiptTransaction: joined """ - purchaser_id = Column(Uuid(as_uuid=False), index=True, nullable=True) - receipt_id = Column(Uuid(as_uuid=False), ForeignKey('model_receipt.id', ondelete='SET NULL'), nullable=True) - receipt = relationship('ModelReceipt', foreign_keys=receipt_id, + purchaser_id: str | None = Column(Uuid(as_uuid=False), index=True, nullable=True) + receipt_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('model_receipt.id', ondelete='SET NULL'), nullable=True) + receipt: 'ModelReceipt' = Relationship(sa_relationship=relationship('ModelReceipt', foreign_keys=receipt_id, cascade='save-update, merge', lazy='joined', - backref=backref('receipt_items', lazy='selectin', cascade='save-update, merge')) - txn_id = Column(Uuid(as_uuid=False), ForeignKey('receipt_transaction.id', ondelete='SET NULL'), nullable=True) - receipt_txn = relationship('ReceiptTransaction', foreign_keys=txn_id, + backref=backref('receipt_items', lazy='selectin', cascade='save-update, merge'))) + txn_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('receipt_transaction.id', ondelete='SET NULL'), nullable=True) + receipt_txn: 'ReceiptTransaction' = Relationship(sa_relationship=relationship('ReceiptTransaction', foreign_keys=txn_id, cascade='save-update, merge', lazy='joined', - backref=backref('receipt_items', cascade='save-update, merge')) - fk_id = Column(Uuid(as_uuid=False), index=True, nullable=True) - fk_model = Column(String) - department = Column(Choice(c.RECEIPT_ITEM_DEPT_OPTS), default=c.OTHER_RECEIPT_ITEM) - category = Column(Choice(c.RECEIPT_CATEGORY_OPTS), default=c.OTHER) - amount = Column(Integer) - comped = Column(Boolean, default=False) - reverted = Column(Boolean, default=False) - count = Column(Integer, default=1) - added = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) - closed = Column(DateTime(timezone=True), nullable=True) - who = Column(String) - desc = Column(String) - admin_notes = Column(String) - revert_change = Column(JSON, default={}, server_default='{}') + backref=backref('receipt_items', cascade='save-update, merge'))) + fk_id: str | None = Column(Uuid(as_uuid=False), index=True, nullable=True) + fk_model: str = Column(String) + department: int = Column(Choice(c.RECEIPT_ITEM_DEPT_OPTS), default=c.OTHER_RECEIPT_ITEM) + category: int = Column(Choice(c.RECEIPT_CATEGORY_OPTS), default=c.OTHER) + amount: int = Column(Integer) + comped: bool = Column(Boolean, default=False) + reverted: bool = Column(Boolean, default=False) + count: int = Column(Integer, default=1) + added: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) + closed: datetime | None = Column(DateTime(timezone=True), nullable=True) + who: str = Column(String) + des: str = Column(String) + admin_notes: str = Column(String) + revert_change: dict[str, Any] = Column(JSON, default={}, server_default='{}') @presave_adjustment def process_item_close(self): @@ -628,22 +630,22 @@ def cannot_delete_reason(self): If necessary, please delete or cancel the payment first." -class ReceiptInfo(MagModel): +class ReceiptInfo(MagModel, table=True): """ ReceiptTransaction: selectin """ - fk_email_model = Column(String) - fk_email_id = Column(String) - terminal_id = Column(String) - reference_id = Column(String) - charged = Column(DateTime(timezone=True)) - voided = Column(DateTime(timezone=True), nullable=True) - card_data = Column(MutableDict.as_mutable(JSONB), default={}) - emv_data = Column(MutableDict.as_mutable(JSONB), default={}) - txn_info = Column(MutableDict.as_mutable(JSONB), default={}) - signature = Column(String) - receipt_html = Column(String) + fk_email_model: str = Column(String) + fk_email_id: str = Column(String) + terminal_id: str = Column(String) + reference_id: str = Column(String) + charged: datetime = Column(DateTime(timezone=True)) + voided: datetime | None = Column(DateTime(timezone=True), nullable=True) + card_data: dict[str, Any] = Field(sa_type=MutableDict.as_mutable(JSONB), default_factory=dict) + emv_data: dict[str, Any] = Field(sa_type=MutableDict.as_mutable(JSONB), default_factory=dict) + txn_info: dict[str, Any] = Field(sa_type=MutableDict.as_mutable(JSONB), default_factory=dict) + signature: str = Column(String) + receipt_html: str = Column(String) @property def response_code_str(self): @@ -755,11 +757,11 @@ def cavv_str(self): return "CAVV not validated." -class TerminalSettlement(MagModel): - batch_timestamp = Column(String) - batch_who = Column(String) - requested = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) - workstation_num = Column(Integer, default=0) - terminal_id = Column(String) - response = Column(MutableDict.as_mutable(JSONB), default={}) - error = Column(String) +class TerminalSettlement(MagModel, table=True): + batch_timestamp: str = Column(String) + batch_who: str = Column(String) + requested: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) + workstation_num: int = Column(Integer, default=0) + terminal_id: str = Column(String) + response: dict[str, Any] = Field(sa_type=MutableDict.as_mutable(JSONB), default_factory=dict) + error: str = Column(String) diff --git a/uber/models/department.py b/uber/models/department.py index 030220a4e..d5a26f5fd 100644 --- a/uber/models/department.py +++ b/uber/models/department.py @@ -7,6 +7,8 @@ from sqlalchemy.schema import ForeignKey, Table, UniqueConstraint, Index from sqlalchemy.sql import text from sqlalchemy.types import Boolean, Float, Integer, Time, Uuid, String, DateTime +from sqlmodel import Field, Relationship +from typing import ClassVar from uber.config import c from uber.custom_tags import readable_join @@ -61,52 +63,52 @@ ) -class DeptChecklistItem(MagModel): +class DeptChecklistItem(MagModel, table=True): """ Attendee: joined Department: joined """ - department_id = Column(Uuid(as_uuid=False), ForeignKey('department.id')) - attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) - slug = Column(String) - comments = Column(String, default='') + department_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('department.id')) + attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) + slug: str = Column(String) + comments: str = Column(String, default='') __table_args__ = ( UniqueConstraint('department_id', 'attendee_id', 'slug'), ) -class BulkPrintingRequest(MagModel): - department_id = Column(Uuid(as_uuid=False), ForeignKey('department.id')) - link = Column(String) - copies = Column(Integer) - print_orientation = Column(Choice(c.PRINT_ORIENTATION_OPTS), default=c.PORTRAIT) - cut_orientation = Column(Choice(c.CUT_ORIENTATION_OPTS), default=c.NONE) - color = Column(Choice(c.PRINT_REQUEST_COLOR_OPTS), default=c.BW) - paper_type = Column(Choice(c.PRINT_REQUEST_PAPER_TYPE_OPTS), default=c.STANDARD) - paper_type_text = Column(String) - size = Column(Choice(c.PRINT_REQUEST_SIZE_OPTS), default=c.STANDARD) - size_text = Column(String) - double_sided = Column(Boolean, default=False) - stapled = Column(Boolean, default=False) - notes = Column(String) - required = Column(Boolean, default=False) - link_is_shared = Column(Boolean, default=False) - - -class DeptMembership(MagModel): +class BulkPrintingRequest(MagModel, table=True): + department_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('department.id')) + link: str = Column(String) + copies: str = Column(Integer) + print_orientation: int = Column(Choice(c.PRINT_ORIENTATION_OPTS), default=c.PORTRAIT) + cut_orientation: int = Column(Choice(c.CUT_ORIENTATION_OPTS), default=c.NONE) + color: int = Column(Choice(c.PRINT_REQUEST_COLOR_OPTS), default=c.BW) + paper_type: int = Column(Choice(c.PRINT_REQUEST_PAPER_TYPE_OPTS), default=c.STANDARD) + paper_type_text: str = Column(String) + size: int = Column(Choice(c.PRINT_REQUEST_SIZE_OPTS), default=c.STANDARD) + size_text: str = Column(String) + double_sided: bool = Column(Boolean, default=False) + stapled: bool = Column(Boolean, default=False) + notes: str = Column(String) + required: bool = Column(Boolean, default=False) + link_is_shared: bool = Column(Boolean, default=False) + + +class DeptMembership(MagModel, table=True): """ Attendee: joined Department: joined DeptRole: selectin """ - is_dept_head = Column(Boolean, default=False) - is_poc = Column(Boolean, default=False) - is_checklist_admin = Column(Boolean, default=False) - attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) - department_id = Column(Uuid(as_uuid=False), ForeignKey('department.id')) + is_dept_head: bool = Column(Boolean, default=False) + is_poc: bool = Column(Boolean, default=False) + is_checklist_admin: bool = Column(Boolean, default=False) + attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) + department_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('department.id')) __mapper_args__ = {'confirm_deleted_rows': False} __table_args__ = ( @@ -145,18 +147,18 @@ def dept_roles_names(self): return readable_join([role.name for role in self.dept_roles]) -class DeptMembershipRequest(MagModel): +class DeptMembershipRequest(MagModel, table=True): """ Attendee: joined Department: joined """ - attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) + attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) # A NULL value for the department_id indicates the attendee is willing # to volunteer for any department (they checked "Anything" for # "Where do you want to help?"). - department_id = Column(Uuid(as_uuid=False), ForeignKey('department.id'), nullable=True) + department_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('department.id'), nullable=True) __mapper_args__ = {'confirm_deleted_rows': False} __table_args__ = ( @@ -166,20 +168,20 @@ class DeptMembershipRequest(MagModel): ) -class DeptRole(MagModel): +class DeptRole(MagModel, table=True): """ Department: joined """ - name = Column(String) - description = Column(String) - department_id = Column(Uuid(as_uuid=False), ForeignKey('department.id')) + name: str = Column(String) + description: str = Column(String) + department_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('department.id')) - dept_memberships = relationship( + dept_memberships: list['DeptMembership'] = Relationship(sa_relationship=relationship( 'DeptMembership', backref=backref('dept_roles', lazy='selectin'), cascade='save-update,merge,refresh-expire,expunge', - secondary='dept_membership_dept_role') + secondary='dept_membership_dept_role')) __table_args__ = ( UniqueConstraint('name', 'department_id'), @@ -220,25 +222,25 @@ def dept_memberships_ids(self, value): self._set_relation_ids('dept_memberships', DeptMembership, value) -class Department(MagModel): - name = Column(String, unique=True) - description = Column(String) - solicits_volunteers = Column(Boolean, default=True) - parent_id = Column(Uuid(as_uuid=False), ForeignKey('department.id'), nullable=True) - max_consecutive_minutes = Column(Integer, default=0) - from_email = Column(String) - manages_panels = Column(Boolean, default=False) - handles_cash = Column(Boolean, default=False) - panels_desc = Column(String) - - jobs = relationship('Job', backref=backref('department', lazy='joined')) - job_templates = relationship('JobTemplate', backref=backref('department', lazy='joined')) - locations = relationship('EventLocation', backref='department') - events = relationship('Event', backref='department') - - dept_checklist_items = relationship('DeptChecklistItem', backref=backref('department', lazy='joined')) - dept_roles = relationship('DeptRole', backref=backref('department', lazy='joined')) - dept_heads = relationship( +class Department(MagModel, table=True): + name: str = Column(String, unique=True) + description: str = Column(String) + solicits_volunteers: bool = Column(Boolean, default=True) + parent_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('department.id'), nullable=True) + max_consecutive_minutes: int = Column(Integer, default=0) + from_email: str = Column(String) + manages_panels: bool = Column(Boolean, default=False) + handles_cash: bool = Column(Boolean, default=False) + panels_desc: str = Column(String) + + jobs: list['Job'] = Relationship(sa_relationship=relationship('Job', backref=backref('department', lazy='joined'))) + job_templates: list['JobTemplate'] = Relationship(sa_relationship=relationship('JobTemplate', backref=backref('department', lazy='joined'))) + locations: list['EventLocation'] = Relationship(sa_relationship=relationship('EventLocation', backref='department')) + events: list['Event'] = Relationship(sa_relationship=relationship('Event', backref='department')) + + dept_checklist_items: list['DeptChecklistItem'] = Relationship(sa_relationship=relationship('DeptChecklistItem', backref=backref('department', lazy='joined'))) + dept_roles: list['DeptRole'] = Relationship(sa_relationship=relationship('DeptRole', backref=backref('department', lazy='joined'))) + dept_heads: list['Attendee'] = Relationship(sa_relationship=relationship( 'Attendee', backref=backref('headed_depts', order_by='Department.name'), primaryjoin='and_(' @@ -246,8 +248,8 @@ class Department(MagModel): 'DeptMembership.is_dept_head == True)', secondary='dept_membership', order_by='Attendee.full_name', - viewonly=True) - checklist_admins = relationship( + viewonly=True)) + checklist_admins: list['Attendee'] = Relationship(sa_relationship=relationship( 'Attendee', backref=backref('checklist_admin_depts', order_by='Department.name'), primaryjoin='and_(' @@ -255,8 +257,8 @@ class Department(MagModel): 'DeptMembership.is_checklist_admin == True)', secondary='dept_membership', order_by='Attendee.full_name', - viewonly=True) - members_with_inherent_role = relationship( + viewonly=True)) + members_with_inherent_role: list['Attendee'] = Relationship(sa_relationship=relationship( 'Attendee', backref=backref('depts_with_inherent_role', order_by='Department.name'), primaryjoin='and_(' @@ -264,8 +266,8 @@ class Department(MagModel): 'DeptMembership.has_inherent_role)', secondary='dept_membership', order_by='Attendee.full_name', - viewonly=True) - members_who_can_admin_checklist = relationship( + viewonly=True)) + members_who_can_admin_checklist: list['Attendee'] = Relationship(sa_relationship=relationship( 'Attendee', backref=backref('can_admin_checklist_depts', order_by='Department.name'), primaryjoin='and_(' @@ -275,8 +277,8 @@ class Department(MagModel): 'DeptMembership.is_dept_head == True))', secondary='dept_membership', order_by='Attendee.full_name', - viewonly=True) - pocs = relationship( + viewonly=True)) + pocs: list['Attendee'] = Relationship(sa_relationship=relationship( 'Attendee', backref=backref('poc_depts', order_by='Department.name'), primaryjoin='and_(' @@ -284,25 +286,25 @@ class Department(MagModel): 'DeptMembership.is_poc == True)', secondary='dept_membership', order_by='Attendee.full_name', - viewonly=True) - members = relationship( + viewonly=True)) + members: list['Attendee'] = Relationship(sa_relationship=relationship( 'Attendee', backref=backref('assigned_depts', order_by='Department.name', overlaps="dept_memberships,attendee"), cascade='save-update,merge,refresh-expire,expunge', order_by='Attendee.full_name', overlaps="attendee,dept_memberships", - secondary='dept_membership') - memberships = relationship('DeptMembership', backref=backref('department', lazy='joined', overlaps="assigned_depts,members"), - overlaps="assigned_depts,members") - membership_requests = relationship('DeptMembershipRequest', backref=backref('department', lazy='joined')) - explicitly_requesting_attendees = relationship( + secondary='dept_membership')) + memberships: list['DeptMembership'] = Relationship(sa_relationship=relationship('DeptMembership', backref=backref('department', lazy='joined', overlaps="assigned_depts,members"), + overlaps="assigned_depts,members")) + membership_requests: list['DeptMembershipRequest'] = Relationship(sa_relationship=relationship('DeptMembershipRequest', backref=backref('department', lazy='joined'))) + explicitly_requesting_attendees: list['Attendee'] = Relationship(sa_relationship=relationship( 'Attendee', backref=backref('explicitly_requested_depts', order_by='Department.name', overlaps="attendee,dept_membership_requests,department,membership_requests"), cascade='save-update,merge,refresh-expire,expunge', secondary='dept_membership_request', order_by='Attendee.full_name', - overlaps="membership_requests,department,attendee,dept_membership_requests") - requesting_attendees = relationship( + overlaps="membership_requests,department,attendee,dept_membership_requests")) + requesting_attendees: list['Attendee'] = Relationship(sa_relationship=relationship( 'Attendee', backref=backref('requested_depts', order_by='Department.name'), primaryjoin='or_(' @@ -310,8 +312,8 @@ class Department(MagModel): 'DeptMembershipRequest.department_id == None)', secondary='dept_membership_request', order_by='Attendee.full_name', - viewonly=True) - unassigned_requesting_attendees = relationship( + viewonly=True)) + unassigned_requesting_attendees: list['Attendee'] = Relationship(sa_relationship=relationship( 'Attendee', primaryjoin='and_(or_(' 'DeptMembershipRequest.department_id == Department.id, ' @@ -321,8 +323,8 @@ class Department(MagModel): 'DeptMembership.attendee_id == DeptMembershipRequest.attendee_id))))', secondary='dept_membership_request', order_by='Attendee.full_name', - viewonly=True) - unassigned_explicitly_requesting_attendees = relationship( + viewonly=True)) + unassigned_explicitly_requesting_attendees: list['Attendee'] = Relationship(sa_relationship=relationship( 'Attendee', primaryjoin='and_(' 'DeptMembershipRequest.department_id == Department.id, ' @@ -331,13 +333,13 @@ class Department(MagModel): 'DeptMembership.attendee_id == DeptMembershipRequest.attendee_id))))', secondary='dept_membership_request', order_by='Attendee.full_name', - viewonly=True) - parent = relationship( + viewonly=True)) + parent: 'Department' = Relationship(sa_relationship=relationship( 'Department', backref=backref('sub_depts', order_by='Department.name', cascade='all,delete-orphan'), cascade='save-update,merge,refresh-expire,expunge', remote_side='Department.id', - single_parent=True) + single_parent=True)) @hybrid_property def member_count(self): @@ -422,7 +424,7 @@ def job_templates_by_name(self): return groupify(self.job_templates, 'template_name') -class Job(MagModel): +class Job(MagModel, table=True): """ Department: joined DeptRole: selectin @@ -430,35 +432,35 @@ class Job(MagModel): JobTemplate: select """ - _ONLY_MEMBERS = 0 - _ALL_VOLUNTEERS = 2 - _VISIBILITY_OPTS = [ + _ONLY_MEMBERS: ClassVar = 0 + _ALL_VOLUNTEERS: ClassVar = 2 + _VISIBILITY_OPTS: ClassVar = [ (_ONLY_MEMBERS, 'Members of this department'), (_ALL_VOLUNTEERS, 'All volunteers')] - job_template_id = Column(Uuid(as_uuid=False), ForeignKey('job_template.id'), nullable=True) - department_id = Column(Uuid(as_uuid=False), ForeignKey('department.id')) + job_template_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('job_template.id'), nullable=True) + department_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('department.id')) - name = Column(String) - description = Column(String) - start_time = Column(DateTime(timezone=True)) - duration = Column(Integer) - weight = Column(Float, default=1) - slots = Column(Integer) - extra15 = Column(Boolean, default=False) - visibility = Column(Choice(_VISIBILITY_OPTS), default=_ONLY_MEMBERS) - all_roles_required = Column(Boolean, default=True) + name: str = Column(String) + description: str = Column(String) + start_time: datetime = Column(DateTime(timezone=True)) + duration: int = Column(Integer) + weight: float = Column(Float, default=1) + slots: int = Column(Integer) + extra15: bool = Column(Boolean, default=False) + visibility: int = Column(Choice(_VISIBILITY_OPTS), default=_ONLY_MEMBERS) + all_roles_required: bool = Column(Boolean, default=True) - required_roles = relationship( + required_roles: list['DeptRole'] = Relationship(sa_relationship=relationship( 'DeptRole', backref='jobs', lazy='selectin', - cascade='save-update,merge,refresh-expire,expunge', secondary='job_required_role') - shifts = relationship('Shift', backref=backref('job', lazy='joined'), lazy='selectin') + cascade='save-update,merge,refresh-expire,expunge', secondary='job_required_role')) + shifts: list['Shift'] = Relationship(sa_relationship=relationship('Shift', backref=backref('job', lazy='joined'), lazy='selectin')) __table_args__ = ( Index('ix_job_department_id', department_id), ) - _repr_attr_names = ['name'] + _repr_attr_names: ClassVar = ['name'] @presave_adjustment def zero_slots(self): @@ -709,34 +711,34 @@ def available_volunteers(self): and self.working_limit_ok(s)] -class JobTemplate(MagModel): +class JobTemplate(MagModel, table=True): """ Department: joined DeptRole: selectin """ - department_id = Column(Uuid(as_uuid=False), ForeignKey('department.id')) - - template_name = Column(String) - type = Column(Choice(c.JOB_TEMPLATE_TYPE_OPTS), default=c.FILL_GAPS) - name = Column(String) - description = Column(String) - duration = Column(Integer) - weight = Column(Float, default=1) - extra15 = Column(Boolean, default=False) - visibility = Column(Choice(Job._VISIBILITY_OPTS), default=Job._ONLY_MEMBERS) - all_roles_required = Column(Boolean, default=True) - - min_slots = Column(Integer) # Future improvement: a bulk-edit for slots in jobs by time of day - days = Column(MultiChoice(c.JOB_DAY_OPTS)) - open_time = Column(Time, nullable=True) - close_time = Column(Time, nullable=True) - interval = Column(Integer, nullable=True) - - required_roles = relationship( + department_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('department.id')) + + template_name: str = Column(String) + type: int = Column(Choice(c.JOB_TEMPLATE_TYPE_OPTS), default=c.FILL_GAPS) + name: str = Column(String) + description: str = Column(String) + duration: int = Column(Integer) + weight: float = Column(Float, default=1) + extra15: bool = Column(Boolean, default=False) + visibility: int = Column(Choice(Job._VISIBILITY_OPTS), default=Job._ONLY_MEMBERS) + all_roles_required: bool = Column(Boolean, default=True) + + min_slots: int = Column(Integer) # Future improvement: a bulk-edit for slots in jobs by time of day + days: str = Column(MultiChoice(c.JOB_DAY_OPTS)) + open_time: time | None = Column(Time, nullable=True) + close_time: time | None = Column(Time, nullable=True) + interval: int = Column(Integer, nullable=True) + + required_roles: list['DeptRole'] = Relationship(sa_relationship=relationship( 'DeptRole', backref='job_templates', lazy='selectin', - cascade='save-update,merge,refresh-expire,expunge', secondary='job_template_required_role') - jobs = relationship('Job', backref=backref('template', lazy='select'), cascade='save-update,merge,refresh-expire,expunge') + cascade='save-update,merge,refresh-expire,expunge', secondary='job_template_required_role')) + jobs: list['Job'] = Relationship(sa_relationship=relationship('Job', backref=backref('template', lazy='select'), cascade='save-update,merge,refresh-expire,expunge')) @presave_adjustment def zero_slots(self): @@ -946,17 +948,17 @@ def real_cutoff_time(self, day_int): return cutoff_time -class Shift(MagModel): +class Shift(MagModel, table=True): """ Attendee: joined Job: joined """ - job_id = Column(Uuid(as_uuid=False), ForeignKey('job.id', ondelete='cascade')) - attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='cascade')) - worked = Column(Choice(c.WORKED_STATUS_OPTS), default=c.SHIFT_UNMARKED) - rating = Column(Choice(c.RATING_OPTS), default=c.UNRATED) - comment = Column(String) + job_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('job.id', ondelete='cascade')) + attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='cascade')) + worked: int = Column(Choice(c.WORKED_STATUS_OPTS), default=c.SHIFT_UNMARKED) + rating: int = Column(Choice(c.RATING_OPTS), default=c.UNRATED) + comment: str = Column(String) __table_args__ = ( Index('ix_shift_job_id', job_id), diff --git a/uber/models/email.py b/uber/models/email.py index a3a7bef56..caff3d4ef 100644 --- a/uber/models/email.py +++ b/uber/models/email.py @@ -13,6 +13,8 @@ from sqlalchemy.orm import backref from sqlalchemy.schema import ForeignKey from sqlalchemy.types import Boolean, Integer, String, Uuid, DateTime +from sqlmodel import Field, Relationship +from typing import Any, ClassVar from uber import utils from uber.config import c @@ -29,17 +31,17 @@ class BaseEmailMixin(object): - model = Column(String) + model: str = Column(String) - subject = Column(String) - body = Column(String) + subject: str = Column(String) + body: str = Column(String) - sender = Column(String) - cc = Column(String) - bcc = Column(String) - replyto = Column(String) + sender: str = Column(String) + cc: str = Column(String) + bcc: str = Column(String) + replyto: str = Column(String) - _repr_attr_names = ['subject'] + _repr_attr_names: ClassVar = ['subject'] @property def body_with_body_tag_stripped(self): @@ -66,27 +68,27 @@ def model_class(self): return None -class AutomatedEmail(MagModel, BaseEmailMixin): - _fixtures = OrderedDict() - email_overrides = [] # Used in plugins, list of (ident, key, val) tuples +class AutomatedEmail(MagModel, BaseEmailMixin, table=True): + _fixtures: ClassVar = OrderedDict() + email_overrides: ClassVar = [] # Used in plugins, list of (ident, key, val) tuples - format = Column(String, default='text') - ident = Column(String, unique=True) + format: str = Column(String, default='text') + ident: str = Column(String, unique=True) - approved = Column(Boolean, default=False) - needs_approval = Column(Boolean, default=True) - unapproved_count = Column(Integer, default=0) - currently_sending = Column(Boolean, default=False) - last_send_time = Column(DateTime(timezone=True), nullable=True, default=None) + approved: bool = Column(Boolean, default=False) + needs_approval: bool = Column(Boolean, default=True) + unapproved_count: int = Column(Integer, default=0) + currently_sending: bool = Column(Boolean, default=False) + last_send_time: datetime | None = Column(DateTime(timezone=True), nullable=True, default=None) - allow_at_the_con = Column(Boolean, default=False) - allow_post_con = Column(Boolean, default=False) + allow_at_the_con: bool = Column(Boolean, default=False) + allow_post_con: bool = Column(Boolean, default=False) - active_after = Column(DateTime(timezone=True), nullable=True, default=None) - active_before = Column(DateTime(timezone=True), nullable=True, default=None) - revert_changes = Column(MutableDict.as_mutable(JSONB), default={}) + active_after: datetime | None = Column(DateTime(timezone=True), nullable=True, default=None) + active_before: datetime | None = Column(DateTime(timezone=True), nullable=True, default=None) + revert_changes: dict[str, Any] = Field(sa_type=MutableDict.as_mutable(JSONB), default_factory=dict) - emails = relationship('Email', backref=backref('automated_email', lazy='joined'), order_by='Email.id') + emails: list['Email'] = Relationship(sa_relationship=relationship('Email', backref=backref('automated_email', lazy='joined'), order_by='Email.id')) @presave_adjustment def date_adjustments(self): @@ -346,18 +348,18 @@ def would_send_if_approved(self, model_instance): return model_instance and getattr(model_instance, 'email_to_address', False) and self.filter(model_instance) -class Email(MagModel, BaseEmailMixin): +class Email(MagModel, BaseEmailMixin, table=True): """ AutomatedEmail: joined """ - automated_email_id = Column( + automated_email_id: str | None = Column( Uuid(as_uuid=False), ForeignKey('automated_email.id', ondelete='set null'), nullable=True, default=None, index=True) - fk_id = Column(Uuid(as_uuid=False), nullable=True) - ident = Column(String) - to = Column(String) - when = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) + fk_id: str | None = Column(Uuid(as_uuid=False), nullable=True) + ident: str = Column(String) + to: str = Column(String) + when: str = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) @cached_property def fk(self): diff --git a/uber/models/group.py b/uber/models/group.py index 58dbf3c51..60b84ed31 100644 --- a/uber/models/group.py +++ b/uber/models/group.py @@ -2,12 +2,15 @@ from datetime import datetime from uuid import uuid4 +from decimal import Decimal from pytz import UTC from sqlalchemy import and_, exists, or_, func, select, not_ from sqlalchemy.ext.hybrid import hybrid_property from sqlalchemy.orm import backref from sqlalchemy.schema import ForeignKey from sqlalchemy.types import Boolean, Integer, Numeric, String, DateTime, Uuid +from sqlmodel import Field, Relationship +from typing import ClassVar from uber.config import c from uber.custom_tags import format_currency @@ -21,80 +24,80 @@ __all__ = ['Group'] -class Group(MagModel, TakesPaymentMixin): +class Group(MagModel, TakesPaymentMixin, table=True): """ Attendee: selectin ModelReceipt: select """ - public_id = Column(Uuid(as_uuid=False), default=lambda: str(uuid4())) - shared_with_id = Column(Uuid(as_uuid=False), ForeignKey('group.id', ondelete='SET NULL'), nullable=True) - shared_with = relationship( + public_id: str | None = Column(Uuid(as_uuid=False), default=lambda: str(uuid4())) + shared_with_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('group.id', ondelete='SET NULL'), nullable=True) + shared_with: 'Group' = Relationship(sa_relationship=relationship( 'Group', foreign_keys='Group.shared_with_id', backref=backref('table_shares', viewonly=True), cascade='save-update,merge,refresh-expire,expunge', remote_side='Group.id', - single_parent=True) - name = Column(String) - tables = Column(Numeric, default=0) - zip_code = Column(String) - address1 = Column(String) - address2 = Column(String) - city = Column(String) - region = Column(String) - country = Column(String) - email_address = Column(String) - phone = Column(String) - website = Column(String) - wares = Column(String) - categories = Column(MultiChoice(c.DEALER_WARES_OPTS)) - categories_text = Column(String) - description = Column(String) - special_needs = Column(String) - - cost = Column(Integer, default=0, admin_only=True) - auto_recalc = Column(Boolean, default=True, admin_only=True) - - can_add = Column(Boolean, default=False, admin_only=True) - is_dealer = Column(Boolean, default=False, admin_only=True) - convert_badges = Column(Boolean, default=False, admin_only=True) - admin_notes = Column(String, admin_only=True) - status = Column(Choice(c.DEALER_STATUS_OPTS), default=c.UNAPPROVED, admin_only=True) - registered = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) - approved = Column(DateTime(timezone=True), nullable=True) - leader_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', use_alter=True, name='fk_leader', ondelete='SET NULL'), + single_parent=True)) + name: str = Column(String) + tables: Decimal = Column(Numeric, default=0) + zip_code: str = Column(String) + address1: str = Column(String) + address2: str = Column(String) + city: str = Column(String) + region: str = Column(String) + country:str = Column(String) + email_address: str = Column(String) + phone: str = Column(String) + website: str = Column(String) + wares: str = Column(String) + categories: str = Column(MultiChoice(c.DEALER_WARES_OPTS)) + categories_text: str = Column(String) + description: str = Column(String) + special_needs: str = Column(String) + + cost: int = Column(Integer, default=0, admin_only=True) + auto_recalc: bool = Column(Boolean, default=True, admin_only=True) + + can_add: bool = Column(Boolean, default=False, admin_only=True) + is_dealer: bool = Column(Boolean, default=False, admin_only=True) + convert_badges: bool = Column(Boolean, default=False, admin_only=True) + admin_notes: str = Column(String, admin_only=True) + status: int = Column(Choice(c.DEALER_STATUS_OPTS), default=c.UNAPPROVED, admin_only=True) + registered: datetime = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) + approved: datetime | None = Column(DateTime(timezone=True), nullable=True) + leader_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', use_alter=True, name='fk_leader', ondelete='SET NULL'), nullable=True) - creator_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), nullable=True) + creator_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), nullable=True) - creator = relationship( + creator: 'Attendee' = Relationship(sa_relationship=relationship( 'Attendee', foreign_keys=creator_id, backref=backref('created_groups', order_by='Group.name'), cascade='save-update,merge,refresh-expire,expunge', remote_side='Attendee.id', - single_parent=True) - leader = relationship('Attendee', foreign_keys=leader_id, post_update=True, cascade='all') - studio = relationship('IndieStudio', uselist=False, backref='group', - cascade='save-update,merge,refresh-expire,expunge') - guest = relationship('GuestGroup', backref=backref('group', lazy='joined'), uselist=False) - active_receipt = relationship( + single_parent=True)) + leader: 'Attendee' = Relationship(sa_relationship=relationship('Attendee', foreign_keys=leader_id, post_update=True, cascade='all')) + studio: 'IndieStudio' = Relationship(sa_relationship=relationship('IndieStudio', uselist=False, backref='group', + cascade='save-update,merge,refresh-expire,expunge')) + guest: 'GuestGroup' = Relationship(sa_relationship=relationship('GuestGroup', backref=backref('group', lazy='joined'), uselist=False)) + active_receipt: 'ModelReceipt' = Relationship(sa_relationship=relationship( 'ModelReceipt', cascade='save-update,merge,refresh-expire,expunge', primaryjoin='and_(remote(ModelReceipt.owner_id) == foreign(Group.id),' 'ModelReceipt.owner_model == "Group",' 'ModelReceipt.closed == None)', lazy='select', - uselist=False) - terms_conditions_doc = relationship( + uselist=False)) + terms_conditions_doc: 'SignedDocument' = Relationship(sa_relationship=relationship( 'SignedDocument', cascade='save-update,merge,refresh-expire,expunge', primaryjoin='and_(SignedDocument.fk_id == foreign(Group.id),' 'SignedDocument.model == "Group")', uselist=False, - overlaps="active_receipt") + overlaps="active_receipt")) - _repr_attr_names = ['name'] + _repr_attr_names: ClassVar = ['name'] @presave_adjustment def _cost_and_leader(self): diff --git a/uber/models/guests.py b/uber/models/guests.py index 272e79558..c511bc3e0 100644 --- a/uber/models/guests.py +++ b/uber/models/guests.py @@ -10,6 +10,8 @@ from sqlalchemy.orm import backref from sqlalchemy.schema import ForeignKey from sqlalchemy.types import Boolean, Integer, String, DateTime, Uuid, JSON +from sqlmodel import Field, Relationship +from typing import Any, ClassVar from uber.config import c from uber.custom_tags import yesno @@ -28,40 +30,40 @@ 'GuestInterview', 'GuestTravelPlans', 'GuestDetailedTravelPlan', 'GuestHospitality', 'GuestTrack'] -class GuestGroup(MagModel): +class GuestGroup(MagModel, table=True): """ Group: joined """ - group_id = Column(Uuid(as_uuid=False), ForeignKey('group.id')) - event_id = Column(Uuid(as_uuid=False), ForeignKey('event.id', ondelete='SET NULL'), nullable=True) - group_type = Column(Choice(c.GROUP_TYPE_OPTS), default=c.BAND) - num_hotel_rooms = Column(Integer, default=1, admin_only=True) - payment = Column(Integer, default=0, admin_only=True) - vehicles = Column(Integer, default=1, admin_only=True) - estimated_loadin_minutes = Column(Integer, default=c.DEFAULT_LOADIN_MINUTES, admin_only=True) - estimated_performance_minutes = Column(Integer, default=c.DEFAULT_PERFORMANCE_MINUTES, admin_only=True) - - wants_mc = Column(Boolean, nullable=True) - needs_rehearsal = Column(Choice(c.GUEST_REHEARSAL_OPTS), nullable=True) - badges_assigned = Column(Boolean, default=False) - info = relationship('GuestInfo', backref=backref('guest', lazy='joined'), uselist=False) - images = relationship( - 'GuestImage', backref=backref('guest'), order_by='GuestImage.id') - bio = relationship('GuestBio', backref=backref('guest', lazy='joined'), uselist=False) - taxes = relationship('GuestTaxes', backref=backref('guest', lazy='joined'), uselist=False) - stage_plot = relationship('GuestStagePlot', backref=backref('guest', lazy='joined'), uselist=False) - panel = relationship('GuestPanel', backref=backref('guest', lazy='joined'), uselist=False) - merch = relationship('GuestMerch', backref=backref('guest', lazy='joined'), uselist=False) - tracks = relationship('GuestTrack', backref=backref('guest', lazy='joined')) - charity = relationship('GuestCharity', backref=backref('guest', lazy='joined'), uselist=False) - autograph = relationship('GuestAutograph', backref=backref('guest', lazy='joined'), uselist=False) - interview = relationship('GuestInterview', backref=backref('guest', lazy='joined'), uselist=False) - travel_plans = relationship('GuestTravelPlans', backref=backref('guest', lazy='joined'), uselist=False) - hospitality = relationship('GuestHospitality', backref=backref('guest', lazy='joined'), uselist=False) - media_request = relationship('GuestMediaRequest', backref=backref('guest', lazy='joined'), uselist=False) - - email_model_name = 'guest' + group_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('group.id')) + event_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('event.id', ondelete='SET NULL'), nullable=True) + group_type: int = Column(Choice(c.GROUP_TYPE_OPTS), default=c.BAND) + num_hotel_rooms: int = Column(Integer, default=1, admin_only=True) + payment: int = Column(Integer, default=0, admin_only=True) + vehicles: int = Column(Integer, default=1, admin_only=True) + estimated_loadin_minutes: int = Column(Integer, default=c.DEFAULT_LOADIN_MINUTES, admin_only=True) + estimated_performance_minutes: int = Column(Integer, default=c.DEFAULT_PERFORMANCE_MINUTES, admin_only=True) + + wants_mc: bool | None = Column(Boolean, nullable=True) + needs_rehearsal: int | None = Column(Choice(c.GUEST_REHEARSAL_OPTS), nullable=True) + badges_assigned: bool = Column(Boolean, default=False) + info: 'GuestInfo' = Relationship(sa_relationship=relationship('GuestInfo', backref=backref('guest', lazy='joined'), uselist=False)) + images: list['GuestImage'] = Relationship(sa_relationship=relationship( + 'GuestImage', backref=backref('guest'), order_by='GuestImage.id')) + bio: 'GuestBio' = Relationship(sa_relationship=relationship('GuestBio', backref=backref('guest', lazy='joined'), uselist=False)) + taxes: 'GuestTaxes' = Relationship(sa_relationship=relationship('GuestTaxes', backref=backref('guest', lazy='joined'), uselist=False)) + stage_plot: 'GuestStagePlot' = Relationship(sa_relationship=relationship('GuestStagePlot', backref=backref('guest', lazy='joined'), uselist=False)) + panel: 'GuestPanel' = Relationship(sa_relationship=relationship('GuestPanel', backref=backref('guest', lazy='joined'), uselist=False)) + merch: 'GuestMerch' = Relationship(sa_relationship=relationship('GuestMerch', backref=backref('guest', lazy='joined'), uselist=False)) + tracks: list['GuestTrack'] = Relationship(sa_relationship=relationship('GuestTrack', backref=backref('guest', lazy='joined'))) + charity: 'GuestCharity' = Relationship(sa_relationship=relationship('GuestCharity', backref=backref('guest', lazy='joined'), uselist=False)) + autograph: 'GuestAutograph' = Relationship(sa_relationship=relationship('GuestAutograph', backref=backref('guest', lazy='joined'), uselist=False)) + interview: 'GuestInterview' = Relationship(sa_relationship=relationship('GuestInterview', backref=backref('guest', lazy='joined'), uselist=False)) + travel_plans: 'GuestTravelPlans' = Relationship(sa_relationship=relationship('GuestTravelPlans', backref=backref('guest', lazy='joined'), uselist=False)) + hospitality: 'GuestHospitality' = Relationship(sa_relationship=relationship('GuestHospitality', backref=backref('guest', lazy='joined'), uselist=False)) + media_request: 'GuestMediaRequest' = Relationship(sa_relationship=relationship('GuestMediaRequest', backref=backref('guest', lazy='joined'), uselist=False)) + + email_model_name: ClassVar = 'guest' def __getattr__(self, name): """ @@ -294,25 +296,25 @@ def guidebook_images(self): return [header_name, thumbnail_name], [header, thumbnail] -class GuestInfo(MagModel): +class GuestInfo(MagModel, table=True): """ GuestGroup: joined """ - guest_id = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) - poc_phone = Column(String) - performer_count = Column(Integer, default=0) - bringing_vehicle = Column(Boolean, default=False) - vehicle_info = Column(String) - arrival_time = Column(String) + guest_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) + poc_phone: str = Column(String) + performer_count: int = Column(Integer, default=0) + bringing_vehicle: bool = Column(Boolean, default=False) + vehicle_info: str = Column(String) + arrival_time: str = Column(String) @property def status(self): return "Yes" if self.poc_phone else "" -class GuestImage(MagModel, GuidebookImageMixin): - guest_id = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id')) +class GuestImage(MagModel, GuidebookImageMixin, table=True): + guest_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id')) @property def url(self): @@ -328,52 +330,52 @@ def download_filename(self): return name + '.' + self.pic_extension -class GuestBio(MagModel): +class GuestBio(MagModel, table=True): """ GuestGroup: joined """ - guest_id = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) - desc = Column(String) - member_info = Column(String) - website = Column(String) - facebook = Column(String) - twitter = Column(String) - instagram = Column(String) - twitch = Column(String) - bandcamp = Column(String) - discord = Column(String) - spotify = Column(String) - other_social_media = Column(String) - teaser_song_url = Column(String) + guest_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) + desc: str = Column(String) + member_info: str = Column(String) + website: str = Column(String) + facebook: str = Column(String) + twitter: str = Column(String) + instagram: str = Column(String) + twitch: str = Column(String) + bandcamp: str = Column(String) + discord: str = Column(String) + spotify: str = Column(String) + other_social_media: str = Column(String) + teaser_song_url: str = Column(String) @property def status(self): return 'Yes' if self.desc else '' -class GuestTaxes(MagModel): +class GuestTaxes(MagModel, table=True): """ GuestGroup: joined """ - guest_id = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) - w9_sent = Column(Boolean, default=False) + guest_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) + w9_sent: bool = Column(Boolean, default=False) @property def status(self): return str(self.w9_sent) -class GuestStagePlot(MagModel): +class GuestStagePlot(MagModel, table=True): """ GuestGroup: joined """ - guest_id = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) - filename = Column(String) - content_type = Column(String) - notes = Column(String) + guest_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) + filename: str = Column(String) + content_type: str = Column(String) + notes: str = Column(String) @property def url(self): @@ -405,33 +407,33 @@ def status(self): return self.notes -class GuestPanel(MagModel): +class GuestPanel(MagModel, table=True): """ GuestGroup: joined """ - guest_id = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) - wants_panel = Column(Choice(c.GUEST_PANEL_OPTS), nullable=True) - name = Column(String) - length = Column(String) - desc = Column(String) - tech_needs = Column(MultiChoice(c.TECH_NEED_OPTS)) - other_tech_needs = Column(String) + guest_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) + wants_panel: int | None = Column(Choice(c.GUEST_PANEL_OPTS), nullable=True) + name: str = Column(String) + length: str = Column(String) + desc: str = Column(String) + tech_needs: str = Column(MultiChoice(c.TECH_NEED_OPTS)) + other_tech_needs: str = Column(String) @property def status(self): return self.wants_panel_label -class GuestTrack(MagModel): +class GuestTrack(MagModel, table=True): """ GuestGroup: joined """ - guest_id = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id')) - filename = Column(String) - content_type = Column(String) - extension = Column(String) + guest_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id')) + filename: str = Column(String) + content_type: str = Column(String) + extension: str = Column(String) @property def file(self): @@ -465,49 +467,49 @@ def filepath(self): return os.path.join(c.GUESTS_INVENTORY_DIR, str('track_' + self.id)) -class GuestMerch(MagModel): +class GuestMerch(MagModel, table=True): """ GuestGroup: joined """ - _inventory_file_regex = re.compile(r'^(audio|image)(|\-\d+)$') - _inventory_filename_regex = re.compile(r'^(audio|image)(|\-\d+)_filename$') - - guest_id = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) - selling_merch = Column(Choice(c.GUEST_MERCH_OPTS), nullable=True) - delivery_method = Column(Choice(c.GUEST_MERCH_DELIVERY_OPTS), nullable=True) - payout_method = Column(Choice(c.GUEST_MERCH_PAYOUT_METHOD_OPTS), nullable=True) - paypal_email = Column(String) - check_payable = Column(String) - check_zip_code = Column(String) - check_address1 = Column(String) - check_address2 = Column(String) - check_city = Column(String) - check_region = Column(String) - check_country = Column(String) - - arrival_plans = Column(String) - checkin_time = Column(Choice(c.GUEST_MERCH_CHECKIN_TIMES), nullable=True) - checkout_time = Column(Choice(c.GUEST_MERCH_CHECKOUT_TIMES), nullable=True) - merch_events = Column(String) - inventory = Column(JSON, default={}, server_default='{}') - inventory_updated = Column(DateTime(timezone=True), nullable=True) - extra_info = Column(String) - tax_phone = Column(String) - - poc_is_group_leader = Column(Boolean, default=False) - poc_first_name = Column(String) - poc_last_name = Column(String) - poc_phone = Column(String) - poc_email = Column(String) - poc_zip_code = Column(String) - poc_address1 = Column(String) - poc_address2 = Column(String) - poc_city = Column(String) - poc_region = Column(String) - poc_country = Column(String) - - handlers = Column(JSON, default=[], server_default='[]') + _inventory_file_regex: ClassVar = re.compile(r'^(audio|image)(|\-\d+)$') + _inventory_filename_regex: ClassVar = re.compile(r'^(audio|image)(|\-\d+)_filename$') + + guest_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) + selling_merch: int | None = Column(Choice(c.GUEST_MERCH_OPTS), nullable=True) + delivery_method: int | None = Column(Choice(c.GUEST_MERCH_DELIVERY_OPTS), nullable=True) + payout_method: int | None = Column(Choice(c.GUEST_MERCH_PAYOUT_METHOD_OPTS), nullable=True) + paypal_email: str = Column(String) + check_payable: str = Column(String) + check_zip_code: str = Column(String) + check_address1: str = Column(String) + check_address2: str = Column(String) + check_city: str = Column(String) + check_region: str = Column(String) + check_country: str = Column(String) + + arrival_plans: str = Column(String) + checkin_time: int | None = Column(Choice(c.GUEST_MERCH_CHECKIN_TIMES), nullable=True) + checkout_time: int | None = Column(Choice(c.GUEST_MERCH_CHECKOUT_TIMES), nullable=True) + merch_events: str = Column(String) + inventory: dict[Any, Any] = Column(JSON, default={}, server_default='{}') + inventory_updated: datetime | None = Column(DateTime(timezone=True), nullable=True) + extra_info: str = Column(String) + tax_phone: str = Column(String) + + poc_is_group_leader: bool = Column(Boolean, default=False) + poc_first_name: str = Column(String) + poc_last_name: str = Column(String) + poc_phone: str = Column(String) + poc_email: str = Column(String) + poc_zip_code: str = Column(String) + poc_address1: str = Column(String) + poc_address2: str = Column(String) + poc_city: str = Column(String) + poc_region: str = Column(String) + poc_country: str = Column(String) + + handlers: dict[str, Any] = Column(JSON, default=[], server_default='[]') @property def full_name(self): @@ -767,14 +769,14 @@ def update_inventory(self, inventory, *, persist_files=True): self.inventory_updated = datetime.now() -class GuestCharity(MagModel): +class GuestCharity(MagModel, table=True): """ GuestGroup: joined """ - guest_id = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) - donating = Column(Choice(c.GUEST_CHARITY_OPTS), nullable=True) - desc = Column(String) + guest_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) + donating: int | None = Column(Choice(c.GUEST_CHARITY_OPTS), nullable=True) + desc: str = Column(String) @property def status(self): @@ -786,16 +788,16 @@ def no_desc_if_not_donating(self): self.desc = '' -class GuestAutograph(MagModel): +class GuestAutograph(MagModel, table=True): """ GuestGroup: joined """ - guest_id = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) - num = Column(Integer, default=0) - length = Column(Integer, default=60) # session length in minutes - rock_island_autographs = Column(Boolean, nullable=True) - rock_island_length = Column(Integer, default=60) # session length in minutes + guest_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) + num: int = Column(Integer, default=0) + length: int = Column(Integer, default=60) # session length in minutes + rock_island_autographs: bool | None = Column(Boolean, nullable=True) + rock_island_length: int = Column(Integer, default=60) # session length in minutes @presave_adjustment def no_length_if_zero_autographs(self): @@ -803,15 +805,15 @@ def no_length_if_zero_autographs(self): self.length = 0 -class GuestInterview(MagModel): +class GuestInterview(MagModel, table=True): """ GuestGroup: joined """ - guest_id = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) - will_interview = Column(Boolean, default=False) - email = Column(String) - direct_contact = Column(Boolean, default=False) + guest_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) + will_interview: bool = Column(Boolean, default=False) + email: str = Column(String) + direct_contact: bool = Column(Boolean, default=False) @presave_adjustment def no_details_if_no_interview(self): @@ -820,62 +822,62 @@ def no_details_if_no_interview(self): self.direct_contact = False -class GuestTravelPlans(MagModel): +class GuestTravelPlans(MagModel, table=True): """ GuestGroup: joined GuestDetailedTravelPlan: selectin """ - guest_id = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) - modes = Column(MultiChoice(c.GUEST_TRAVEL_OPTS), default=c.OTHER) - modes_text = Column(String) - details = Column(String) - completed = Column(Boolean, default=False) + guest_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) + modes: str = Column(MultiChoice(c.GUEST_TRAVEL_OPTS), default=c.OTHER) + modes_text: str = Column(String) + details: str = Column(String) + completed: bool = Column(Boolean, default=False) @property def num_detailed_travel_plans(self): return len(self.detailed_travel_plans) -class GuestHospitality(MagModel): +class GuestHospitality(MagModel, table=True): """ GuestGroup: joined """ - guest_id = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) - completed = Column(Boolean, default=False) + guest_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) + completed: bool = Column(Boolean, default=False) -class GuestMediaRequest(MagModel): +class GuestMediaRequest(MagModel, table=True): """ GuestGroup: joined """ - guest_id = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) - completed = Column(Boolean, default=False) + guest_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) + completed: bool = Column(Boolean, default=False) -class GuestDetailedTravelPlan(MagModel): +class GuestDetailedTravelPlan(MagModel, table=True): """ GuestTravelPlans: joined """ - travel_plans_id = Column(Uuid(as_uuid=False), ForeignKey('guest_travel_plans.id'), nullable=True) - travel_plans = relationship('GuestTravelPlans', foreign_keys=travel_plans_id, single_parent=True, + travel_plans_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('guest_travel_plans.id'), nullable=True) + travel_plans: 'GuestTravelPlans' = Relationship(sa_relationship=relationship('GuestTravelPlans', foreign_keys=travel_plans_id, single_parent=True, backref=backref('detailed_travel_plans', lazy='selectin'), lazy='joined', - cascade='save-update,merge,refresh-expire,expunge') - mode = Column(Choice(c.GUEST_TRAVEL_OPTS)) - mode_text = Column(String) - traveller = Column(String) - companions = Column(String) - luggage_needs = Column(String) - contact_email = Column(String) - contact_phone = Column(String) - arrival_time = Column(DateTime(timezone=True)) - arrival_details = Column(String) - departure_time = Column(DateTime(timezone=True)) - departure_details = Column(String) - extra_details = Column(String) + cascade='save-update,merge,refresh-expire,expunge')) + mode: int = Column(Choice(c.GUEST_TRAVEL_OPTS)) + mode_text: str = Column(String) + traveller: str = Column(String) + companions: str = Column(String) + luggage_needs: str = Column(String) + contact_email: str = Column(String) + contact_phone: str = Column(String) + arrival_time: datetime = Column(DateTime(timezone=True)) + arrival_details: str = Column(String) + departure_time: datetime = Column(DateTime(timezone=True)) + departure_details: str = Column(String) + extra_details: str = Column(String) @classproperty def min_arrival_time(self): diff --git a/uber/models/hotel.py b/uber/models/hotel.py index f171a74ea..b600f9453 100644 --- a/uber/models/hotel.py +++ b/uber/models/hotel.py @@ -2,7 +2,7 @@ import random import checkdigit.verhoeff as verhoeff -from datetime import timedelta, datetime +from datetime import timedelta, datetime, date from pytz import UTC from markupsafe import Markup from sqlalchemy import Sequence, case @@ -12,6 +12,8 @@ from sqlalchemy.orm import backref from sqlalchemy.schema import ForeignKey from sqlalchemy.types import Boolean, Date, Integer, String, DateTime, Uuid +from sqlmodel import Field, Relationship +from typing import Any, ClassVar from uber.config import c from uber.custom_tags import readable_join, datetime_local_filter @@ -65,17 +67,17 @@ def setup_teardown(self): for mutate in [str.upper, str.lower]}) -class HotelRequests(MagModel, NightsMixin): +class HotelRequests(MagModel, NightsMixin, table=True): """ Attendee: joined """ - attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), unique=True) - nights = Column(MultiChoice(c.NIGHT_OPTS)) - wanted_roommates = Column(String) - unwanted_roommates = Column(String) - special_needs = Column(String) - approved = Column(Boolean, default=False, admin_only=True) + attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), unique=True) + nights: str = Column(MultiChoice(c.NIGHT_OPTS)) + wanted_roommates: str = Column(String) + unwanted_roommates: str = Column(String) + special_needs: str = Column(String) + approved: bool = Column(Boolean, default=False, admin_only=True) def decline(self): nights = [n for n in self.nights.split(',') if int(n) in c.CORE_NIGHTS] @@ -89,13 +91,13 @@ def __repr__(self): return '<{self.attendee.full_name} Hotel Requests>'.format(self=self) -class Room(MagModel, NightsMixin): - notes = Column(String) - message = Column(String) - locked_in = Column(Boolean, default=False) - nights = Column(MultiChoice(c.NIGHT_OPTS)) - created = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) - assignments = relationship('RoomAssignment', backref=backref('room', lazy='joined')) +class Room(MagModel, NightsMixin, table=True): + notes: str = Column(String) + message: str = Column(String) + locked_in: bool = Column(Boolean, default=False) + nights: str = Column(MultiChoice(c.NIGHT_OPTS)) + created: datetime = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) + assignments: list['RoomAssignment'] = Relationship(sa_relationship=relationship('RoomAssignment', backref=backref('room', lazy='joined'))) @property def email(self): @@ -119,88 +121,88 @@ def check_out_date(self): return c.NIGHT_DATES[self.nights_labels[-1]] + timedelta(days=1) -class RoomAssignment(MagModel): +class RoomAssignment(MagModel, table=True): """ Attendee: joined Room: joined """ - room_id = Column(Uuid(as_uuid=False), ForeignKey('room.id')) - attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) + room_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('room.id')) + attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) -class LotteryApplication(MagModel): +class LotteryApplication(MagModel, table=True): """ Attendee: joined LotteryApplication (parent_application): joined """ - attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), unique=True, nullable=True) - attendee = relationship('Attendee', lazy='joined', backref=backref('lottery_application', uselist=False), + attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), unique=True, nullable=True) + attendee: 'Attendee' = Relationship(sa_relationship=relationship('Attendee', lazy='joined', backref=backref('lottery_application', uselist=False), cascade='save-update,merge,refresh-expire,expunge', - uselist=False) - invite_code = Column(String) # Not used for now but we're keeping it for later - confirmation_num = Column(String) - - response_id_seq = Sequence('lottery_application_response_id_seq') - response_id = Column(Integer, response_id_seq, server_default=response_id_seq.next_value(), unique=True) - status = Column(Choice(c.HOTEL_LOTTERY_STATUS_OPTS), default=c.PARTIAL, admin_only=True) - entry_started = Column(DateTime(timezone=True), nullable=True) - entry_metadata = Column(MutableDict.as_mutable(JSONB), server_default='{}', default={}) - entry_type = Column(Choice(c.HOTEL_LOTTERY_ENTRY_TYPE_OPTS), nullable=True) - current_step = Column(Integer, default=0) - last_submitted = Column(DateTime(timezone=True), nullable=True) - admin_notes = Column(String) - is_staff_entry = Column(Boolean, default=False) - - legal_first_name = Column(String) - legal_last_name = Column(String) - cellphone = Column(String) - earliest_checkin_date = Column(Date, nullable=True) - latest_checkin_date = Column(Date, nullable=True) - earliest_checkout_date = Column(Date, nullable=True) - latest_checkout_date = Column(Date, nullable=True) - selection_priorities = Column(MultiChoice(c.HOTEL_LOTTERY_PRIORITIES_OPTS)) - - hotel_preference = Column(MultiChoice(c.HOTEL_LOTTERY_HOTELS_OPTS)) - room_type_preference = Column(MultiChoice(c.HOTEL_LOTTERY_ROOM_TYPES_OPTS)) - wants_ada = Column(Boolean, default=False) - ada_requests = Column(String) - - room_opt_out = Column(Boolean, default=False) - suite_type_preference = Column(MultiChoice(c.HOTEL_LOTTERY_SUITE_ROOM_TYPES_OPTS)) - - terms_accepted = Column(Boolean, default=False) - data_policy_accepted = Column(Boolean, default=False) - suite_terms_accepted = Column(Boolean, default=False) - guarantee_policy_accepted = Column(Boolean, default=False) - can_edit = Column(Boolean, default=False) - final_status_hidden = Column(Boolean, default=True) - booking_url_hidden = Column(Boolean, default=True) + uselist=False)) + invite_code: str = Column(String) # Not used for now but we're keeping it for later + confirmation_num: str = Column(String) + + response_id_seq: ClassVar = Sequence('lottery_application_response_id_seq') + response_id: int = Column(Integer, response_id_seq, server_default=response_id_seq.next_value(), unique=True) + status: int = Column(Choice(c.HOTEL_LOTTERY_STATUS_OPTS), default=c.PARTIAL, admin_only=True) + entry_started: datetime | None = Column(DateTime(timezone=True), nullable=True) + entry_metadata: dict[str, Any] = Column(MutableDict.as_mutable(JSONB), server_default='{}', default={}) + entry_type: int | None = Column(Choice(c.HOTEL_LOTTERY_ENTRY_TYPE_OPTS), nullable=True) + current_step: int = Column(Integer, default=0) + last_submitted: datetime | None = Column(DateTime(timezone=True), nullable=True) + admin_notes: str = Column(String) + is_staff_entry: bool = Column(Boolean, default=False) + + legal_first_name: str = Column(String) + legal_last_name: str = Column(String) + cellphone: str = Column(String) + earliest_checkin_date: date | None = Column(Date, nullable=True) + latest_checkin_date: date | None = Column(Date, nullable=True) + earliest_checkout_date: date | None = Column(Date, nullable=True) + latest_checkout_date: date | None = Column(Date, nullable=True) + selection_priorities: str = Column(MultiChoice(c.HOTEL_LOTTERY_PRIORITIES_OPTS)) + + hotel_preference: str = Column(MultiChoice(c.HOTEL_LOTTERY_HOTELS_OPTS)) + room_type_preference: str = Column(MultiChoice(c.HOTEL_LOTTERY_ROOM_TYPES_OPTS)) + wants_ada: bool = Column(Boolean, default=False) + ada_requests: str = Column(String) + + room_opt_out: bool = Column(Boolean, default=False) + suite_type_preference: str = Column(MultiChoice(c.HOTEL_LOTTERY_SUITE_ROOM_TYPES_OPTS)) + + terms_accepted: bool = Column(Boolean, default=False) + data_policy_accepted: bool = Column(Boolean, default=False) + suite_terms_accepted: bool = Column(Boolean, default=False) + guarantee_policy_accepted: bool = Column(Boolean, default=False) + can_edit: bool = Column(Boolean, default=False) + final_status_hidden: bool = Column(Boolean, default=True) + booking_url_hidden: bool = Column(Boolean, default=True) # If this is set then the above values are ignored - parent_application_id = Column(Uuid(as_uuid=False), ForeignKey('lottery_application.id'), nullable=True) - parent_application = relationship( + parent_application_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('lottery_application.id'), nullable=True) + parent_application: 'LotteryApplication' = Relationship(sa_relationship=relationship( 'LotteryApplication', lazy='joined', foreign_keys='LotteryApplication.parent_application_id', backref=backref('group_members'), cascade='save-update,merge,refresh-expire,expunge', remote_side='LotteryApplication.id', - single_parent=True) + single_parent=True)) former_parent_id = Column(Uuid(as_uuid=False), nullable=True) - room_group_name = Column(String) - email_model_name = 'app' - - assigned_hotel = Column(Choice(c.HOTEL_LOTTERY_HOTELS_OPTS), nullable=True) - assigned_room_type = Column(Choice(c.HOTEL_LOTTERY_ROOM_TYPES_OPTS), nullable=True) - assigned_suite_type = Column(Choice(c.HOTEL_LOTTERY_SUITE_ROOM_TYPES_OPTS), nullable=True) - assigned_check_in_date = Column(Date, nullable=True) - assigned_check_out_date = Column(Date, nullable=True) - deposit_cutoff_date = Column(Date, nullable=True) - lottery_name = Column(String) - booking_url = Column(String) + room_group_name: str = Column(String) + email_model_name: ClassVar = 'app' + + assigned_hotel: int | None = Column(Choice(c.HOTEL_LOTTERY_HOTELS_OPTS), nullable=True) + assigned_room_type: int | None = Column(Choice(c.HOTEL_LOTTERY_ROOM_TYPES_OPTS), nullable=True) + assigned_suite_type: int | None = Column(Choice(c.HOTEL_LOTTERY_SUITE_ROOM_TYPES_OPTS), nullable=True) + assigned_check_in_date: date | None = Column(Date, nullable=True) + assigned_check_out_date: date | None = Column(Date, nullable=True) + deposit_cutoff_date: date | None = Column(Date, nullable=True) + lottery_name: str = Column(String) + booking_url: str = Column(String) @presave_adjustment def unset_entry_type(self): diff --git a/uber/models/legal.py b/uber/models/legal.py index 2d8ded147..cd46089b7 100644 --- a/uber/models/legal.py +++ b/uber/models/legal.py @@ -1,4 +1,6 @@ +from datetime import datetime from sqlalchemy.types import Uuid, String, DateTime +from sqlmodel import Field, Relationship from uber.decorators import presave_adjustment from uber.models import MagModel @@ -7,15 +9,15 @@ __all__ = ['SignedDocument'] -class SignedDocument(MagModel): - fk_id = Column(Uuid(as_uuid=False), index=True) - model = Column(String) - document_id = Column(String) - last_emailed = Column(DateTime(timezone=True), nullable=True, default=None) - link = Column(String) - ident = Column(String) - signed = Column(DateTime(timezone=True), nullable=True, default=None) - declined = Column(DateTime(timezone=True), nullable=True, default=None) +class SignedDocument(MagModel, table=True): + fk_id: str = Column(Uuid(as_uuid=False), index=True) + model: str = Column(String) + document_id: str = Column(String) + last_emailed: datetime | None = Column(DateTime(timezone=True), nullable=True, default=None) + link: str = Column(String) + ident: str = Column(String) + signed: datetime | None = Column(DateTime(timezone=True), nullable=True, default=None) + declined: datetime | None = Column(DateTime(timezone=True), nullable=True, default=None) @presave_adjustment def null_to_strings(self): diff --git a/uber/models/marketplace.py b/uber/models/marketplace.py index 5b84a2e2b..e32c2de15 100644 --- a/uber/models/marketplace.py +++ b/uber/models/marketplace.py @@ -10,45 +10,47 @@ from sqlalchemy.orm import backref from sqlalchemy.types import Boolean, Integer, Uuid, String, DateTime from sqlalchemy.schema import ForeignKey +from sqlmodel import Field, Relationship +from typing import ClassVar __all__ = ['ArtistMarketplaceApplication'] -class ArtistMarketplaceApplication(MagModel): +class ArtistMarketplaceApplication(MagModel, table=True): """ Attendee: joined """ - MATCHING_DEALER_FIELDS = ['email_address', 'website', 'name'] + MATCHING_DEALER_FIELDS: ClassVar = ['email_address', 'website', 'name'] - attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) - attendee = relationship('Attendee', lazy='joined', backref=backref('marketplace_application', uselist=False), + attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) + attendee: 'Attendee' = Relationship(sa_relationship=relationship('Attendee', lazy='joined', backref=backref('marketplace_application', uselist=False), cascade='save-update,merge,refresh-expire,expunge', - uselist=False) - name = Column(String) - display_name = Column(String) - email_address = Column(String) - website = Column(String) - tax_number = Column(String) - terms_accepted = Column(Boolean, default=False) - seating_requests = Column(String) - accessibility_requests = Column(String) - - status = Column(Choice(c.MARKETPLACE_STATUS_OPTS), default=c.PENDING, admin_only=True) - registered = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) - accepted = Column(DateTime(timezone=True), nullable=True) - receipt_items = relationship('ReceiptItem', + uselist=False)) + name: str = Column(String) + display_name: str = Column(String) + email_address: str = Column(String) + website: str = Column(String) + tax_number: str = Column(String) + terms_accepted: bool = Column(Boolean, default=False) + seating_requests: str = Column(String) + accessibility_requests: str = Column(String) + + status: int = Column(Choice(c.MARKETPLACE_STATUS_OPTS), default=c.PENDING, admin_only=True) + registered: datetime = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) + accepted: datetime | None = Column(DateTime(timezone=True), nullable=True) + receipt_items: list['ReceiptItem'] = Relationship(sa_relationship=relationship('ReceiptItem', primaryjoin='and_(' 'ReceiptItem.fk_model == "ArtistMarketplaceApplication", ' 'remote(ReceiptItem.fk_id) == foreign(ArtistMarketplaceApplication.id))', viewonly=True, - uselist=True) + uselist=True)) - admin_notes = Column(String, admin_only=True) - overridden_price = Column(Integer, nullable=True, admin_only=True) + admin_notes: str = Column(String, admin_only=True) + overridden_price: int | None = Column(Integer, nullable=True, admin_only=True) - email_model_name = 'app' + email_model_name: ClassVar = 'app' @presave_adjustment def _cost_adjustments(self): diff --git a/uber/models/mits.py b/uber/models/mits.py index 35439e700..302038a9a 100644 --- a/uber/models/mits.py +++ b/uber/models/mits.py @@ -9,6 +9,8 @@ from sqlalchemy.schema import ForeignKey from sqlalchemy.types import Boolean, Integer, Uuid, DateTime, String from sqlalchemy.ext.hybrid import hybrid_property +from sqlmodel import Field, Relationship +from typing import ClassVar from uber.config import c from uber.models import MagModel @@ -20,33 +22,33 @@ __all__ = ['MITSTeam', 'MITSApplicant', 'MITSGame', 'MITSPicture', 'MITSDocument', 'MITSTimes'] -class MITSTeam(MagModel): +class MITSTeam(MagModel, table=True): """ MITSGame: selectin """ - name = Column(String) - days_available = Column(Integer, nullable=True) - hours_available = Column(Integer, nullable=True) - concurrent_attendees = Column(Integer, default=0) - panel_interest = Column(Boolean, nullable=True, admin_only=True) - showcase_interest = Column(Boolean, nullable=True, admin_only=True) - want_to_sell = Column(Boolean, default=False) - address = Column(String) - submitted = Column(DateTime(timezone=True), nullable=True) - waiver_signature = Column(String) - waiver_signed = Column(DateTime(timezone=True), nullable=True) - - applied = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) - status = Column(Choice(c.MITS_APP_STATUS), default=c.PENDING, admin_only=True) - - applicants = relationship('MITSApplicant', backref=backref('team', lazy='joined')) - games = relationship('MITSGame', lazy='selectin', backref=backref('team', lazy='joined')) - schedule = relationship('MITSTimes', uselist=False, backref=backref('team', lazy='joined')) - panel_app = relationship('MITSPanelApplication', uselist=False, backref=backref('team', lazy='joined')) - - duplicate_of = Column(Uuid(as_uuid=False), nullable=True) - deleted = Column(Boolean, default=False) + name: str = Column(String) + days_available: int | None = Column(Integer, nullable=True) + hours_available: int | None = Column(Integer, nullable=True) + concurrent_attendees: int | None = Column(Integer, default=0) + panel_interest: bool | None = Column(Boolean, nullable=True, admin_only=True) + showcase_interest: bool | None = Column(Boolean, nullable=True, admin_only=True) + want_to_sell: bool = Column(Boolean, default=False) + address: str = Column(String) + submitted: datetime | None = Column(DateTime(timezone=True), nullable=True) + waiver_signature: str = Column(String) + waiver_signed: datetime | None = Column(DateTime(timezone=True), nullable=True) + + applied: datetime = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) + status: int = Column(Choice(c.MITS_APP_STATUS), default=c.PENDING, admin_only=True) + + applicants: list['MITSApplicant'] = Relationship(sa_relationship=relationship('MITSApplicant', backref=backref('team', lazy='joined'))) + games: list['MITSGame'] = Relationship(sa_relationship=relationship('MITSGame', lazy='selectin', backref=backref('team', lazy='joined'))) + schedule: 'MITSTimes' = Relationship(sa_relationship=relationship('MITSTimes', uselist=False, backref=backref('team', lazy='joined'))) + panel_app: 'MITSPanelApplication' = Relationship(sa_relationship=relationship('MITSPanelApplication', uselist=False, backref=backref('team', lazy='joined'))) + + duplicate_of: str | None = Column(Uuid(as_uuid=False), nullable=True) + deleted: bool = Column(Boolean, default=False) # We've found that a lot of people start filling out an application and # then instead of continuing their application just start over fresh and # fill out a new one. In these cases we mark the application as @@ -54,7 +56,7 @@ class MITSTeam(MagModel): # applicant tries to log into the original application, we can redirect # them to the correct application. - email_model_name = 'team' + email_model_name: ClassVar = 'team' @property def accepted(self): @@ -135,24 +137,24 @@ def completion_percentage(self): return 100 * self.steps_completed // c.MITS_APPLICATION_STEPS -class MITSApplicant(MagModel): +class MITSApplicant(MagModel, table=True): """ MITSTeam: joined """ - team_id = Column(ForeignKey('mits_team.id')) - attendee_id = Column(ForeignKey('attendee.id'), nullable=True) - primary_contact = Column(Boolean, default=False) - first_name = Column(String) - last_name = Column(String) - email = Column(String) - cellphone = Column(String) - contact_method = Column(Choice(c.MITS_CONTACT_OPTS), default=c.TEXTING) + team_id: str | None = Column(ForeignKey('mits_team.id')) + attendee_id: str | None = Column(ForeignKey('attendee.id'), nullable=True) + primary_contact: bool = Column(Boolean, default=False) + first_name: str = Column(String) + last_name: str = Column(String) + email: str = Column(String) + cellphone: str = Column(String) + contact_method: int = Column(Choice(c.MITS_CONTACT_OPTS), default=c.TEXTING) - declined_hotel_space = Column(Boolean, default=False) - requested_room_nights = Column(MultiChoice(c.MITS_ROOM_NIGHT_OPTS), default='') + declined_hotel_space: bool = Column(Boolean, default=False) + requested_room_nights: str = Column(MultiChoice(c.MITS_ROOM_NIGHT_OPTS), default='') - email_model_name = 'applicant' + email_model_name: ClassVar = 'applicant' @property def email_to_address(self): @@ -168,30 +170,30 @@ def has_requested(self, night): return night in self.requested_room_nights_ints -class MITSGame(MagModel): +class MITSGame(MagModel, table=True): """ MITSTeam: joined MITSPicture: selectin MITSDocument: selectin """ - team_id = Column(ForeignKey('mits_team.id')) - name = Column(String) - promo_blurb = Column(String) - description = Column(String) - genre = Column(String) - phase = Column(Choice(c.MITS_PHASE_OPTS), default=c.DEVELOPMENT) - min_age = Column(Choice(c.MITS_AGE_OPTS), default=c.CHILD) - age_explanation = Column(String) - min_players = Column(Integer, default=2) - max_players = Column(Integer, default=4) - copyrighted = Column(Choice(c.MITS_COPYRIGHT_OPTS), nullable=True) - personally_own = Column(Boolean, default=False) - unlicensed = Column(Boolean, default=False) - professional = Column(Boolean, default=False) - tournament = Column(Boolean, default=False) - pictures = relationship('MITSPicture', lazy='selectin', backref=backref('game', lazy='joined')) - documents = relationship('MITSDocument', lazy='selectin', backref=backref('game', lazy='joined')) + team_id: str | None = Column(ForeignKey('mits_team.id')) + name: str = Column(String) + promo_blurb: str = Column(String) + description: str = Column(String) + genre: str = Column(String) + phase: int = Column(Choice(c.MITS_PHASE_OPTS), default=c.DEVELOPMENT) + min_age: int = Column(Choice(c.MITS_AGE_OPTS), default=c.CHILD) + age_explanation: str = Column(String) + min_players: int = Column(Integer, default=2) + max_players: int = Column(Integer, default=4) + copyrighted: int | None = Column(Choice(c.MITS_COPYRIGHT_OPTS), nullable=True) + personally_own: bool = Column(Boolean, default=False) + unlicensed: bool = Column(Boolean, default=False) + professional: bool = Column(Boolean, default=False) + tournament: bool = Column(Boolean, default=False) + pictures: list['MITSPicture'] = Relationship(sa_relationship=relationship('MITSPicture', lazy='selectin', backref=backref('game', lazy='joined'))) + documents: list['MITSDocument'] = Relationship(sa_relationship=relationship('MITSDocument', lazy='selectin', backref=backref('game', lazy='joined'))) @hybrid_property def has_been_accepted(self): @@ -245,13 +247,13 @@ def guidebook_images(self): return [header_name, thumbnail_name], [header, thumbnail] -class MITSPicture(MagModel, GuidebookImageMixin): +class MITSPicture(MagModel, GuidebookImageMixin, table=True): """ MITSGame: joined """ - game_id = Column(Uuid(as_uuid=False), ForeignKey('mits_game.id')) - description = Column(String) + game_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('mits_game.id')) + description: str = Column(String) @property def url(self): @@ -262,14 +264,14 @@ def filepath(self): return os.path.join(c.MITS_PICTURE_DIR, str(self.id)) -class MITSDocument(MagModel): +class MITSDocument(MagModel, table=True): """ MITSGame: joined """ - game_id = Column(Uuid(as_uuid=False), ForeignKey('mits_game.id')) - filename = Column(String) - description = Column(String) + game_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('mits_game.id')) + filename: str = Column(String) + description: str = Column(String) @property def url(self): @@ -280,26 +282,26 @@ def filepath(self): return os.path.join(c.MITS_PICTURE_DIR, str(self.id)) -class MITSTimes(MagModel): +class MITSTimes(MagModel, table=True): """ MITSTeam: joined """ - team_id = Column(ForeignKey('mits_team.id')) - showcase_availability = Column(MultiChoice(c.MITS_SHOWCASE_SCHEDULE_OPTS)) - availability = Column(MultiChoice(c.MITS_SCHEDULE_OPTS)) + team_id: str | None = Column(ForeignKey('mits_team.id')) + showcase_availability: str = Column(MultiChoice(c.MITS_SHOWCASE_SCHEDULE_OPTS)) + availability: str = Column(MultiChoice(c.MITS_SCHEDULE_OPTS)) -class MITSPanelApplication(MagModel): +class MITSPanelApplication(MagModel, table=True): """ MITSTeam: joined """ - team_id = Column(ForeignKey('mits_team.id')) - name = Column(String) - description = Column(String) - length = Column(Choice(c.PANEL_STRICT_LENGTH_OPTS), default=c.SIXTY_MIN) - participation_interest = Column(Boolean, default=False) + team_id: str | None = Column(ForeignKey('mits_team.id')) + name: str = Column(String) + description: str = Column(String) + length: int = Column(Choice(c.PANEL_STRICT_LENGTH_OPTS), default=c.SIXTY_MIN) + participation_interest: bool = Column(Boolean, default=False) def add_applicant_restriction(): diff --git a/uber/models/panels.py b/uber/models/panels.py index 7302b2c85..a832368d2 100644 --- a/uber/models/panels.py +++ b/uber/models/panels.py @@ -6,6 +6,8 @@ from sqlalchemy.schema import ForeignKey, Table, UniqueConstraint, Index from sqlalchemy.types import Boolean, Integer, Uuid, String, DateTime from sqlalchemy.ext.hybrid import hybrid_property +from sqlmodel import Field, Relationship +from typing import ClassVar from uber.config import c from uber.decorators import presave_adjustment @@ -29,16 +31,16 @@ ) -class EventLocation(MagModel): - department_id = Column(Uuid(as_uuid=False), ForeignKey('department.id', ondelete='SET NULL'), nullable=True) - name = Column(String) - room = Column(String) - tracks = Column(MultiChoice(c.EVENT_TRACK_OPTS)) +class EventLocation(MagModel, table=True): + department_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('department.id', ondelete='SET NULL'), nullable=True) + name: str = Column(String) + room: str = Column(String) + tracks: str = Column(MultiChoice(c.EVENT_TRACK_OPTS)) - events = relationship('Event', backref=backref('location', lazy='joined', cascade="save-update,merge"), - cascade="save-update,merge", single_parent=True) - attractions = relationship('AttractionEvent', backref=backref('location', lazy='joined', cascade="save-update,merge"), - cascade="save-update,merge", single_parent=True) + events: list['Event'] = Relationship(sa_relationship=relationship('Event', backref=backref('location', lazy='joined', cascade="save-update,merge"), + cascade="save-update,merge", single_parent=True)) + attractions: list['AttractionEvent'] = Relationship(sa_relationship=relationship('AttractionEvent', backref=backref('location', lazy='joined', cascade="save-update,merge"), + cascade="save-update,merge", single_parent=True)) @property def schedule_name(self): @@ -78,30 +80,30 @@ def update_events(self, session): session.add(event) -class Event(MagModel): +class Event(MagModel, table=True): """ EventLocation: joined """ - event_location_id = Column(Uuid(as_uuid=False), ForeignKey('event_location.id', ondelete='SET NULL'), nullable=True) - department_id = Column(Uuid(as_uuid=False), ForeignKey('department.id', ondelete='SET NULL'), nullable=True) - attraction_event_id = Column(Uuid(as_uuid=False), ForeignKey('attraction_event.id', ondelete='SET NULL'), nullable=True) - start_time = Column(DateTime(timezone=True)) - duration = Column(Integer, default=60) - name = Column(String, nullable=False) - description = Column(String) - public_description = Column(String) - tracks = Column(MultiChoice(c.EVENT_TRACK_OPTS)) - - assigned_panelists = relationship('AssignedPanelist', backref=backref('event', lazy='joined')) - applications = relationship('PanelApplication', backref=backref('event', lazy='joined', cascade="save-update,merge"), - cascade="save-update,merge") - panel_feedback = relationship('EventFeedback', backref='event') - guest = relationship('GuestGroup', backref=backref('event', cascade="save-update,merge"), - cascade='save-update,merge') - attraction = relationship('AttractionEvent', backref=backref( + event_location_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('event_location.id', ondelete='SET NULL'), nullable=True) + department_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('department.id', ondelete='SET NULL'), nullable=True) + attraction_event_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attraction_event.id', ondelete='SET NULL'), nullable=True) + start_time: datetime = Column(DateTime(timezone=True)) + duration: int = Column(Integer, default=60) + name: str = Column(String, nullable=False) + description: str = Column(String) + public_description: str = Column(String) + tracks: str = Column(MultiChoice(c.EVENT_TRACK_OPTS)) + + assigned_panelists: list['AssignedPanelist'] = Relationship(sa_relationship=relationship('AssignedPanelist', backref=backref('event', lazy='joined'))) + applications: list['PanelApplication'] = Relationship(sa_relationship=relationship('PanelApplication', backref=backref('event', lazy='joined', cascade="save-update,merge"), + cascade="save-update,merge")) + panel_feedback: list['EventFeedback'] = Relationship(sa_relationship=relationship('EventFeedback', backref='event')) + guest: 'GuestGroup' = Relationship(sa_relationship=relationship('GuestGroup', backref=backref('event', cascade="save-update,merge"), + cascade='save-update,merge')) + attraction: 'AttractionEvent' = Relationship(sa_relationship=relationship('AttractionEvent', backref=backref( 'schedule_item', lazy='joined', cascade="save-update,merge", uselist=False - ), cascade='save-update,merge') + ), cascade='save-update,merge')) @property def minutes(self): @@ -157,14 +159,14 @@ def guidebook_desc(self): return self.public_description or self.description -class AssignedPanelist(MagModel): +class AssignedPanelist(MagModel, table=True): """ Attendee: joined Event: joined """ - attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='cascade')) - event_id = Column(Uuid(as_uuid=False), ForeignKey('event.id', ondelete='cascade')) + attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='cascade')) + event_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('event.id', ondelete='cascade')) def __repr__(self): if self.attendee: @@ -174,56 +176,56 @@ def __repr__(self): return super(AssignedPanelist, self).__repr__() -class PanelApplication(MagModel): +class PanelApplication(MagModel, table=True): """ Event: joined PanelApplicant: selectin """ - event_id = Column(Uuid(as_uuid=False), ForeignKey('event.id', ondelete='SET NULL'), nullable=True) - poc_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), nullable=True) - submitter_id = Column(Uuid(as_uuid=False), ForeignKey('panel_applicant.id', ondelete='SET NULL'), nullable=True) - name = Column(String) - length = Column(Choice(c.PANEL_LENGTH_OPTS), default=c.SIXTY_MIN) - length_text = Column(String) - length_reason = Column(String) - description = Column(String) - public_description = Column(String) - unavailable = Column(String) - available = Column(String) - affiliations = Column(String) - past_attendance = Column(String) - department = Column(UniqueList) - department_name = Column(String) - rating = Column(Choice(c.PANEL_RATING_OPTS), default=c.UNRATED) - granular_rating = Column(MultiChoice(c.PANEL_CONTENT_OPTS)) - presentation = Column(Choice(c.PRESENTATION_OPTS)) - other_presentation = Column(String) - noise_level = Column(Choice(c.NOISE_LEVEL_OPTS)) - tech_needs = Column(MultiChoice(c.TECH_NEED_OPTS)) - other_tech_needs = Column(String) - need_tables = Column(Boolean, default=False) - tables_desc = Column(String) - has_cost = Column(Boolean, default=False) - is_loud = Column(Boolean, default=False) - tabletop = Column(Boolean, default=False) - cost_desc = Column(String) - livestream = Column(Choice(c.LIVESTREAM_OPTS), default=c.OPT_IN) - record = Column(Choice(c.LIVESTREAM_OPTS), default=c.OPT_IN) - panelist_bringing = Column(String) - extra_info = Column(String) - applied = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) - accepted = Column(DateTime(timezone=True), nullable=True) - confirmed = Column(DateTime(timezone=True), nullable=True) - status = Column(Choice(c.PANEL_APP_STATUS_OPTS), default=c.PENDING, admin_only=True) - comments = Column(String, admin_only=True) - tags = Column(UniqueList, admin_only=True) - - applicants = relationship('PanelApplicant', lazy='selectin', backref=backref('applications', lazy='selectin'), + event_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('event.id', ondelete='SET NULL'), nullable=True) + poc_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), nullable=True) + submitter_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('panel_applicant.id', ondelete='SET NULL'), nullable=True) + name: str = Column(String) + length: int = Column(Choice(c.PANEL_LENGTH_OPTS), default=c.SIXTY_MIN) + length_text: str = Column(String) + length_reason: str = Column(String) + description: str = Column(String) + public_description: str = Column(String) + unavailable: str = Column(String) + available: str = Column(String) + affiliations: str = Column(String) + past_attendance: str = Column(String) + department: str = Column(UniqueList) + department_name: str = Column(String) + rating: int = Column(Choice(c.PANEL_RATING_OPTS), default=c.UNRATED) + granular_rating: str = Column(MultiChoice(c.PANEL_CONTENT_OPTS)) + presentation: int = Column(Choice(c.PRESENTATION_OPTS)) + other_presentation: str = Column(String) + noise_level: int = Column(Choice(c.NOISE_LEVEL_OPTS)) + tech_needs: str = Column(MultiChoice(c.TECH_NEED_OPTS)) + other_tech_needs: str = Column(String) + need_tables: bool = Column(Boolean, default=False) + tables_desc: str = Column(String) + has_cost: bool = Column(Boolean, default=False) + is_loud: bool = Column(Boolean, default=False) + tabletop: bool = Column(Boolean, default=False) + cost_desc: str = Column(String) + livestream: int = Column(Choice(c.LIVESTREAM_OPTS), default=c.OPT_IN) + record: int = Column(Choice(c.LIVESTREAM_OPTS), default=c.OPT_IN) + panelist_bringing: str = Column(String) + extra_info: str = Column(String) + applied: datetime = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) + accepted: datetime | None = Column(DateTime(timezone=True), nullable=True) + confirmed: datetime | None = Column(DateTime(timezone=True), nullable=True) + status: int = Column(Choice(c.PANEL_APP_STATUS_OPTS), default=c.PENDING, admin_only=True) + comments: str = Column(String, admin_only=True) + tags: str = Column(UniqueList, admin_only=True) + + applicants: list['PanelApplicant'] = Relationship(sa_relationship=relationship('PanelApplicant', lazy='selectin', backref=backref('applications', lazy='selectin'), cascade='save-update,merge,refresh-expire,expunge', - secondary='panel_applicant_application') + secondary='panel_applicant_application')) - email_model_name = 'app' + email_model_name: ClassVar = 'app' @presave_adjustment def update_event_info(self): @@ -331,29 +333,29 @@ def has_been_accepted(self): return self.status == c.ACCEPTED -class PanelApplicant(MagModel): +class PanelApplicant(MagModel, table=True): """ Attendee: joined PanelApplicant: selectin """ - attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), nullable=True) - submitter = Column(Boolean, default=False) - first_name = Column(String) - last_name = Column(String) - email = Column(String) - cellphone = Column(String) - communication_pref = Column(MultiChoice(c.COMMUNICATION_PREF_OPTS)) - other_communication_pref = Column(String) - requested_accessibility_services = Column(Boolean, default=False) - pronouns = Column(MultiChoice(c.PRONOUN_OPTS)) - other_pronouns = Column(String) - occupation = Column(String) - website = Column(String) - other_credentials = Column(String) - guidebook_bio = Column(String) - display_name = Column(String) - social_media_info = Column(String) + attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), nullable=True) + submitter: bool = Column(Boolean, default=False) + first_name: str = Column(String) + last_name: str = Column(String) + email: str = Column(String) + cellphone: str = Column(String) + communication_pref: str = Column(MultiChoice(c.COMMUNICATION_PREF_OPTS)) + other_communication_pref: str = Column(String) + requested_accessibility_services: bool = Column(Boolean, default=False) + pronouns: str = Column(MultiChoice(c.PRONOUN_OPTS)) + other_pronouns: str = Column(String) + occupation: str = Column(String) + website: str = Column(String) + other_credentials: str = Column(String) + guidebook_bio: str = Column(String) + display_name: str = Column(String) + social_media_info: str = Column(String) @property def has_credentials(self): @@ -378,10 +380,10 @@ def check_if_still_submitter(self, app_id): self.submitter = False -class EventFeedback(MagModel): - event_id = Column(Uuid(as_uuid=False), ForeignKey('event.id')) - attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='cascade')) - headcount_starting = Column(Integer, default=0) - headcount_during = Column(Integer, default=0) - comments = Column(String) - rating = Column(Choice(c.PANEL_FEEDBACK_OPTS), default=c.UNRATED) +class EventFeedback(MagModel, table=True): + event_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('event.id')) + attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='cascade')) + headcount_starting: int = Column(Integer, default=0) + headcount_during: int = Column(Integer, default=0) + comments: str = Column(String) + rating: int = Column(Choice(c.PANEL_FEEDBACK_OPTS), default=c.UNRATED) diff --git a/uber/models/promo_code.py b/uber/models/promo_code.py index 4822381d2..d1d8baf55 100644 --- a/uber/models/promo_code.py +++ b/uber/models/promo_code.py @@ -12,6 +12,8 @@ from sqlalchemy.orm import backref from sqlalchemy.schema import Index, ForeignKey from sqlalchemy.types import Integer, Uuid, String, DateTime +from sqlmodel import Field, Relationship +from typing import ClassVar from uber.config import c from uber.decorators import presave_adjustment @@ -23,7 +25,7 @@ __all__ = ['PromoCodeWord', 'PromoCodeGroup', 'PromoCode'] -class PromoCodeWord(MagModel): +class PromoCodeWord(MagModel, table=True): """ Words used to generate promo codes. @@ -46,19 +48,19 @@ class PromoCodeWord(MagModel): `part_of_speech`. """ - _ADJECTIVE = 0 - _NOUN = 1 - _VERB = 2 - _ADVERB = 3 - _PART_OF_SPEECH_OPTS = [ + _ADJECTIVE: ClassVar = 0 + _NOUN: ClassVar = 1 + _VERB: ClassVar = 2 + _ADVERB: ClassVar = 3 + _PART_OF_SPEECH_OPTS: ClassVar = [ (_ADJECTIVE, 'adjective'), (_NOUN, 'noun'), (_VERB, 'verb'), (_ADVERB, 'adverb')] - _PARTS_OF_SPEECH = dict(_PART_OF_SPEECH_OPTS) + _PARTS_OF_SPEECH: ClassVar = dict(_PART_OF_SPEECH_OPTS) - word = Column(String) - part_of_speech = Column(Choice(_PART_OF_SPEECH_OPTS), default=_ADJECTIVE) + word: str = Column(String) + part_of_speech: int = Column(Choice(_PART_OF_SPEECH_OPTS), default=_ADJECTIVE) __table_args__ = ( Index( @@ -69,7 +71,7 @@ class PromoCodeWord(MagModel): CheckConstraint(func.trim(word) != '', name='ck_promo_code_word_non_empty_word') ) - _repr_attr_names = ('word',) + _repr_attr_names: ClassVar = ('word',) @hybrid_property def normalized_word(self): @@ -131,22 +133,22 @@ def normalize_word(cls, word): c.PROMO_CODE_WORD_PARTS_OF_SPEECH = PromoCodeWord._PARTS_OF_SPEECH -class PromoCodeGroup(MagModel): +class PromoCodeGroup(MagModel, table=True): """ Attendee: joined PromoCode: selectin """ - name = Column(String) - code = Column(String, admin_only=True) - registered = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) - buyer_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), nullable=True) - buyer = relationship( + name: str = Column(String) + code: str = Column(String, admin_only=True) + registered: datetime = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) + buyer_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), nullable=True) + buyer: 'Attendee' = Relationship(sa_relationship=relationship( 'Attendee', backref='promo_code_groups', lazy='joined', foreign_keys=buyer_id, - cascade='save-update,merge,refresh-expire,expunge') + cascade='save-update,merge,refresh-expire,expunge')) - email_model_name = 'group' + email_model_name: ClassVar = 'group' @presave_adjustment def group_code(self): @@ -228,7 +230,7 @@ def min_badges_addable(self): return 1 if self.hours_remaining_in_grace_period > 0 else c.MIN_GROUP_ADDITION -class PromoCode(MagModel): +class PromoCode(MagModel, table=True): """ Promo codes used by attendees to purchase badges at discounted prices. Attendee: selectin @@ -307,28 +309,28 @@ class PromoCode(MagModel): uses_remaining. """ - _FIXED_DISCOUNT = 0 - _FIXED_PRICE = 1 - _PERCENT_DISCOUNT = 2 - _DISCOUNT_TYPE_OPTS = [ + _FIXED_DISCOUNT: ClassVar = 0 + _FIXED_PRICE: ClassVar = 1 + _PERCENT_DISCOUNT: ClassVar = 2 + _DISCOUNT_TYPE_OPTS: ClassVar = [ (_FIXED_DISCOUNT, 'Fixed Discount'), (_FIXED_PRICE, 'Fixed Price'), (_PERCENT_DISCOUNT, 'Percent Discount')] - code = Column(String) - discount = Column(Integer, nullable=True, default=None) - discount_type = Column(Choice(_DISCOUNT_TYPE_OPTS), default=_FIXED_DISCOUNT) - expiration_date = Column(DateTime(timezone=True), default=c.ESCHATON) - uses_allowed = Column(Integer, nullable=True, default=None) - cost = Column(Integer, nullable=True, default=None) - admin_notes = Column(String) - - group_id = Column(Uuid(as_uuid=False), ForeignKey('promo_code_group.id', ondelete='SET NULL'), nullable=True) - group = relationship( + code: str = Column(String) + discount: int | None = Column(Integer, nullable=True, default=None) + discount_type: int = Column(Choice(_DISCOUNT_TYPE_OPTS), default=_FIXED_DISCOUNT) + expiration_date: datetime = Column(DateTime(timezone=True), default=c.ESCHATON) + uses_allowed: int | None = Column(Integer, nullable=True, default=None) + cost: int | None = Column(Integer, nullable=True, default=None) + admin_notes: str = Column(String) + + group_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('promo_code_group.id', ondelete='SET NULL'), nullable=True) + group: 'PromoCodeGroup' = Relationship(sa_relationship=relationship( PromoCodeGroup, backref=backref('promo_codes', lazy='selectin'), lazy='joined', foreign_keys=group_id, - cascade='save-update,merge,refresh-expire,expunge') + cascade='save-update,merge,refresh-expire,expunge')) __table_args__ = ( Index( diff --git a/uber/models/showcase.py b/uber/models/showcase.py index fc00947b1..b4eb46c5a 100644 --- a/uber/models/showcase.py +++ b/uber/models/showcase.py @@ -12,6 +12,8 @@ from sqlalchemy.schema import ForeignKey, UniqueConstraint from sqlalchemy.types import Boolean, Integer, String, DateTime, Uuid from sqlalchemy.ext.hybrid import hybrid_property +from sqlmodel import Field, Relationship +from typing import ClassVar from uber.config import c from uber.custom_tags import readable_join, datetime_local_filter @@ -35,27 +37,27 @@ def game_reviews(self): return [r for r in self.reviews if r.game_status != c.PENDING] -class IndieJudge(MagModel, ReviewMixin): +class IndieJudge(MagModel, ReviewMixin, table=True): """ IndieGameCode: selectin IndieGameReview: selectin """ - admin_id = Column(Uuid(as_uuid=False), ForeignKey('admin_account.id')) - status = Column(Choice(c.MIVS_JUDGE_STATUS_OPTS), default=c.UNCONFIRMED) - assignable_showcases = Column(MultiChoice(c.SHOWCASE_GAME_TYPE_OPTS)) - all_games_showcases = Column(MultiChoice(c.SHOWCASE_GAME_TYPE_OPTS)) - no_game_submission = Column(Boolean, nullable=True) - genres = Column(MultiChoice(c.MIVS_JUDGE_GENRE_OPTS)) - platforms = Column(MultiChoice(c.MIVS_PLATFORM_OPTS)) - platforms_text = Column(String) - vr_text = Column(String) - staff_notes = Column(String) + admin_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('admin_account.id')) + status: int = Column(Choice(c.MIVS_JUDGE_STATUS_OPTS), default=c.UNCONFIRMED) + assignable_showcases: str = Column(MultiChoice(c.SHOWCASE_GAME_TYPE_OPTS)) + all_games_showcases: str = Column(MultiChoice(c.SHOWCASE_GAME_TYPE_OPTS)) + no_game_submission: bool | None = Column(Boolean, nullable=True) + genres: str = Column(MultiChoice(c.MIVS_JUDGE_GENRE_OPTS)) + platforms: str = Column(MultiChoice(c.MIVS_PLATFORM_OPTS)) + platforms_text: str = Column(String) + vr_text: str = Column(String) + staff_notes: str = Column(String) - codes = relationship('IndieGameCode', lazy='selectin', backref=backref('judge', lazy='joined')) - reviews = relationship('IndieGameReview', lazy='selectin', backref=backref('judge', lazy='joined')) + codes: list['IndieGameCode'] = Relationship(sa_relationship=relationship('IndieGameCode', lazy='selectin', backref=backref('judge', lazy='joined'))) + reviews: list['IndieGameReview'] = Relationship(sa_relationship=relationship('IndieGameReview', lazy='selectin', backref=backref('judge', lazy='joined'))) - email_model_name = 'judge' + email_model_name: ClassVar = 'judge' @presave_adjustment def only_one_showcase(self): @@ -133,42 +135,42 @@ def get_code_for(self, game_id): return codes_for_game[0] if codes_for_game else '' -class IndieStudio(MagModel): +class IndieStudio(MagModel, table=True): """ IndieGame: selectin """ - group_id = Column(Uuid(as_uuid=False), ForeignKey('group.id'), nullable=True) - name = Column(String, unique=True) - website = Column(String) - other_links = Column(UniqueList) + group_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('group.id'), nullable=True) + name: str = Column(String, unique=True) + website: str = Column(String) + other_links: str = Column(UniqueList) - status = Column( + status: int = Column( Choice(c.MIVS_STUDIO_STATUS_OPTS), default=c.NEW, admin_only=True) - staff_notes = Column(String, admin_only=True) - registered = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) - - accepted_core_hours = Column(Boolean, default=False) - discussion_emails = Column(String) - completed_discussion = Column(Boolean, default=False) - read_handbook = Column(Boolean, default=False) - training_password = Column(String) - selling_merch = Column(Choice(c.MIVS_MERCH_OPTS), nullable=True) - needs_hotel_space = Column(Boolean, nullable=True, admin_only=True) # "Admin only" preserves null default - name_for_hotel = Column(String) - email_for_hotel = Column(String) - contact_phone = Column(String) - show_info_updated = Column(Boolean, default=False) - logistics_updated = Column(Boolean, default=False) - - games = relationship( - 'IndieGame', backref=backref('studio', lazy='joined'), lazy='selectin', order_by='IndieGame.title') - developers = relationship( + staff_notes: str = Column(String, admin_only=True) + registered: datetime = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) + + accepted_core_hours: bool = Column(Boolean, default=False) + discussion_emails: str = Column(String) + completed_discussion: bool = Column(Boolean, default=False) + read_handbook: bool = Column(Boolean, default=False) + training_password: str = Column(String) + selling_merch: int | None = Column(Choice(c.MIVS_MERCH_OPTS), nullable=True) + needs_hotel_space: bool | None = Column(Boolean, nullable=True, admin_only=True) # "Admin only" preserves null default + name_for_hotel: str = Column(String) + email_for_hotel: str = Column(String) + contact_phone: str = Column(String) + show_info_updated: bool = Column(Boolean, default=False) + logistics_updated: bool = Column(Boolean, default=False) + + games: list['IndieGame'] = Relationship(sa_relationship=relationship( + 'IndieGame', backref=backref('studio', lazy='joined'), lazy='selectin', order_by='IndieGame.title')) + developers: list['IndieDeveloper'] = Relationship(sa_relationship=relationship( 'IndieDeveloper', backref=backref('studio', lazy='joined'), - order_by='IndieDeveloper.last_name') + order_by='IndieDeveloper.last_name')) - email_model_name = 'studio' + email_model_name: ClassVar = 'studio' @property def primary_contact_first_names(self): @@ -321,21 +323,21 @@ def unclaimed_badges(self): return max(0, self.comped_badges - claimed_count) -class IndieDeveloper(MagModel): +class IndieDeveloper(MagModel, table=True): """ IndieStudio: joined """ - studio_id = Column(Uuid(as_uuid=False), ForeignKey('indie_studio.id')) - attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), nullable=True) + studio_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('indie_studio.id')) + attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), nullable=True) - gets_emails = Column(Boolean, default=False) - first_name = Column(String) - last_name = Column(String) - email = Column(String) - cellphone = Column(String) - agreed_coc = Column(Boolean, default=False) - agreed_data_policy = Column(Boolean, default=False) + gets_emails: bool = Column(Boolean, default=False) + first_name: str = Column(String) + last_name: staticmethod = Column(String) + email: str = Column(String) + cellphone: str = Column(String) + agreed_coc: bool = Column(Boolean, default=False) + agreed_data_policy: bool = Column(Boolean, default=False) @property def email_to_address(self): @@ -358,7 +360,7 @@ def matching_attendee(self): ).first() -class IndieGame(MagModel, ReviewMixin): +class IndieGame(MagModel, ReviewMixin, table=True): """ IndieStudio: joined IndieDeveloper: joined @@ -366,84 +368,84 @@ class IndieGame(MagModel, ReviewMixin): IndieGameImage: selectin """ - studio_id = Column(Uuid(as_uuid=False), ForeignKey('indie_studio.id')) - primary_contact_id = Column(Uuid(as_uuid=False), ForeignKey('indie_developer.id', ondelete='SET NULL'), nullable=True) - primary_contact = relationship(IndieDeveloper, backref='arcade_games', lazy='joined', - foreign_keys=primary_contact_id, cascade='save-update,merge,refresh-expire,expunge') - - title = Column(String) - brief_description = Column(String) - description = Column(String) - genres = Column(MultiChoice(c.MIVS_GENRE_OPTS)) - genres_text = Column(String) - platforms = Column(MultiChoice(c.MIVS_PLATFORM_OPTS + c.INDIE_RETRO_PLATFORM_OPTS)) - platforms_text = Column(String) - player_count = Column(String) - how_to_play = Column(String) - link_to_video = Column(String) - link_to_game = Column(String) - - requires_gamepad = Column(Boolean, default=False) - is_alumni = Column(Boolean, default=False) - content_warning = Column(Boolean, default=False) - warning_desc = Column(String) - photosensitive_warning = Column(Boolean, default=False) - has_multiplayer = Column(Boolean, default=False) - password_to_game = Column(String) - code_type = Column(Choice(c.MIVS_CODE_TYPE_OPTS), default=c.NO_CODE) - code_instructions = Column(String) - build_status = Column( + studio_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('indie_studio.id')) + primary_contact_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('indie_developer.id', ondelete='SET NULL'), nullable=True) + primary_contact: 'IndieDeveloper' = Relationship(sa_relationship=relationship(IndieDeveloper, backref='arcade_games', lazy='joined', + foreign_keys=primary_contact_id, cascade='save-update,merge,refresh-expire,expunge')) + + title: str = Column(String) + brief_description: str = Column(String) + description: str = Column(String) + genres: str = Column(MultiChoice(c.MIVS_GENRE_OPTS)) + genres_text: str = Column(String) + platforms: str = Column(MultiChoice(c.MIVS_PLATFORM_OPTS + c.INDIE_RETRO_PLATFORM_OPTS)) + platforms_text: str = Column(String) + player_count: str = Column(String) + how_to_play: str = Column(String) + link_to_video: str = Column(String) + link_to_game: str = Column(String) + + requires_gamepad: bool = Column(Boolean, default=False) + is_alumni: bool = Column(Boolean, default=False) + content_warning: bool = Column(Boolean, default=False) + warning_desc: str = Column(String) + photosensitive_warning: bool = Column(Boolean, default=False) + has_multiplayer: bool = Column(Boolean, default=False) + password_to_game: str = Column(String) + code_type: int = Column(Choice(c.MIVS_CODE_TYPE_OPTS), default=c.NO_CODE) + code_instructions: str = Column(String) + build_status: int = Column( Choice(c.MIVS_BUILD_STATUS_OPTS), default=c.PRE_ALPHA) - build_notes = Column(String) - - game_hours = Column(String) - game_hours_text = Column(String) - game_end_time = Column(Boolean, default=False) - floorspace = Column(Choice(c.INDIE_ARCADE_FLOORSPACE_OPTS), nullable=True) - floorspace_text = Column(String) - cabinet_type = Column(Choice(c.INDIE_ARCADE_CABINET_OPTS), nullable=True) - cabinet_type_text = Column(String) - sanitation_requests = Column(String) - transit_needs = Column(String) - found_how = Column(String) - read_faq = Column(String) - mailing_list = Column(Boolean, default=False) - - publisher_name = Column(String) - release_date = Column(String) - other_assets = Column(String) - in_person = Column(Boolean, default=False) - delivery_method = Column(Choice(c.INDIE_RETRO_DELIVERY_OPTS), nullable=True) - - agreed_liability = Column(Boolean, default=False) - agreed_showtimes = Column(Boolean, default=False) - agreed_equipment = Column(Boolean, default=False) - - link_to_promo_video = Column(String) - link_to_webpage = Column(String) - link_to_store = Column(String) - other_social_media = Column(String) - - tournament_at_event = Column(Boolean, default=False) - tournament_prizes = Column(String) - multiplayer_game_length = Column(Integer, nullable=True) # Length in minutes - leaderboard_challenge = Column(Boolean, default=False) - - showcase_type = Column(Choice(c.SHOWCASE_GAME_TYPE_OPTS), default=c.MIVS) - submitted = Column(Boolean, default=False) - status = Column( + build_notes: str = Column(String) + + game_hours: str = Column(String) + game_hours_text: str = Column(String) + game_end_time: bool = Column(Boolean, default=False) + floorspace: int | None = Column(Choice(c.INDIE_ARCADE_FLOORSPACE_OPTS), nullable=True) + floorspace_text: str = Column(String) + cabinet_type: int | None = Column(Choice(c.INDIE_ARCADE_CABINET_OPTS), nullable=True) + cabinet_type_text: str = Column(String) + sanitation_requests: str = Column(String) + transit_needs: str = Column(String) + found_how: str = Column(String) + read_faq: str = Column(String) + mailing_list: bool = Column(Boolean, default=False) + + publisher_name: str = Column(String) + release_date: str = Column(String) + other_assets: str = Column(String) + in_person: bool = Column(Boolean, default=False) + delivery_method: int | None = Column(Choice(c.INDIE_RETRO_DELIVERY_OPTS), nullable=True) + + agreed_liability: bool = Column(Boolean, default=False) + agreed_showtimes: bool = Column(Boolean, default=False) + agreed_equipment: bool = Column(Boolean, default=False) + + link_to_promo_video: str = Column(String) + link_to_webpage: str = Column(String) + link_to_store: str = Column(String) + other_social_media: str = Column(String) + + tournament_at_event: bool = Column(Boolean, default=False) + tournament_prizes: str = Column(String) + multiplayer_game_length: int = Column(Integer, nullable=True) # Length in minutes + leaderboard_challenge: bool = Column(Boolean, default=False) + + showcase_type: int = Column(Choice(c.SHOWCASE_GAME_TYPE_OPTS), default=c.MIVS) + submitted: bool = Column(Boolean, default=False) + status: int = Column( Choice(c.MIVS_GAME_STATUS_OPTS), default=c.NEW, admin_only=True) - judge_notes = Column(String, admin_only=True) - registered = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) - waitlisted = Column(DateTime(timezone=True), nullable=True) - accepted = Column(DateTime(timezone=True), nullable=True) + judge_notes: str = Column(String, admin_only=True) + registered: datetime = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) + waitlisted: datetime | None = Column(DateTime(timezone=True), nullable=True) + accepted: datetime | None = Column(DateTime(timezone=True), nullable=True) - codes = relationship('IndieGameCode', lazy='selectin', backref=backref('game', lazy='joined')) - reviews = relationship('IndieGameReview', backref=backref('game', lazy='joined')) - images = relationship( - 'IndieGameImage', lazy='selectin', backref=backref('game', lazy='joined'), order_by='IndieGameImage.id') + codes: list['IndieGameCode'] = Relationship(sa_relationship=relationship('IndieGameCode', lazy='selectin', backref=backref('game', lazy='joined'))) + reviews: list['IndieGameReview'] = Relationship(sa_relationship=relationship('IndieGameReview', backref=backref('game', lazy='joined'))) + images: list['IndieGameImage'] = Relationship(sa_relationship=relationship( + 'IndieGameImage', lazy='selectin', backref=backref('game', lazy='joined'), order_by='IndieGameImage.id')) - email_model_name = 'game' + email_model_name: ClassVar = 'game' @presave_adjustment def accepted_time(self): @@ -676,15 +678,15 @@ def guidebook_images(self): return [header_name, thumbnail_name], [header, thumbnail] -class IndieGameImage(MagModel, GuidebookImageMixin): +class IndieGameImage(MagModel, GuidebookImageMixin, table=True): """ IndieGame: joined """ - game_id = Column(Uuid(as_uuid=False), ForeignKey('indie_game.id')) - description = Column(String) - use_in_promo = Column(Boolean, default=False) - is_screenshot = Column(Boolean, default=True) + game_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('indie_game.id')) + description: str = Column(String) + use_in_promo: bool = Column(Boolean, default=False) + is_screenshot: bool = Column(Boolean, default=True) @property def image(self): @@ -720,24 +722,24 @@ def filepath(self): return os.path.join(c.MIVS_GAME_IMAGE_DIR, str(self.id)) -class IndieGameCode(MagModel): +class IndieGameCode(MagModel, table=True): """ IndieGame: joined IndieJudge: joined """ - game_id = Column(Uuid(as_uuid=False), ForeignKey('indie_game.id')) - judge_id = Column(Uuid(as_uuid=False), ForeignKey('indie_judge.id'), nullable=True) - code = Column(String) - unlimited_use = Column(Boolean, default=False) - judge_notes = Column(String, admin_only=True) # TODO: Remove? + game_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('indie_game.id')) + judge_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('indie_judge.id'), nullable=True) + code: str = Column(String) + unlimited_use: bool = Column(Boolean, default=False) + judge_notes: str = Column(String, admin_only=True) # TODO: Remove? @property def type_label(self): return 'Unlimited-Use' if self.unlimited_use else 'Single-Person' -class IndieGameReview(MagModel): +class IndieGameReview(MagModel, table=True): """ IndieGame: joined IndieJudge: joined diff --git a/uber/models/tabletop.py b/uber/models/tabletop.py index bafa7601a..6612f26a6 100644 --- a/uber/models/tabletop.py +++ b/uber/models/tabletop.py @@ -4,6 +4,8 @@ from sqlalchemy.orm import backref from sqlalchemy.schema import ForeignKey from sqlalchemy.types import Boolean, DateTime, String, Uuid +from sqlmodel import Field, Relationship +from typing import ClassVar from uber.models import MagModel from uber.models.types import default_relationship as relationship, DefaultColumn as Column @@ -12,14 +14,14 @@ __all__ = ['TabletopGame', 'TabletopCheckout'] -class TabletopGame(MagModel): - code = Column(String) - name = Column(String) - attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) - returned = Column(Boolean, default=False) - checkouts = relationship('TabletopCheckout', order_by='TabletopCheckout.checked_out', backref=backref('game', lazy='joined')) +class TabletopGame(MagModel, table=True): + code: str = Column(String) + name: str = Column(String) + attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) + returned: bool = Column(Boolean, default=False) + checkouts: list['TabletopCheckout'] = Relationship(sa_relationship=relationship('TabletopCheckout', order_by='TabletopCheckout.checked_out', backref=backref('game', lazy='joined'))) - _repr_attr_names = ['name'] + _repr_attr_names: ClassVar = ['name'] @property def checked_out(self): @@ -29,13 +31,13 @@ def checked_out(self): pass -class TabletopCheckout(MagModel): +class TabletopCheckout(MagModel, table=True): """ Attendee: joined TabletopGame: joined """ - game_id = Column(Uuid(as_uuid=False), ForeignKey('tabletop_game.id')) - attendee_id = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) - checked_out = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) - returned = Column(DateTime(timezone=True), nullable=True) + game_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('tabletop_game.id')) + attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) + checked_out: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) + returned: datetime | None = Column(DateTime(timezone=True), nullable=True) diff --git a/uber/models/tracking.py b/uber/models/tracking.py index e6a9f1cf0..523ce2f96 100644 --- a/uber/models/tracking.py +++ b/uber/models/tracking.py @@ -15,6 +15,8 @@ from sqlalchemy.dialects.postgresql.json import JSONB from sqlalchemy.ext.mutable import MutableDict from sqlalchemy.orm.exc import NoResultFound +from sqlmodel import Field, Relationship +from typing import Any, ClassVar from uber.serializer import serializer from uber.config import c @@ -31,12 +33,12 @@ serializer.register(associationproxy._AssociationList, list) -class ReportTracking(MagModel): - when = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) - who = Column(String) - supervisor = Column(String) - page = Column(String) - params = Column(MutableDict.as_mutable(JSONB), default={}) +class ReportTracking(MagModel, table=True): + when: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) + who: str = Column(String) + supervisor: str = Column(String) + page: str = Column(String) + params: dict[str, Any] = Field(sa_type=MutableDict.as_mutable(JSONB), default_factory=dict) @property def who_repr(self): @@ -56,12 +58,12 @@ def track_report(cls, params): session.commit() -class PageViewTracking(MagModel): - when = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) - who = Column(String) - supervisor = Column(String) - page = Column(String) - which = Column(String) +class PageViewTracking(MagModel, table=True): + when: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) + who: str = Column(String) + supervisor: str = Column(String) + page: str = Column(String) + which: str = Column(String) @property def who_repr(self): @@ -108,18 +110,18 @@ def track_pageview(cls): session.commit() -class Tracking(MagModel): - fk_id = Column(Uuid(as_uuid=False), index=True) - model = Column(String) - when = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC), index=True) - who = Column(String, index=True) - supervisor = Column(String) - page = Column(String) - which = Column(String) - links = Column(String) - action = Column(Choice(c.TRACKING_OPTS)) - data = Column(String) - snapshot = Column(String) +class Tracking(MagModel, table=True): + fk_id: str = Column(Uuid(as_uuid=False), index=True) + model: str = Column(String) + when: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC), index=True) + who: str = Column(String, index=True) + supervisor: str = Column(String) + page: str = Column(String) + which: str = Column(String) + links: str = Column(String) + action: int = Column(Choice(c.TRACKING_OPTS)) + data: str = Column(String) + snapshot: str = Column(String) @property def who_repr(self): @@ -283,18 +285,18 @@ def _insert(session): _insert(session) -class TxnRequestTracking(MagModel): - incr_id_seq = Sequence('txn_request_tracking_incr_id_seq') - incr_id = Column(Integer, incr_id_seq, server_default=incr_id_seq.next_value(), unique=True) - fk_id = Column(Uuid(as_uuid=False), nullable=True) - workstation_num = Column(Integer, default=0) - terminal_id = Column(String) - who = Column(String) - requested = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) - resolved = Column(DateTime(timezone=True), nullable=True) - success = Column(Boolean, default=False) - response = Column(MutableDict.as_mutable(JSONB), default={}) - internal_error = Column(String) +class TxnRequestTracking(MagModel, table=True): + incr_id_seq: ClassVar = Sequence('txn_request_tracking_incr_id_seq') + incr_id: int = Column(Integer, incr_id_seq, server_default=incr_id_seq.next_value(), unique=True) + fk_id: str | None = Column(Uuid(as_uuid=False), nullable=True) + workstation_num: int = Column(Integer, default=0) + terminal_id: str = Column(String) + who: str = Column(String) + requested: datetime = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) + resolved: datetime | None = Column(DateTime(timezone=True), nullable=True) + success: bool = Column(Boolean, default=False) + response: dict[Any, Any] = Field(sa_type=MutableDict.as_mutable(JSONB), default_factory=dict) + internal_error: str = Column(String) @presave_adjustment def log_internal_error(self): diff --git a/uber/models/types.py b/uber/models/types.py index fe53fce54..2425d6071 100644 --- a/uber/models/types.py +++ b/uber/models/types.py @@ -294,11 +294,11 @@ def convert_if_labels(self, value): class GuidebookImageMixin(): - filename = Column(String) - content_type = Column(String) - extension = Column(String) - is_header = Column(Boolean, default=False) - is_thumbnail = Column(Boolean, default=False) + filename: str = Column(String) + content_type: str = Column(String) + extension: str = Column(String) + is_header: bool = Column(Boolean, default=False) + is_thumbnail: bool = Column(Boolean, default=False) @property def url(self): diff --git a/uber/tasks/email.py b/uber/tasks/email.py index a8b8ae2e0..a2fc272db 100644 --- a/uber/tasks/email.py +++ b/uber/tasks/email.py @@ -86,7 +86,7 @@ def send_email( if original_to: body = body.decode('utf-8') if isinstance(body, bytes) else body - if isinstance(model, MagModel): + if isinstance(model, MagModel, table=True): fk_kwargs = {'fk_id': model.id, 'model': model.__class__.__name__} elif isinstance(model, Mapping): fk_kwargs = {'fk_id': model.get('id', None), 'model': model.get('_model', model.get('__type__', 'n/a'))} @@ -94,7 +94,7 @@ def send_email( fk_kwargs = {'model': 'n/a'} if automated_email: - if isinstance(automated_email, MagModel): + if isinstance(automated_email, MagModel, table=True): fk_kwargs['automated_email_id'] = automated_email.id elif isinstance(model, Mapping): fk_kwargs['automated_email_id'] = automated_email.get('id', None) From c3a3ded65b600fa3e6d891768451f1d9e6908559 Mon Sep 17 00:00:00 2001 From: Victoria Earl Date: Fri, 13 Feb 2026 20:58:07 +0100 Subject: [PATCH 08/20] SQLModel now working for server startup --- uber/models/__init__.py | 14 +-- uber/models/admin.py | 6 +- uber/models/api.py | 4 +- uber/models/art_show.py | 51 ++++----- uber/models/attendee.py | 193 +++++++++++++++++----------------- uber/models/attraction.py | 34 +++--- uber/models/badge_printing.py | 4 +- uber/models/commerce.py | 38 +++---- uber/models/department.py | 50 ++++----- uber/models/email.py | 4 +- uber/models/group.py | 12 +-- uber/models/guests.py | 40 +++---- uber/models/hotel.py | 14 +-- uber/models/marketplace.py | 2 +- uber/models/mits.py | 14 +-- uber/models/panels.py | 24 ++--- uber/models/promo_code.py | 40 +++---- uber/models/showcase.py | 54 +++++----- uber/models/tabletop.py | 6 +- uber/models/tracking.py | 10 +- 20 files changed, 303 insertions(+), 311 deletions(-) diff --git a/uber/models/__init__.py b/uber/models/__init__.py index 82c2e64d7..10650aedd 100644 --- a/uber/models/__init__.py +++ b/uber/models/__init__.py @@ -131,7 +131,7 @@ def uncamel(s, sep='_'): DeclarativeBase.metadata = MetaData() class MagModel(SQLModel): - model_config = ConfigDict(ignored_types=(hybrid_method, hybrid_property)) + model_config: ClassVar = ConfigDict(ignored_types=(hybrid_method, hybrid_property)) @declared_attr.directive def __tablename__(cls) -> str: @@ -159,9 +159,9 @@ def to_dict(self, fields=None): data[field] = val return data - id: str | None = Field(sa_type=Uuid(as_uuid=False), default_factory=str(uuid4()), primary_key=True) - created: datetime = Field(sa_type=DateTime(timezone=True), sa_column_kwargs={'server_default': utcnow()}, default_factory=datetime.now(UTC)) - last_updated: datetime = Field(sa_type=DateTime(timezone=True), sa_column_kwargs={'server_default': utcnow()}, default_factory=datetime.now(UTC)) + id: str | None = Field(sa_type=Uuid(as_uuid=False), default_factory=lambda: str(uuid4()), primary_key=True) + created: datetime = Field(sa_type=DateTime(timezone=True), sa_column_kwargs={'server_default': utcnow()}, default_factory=lambda: datetime.now(UTC)) + last_updated: datetime = Field(sa_type=DateTime(timezone=True), sa_column_kwargs={'server_default': utcnow()}, default_factory=lambda: datetime.now(UTC)) """ The two columns below allow tracking any object in external sources, @@ -772,7 +772,7 @@ def minutestr(dt): class UberSession(sqlalchemy.orm.Session): engine = engine - BaseClass = DeclarativeBase + BaseClass = SQLModel def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) @@ -2325,7 +2325,7 @@ def model_mixin(cls, model): _ScopedSession.all_models = UberSession.all_models _ScopedSession.resolve_model = UberSession.resolve_model _ScopedSession.engine = engine -_ScopedSession.BaseClass = DeclarativeBase +_ScopedSession.BaseClass = SQLModel _ScopedSession.SessionMixin = UberSession.SessionMixin _ScopedSession.session_factory = SessionFactory @@ -2354,7 +2354,7 @@ def initialize_db(): log.info(f"Initializing model {str(model)}") if not hasattr(Session.SessionMixin, model.__tablename__): setattr(Session.SessionMixin, model.__tablename__, _make_getter(model)) - DeclarativeBase.metadata.create_all(engine) + SQLModel.metadata.create_all(engine) cherrypy.engine.subscribe('start', initialize_db, priority=97) def _attendee_validity_check(): diff --git a/uber/models/admin.py b/uber/models/admin.py index 9ce3ef3a2..b5b4ab1d2 100644 --- a/uber/models/admin.py +++ b/uber/models/admin.py @@ -40,7 +40,7 @@ class AdminAccount(MagModel, table=True): PasswordReset: select """ - attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), unique=True) + attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), unique=True)) access_groups: list['AccessGroup'] = Relationship(sa_relationship=relationship( 'AccessGroup', backref='admin_accounts', lazy='selectin', cascade='save-update,merge,refresh-expire,expunge', secondary='admin_access_group')) @@ -263,8 +263,8 @@ def invalid_api_accesses(self): class PasswordReset(MagModel, table=True): - admin_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('admin_account.id'), unique=True, nullable=True) - attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee_account.id'), unique=True, nullable=True) + admin_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('admin_account.id'), unique=True, nullable=True)) + attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee_account.id'), unique=True, nullable=True)) generated: datetime = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) hashed: str = Column(String, private=True) diff --git a/uber/models/api.py b/uber/models/api.py index 663f5e2a1..8c917c350 100644 --- a/uber/models/api.py +++ b/uber/models/api.py @@ -22,7 +22,7 @@ class ApiToken(MagModel, table=True): AdminAccount: joined """ - admin_account_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('admin_account.id')) + admin_account_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('admin_account.id'))) token: str | None = Column(Uuid(as_uuid=False), default=lambda: str(uuid.uuid4()), private=True) access: int = Column(MultiChoice(c.API_ACCESS_OPTS)) name: str = Column(String) @@ -48,7 +48,7 @@ def api_delete(self): class ApiJob(MagModel, table=True): - admin_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('admin_account.id'), nullable=True) + admin_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('admin_account.id'), nullable=True)) admin_name: str = Column(String) # Preserve admin's name in case their account is removed queued: datetime | None = Column(DateTime(timezone=True), nullable=True, default=None) completed: datetime | None = Column(DateTime(timezone=True), nullable=True, default=None) diff --git a/uber/models/art_show.py b/uber/models/art_show.py index 4583ac9cc..49ead1c7e 100644 --- a/uber/models/art_show.py +++ b/uber/models/art_show.py @@ -19,6 +19,7 @@ from sqlalchemy.types import Integer, Boolean, String, Uuid, DateTime from sqlalchemy.schema import ForeignKey, UniqueConstraint, Index from sqlmodel import Field, Relationship +from typing import ClassVar log = logging.getLogger(__name__) @@ -31,16 +32,16 @@ class ArtShowAgentCode(MagModel, table=True): """ ArtShowApplication: joined """ - app_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('art_show_application.id')) + app_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('art_show_application.id'))) app: 'ArtShowApplication' = Relationship(sa_relationship=relationship('ArtShowApplication', lazy='joined', backref=backref('agent_codes', cascade='merge,refresh-expire,expunge'), - foreign_keys=app_id, + foreign_keys='ArtShowAgentCode.app_id', cascade='merge,refresh-expire,expunge')) - attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), - nullable=True) + attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), + nullable=True)) attendee: 'Attendee' = Relationship(sa_relationship=relationship('Attendee', backref=backref('agent_codes', cascade='merge,refresh-expire,expunge'), - foreign_keys=attendee_id, + foreign_keys='ArtShowAgentCode.attendee_id', cascade='merge,refresh-expire,expunge')) code: str = Column(String) cancelled: datetime | None = Column(DateTime(timezone=True), nullable=True) @@ -64,9 +65,9 @@ class ArtShowApplication(MagModel, table=True): ModelReceipt: select """ - attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), - nullable=True) - attendee: 'Attendee' = Relationship(sa_relationship=relationship('Attendee', lazy='joined', foreign_keys=attendee_id, cascade='save-update, merge', + attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), + nullable=True)) + attendee: 'Attendee' = Relationship(sa_relationship=relationship('Attendee', lazy='joined', foreign_keys='ArtShowApplication.attendee_id', cascade='save-update, merge', backref=backref('art_show_applications', cascade='save-update, merge'))) checked_in: datetime | None = Column(DateTime(timezone=True), nullable=True) checked_out: datetime | None = Column(DateTime(timezone=True), nullable=True) @@ -113,7 +114,7 @@ class ArtShowApplication(MagModel, table=True): assignments: list['ArtPanelAssignment'] = Relationship(sa_relationship=relationship('ArtPanelAssignment', backref=backref('app', lazy='joined'))) - email_model_name = 'app' + email_model_name: ClassVar = 'app' @presave_adjustment def _cost_adjustments(self): @@ -451,18 +452,18 @@ class ArtShowPiece(MagModel, table=True): Attendee (buyer): joined """ - app_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('art_show_application.id', ondelete='SET NULL'), nullable=True) - app: 'ArtShowApplication' = Relationship(sa_relationship=relationship('ArtShowApplication', foreign_keys=app_id, + app_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('art_show_application.id', ondelete='SET NULL'), nullable=True)) + app: 'ArtShowApplication' = Relationship(sa_relationship=relationship('ArtShowApplication', foreign_keys='ArtShowPiece.app_id', cascade='save-update, merge', lazy='joined', backref=backref('art_show_pieces', cascade='save-update, merge'))) - receipt_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('art_show_receipt.id', ondelete='SET NULL'), nullable=True) - receipt: 'ArtShowReceipt' = Relationship(sa_relationship=relationship('ArtShowReceipt', foreign_keys=receipt_id, + receipt_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('art_show_receipt.id', ondelete='SET NULL'), nullable=True)) + receipt: 'ArtShowReceipt' = Relationship(sa_relationship=relationship('ArtShowReceipt', foreign_keys='ArtShowPiece.receipt_id', cascade='save-update, merge', overlaps="art_show_purchases,buyer", backref=backref('pieces', lazy='selectin', cascade='save-update, merge', overlaps="art_show_purchases,buyer"))) - winning_bidder_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('art_show_bidder.id', ondelete='SET NULL'), nullable=True) - winning_bidder: 'ArtShowBidder' = Relationship(sa_relationship=relationship('ArtShowBidder', foreign_keys=winning_bidder_id, + winning_bidder_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('art_show_bidder.id', ondelete='SET NULL'), nullable=True)) + winning_bidder: 'ArtShowBidder' = Relationship(sa_relationship=relationship('ArtShowBidder', foreign_keys='ArtShowPiece.winning_bidder_id', cascade='save-update, merge', backref=backref('art_show_pieces', cascade='save-update, merge'))) @@ -611,7 +612,7 @@ class ArtShowPanel(MagModel, table=True): assignments: list['ArtPanelAssignment'] = Relationship(sa_relationship=relationship('ArtPanelAssignment', lazy='selectin', backref=backref('panel', lazy='joined'))) - __table_args__ = ( + __table_args__: ClassVar = ( UniqueConstraint('gallery', 'surface_type', 'origin_x', 'origin_y', 'terminus_x', 'terminus_y'), ) @@ -645,12 +646,12 @@ class ArtPanelAssignment(MagModel, table=True): ArtShowPanel: joined """ - panel_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('art_show_panel.id')) - app_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('art_show_application.id')) + panel_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('art_show_panel.id'))) + app_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('art_show_application.id'))) manual: bool = Column(Boolean, default=False) assigned_side: int = Column(Choice(c.ART_SHOW_PANEL_SIDE_OPTS), default=c.START) - __table_args__ = ( + __table_args__: ClassVar = ( UniqueConstraint('panel_id', 'assigned_side'), Index('ix_art_panel_assignment_panel_id', 'panel_id'), Index('ix_art_panel_assignment_assigned_side', 'assigned_side'), @@ -681,8 +682,8 @@ class ArtShowPayment(MagModel, table=True): ArtShowReceipt: joined """ - receipt_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('art_show_receipt.id', ondelete='SET NULL'), nullable=True) - receipt: 'ArtShowReceipt' = Relationship(sa_relationship=relationship('ArtShowReceipt', lazy='joined', foreign_keys=receipt_id, + receipt_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('art_show_receipt.id', ondelete='SET NULL'), nullable=True)) + receipt: 'ArtShowReceipt' = Relationship(sa_relationship=relationship('ArtShowReceipt', lazy='joined', foreign_keys='ArtShowPayment.receipt_id', cascade='save-update, merge', backref=backref('art_show_payments', lazy='selectin', cascade='save-update, merge'))) @@ -699,8 +700,8 @@ class ArtShowReceipt(MagModel, table=True): """ invoice_num: int = Column(Integer, default=0) - attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), nullable=True) - attendee: 'Attendee' = Relationship(sa_relationship=relationship('Attendee', foreign_keys=attendee_id, + attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), nullable=True)) + attendee: 'Attendee' = Relationship(sa_relationship=relationship('Attendee', foreign_keys='ArtShowReceipt.attendee_id', cascade='save-update, merge', lazy='joined', overlaps="art_show_purchases,buyer", backref=backref('art_show_receipts', @@ -765,14 +766,14 @@ class ArtShowBidder(MagModel, table=True): Attendee: joined """ - attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), nullable=True) + attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), nullable=True)) bidder_num: str = Column(String) admin_notes: str = Column(String) signed_up: datetime | None = Column(DateTime(timezone=True), nullable=True) email_won_bids: bool = Column(Boolean, default=False) contact_type: int = Column(Choice(c.ART_SHOW_CONTACT_TYPE_OPTS), default=c.EMAIL) - email_model_name = 'bidder' + email_model_name: ClassVar = 'bidder' @presave_adjustment def zfill_bidder_num(self): diff --git a/uber/models/attendee.py b/uber/models/attendee.py index 75a2a5d0d..19caa0a75 100644 --- a/uber/models/attendee.py +++ b/uber/models/attendee.py @@ -153,19 +153,15 @@ class BadgeInfo(MagModel, table=True): Attendee: joined """ - attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), nullable=True, default=None) + attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), nullable=True, default=None)) attendee: 'Attendee' = Relationship(sa_relationship=relationship('Attendee', backref=backref('allocated_badges', cascade='merge,refresh-expire,expunge'), - foreign_keys=attendee_id, lazy='joined', + foreign_keys='BadgeInfo.attendee_id', lazy='joined', cascade='save-update,merge,refresh-expire,expunge', single_parent=True)) active: bool = Column(Boolean, default=False) picked_up: datetime | None = Column(DateTime(timezone=True), nullable=True, default=None) reported_lost: datetime | None = Column(DateTime(timezone=True), nullable=True, default=None) ident: int = Column(Integer, default=0, index=True) - __table_args__ = ( - Index('ix_badge_info_attendee_id', attendee_id.desc()), - ) - def __repr__(self): return f"" @@ -206,6 +202,9 @@ def check_in(self): self.picked_up = self.attendee.checked_in or datetime.now(UTC) +Index('ix_badge_info_attendee_id', BadgeInfo.attendee_id.desc()) + + class Attendee(MagModel, TakesPaymentMixin, table=True): """ Group: select @@ -215,18 +214,18 @@ class Attendee(MagModel, TakesPaymentMixin, table=True): DeptMembership: select """ - watchlist_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('watch_list.id', ondelete='set null'), nullable=True, default=None) - group_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('group.id', ondelete='SET NULL'), nullable=True) + watchlist_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('watch_list.id', ondelete='set null'), nullable=True)) + group_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('group.id', ondelete='SET NULL'), nullable=True)) group: 'Group' = Relationship(sa_relationship=relationship( Group, backref=(backref('attendees', lazy='selectin')), - foreign_keys=group_id, lazy='select', cascade='save-update,merge,refresh-expire,expunge')) + foreign_keys='Attendee.group_id', lazy='select', cascade='save-update,merge,refresh-expire,expunge')) - badge_pickup_group_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('badge_pickup_group.id', ondelete='SET NULL'), nullable=True) + badge_pickup_group_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('badge_pickup_group.id', ondelete='SET NULL'), nullable=True)) badge_pickup_group: 'BadgePickupGroup' = Relationship(sa_relationship=relationship( - 'BadgePickupGroup', backref=backref('attendees', lazy='selectin', order_by='Attendee.full_name'), foreign_keys=badge_pickup_group_id, + 'BadgePickupGroup', backref=backref('attendees', lazy='selectin', order_by='Attendee.full_name'), foreign_keys='Attendee.badge_pickup_group_id', cascade='save-update,merge,refresh-expire,expunge', single_parent=True)) - creator_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='set null'), nullable=True) + creator_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='set null'), nullable=True)) creator: 'Attendee' = Relationship(sa_relationship=relationship( 'Attendee', foreign_keys='Attendee.creator_id', @@ -235,7 +234,7 @@ class Attendee(MagModel, TakesPaymentMixin, table=True): remote_side='Attendee.id', single_parent=True)) - current_attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), nullable=True) + current_attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), nullable=True)) current_attendee: 'Attendee' = Relationship(sa_relationship=relationship( 'Attendee', foreign_keys='Attendee.current_attendee_id', @@ -263,78 +262,76 @@ class Attendee(MagModel, TakesPaymentMixin, table=True): # # The practical result of this is that we must manually set promo_code_id # in order for the relationship to be persisted. - promo_code_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('promo_code.id'), nullable=True, index=True) + promo_code_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('promo_code.id'), nullable=True, index=True)) promo_code: 'PromoCode' = Relationship(sa_relationship=relationship( 'PromoCode', lazy='select', backref=backref('used_by', lazy='selectin', cascade='merge,refresh-expire,expunge'), - foreign_keys=promo_code_id, + foreign_keys='Attendee.promo_code_id', cascade='merge,refresh-expire,expunge')) - transfer_code: str = Column(String) - - placeholder: bool = Column(Boolean, default=False, admin_only=True, index=True) - first_name: str = Column(String) - last_name: str = Column(String) - legal_name: str = Column(String) - email: str = Column(String) - birthdate: date | None = Column(Date, nullable=True, default=None) - age_group: int | None = Column(Choice(c.AGE_GROUPS), default=c.AGE_UNKNOWN, nullable=True) - - international: bool = Column(Boolean, default=False) - zip_code: str = Column(String) - address1: str = Column(String) - address2: str = Column(String) - city: str = Column(String) - region: str = Column(String) - country: str = Column(String) - ec_name: str = Column(String) - ec_phone: str = Column(String) - onsite_contact: str = Column(String) - no_onsite_contact: bool = Column(Boolean, default=False) - cellphone: str = Column(String) - no_cellphone: bool = Column(Boolean, default=False) - - requested_accessibility_services: bool = Column(Boolean, default=False) - - interests: str = Column(MultiChoice(c.INTEREST_OPTS)) - found_how: str = Column(String) # TODO: Remove? - comments: str = Column(String) # TODO: Remove? - for_review: str = Column(String, admin_only=True) - admin_notes: str = Column(String, admin_only=True) - - public_id: str | None = Column(Uuid(as_uuid=False), default=lambda: str(uuid4())) - badge_type: int = Column(Choice(c.BADGE_OPTS), default=c.ATTENDEE_BADGE) - badge_status: int = Column(Choice(c.BADGE_STATUS_OPTS), default=c.NEW_STATUS, index=True, admin_only=True) - ribbon: str = Column(MultiChoice(c.RIBBON_OPTS), admin_only=True) - - affiliate: str = Column(String) # TODO: Remove + transfer_code: str = '' + + placeholder: bool = Field(default=False, index=True) + first_name: str = '' + last_name: str = '' + legal_name: str = '' + email: str = '' + birthdate: date | None = None + age_group: int | None = Field(sa_column=Column(Choice(c.AGE_GROUPS), default=c.AGE_UNKNOWN, nullable=True)) + + international: bool = False + zip_code: str = '' + address1: str = '' + address2: str = '' + city: str = '' + region: str = '' + country: str = '' + ec_name: str = '' + ec_phone: str = '' + onsite_contact: str = '' + no_onsite_contact: bool = False + cellphone: str = '' + no_cellphone: bool = False + + requested_accessibility_services: bool = False + + interests: str = Field(default='', sa_column=Column(MultiChoice(c.INTEREST_OPTS))) + found_how: str = '' + comments: str = '' + for_review: str = '' + admin_notes: str = '' + + public_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), default=lambda: str(uuid4()))) + badge_type: int = Field(default=c.ATTENDEE_BADGE, sa_column=Column(Choice(c.BADGE_OPTS))) + badge_status: int = Field(default=c.NEW_STATUS, sa_column=Column(Choice(c.BADGE_STATUS_OPTS), index=True, admin_only=True)) + ribbon: str = Field(default='', sa_column=Column(MultiChoice(c.RIBBON_OPTS), admin_only=True)) # If [[staff_shirt]] is the same as [[shirt]], we only use the shirt column - shirt: int = Column(Choice(c.SHIRT_OPTS), default=c.NO_SHIRT) - staff_shirt: int = Column(Choice(c.STAFF_SHIRT_OPTS), default=c.NO_SHIRT) - num_event_shirts: int = Column(Choice(c.STAFF_EVENT_SHIRT_OPTS, allow_unspecified=True), default=-1) - shirt_opt_out: int = Column(Choice(c.SHIRT_OPT_OUT_OPTS), default=c.OPT_IN) - can_spam: bool = Column(Boolean, default=False) - regdesk_info: str = Column(String, admin_only=True) - extra_merch: str = Column(String, admin_only=True) - got_merch: bool = Column(Boolean, default=False, admin_only=True) - got_staff_merch: bool = Column(Boolean, default=False, admin_only=True) - got_swadge: bool = Column(Boolean, default=False, admin_only=True) - can_transfer: bool = Column(Boolean, default=False, admin_only=True) - - reg_station: int | None = Column(Integer, nullable=True, admin_only=True) - registered: datetime = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) - confirmed: datetime | None = Column(DateTime(timezone=True), nullable=True, default=None) - checked_in: datetime | None = Column(DateTime(timezone=True), nullable=True) - - paid: int = Column(Choice(c.PAYMENT_OPTS), default=c.NOT_PAID, index=True, admin_only=True) - badge_cost: int | None = Column(Integer, nullable=True, admin_only=True) - overridden_price: int | None = Column(Integer, nullable=True, admin_only=True) - amount_extra: int = Column(Choice(c.DONATION_TIER_OPTS, allow_unspecified=True), default=0) - extra_donation: int = Column(Integer, default=0) - - badge_printed_name: str = Column(String) + shirt: int = Field(default=c.NO_SHIRT, sa_column=Column(Choice(c.SHIRT_OPTS))) + staff_shirt: int = Field(default=c.NO_SHIRT, sa_column=Column(Choice(c.STAFF_SHIRT_OPTS))) + num_event_shirts: int = Field(default=-1, sa_column=Column(Choice(c.STAFF_EVENT_SHIRT_OPTS, allow_unspecified=True))) + shirt_opt_out: int = Field(default=c.OPT_IN, sa_column=Column(Choice(c.SHIRT_OPT_OUT_OPTS))) + can_spam: bool = False + regdesk_info: str = '' + extra_merch: str = '' + got_merch: bool = False + got_staff_merch: bool = False + got_swadge: bool = False + can_transfer: bool = False + + reg_station: int | None + registered: datetime = Field(default_factory=lambda: datetime.now(UTC), sa_column=Column(DateTime(timezone=True), server_default=utcnow())) + confirmed: datetime | None = Field(sa_column=Column(DateTime(timezone=True), nullable=True, default=None)) + checked_in: datetime | None = Field(sa_column=Column(DateTime(timezone=True), nullable=True)) + + paid: int = Field(default=c.NOT_PAID, sa_column=Column(Choice(c.PAYMENT_OPTS), index=True, admin_only=True)) + badge_cost: int | None + overridden_price: int | None + amount_extra: int = Field(default=0, sa_column=Column(Choice(c.DONATION_TIER_OPTS, allow_unspecified=True))) + extra_donation: int = 0 + + badge_printed_name: str = '' active_receipt: 'ModelReceipt' = Relationship(sa_relationship=relationship( 'ModelReceipt', @@ -344,7 +341,7 @@ class Attendee(MagModel, TakesPaymentMixin, table=True): 'ModelReceipt.closed == None)', lazy='select', uselist=False)) - default_cost: int | None = Column(Integer, nullable=True) + default_cost: int | None dept_memberships: list['DeptMembership'] = Relationship(sa_relationship=relationship('DeptMembership', backref=backref('attendee', lazy='joined'), lazy='select')) dept_membership_requests: list['DeptMembershipRequest'] = Relationship(sa_relationship=relationship('DeptMembershipRequest', backref=backref('attendee', lazy='joined'))) @@ -403,16 +400,16 @@ class Attendee(MagModel, TakesPaymentMixin, table=True): 'DeptMembership.is_checklist_admin == True)', viewonly=True)) - staffing: bool = Column(Boolean, default=False) - agreed_to_volunteer_agreement: bool = Column(Boolean, default=False) - reviewed_emergency_procedures: bool = Column(Boolean, default=False) - reviewed_cash_handling: datetime | None = Column(DateTime(timezone=True), nullable=True, default=None) - name_in_credits: str | None = Column(String, nullable=True) - walk_on_volunteer: bool = Column(Boolean, default=False) - nonshift_minutes: int = Column(Integer, default=0, admin_only=True) - past_years: str = Column(String, admin_only=True) - can_work_setup: bool = Column(Boolean, default=False, admin_only=True) - can_work_teardown: bool = Column(Boolean, default=False, admin_only=True) + staffing: bool = False + agreed_to_volunteer_agreement: bool = False + reviewed_emergency_procedures: bool = False + reviewed_cash_handling: datetime | None = Field(sa_column=Column(DateTime(timezone=True), nullable=True, default=None)) + name_in_credits: str | None + walk_on_volunteer: bool = False + nonshift_minutes: int = 0 + past_years: str = '' + can_work_setup: bool = False + can_work_teardown: bool = False # TODO: a record of when an attendee is unable to pickup a shirt # (which type? swag or staff? prob swag) @@ -430,12 +427,12 @@ class Attendee(MagModel, TakesPaymentMixin, table=True): indie_developer: 'IndieDeveloper' = Relationship(sa_relationship=relationship( 'IndieDeveloper', backref=backref('attendee'), uselist=False)) - hotel_eligible: bool = Column(Boolean, default=False, admin_only=True) + hotel_eligible: bool = False hotel_requests: 'HotelRequests' = Relationship(sa_relationship=relationship('HotelRequests', backref=backref('attendee', lazy='joined'), uselist=False)) room_assignments: list['RoomAssignment'] = Relationship(sa_relationship=relationship('RoomAssignment', backref=backref('attendee', lazy='joined'))) # The PIN/password used by third party hotel reservation systems - hotel_pin: str = Column(String, nullable=True, unique=True) + hotel_pin: str | None = Field(nullable=True, unique=True) # ========================= # mits @@ -468,11 +465,11 @@ class Attendee(MagModel, TakesPaymentMixin, table=True): (_NOTIFICATION_TEXT, 'Text'), (_NOTIFICATION_NONE, 'None')] - notification_pref: int = Column(Choice(_NOTIFICATION_PREF_OPTS), default=_NOTIFICATION_EMAIL) - attractions_opt_out: bool = Column(Boolean, default=False) + notification_pref: int = Field(default=_NOTIFICATION_EMAIL, sa_column=Column(Choice(_NOTIFICATION_PREF_OPTS))) + attractions_opt_out: bool = False attraction_signups: list['AttractionSignup'] = Relationship(sa_relationship=relationship('AttractionSignup', backref=backref('attendee', lazy='joined'), order_by='AttractionSignup.signup_time')) - attraction_event_signups = association_proxy('attraction_signups', 'event') + attraction_event_signups: ClassVar = association_proxy('attraction_signups', 'event') attraction_notifications: list['AttractionNotifications'] = Relationship(sa_relationship=relationship( 'AttractionNotification', backref=backref('attendee', lazy='joined'), order_by='AttractionNotification.sent_time')) @@ -504,12 +501,12 @@ class Attendee(MagModel, TakesPaymentMixin, table=True): viewonly=True)) _attendee_table_args: ClassVar = [ - Index('ix_attendee_paid_group_id', paid, group_id), - Index('ix_attendee_badge_status_badge_type', badge_status, badge_type), + Index('ix_attendee_paid_group_id', 'paid', 'group_id'), + Index('ix_attendee_badge_status_badge_type', 'badge_status', 'badge_type'), ] - __table_args__ = tuple(_attendee_table_args) - _repr_attr_names = ['full_name'] + __table_args__: ClassVar = tuple(_attendee_table_args) + _repr_attr_names: ClassVar = ['full_name'] def to_dict(self, *args, **kwargs): # Kludgey fix for SQLAlchemy breaking our stuff @@ -2742,7 +2739,7 @@ class FoodRestrictions(MagModel, table=True): Attendee: joined """ - attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), unique=True) + attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), unique=True)) standard: str = Column(MultiChoice(c.FOOD_RESTRICTION_OPTS)) sandwich_pref: str = Column(MultiChoice(c.SANDWICH_OPTS)) freeform: str = Column(String) diff --git a/uber/models/attraction.py b/uber/models/attraction.py index 09fe706ab..c77ffe150 100644 --- a/uber/models/attraction.py +++ b/uber/models/attraction.py @@ -146,8 +146,8 @@ class Attraction(MagModel, AttractionMixin, table=True): advance_checkin: int = Column(Integer, default=0) restriction: int = Column(Choice(_RESTRICTION_OPTS), default=_NONE) badge_num_required: bool = Column(Boolean, default=False) - department_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('department.id'), nullable=True) - owner_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('admin_account.id'), nullable=True) + department_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('department.id'), nullable=True)) + owner_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('admin_account.id'), nullable=True)) owner: 'AdminAccount' = Relationship(sa_relationship=relationship( 'AdminAccount', @@ -359,13 +359,13 @@ class AttractionFeature(MagModel, AttractionMixin, table=True): description: str = Column(String) is_public: bool = Column(Boolean, default=False) badge_num_required: bool = Column(Boolean, default=False) - attraction_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attraction.id')) + attraction_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attraction.id'))) events: list['AttractionEvent'] = Relationship(sa_relationship=relationship( 'AttractionEvent', backref=backref('feature', lazy='joined'), lazy='selectin', order_by='[AttractionEvent.start_time, AttractionEvent.id]')) - __table_args__ = ( + __table_args__: ClassVar = ( UniqueConstraint('name', 'attraction_id'), UniqueConstraint('slug', 'attraction_id'), ) @@ -487,9 +487,9 @@ class AttractionEvent(MagModel, AttractionMixin, table=True): Event: joined """ - attraction_feature_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attraction_feature.id')) - attraction_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attraction.id'), index=True) - event_location_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('event_location.id', ondelete='SET NULL'), nullable=True) + attraction_feature_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attraction_feature.id'))) + attraction_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attraction.id'), index=True)) + event_location_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('event_location.id', ondelete='SET NULL'), nullable=True)) start_time: datetime = Column(DateTime(timezone=True), default=c.EPOCH) duration: int = Column(Integer, default=60) @@ -497,7 +497,7 @@ class AttractionEvent(MagModel, AttractionMixin, table=True): signups: list['AttractionSignup'] = Relationship(sa_relationship=relationship('AttractionSignup', backref=backref('event', lazy='joined'), order_by='AttractionSignup.checkin_time')) - attendee_signups = association_proxy('signups', 'attendee') + attendee_signups: ClassVar = association_proxy('signups', 'attendee') notifications: list['AttractionNotification'] = Relationship(sa_relationship=relationship('AttractionNotification', backref=backref('event', lazy='joined'), order_by='AttractionNotification.sent_time')) @@ -774,9 +774,9 @@ class AttractionSignup(MagModel, table=True): AttractionEvent: joined """ - attraction_event_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attraction_event.id')) - attraction_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attraction.id')) - attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) + attraction_event_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attraction_event.id'))) + attraction_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attraction.id'))) + attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'))) signup_time: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(pytz.UTC)) checkin_time: datetime = Column(DateTime(timezone=True), default=lambda: utcmin.datetime, index=True) @@ -879,9 +879,9 @@ class AttractionNotification(MagModel, table=True): AttractionSignup: joined """ - attraction_event_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attraction_event.id')) - attraction_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attraction.id')) - attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) + attraction_event_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attraction_event.id'))) + attraction_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attraction.id'))) + attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'))) notification_type: int = Column(Choice(Attendee._NOTIFICATION_PREF_OPTS)) ident: str = Column(String, index=True) @@ -901,9 +901,9 @@ class AttractionNotificationReply(MagModel, table=True): AttractionEvent: joined """ - attraction_event_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attraction_event.id'), nullable=True) - attraction_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attraction.id'), nullable=True) - attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), nullable=True) + attraction_event_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attraction_event.id'), nullable=True)) + attraction_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attraction.id'), nullable=True)) + attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), nullable=True)) notification_type: int = Column(Choice(Attendee._NOTIFICATION_PREF_OPTS)) from_phonenumber: str = Column(String) diff --git a/uber/models/badge_printing.py b/uber/models/badge_printing.py index e9d609ed0..8ab3096f4 100644 --- a/uber/models/badge_printing.py +++ b/uber/models/badge_printing.py @@ -18,8 +18,8 @@ class PrintJob(MagModel, table=True): Attendee: joined """ - attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) - admin_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('admin_account.id'), nullable=True) + attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'))) + admin_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('admin_account.id'), nullable=True)) admin_name: str = Column(String) # Preserve admin's name in case their account is removed printer_id: str = Column(String) diff --git a/uber/models/commerce.py b/uber/models/commerce.py index 03d1eaacb..f6b7747fa 100644 --- a/uber/models/commerce.py +++ b/uber/models/commerce.py @@ -12,7 +12,7 @@ from sqlalchemy.ext.mutable import MutableDict from sqlalchemy.orm import backref from sqlmodel import Field, Relationship -from typing import Any +from typing import Any, ClassVar from uber.config import c from uber.custom_tags import format_currency @@ -36,18 +36,18 @@ class ArbitraryCharge(MagModel, table=True): when: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) reg_station: int | None = Column(Integer, nullable=True) - _repr_attr_names = ['what'] + _repr_attr_names: ClassVar = ['what'] class MerchDiscount(MagModel, table=True): """Staffers can apply a single-use discount to any merch purchases.""" - attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), unique=True) + attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), unique=True)) uses: int = Column(Integer) class MerchPickup(MagModel, table=True): - picked_up_by_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) - picked_up_for_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), unique=True) + picked_up_by_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'))) + picked_up_for_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), unique=True)) picked_up_by: 'Attendee' = Relationship(sa_relationship=relationship( Attendee, primaryjoin='MerchPickup.picked_up_by_id == Attendee.id', @@ -59,7 +59,7 @@ class MerchPickup(MagModel, table=True): class MPointsForCash(MagModel, table=True): - attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) + attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'))) amount: int = Column(Integer) when: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) @@ -69,17 +69,17 @@ class NoShirt(MagModel, table=True): Used to track when someone tried to pick up a shirt they were owed when we were out of stock, so that we can contact them later. """ - attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), unique=True) + attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), unique=True)) class OldMPointExchange(MagModel, table=True): - attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) + attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'))) amount: int = Column(Integer) when: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) class Sale(MagModel, table=True): - attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='set null'), nullable=True) + attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='set null'), nullable=True)) what: str = Column(String) cash: int = Column(Integer, default=0) mpoints: int = Column(Integer, default=0) @@ -336,15 +336,15 @@ class ReceiptTransaction(MagModel, table=True): plus it allows admins to refund Stripe payments per item. """ - receipt_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('model_receipt.id', ondelete='SET NULL'), nullable=True) - receipt: 'ModelReceipt' = Relationship(sa_relationship=relationship('ModelReceipt', foreign_keys=receipt_id, + receipt_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('model_receipt.id', ondelete='SET NULL'), nullable=True)) + receipt: 'ModelReceipt' = Relationship(sa_relationship=relationship('ModelReceipt', foreign_keys='ReceiptTransaction.receipt_id', cascade='save-update, merge', lazy='joined', backref=backref('receipt_txns', lazy='selectin', cascade='save-update, merge'))) - receipt_info_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('receipt_info.id', ondelete='SET NULL'), nullable=True) - receipt_info: 'ReceiptInfo' = Relationship(sa_relationship=relationship('ReceiptInfo', foreign_keys=receipt_info_id, + receipt_info_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('receipt_info.id', ondelete='SET NULL'), nullable=True)) + receipt_info: 'ReceiptInfo' = Relationship(sa_relationship=relationship('ReceiptInfo', foreign_keys='ReceiptTransaction.receipt_info_id', cascade='save-update, merge', backref=backref('receipt_txns', lazy='selectin', cascade='save-update, merge'))) - refunded_txn_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('receipt_transaction.id', ondelete='SET NULL'), nullable=True) + refunded_txn_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('receipt_transaction.id', ondelete='SET NULL'), nullable=True)) refunded_txn: 'ReceiptTransaction' = Relationship(sa_relationship=relationship('ReceiptTransaction', foreign_keys='ReceiptTransaction.refunded_txn_id', backref=backref('refund_txns', order_by='ReceiptTransaction.added'), cascade='save-update,merge,refresh-expire,expunge', @@ -549,12 +549,12 @@ class ReceiptItem(MagModel, table=True): """ purchaser_id: str | None = Column(Uuid(as_uuid=False), index=True, nullable=True) - receipt_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('model_receipt.id', ondelete='SET NULL'), nullable=True) - receipt: 'ModelReceipt' = Relationship(sa_relationship=relationship('ModelReceipt', foreign_keys=receipt_id, + receipt_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('model_receipt.id', ondelete='SET NULL'), nullable=True)) + receipt: 'ModelReceipt' = Relationship(sa_relationship=relationship('ModelReceipt', foreign_keys='ReceiptItem.receipt_id', cascade='save-update, merge', lazy='joined', backref=backref('receipt_items', lazy='selectin', cascade='save-update, merge'))) - txn_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('receipt_transaction.id', ondelete='SET NULL'), nullable=True) - receipt_txn: 'ReceiptTransaction' = Relationship(sa_relationship=relationship('ReceiptTransaction', foreign_keys=txn_id, + txn_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('receipt_transaction.id', ondelete='SET NULL'), nullable=True)) + receipt_txn: 'ReceiptTransaction' = Relationship(sa_relationship=relationship('ReceiptTransaction', foreign_keys='ReceiptItem.txn_id', cascade='save-update, merge', lazy='joined', backref=backref('receipt_items', cascade='save-update, merge'))) fk_id: str | None = Column(Uuid(as_uuid=False), index=True, nullable=True) @@ -570,7 +570,7 @@ class ReceiptItem(MagModel, table=True): who: str = Column(String) des: str = Column(String) admin_notes: str = Column(String) - revert_change: dict[str, Any] = Column(JSON, default={}, server_default='{}') + revert_change: dict[str, Any] = Field(sa_type=JSON, default_factory=dict) @presave_adjustment def process_item_close(self): diff --git a/uber/models/department.py b/uber/models/department.py index d5a26f5fd..91cd8c423 100644 --- a/uber/models/department.py +++ b/uber/models/department.py @@ -69,18 +69,18 @@ class DeptChecklistItem(MagModel, table=True): Department: joined """ - department_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('department.id')) - attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) + department_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('department.id'))) + attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'))) slug: str = Column(String) comments: str = Column(String, default='') - __table_args__ = ( + __table_args__: ClassVar = ( UniqueConstraint('department_id', 'attendee_id', 'slug'), ) class BulkPrintingRequest(MagModel, table=True): - department_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('department.id')) + department_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('department.id'))) link: str = Column(String) copies: str = Column(Integer) print_orientation: int = Column(Choice(c.PRINT_ORIENTATION_OPTS), default=c.PORTRAIT) @@ -107,11 +107,11 @@ class DeptMembership(MagModel, table=True): is_dept_head: bool = Column(Boolean, default=False) is_poc: bool = Column(Boolean, default=False) is_checklist_admin: bool = Column(Boolean, default=False) - attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) - department_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('department.id')) + attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'))) + department_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('department.id'))) - __mapper_args__ = {'confirm_deleted_rows': False} - __table_args__ = ( + __mapper_args__: ClassVar = {'confirm_deleted_rows': False} + __table_args__: ClassVar = ( UniqueConstraint('attendee_id', 'department_id'), Index('ix_dept_membership_attendee_id', 'attendee_id'), Index('ix_dept_membership_department_id', 'department_id'), @@ -153,15 +153,15 @@ class DeptMembershipRequest(MagModel, table=True): Department: joined """ - attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) + attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'))) # A NULL value for the department_id indicates the attendee is willing # to volunteer for any department (they checked "Anything" for # "Where do you want to help?"). - department_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('department.id'), nullable=True) + department_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('department.id'), nullable=True)) - __mapper_args__ = {'confirm_deleted_rows': False} - __table_args__ = ( + __mapper_args__: ClassVar = {'confirm_deleted_rows': False} + __table_args__: ClassVar = ( UniqueConstraint('attendee_id', 'department_id'), Index('ix_dept_membership_request_attendee_id', 'attendee_id'), Index('ix_dept_membership_request_department_id', 'department_id'), @@ -175,7 +175,7 @@ class DeptRole(MagModel, table=True): name: str = Column(String) description: str = Column(String) - department_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('department.id')) + department_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('department.id'))) dept_memberships: list['DeptMembership'] = Relationship(sa_relationship=relationship( 'DeptMembership', @@ -183,7 +183,7 @@ class DeptRole(MagModel, table=True): cascade='save-update,merge,refresh-expire,expunge', secondary='dept_membership_dept_role')) - __table_args__ = ( + __table_args__: ClassVar = ( UniqueConstraint('name', 'department_id'), Index('ix_dept_role_department_id', 'department_id'), ) @@ -226,7 +226,7 @@ class Department(MagModel, table=True): name: str = Column(String, unique=True) description: str = Column(String) solicits_volunteers: bool = Column(Boolean, default=True) - parent_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('department.id'), nullable=True) + parent_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('department.id'), nullable=True)) max_consecutive_minutes: int = Column(Integer, default=0) from_email: str = Column(String) manages_panels: bool = Column(Boolean, default=False) @@ -438,8 +438,8 @@ class Job(MagModel, table=True): (_ONLY_MEMBERS, 'Members of this department'), (_ALL_VOLUNTEERS, 'All volunteers')] - job_template_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('job_template.id'), nullable=True) - department_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('department.id')) + job_template_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('job_template.id'), nullable=True)) + department_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('department.id'))) name: str = Column(String) description: str = Column(String) @@ -456,8 +456,8 @@ class Job(MagModel, table=True): cascade='save-update,merge,refresh-expire,expunge', secondary='job_required_role')) shifts: list['Shift'] = Relationship(sa_relationship=relationship('Shift', backref=backref('job', lazy='joined'), lazy='selectin')) - __table_args__ = ( - Index('ix_job_department_id', department_id), + __table_args__: ClassVar = ( + Index('ix_job_department_id', 'department_id'), ) _repr_attr_names: ClassVar = ['name'] @@ -717,7 +717,7 @@ class JobTemplate(MagModel, table=True): DeptRole: selectin """ - department_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('department.id')) + department_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('department.id'))) template_name: str = Column(String) type: int = Column(Choice(c.JOB_TEMPLATE_TYPE_OPTS), default=c.FILL_GAPS) @@ -954,15 +954,15 @@ class Shift(MagModel, table=True): Job: joined """ - job_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('job.id', ondelete='cascade')) - attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='cascade')) + job_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('job.id', ondelete='cascade'))) + attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='cascade'))) worked: int = Column(Choice(c.WORKED_STATUS_OPTS), default=c.SHIFT_UNMARKED) rating: int = Column(Choice(c.RATING_OPTS), default=c.UNRATED) comment: str = Column(String) - __table_args__ = ( - Index('ix_shift_job_id', job_id), - Index('ix_shift_attendee_id', attendee_id), + __table_args__: ClassVar = ( + Index('ix_shift_job_id', 'job_id'), + Index('ix_shift_attendee_id', 'attendee_id'), ) @property diff --git a/uber/models/email.py b/uber/models/email.py index caff3d4ef..4f3b18de9 100644 --- a/uber/models/email.py +++ b/uber/models/email.py @@ -353,8 +353,8 @@ class Email(MagModel, BaseEmailMixin, table=True): AutomatedEmail: joined """ - automated_email_id: str | None = Column( - Uuid(as_uuid=False), ForeignKey('automated_email.id', ondelete='set null'), nullable=True, default=None, index=True) + automated_email_id: str | None = Field(sa_column=Column( + Uuid(as_uuid=False), ForeignKey('automated_email.id', ondelete='set null'), nullable=True, default=None, index=True)) fk_id: str | None = Column(Uuid(as_uuid=False), nullable=True) ident: str = Column(String) diff --git a/uber/models/group.py b/uber/models/group.py index 60b84ed31..c22467a31 100644 --- a/uber/models/group.py +++ b/uber/models/group.py @@ -31,7 +31,7 @@ class Group(MagModel, TakesPaymentMixin, table=True): """ public_id: str | None = Column(Uuid(as_uuid=False), default=lambda: str(uuid4())) - shared_with_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('group.id', ondelete='SET NULL'), nullable=True) + shared_with_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('group.id', ondelete='SET NULL'), nullable=True)) shared_with: 'Group' = Relationship(sa_relationship=relationship( 'Group', foreign_keys='Group.shared_with_id', @@ -66,18 +66,18 @@ class Group(MagModel, TakesPaymentMixin, table=True): status: int = Column(Choice(c.DEALER_STATUS_OPTS), default=c.UNAPPROVED, admin_only=True) registered: datetime = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) approved: datetime | None = Column(DateTime(timezone=True), nullable=True) - leader_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', use_alter=True, name='fk_leader', ondelete='SET NULL'), - nullable=True) - creator_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), nullable=True) + leader_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id', use_alter=True, name='fk_leader', ondelete='SET NULL'), + nullable=True)) + creator_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), nullable=True)) creator: 'Attendee' = Relationship(sa_relationship=relationship( 'Attendee', - foreign_keys=creator_id, + foreign_keys='Group.creator_id', backref=backref('created_groups', order_by='Group.name'), cascade='save-update,merge,refresh-expire,expunge', remote_side='Attendee.id', single_parent=True)) - leader: 'Attendee' = Relationship(sa_relationship=relationship('Attendee', foreign_keys=leader_id, post_update=True, cascade='all')) + leader: 'Attendee' = Relationship(sa_relationship=relationship('Attendee', foreign_keys='Group.leader_id', post_update=True, cascade='all')) studio: 'IndieStudio' = Relationship(sa_relationship=relationship('IndieStudio', uselist=False, backref='group', cascade='save-update,merge,refresh-expire,expunge')) guest: 'GuestGroup' = Relationship(sa_relationship=relationship('GuestGroup', backref=backref('group', lazy='joined'), uselist=False)) diff --git a/uber/models/guests.py b/uber/models/guests.py index c511bc3e0..342470534 100644 --- a/uber/models/guests.py +++ b/uber/models/guests.py @@ -35,8 +35,8 @@ class GuestGroup(MagModel, table=True): Group: joined """ - group_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('group.id')) - event_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('event.id', ondelete='SET NULL'), nullable=True) + group_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('group.id'))) + event_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('event.id', ondelete='SET NULL'), nullable=True)) group_type: int = Column(Choice(c.GROUP_TYPE_OPTS), default=c.BAND) num_hotel_rooms: int = Column(Integer, default=1, admin_only=True) payment: int = Column(Integer, default=0, admin_only=True) @@ -301,7 +301,7 @@ class GuestInfo(MagModel, table=True): GuestGroup: joined """ - guest_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) + guest_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True)) poc_phone: str = Column(String) performer_count: int = Column(Integer, default=0) bringing_vehicle: bool = Column(Boolean, default=False) @@ -314,7 +314,7 @@ def status(self): class GuestImage(MagModel, GuidebookImageMixin, table=True): - guest_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id')) + guest_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'))) @property def url(self): @@ -335,7 +335,7 @@ class GuestBio(MagModel, table=True): GuestGroup: joined """ - guest_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) + guest_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True)) desc: str = Column(String) member_info: str = Column(String) website: str = Column(String) @@ -359,7 +359,7 @@ class GuestTaxes(MagModel, table=True): GuestGroup: joined """ - guest_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) + guest_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True)) w9_sent: bool = Column(Boolean, default=False) @property @@ -372,7 +372,7 @@ class GuestStagePlot(MagModel, table=True): GuestGroup: joined """ - guest_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) + guest_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True)) filename: str = Column(String) content_type: str = Column(String) notes: str = Column(String) @@ -412,7 +412,7 @@ class GuestPanel(MagModel, table=True): GuestGroup: joined """ - guest_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) + guest_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True)) wants_panel: int | None = Column(Choice(c.GUEST_PANEL_OPTS), nullable=True) name: str = Column(String) length: str = Column(String) @@ -430,7 +430,7 @@ class GuestTrack(MagModel, table=True): GuestGroup: joined """ - guest_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id')) + guest_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'))) filename: str = Column(String) content_type: str = Column(String) extension: str = Column(String) @@ -475,7 +475,7 @@ class GuestMerch(MagModel, table=True): _inventory_file_regex: ClassVar = re.compile(r'^(audio|image)(|\-\d+)$') _inventory_filename_regex: ClassVar = re.compile(r'^(audio|image)(|\-\d+)_filename$') - guest_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) + guest_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True)) selling_merch: int | None = Column(Choice(c.GUEST_MERCH_OPTS), nullable=True) delivery_method: int | None = Column(Choice(c.GUEST_MERCH_DELIVERY_OPTS), nullable=True) payout_method: int | None = Column(Choice(c.GUEST_MERCH_PAYOUT_METHOD_OPTS), nullable=True) @@ -492,7 +492,7 @@ class GuestMerch(MagModel, table=True): checkin_time: int | None = Column(Choice(c.GUEST_MERCH_CHECKIN_TIMES), nullable=True) checkout_time: int | None = Column(Choice(c.GUEST_MERCH_CHECKOUT_TIMES), nullable=True) merch_events: str = Column(String) - inventory: dict[Any, Any] = Column(JSON, default={}, server_default='{}') + inventory: dict[Any, Any] = Field(sa_type=JSON, default_factory=dict) inventory_updated: datetime | None = Column(DateTime(timezone=True), nullable=True) extra_info: str = Column(String) tax_phone: str = Column(String) @@ -509,7 +509,7 @@ class GuestMerch(MagModel, table=True): poc_region: str = Column(String) poc_country: str = Column(String) - handlers: dict[str, Any] = Column(JSON, default=[], server_default='[]') + handlers: dict[str, Any] = Field(sa_type=JSON, default_factory=dict) @property def full_name(self): @@ -774,7 +774,7 @@ class GuestCharity(MagModel, table=True): GuestGroup: joined """ - guest_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) + guest_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True)) donating: int | None = Column(Choice(c.GUEST_CHARITY_OPTS), nullable=True) desc: str = Column(String) @@ -793,7 +793,7 @@ class GuestAutograph(MagModel, table=True): GuestGroup: joined """ - guest_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) + guest_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True)) num: int = Column(Integer, default=0) length: int = Column(Integer, default=60) # session length in minutes rock_island_autographs: bool | None = Column(Boolean, nullable=True) @@ -810,7 +810,7 @@ class GuestInterview(MagModel, table=True): GuestGroup: joined """ - guest_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) + guest_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True)) will_interview: bool = Column(Boolean, default=False) email: str = Column(String) direct_contact: bool = Column(Boolean, default=False) @@ -828,7 +828,7 @@ class GuestTravelPlans(MagModel, table=True): GuestDetailedTravelPlan: selectin """ - guest_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) + guest_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True)) modes: str = Column(MultiChoice(c.GUEST_TRAVEL_OPTS), default=c.OTHER) modes_text: str = Column(String) details: str = Column(String) @@ -844,7 +844,7 @@ class GuestHospitality(MagModel, table=True): GuestGroup: joined """ - guest_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) + guest_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True)) completed: bool = Column(Boolean, default=False) @@ -853,7 +853,7 @@ class GuestMediaRequest(MagModel, table=True): GuestGroup: joined """ - guest_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True) + guest_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True)) completed: bool = Column(Boolean, default=False) @@ -862,8 +862,8 @@ class GuestDetailedTravelPlan(MagModel, table=True): GuestTravelPlans: joined """ - travel_plans_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('guest_travel_plans.id'), nullable=True) - travel_plans: 'GuestTravelPlans' = Relationship(sa_relationship=relationship('GuestTravelPlans', foreign_keys=travel_plans_id, single_parent=True, + travel_plans_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('guest_travel_plans.id'), nullable=True)) + travel_plans: 'GuestTravelPlans' = Relationship(sa_relationship=relationship('GuestTravelPlans', foreign_keys='GuestDetailedTravelPlan.travel_plans_id', single_parent=True, backref=backref('detailed_travel_plans', lazy='selectin'), lazy='joined', cascade='save-update,merge,refresh-expire,expunge')) mode: int = Column(Choice(c.GUEST_TRAVEL_OPTS)) diff --git a/uber/models/hotel.py b/uber/models/hotel.py index b600f9453..8ea6b041a 100644 --- a/uber/models/hotel.py +++ b/uber/models/hotel.py @@ -72,7 +72,7 @@ class HotelRequests(MagModel, NightsMixin, table=True): Attendee: joined """ - attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), unique=True) + attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), unique=True)) nights: str = Column(MultiChoice(c.NIGHT_OPTS)) wanted_roommates: str = Column(String) unwanted_roommates: str = Column(String) @@ -127,8 +127,8 @@ class RoomAssignment(MagModel, table=True): Room: joined """ - room_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('room.id')) - attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) + room_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('room.id'))) + attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'))) class LotteryApplication(MagModel, table=True): @@ -137,7 +137,7 @@ class LotteryApplication(MagModel, table=True): LotteryApplication (parent_application): joined """ - attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), unique=True, nullable=True) + attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), unique=True, nullable=True)) attendee: 'Attendee' = Relationship(sa_relationship=relationship('Attendee', lazy='joined', backref=backref('lottery_application', uselist=False), cascade='save-update,merge,refresh-expire,expunge', uselist=False)) @@ -148,7 +148,7 @@ class LotteryApplication(MagModel, table=True): response_id: int = Column(Integer, response_id_seq, server_default=response_id_seq.next_value(), unique=True) status: int = Column(Choice(c.HOTEL_LOTTERY_STATUS_OPTS), default=c.PARTIAL, admin_only=True) entry_started: datetime | None = Column(DateTime(timezone=True), nullable=True) - entry_metadata: dict[str, Any] = Column(MutableDict.as_mutable(JSONB), server_default='{}', default={}) + entry_metadata: dict[str, Any] = Field(sa_type=MutableDict.as_mutable(JSONB), default_factory=dict) entry_type: int | None = Column(Choice(c.HOTEL_LOTTERY_ENTRY_TYPE_OPTS), nullable=True) current_step: int = Column(Integer, default=0) last_submitted: datetime | None = Column(DateTime(timezone=True), nullable=True) @@ -181,7 +181,7 @@ class LotteryApplication(MagModel, table=True): booking_url_hidden: bool = Column(Boolean, default=True) # If this is set then the above values are ignored - parent_application_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('lottery_application.id'), nullable=True) + parent_application_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('lottery_application.id'), nullable=True)) parent_application: 'LotteryApplication' = Relationship(sa_relationship=relationship( 'LotteryApplication', lazy='joined', @@ -190,7 +190,7 @@ class LotteryApplication(MagModel, table=True): cascade='save-update,merge,refresh-expire,expunge', remote_side='LotteryApplication.id', single_parent=True)) - former_parent_id = Column(Uuid(as_uuid=False), nullable=True) + former_parent_id: str | None = Column(Uuid(as_uuid=False), nullable=True) room_group_name: str = Column(String) email_model_name: ClassVar = 'app' diff --git a/uber/models/marketplace.py b/uber/models/marketplace.py index e32c2de15..a194ced2d 100644 --- a/uber/models/marketplace.py +++ b/uber/models/marketplace.py @@ -24,7 +24,7 @@ class ArtistMarketplaceApplication(MagModel, table=True): MATCHING_DEALER_FIELDS: ClassVar = ['email_address', 'website', 'name'] - attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) + attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'))) attendee: 'Attendee' = Relationship(sa_relationship=relationship('Attendee', lazy='joined', backref=backref('marketplace_application', uselist=False), cascade='save-update,merge,refresh-expire,expunge', uselist=False)) diff --git a/uber/models/mits.py b/uber/models/mits.py index 302038a9a..5c06d2e25 100644 --- a/uber/models/mits.py +++ b/uber/models/mits.py @@ -142,8 +142,8 @@ class MITSApplicant(MagModel, table=True): MITSTeam: joined """ - team_id: str | None = Column(ForeignKey('mits_team.id')) - attendee_id: str | None = Column(ForeignKey('attendee.id'), nullable=True) + team_id: str | None = Field(sa_column=Column(ForeignKey('mits_team.id'))) + attendee_id: str | None = Field(sa_column=Column(ForeignKey('attendee.id'), nullable=True)) primary_contact: bool = Column(Boolean, default=False) first_name: str = Column(String) last_name: str = Column(String) @@ -177,7 +177,7 @@ class MITSGame(MagModel, table=True): MITSDocument: selectin """ - team_id: str | None = Column(ForeignKey('mits_team.id')) + team_id: str | None = Field(sa_column=Column(ForeignKey('mits_team.id'))) name: str = Column(String) promo_blurb: str = Column(String) description: str = Column(String) @@ -252,7 +252,7 @@ class MITSPicture(MagModel, GuidebookImageMixin, table=True): MITSGame: joined """ - game_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('mits_game.id')) + game_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('mits_game.id'))) description: str = Column(String) @property @@ -269,7 +269,7 @@ class MITSDocument(MagModel, table=True): MITSGame: joined """ - game_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('mits_game.id')) + game_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('mits_game.id'))) filename: str = Column(String) description: str = Column(String) @@ -287,7 +287,7 @@ class MITSTimes(MagModel, table=True): MITSTeam: joined """ - team_id: str | None = Column(ForeignKey('mits_team.id')) + team_id: str | None = Field(sa_column=Column(ForeignKey('mits_team.id'))) showcase_availability: str = Column(MultiChoice(c.MITS_SHOWCASE_SCHEDULE_OPTS)) availability: str = Column(MultiChoice(c.MITS_SCHEDULE_OPTS)) @@ -297,7 +297,7 @@ class MITSPanelApplication(MagModel, table=True): MITSTeam: joined """ - team_id: str | None = Column(ForeignKey('mits_team.id')) + team_id: str | None = Field(sa_column=Column(ForeignKey('mits_team.id'))) name: str = Column(String) description: str = Column(String) length: int = Column(Choice(c.PANEL_STRICT_LENGTH_OPTS), default=c.SIXTY_MIN) diff --git a/uber/models/panels.py b/uber/models/panels.py index a832368d2..5abaeffb2 100644 --- a/uber/models/panels.py +++ b/uber/models/panels.py @@ -32,7 +32,7 @@ class EventLocation(MagModel, table=True): - department_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('department.id', ondelete='SET NULL'), nullable=True) + department_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('department.id', ondelete='SET NULL'), nullable=True)) name: str = Column(String) room: str = Column(String) tracks: str = Column(MultiChoice(c.EVENT_TRACK_OPTS)) @@ -85,9 +85,9 @@ class Event(MagModel, table=True): EventLocation: joined """ - event_location_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('event_location.id', ondelete='SET NULL'), nullable=True) - department_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('department.id', ondelete='SET NULL'), nullable=True) - attraction_event_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attraction_event.id', ondelete='SET NULL'), nullable=True) + event_location_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('event_location.id', ondelete='SET NULL'), nullable=True)) + department_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('department.id', ondelete='SET NULL'), nullable=True)) + attraction_event_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attraction_event.id', ondelete='SET NULL'), nullable=True)) start_time: datetime = Column(DateTime(timezone=True)) duration: int = Column(Integer, default=60) name: str = Column(String, nullable=False) @@ -165,8 +165,8 @@ class AssignedPanelist(MagModel, table=True): Event: joined """ - attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='cascade')) - event_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('event.id', ondelete='cascade')) + attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='cascade'))) + event_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('event.id', ondelete='cascade'))) def __repr__(self): if self.attendee: @@ -182,9 +182,9 @@ class PanelApplication(MagModel, table=True): PanelApplicant: selectin """ - event_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('event.id', ondelete='SET NULL'), nullable=True) - poc_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), nullable=True) - submitter_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('panel_applicant.id', ondelete='SET NULL'), nullable=True) + event_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('event.id', ondelete='SET NULL'), nullable=True)) + poc_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), nullable=True)) + submitter_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('panel_applicant.id', ondelete='SET NULL'), nullable=True)) name: str = Column(String) length: int = Column(Choice(c.PANEL_LENGTH_OPTS), default=c.SIXTY_MIN) length_text: str = Column(String) @@ -339,7 +339,7 @@ class PanelApplicant(MagModel, table=True): PanelApplicant: selectin """ - attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), nullable=True) + attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), nullable=True)) submitter: bool = Column(Boolean, default=False) first_name: str = Column(String) last_name: str = Column(String) @@ -381,8 +381,8 @@ def check_if_still_submitter(self, app_id): class EventFeedback(MagModel, table=True): - event_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('event.id')) - attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='cascade')) + event_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('event.id'))) + attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='cascade'))) headcount_starting: int = Column(Integer, default=0) headcount_during: int = Column(Integer, default=0) comments: str = Column(String) diff --git a/uber/models/promo_code.py b/uber/models/promo_code.py index d1d8baf55..0c8a1cb48 100644 --- a/uber/models/promo_code.py +++ b/uber/models/promo_code.py @@ -62,15 +62,6 @@ class PromoCodeWord(MagModel, table=True): word: str = Column(String) part_of_speech: int = Column(Choice(_PART_OF_SPEECH_OPTS), default=_ADJECTIVE) - __table_args__ = ( - Index( - 'uq_promo_code_word_normalized_word_part_of_speech', - func.lower(func.trim(word)), - part_of_speech, - unique=True), - CheckConstraint(func.trim(word) != '', name='ck_promo_code_word_non_empty_word') - ) - _repr_attr_names: ClassVar = ('word',) @hybrid_property @@ -131,6 +122,12 @@ def normalize_word(cls, word): c.PROMO_CODE_WORD_PART_OF_SPEECH_OPTS = PromoCodeWord._PART_OF_SPEECH_OPTS c.PROMO_CODE_WORD_PARTS_OF_SPEECH = PromoCodeWord._PARTS_OF_SPEECH +Index( + 'uq_promo_code_word_normalized_word_part_of_speech', + func.lower(func.trim(PromoCodeWord.word)), + PromoCodeWord.part_of_speech, + unique=True), +CheckConstraint(func.trim(PromoCodeWord.word) != '', name='ck_promo_code_word_non_empty_word') class PromoCodeGroup(MagModel, table=True): @@ -141,11 +138,11 @@ class PromoCodeGroup(MagModel, table=True): name: str = Column(String) code: str = Column(String, admin_only=True) - registered: datetime = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) - buyer_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), nullable=True) + registered: datetime = Field(sa_column=Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC))) + buyer_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), nullable=True)) buyer: 'Attendee' = Relationship(sa_relationship=relationship( 'Attendee', backref='promo_code_groups', lazy='joined', - foreign_keys=buyer_id, + foreign_keys='PromoCodeGroup.buyer_id', cascade='save-update,merge,refresh-expire,expunge')) email_model_name: ClassVar = 'group' @@ -326,21 +323,13 @@ class PromoCode(MagModel, table=True): cost: int | None = Column(Integer, nullable=True, default=None) admin_notes: str = Column(String) - group_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('promo_code_group.id', ondelete='SET NULL'), nullable=True) + group_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('promo_code_group.id', ondelete='SET NULL'), nullable=True)) group: 'PromoCodeGroup' = Relationship(sa_relationship=relationship( PromoCodeGroup, backref=backref('promo_codes', lazy='selectin'), lazy='joined', - foreign_keys=group_id, + foreign_keys='PromoCode.group_id', cascade='save-update,merge,refresh-expire,expunge')) - __table_args__ = ( - Index( - 'uq_promo_code_normalized_code', - func.replace(func.replace(func.lower(code), '-', ''), ' ', ''), - unique=True), - CheckConstraint(func.trim(code) != '', name='ck_promo_code_non_empty_code') - ) - - _repr_attr_names = ('code',) + _repr_attr_names: ClassVar = ('code',) @classmethod def normalize_expiration_date(cls, dt): @@ -518,3 +507,8 @@ def calculate_discounted_price(self, price): c.PROMO_CODE_DISCOUNT_TYPE_OPTS = PromoCode._DISCOUNT_TYPE_OPTS +Index( + 'uq_promo_code_normalized_code', + func.replace(func.replace(func.lower(PromoCode.code), '-', ''), ' ', ''), + unique=True), +CheckConstraint(func.trim(PromoCode.code) != '', name='ck_promo_code_non_empty_code') diff --git a/uber/models/showcase.py b/uber/models/showcase.py index b4eb46c5a..f849af062 100644 --- a/uber/models/showcase.py +++ b/uber/models/showcase.py @@ -43,7 +43,7 @@ class IndieJudge(MagModel, ReviewMixin, table=True): IndieGameReview: selectin """ - admin_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('admin_account.id')) + admin_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('admin_account.id'))) status: int = Column(Choice(c.MIVS_JUDGE_STATUS_OPTS), default=c.UNCONFIRMED) assignable_showcases: str = Column(MultiChoice(c.SHOWCASE_GAME_TYPE_OPTS)) all_games_showcases: str = Column(MultiChoice(c.SHOWCASE_GAME_TYPE_OPTS)) @@ -140,7 +140,7 @@ class IndieStudio(MagModel, table=True): IndieGame: selectin """ - group_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('group.id'), nullable=True) + group_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('group.id'), nullable=True)) name: str = Column(String, unique=True) website: str = Column(String) other_links: str = Column(UniqueList) @@ -328,12 +328,12 @@ class IndieDeveloper(MagModel, table=True): IndieStudio: joined """ - studio_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('indie_studio.id')) - attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), nullable=True) + studio_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('indie_studio.id'))) + attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), nullable=True)) gets_emails: bool = Column(Boolean, default=False) first_name: str = Column(String) - last_name: staticmethod = Column(String) + last_name: str = Column(String) email: str = Column(String) cellphone: str = Column(String) agreed_coc: bool = Column(Boolean, default=False) @@ -368,10 +368,10 @@ class IndieGame(MagModel, ReviewMixin, table=True): IndieGameImage: selectin """ - studio_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('indie_studio.id')) - primary_contact_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('indie_developer.id', ondelete='SET NULL'), nullable=True) + studio_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('indie_studio.id'))) + primary_contact_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('indie_developer.id', ondelete='SET NULL'), nullable=True)) primary_contact: 'IndieDeveloper' = Relationship(sa_relationship=relationship(IndieDeveloper, backref='arcade_games', lazy='joined', - foreign_keys=primary_contact_id, cascade='save-update,merge,refresh-expire,expunge')) + foreign_keys='IndieGame.primary_contact_id', cascade='save-update,merge,refresh-expire,expunge')) title: str = Column(String) brief_description: str = Column(String) @@ -683,7 +683,7 @@ class IndieGameImage(MagModel, GuidebookImageMixin, table=True): IndieGame: joined """ - game_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('indie_game.id')) + game_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('indie_game.id'))) description: str = Column(String) use_in_promo: bool = Column(Boolean, default=False) is_screenshot: bool = Column(Boolean, default=True) @@ -728,8 +728,8 @@ class IndieGameCode(MagModel, table=True): IndieJudge: joined """ - game_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('indie_game.id')) - judge_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('indie_judge.id'), nullable=True) + game_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('indie_game.id'))) + judge_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('indie_judge.id'), nullable=True)) code: str = Column(String) unlimited_use: bool = Column(Boolean, default=False) judge_notes: str = Column(String, admin_only=True) # TODO: Remove? @@ -745,26 +745,26 @@ class IndieGameReview(MagModel, table=True): IndieJudge: joined """ - game_id = Column(Uuid(as_uuid=False), ForeignKey('indie_game.id')) - judge_id = Column(Uuid(as_uuid=False), ForeignKey('indie_judge.id')) - video_status = Column( + game_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('indie_game.id'))) + judge_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('indie_judge.id'))) + video_status: int = Column( Choice(c.MIVS_VIDEO_REVIEW_STATUS_OPTS), default=c.PENDING) - game_status = Column( + game_status: int = Column( Choice(c.MIVS_GAME_REVIEW_STATUS_OPTS), default=c.PENDING) - game_status_text = Column(String) - game_content_bad = Column(Boolean, default=False) - read_how_to_play = Column(Boolean, default=False) + game_status_text: str = Column(String) + game_content_bad: bool = Column(Boolean, default=False) + read_how_to_play: bool = Column(Boolean, default=False) # 0 = not reviewed, 1-10 score (10 is best) - readiness_score = Column(Integer, default=0) - design_score = Column(Integer, default=0) - enjoyment_score = Column(Integer, default=0) - game_review = Column(String) - developer_response = Column(String) - staff_notes = Column(String) - send_to_studio = Column(Boolean, default=False) - - __table_args__ = ( + readiness_score: int = Column(Integer, default=0) + design_score: int = Column(Integer, default=0) + enjoyment_score: int = Column(Integer, default=0) + game_review: str = Column(String) + developer_response: str = Column(String) + staff_notes: str = Column(String) + send_to_studio: bool = Column(Boolean, default=False) + + __table_args__: ClassVar = ( UniqueConstraint('game_id', 'judge_id', name='review_game_judge_uniq'), ) diff --git a/uber/models/tabletop.py b/uber/models/tabletop.py index 6612f26a6..dd08ccf50 100644 --- a/uber/models/tabletop.py +++ b/uber/models/tabletop.py @@ -17,7 +17,7 @@ class TabletopGame(MagModel, table=True): code: str = Column(String) name: str = Column(String) - attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) + attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'))) returned: bool = Column(Boolean, default=False) checkouts: list['TabletopCheckout'] = Relationship(sa_relationship=relationship('TabletopCheckout', order_by='TabletopCheckout.checked_out', backref=backref('game', lazy='joined'))) @@ -37,7 +37,7 @@ class TabletopCheckout(MagModel, table=True): TabletopGame: joined """ - game_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('tabletop_game.id')) - attendee_id: str | None = Column(Uuid(as_uuid=False), ForeignKey('attendee.id')) + game_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('tabletop_game.id'))) + attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'))) checked_out: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) returned: datetime | None = Column(DateTime(timezone=True), nullable=True) diff --git a/uber/models/tracking.py b/uber/models/tracking.py index 523ce2f96..04d5393e3 100644 --- a/uber/models/tracking.py +++ b/uber/models/tracking.py @@ -59,11 +59,11 @@ def track_report(cls, params): class PageViewTracking(MagModel, table=True): - when: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) - who: str = Column(String) - supervisor: str = Column(String) - page: str = Column(String) - which: str = Column(String) + when: datetime = Field(default_factory=lambda: datetime.now(UTC), sa_column=Column(DateTime(timezone=True))) + who: str = '' + supervisor: str = '' + page: str = '' + which: str = '' @property def who_repr(self): From 119e6d6e7756ddcc8983c9a2dcb2d89b6cbeec47 Mon Sep 17 00:00:00 2001 From: Victoria Earl Date: Thu, 19 Feb 2026 01:32:11 +0100 Subject: [PATCH 09/20] Completely rewrite relationships in SQLModel We had to remove backrefs as they broke SQLModel's ability to assign the backref columns. Also recasts all the foreign keys into SQLModel's Field(), and partially converts the regular columns (for Attendee and Department, specifically). Thanks to all this and a couple other fixes, forms will load and save now. --- alembic/env.py | 2 +- .../6500aca85560_relationships_overhaul.py | 1749 +++++++++++++++++ uber/api.py | 4 +- uber/forms/__init__.py | 2 +- uber/models/__init__.py | 6 +- uber/models/admin.py | 59 +- uber/models/api.py | 11 +- uber/models/art_show.py | 115 +- uber/models/attendee.py | 295 +-- uber/models/attraction.py | 173 +- uber/models/badge_printing.py | 8 +- uber/models/commerce.py | 80 +- uber/models/department.py | 360 ++-- uber/models/email.py | 9 +- uber/models/group.py | 46 +- uber/models/guests.py | 107 +- uber/models/hotel.py | 40 +- uber/models/marketplace.py | 12 +- uber/models/mits.py | 43 +- uber/models/panels.py | 79 +- uber/models/promo_code.py | 26 +- uber/models/showcase.py | 73 +- uber/models/tabletop.py | 18 +- uber/site_sections/art_show_reports.py | 4 +- uber/site_sections/reg_admin.py | 17 +- uber/site_sections/registration.py | 1 + .../art_show_admin/bidder_signup.html | 14 +- uber/templates/confirm_tabs.html | 13 +- .../preregistration/attendee_card.html | 6 +- .../reg_admin/attendee_account_form.html | 6 +- 30 files changed, 2670 insertions(+), 708 deletions(-) create mode 100644 alembic/versions/6500aca85560_relationships_overhaul.py diff --git a/alembic/env.py b/alembic/env.py index 76b031b03..f236c0230 100644 --- a/alembic/env.py +++ b/alembic/env.py @@ -29,7 +29,7 @@ def include_object(object, name, type_, reflected, compare_to): """Exclude alembic's own version tables from alembic's consideration.""" - return not name.startswith('alembic_version') + return not name or not name.startswith('alembic_version') def render_item(type_, obj, autogen_context): diff --git a/alembic/versions/6500aca85560_relationships_overhaul.py b/alembic/versions/6500aca85560_relationships_overhaul.py new file mode 100644 index 000000000..6cb761fc6 --- /dev/null +++ b/alembic/versions/6500aca85560_relationships_overhaul.py @@ -0,0 +1,1749 @@ +"""Relationships overhaul + +Revision ID: 6500aca85560 +Revises: 3d942ce689fc +Create Date: 2026-02-19 00:25:38.129029 + +""" + + +# revision identifiers, used by Alembic. +revision = '6500aca85560' +down_revision = '3d942ce689fc' +branch_labels = None +depends_on = None + +from alembic import op +import sqlalchemy as sa +import sqlmodel +from sqlalchemy.dialects import postgresql + + +try: + is_sqlite = op.get_context().dialect.name == 'sqlite' +except Exception: + is_sqlite = False + +if is_sqlite: + op.get_context().connection.execute('PRAGMA foreign_keys=ON;') + utcnow_server_default = "(datetime('now', 'utc'))" +else: + utcnow_server_default = "timezone('utc', current_timestamp)" + +def sqlite_column_reflect_listener(inspector, table, column_info): + """Adds parenthesis around SQLite datetime defaults for utcnow.""" + if column_info['default'] == "datetime('now', 'utc')": + column_info['default'] = utcnow_server_default + +sqlite_reflect_kwargs = { + 'listeners': [('column_reflect', sqlite_column_reflect_listener)] +} + +# =========================================================================== +# HOWTO: Handle alter statements in SQLite +# +# def upgrade(): +# if is_sqlite: +# with op.batch_alter_table('table_name', reflect_kwargs=sqlite_reflect_kwargs) as batch_op: +# batch_op.alter_column('column_name', type_=sa.Unicode(), server_default='', nullable=False) +# else: +# op.alter_column('table_name', 'column_name', type_=sa.Unicode(), server_default='', nullable=False) +# +# =========================================================================== + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('attendee_tournament') + op.alter_column('access_group', 'start_time', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=True) + op.alter_column('access_group', 'end_time', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=True) + op.alter_column('admin_account', 'attendee_id', + existing_type=sa.UUID(), + nullable=True) + op.drop_constraint(op.f('fk_admin_account_attendee_id_attendee'), 'admin_account', type_='foreignkey') + op.create_foreign_key(None, 'admin_account', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') + op.alter_column('api_job', 'queued', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=True) + op.alter_column('api_job', 'completed', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=True) + op.alter_column('api_job', 'cancelled', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=True) + op.alter_column('api_token', 'admin_account_id', + existing_type=sa.UUID(), + nullable=True) + op.alter_column('api_token', 'token', + existing_type=sa.UUID(), + type_=sqlmodel.sql.sqltypes.AutoString(), + nullable=True) + op.alter_column('api_token', 'issued_time', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=False) + op.alter_column('api_token', 'revoked_time', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + nullable=False) + op.drop_constraint(op.f('fk_api_token_admin_account_id_admin_account'), 'api_token', type_='foreignkey') + op.create_foreign_key(None, 'api_token', 'admin_account', ['admin_account_id'], ['id'], ondelete='CASCADE') + op.alter_column('arbitrary_charge', 'when', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=False) + op.alter_column('art_panel_assignment', 'app_id', + existing_type=sa.UUID(), + nullable=True) + op.alter_column('art_panel_assignment', 'panel_id', + existing_type=sa.UUID(), + nullable=True) + op.drop_constraint(op.f('fk_art_panel_assignment_app_id_art_show_application'), 'art_panel_assignment', type_='foreignkey') + op.drop_constraint(op.f('fk_art_panel_assignment_panel_id_art_show_panel'), 'art_panel_assignment', type_='foreignkey') + op.create_foreign_key(None, 'art_panel_assignment', 'art_show_application', ['app_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(None, 'art_panel_assignment', 'art_show_panel', ['panel_id'], ['id'], ondelete='CASCADE') + op.alter_column('art_show_agent_code', 'app_id', + existing_type=sa.UUID(), + nullable=True) + op.alter_column('art_show_agent_code', 'cancelled', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=True) + op.drop_constraint(op.f('fk_art_show_agent_code_app_id_art_show_application'), 'art_show_agent_code', type_='foreignkey') + op.drop_constraint(op.f('fk_art_show_agent_code_attendee_id_attendee'), 'art_show_agent_code', type_='foreignkey') + op.create_foreign_key(None, 'art_show_agent_code', 'attendee', ['attendee_id'], ['id']) + op.create_foreign_key(None, 'art_show_agent_code', 'art_show_application', ['app_id'], ['id'], ondelete='CASCADE') + op.alter_column('art_show_application', 'checked_in', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=True) + op.alter_column('art_show_application', 'checked_out', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=True) + op.alter_column('art_show_application', 'overridden_price', + existing_type=sa.INTEGER(), + nullable=False) + op.alter_column('art_show_application', 'default_cost', + existing_type=sa.INTEGER(), + nullable=False) + op.create_unique_constraint(None, 'art_show_application', ['attendee_id']) + op.drop_constraint(op.f('fk_art_show_application_attendee_id_attendee'), 'art_show_application', type_='foreignkey') + op.create_foreign_key(None, 'art_show_application', 'attendee', ['attendee_id'], ['id']) + op.alter_column('art_show_bidder', 'signed_up', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=True) + op.drop_constraint(op.f('fk_art_show_bidder_attendee_id_attendee'), 'art_show_bidder', type_='foreignkey') + op.create_foreign_key(None, 'art_show_bidder', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') + op.alter_column('art_show_payment', 'when', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=False) + op.drop_constraint(op.f('fk_art_show_payment_receipt_id_art_show_receipt'), 'art_show_payment', type_='foreignkey') + op.create_foreign_key(None, 'art_show_payment', 'art_show_receipt', ['receipt_id'], ['id'], ondelete='CASCADE') + op.drop_constraint(op.f('fk_art_show_pieces_app_id_art_show_application'), 'art_show_piece', type_='foreignkey') + op.drop_constraint(op.f('fk_art_show_piece_winning_bidder_id_art_show_bidder'), 'art_show_piece', type_='foreignkey') + op.drop_constraint(op.f('fk_art_show_piece_receipt_id_art_show_receipt'), 'art_show_piece', type_='foreignkey') + op.create_foreign_key(None, 'art_show_piece', 'art_show_bidder', ['winning_bidder_id'], ['id']) + op.create_foreign_key(None, 'art_show_piece', 'art_show_receipt', ['receipt_id'], ['id']) + op.create_foreign_key(None, 'art_show_piece', 'art_show_application', ['app_id'], ['id'], ondelete='CASCADE') + op.alter_column('art_show_receipt', 'closed', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=True) + op.drop_constraint(op.f('fk_art_show_receipt_attendee_id_attendee'), 'art_show_receipt', type_='foreignkey') + op.create_foreign_key(None, 'art_show_receipt', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') + op.alter_column('artist_marketplace_application', 'attendee_id', + existing_type=sa.UUID(), + nullable=True) + op.alter_column('artist_marketplace_application', 'registered', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=False, + existing_server_default=sa.text("timezone('utc'::text, CURRENT_TIMESTAMP)")) + op.alter_column('artist_marketplace_application', 'accepted', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=True) + op.create_unique_constraint(None, 'artist_marketplace_application', ['attendee_id']) + op.drop_constraint(op.f('fk_artist_marketplace_application_attendee_id_attendee'), 'artist_marketplace_application', type_='foreignkey') + op.create_foreign_key(None, 'artist_marketplace_application', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') + op.alter_column('assigned_panelist', 'attendee_id', + existing_type=sa.UUID(), + nullable=True) + op.alter_column('assigned_panelist', 'event_id', + existing_type=sa.UUID(), + nullable=True) + op.drop_constraint(op.f('fk_attendee_creator_id_attendee'), 'attendee', type_='foreignkey') + op.drop_constraint(op.f('fk_attendee_watchlist_id_watch_list'), 'attendee', type_='foreignkey') + op.drop_constraint(op.f('fk_attendee_badge_pickup_group_id_badge_pickup_group'), 'attendee', type_='foreignkey') + op.drop_constraint(op.f('fk_attendee_group_id_group'), 'attendee', type_='foreignkey') + op.create_foreign_key(None, 'attendee', 'attendee', ['creator_id'], ['id']) + op.create_foreign_key(None, 'attendee', 'watch_list', ['watchlist_id'], ['id']) + op.create_foreign_key(None, 'attendee', 'badge_pickup_group', ['badge_pickup_group_id'], ['id']) + op.create_foreign_key(None, 'attendee', 'group', ['group_id'], ['id']) + op.drop_column('attendee', 'affiliate') + op.alter_column('attendee_account', 'public_id', + existing_type=sa.UUID(), + type_=sqlmodel.sql.sqltypes.AutoString(), + existing_nullable=True) + op.alter_column('attraction', 'signups_open_time', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=True) + op.drop_constraint(op.f('attraction_name_key'), 'attraction', type_='unique') + op.drop_constraint(op.f('uq_attraction_slug'), 'attraction', type_='unique') + op.alter_column('attraction_event', 'signups_open_time', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=True) + op.alter_column('attraction_event', 'attraction_id', + existing_type=sa.UUID(), + nullable=True) + op.alter_column('attraction_event', 'attraction_feature_id', + existing_type=sa.UUID(), + nullable=True) + op.alter_column('attraction_event', 'start_time', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=False) + op.drop_constraint(op.f('fk_attraction_event_attraction_id_attraction'), 'attraction_event', type_='foreignkey') + op.drop_constraint(op.f('fk_attraction_event_location_id_event_location'), 'attraction_event', type_='foreignkey') + op.drop_constraint(op.f('fk_attraction_event_attraction_feature_id_attraction_feature'), 'attraction_event', type_='foreignkey') + op.create_foreign_key(None, 'attraction_event', 'attraction_feature', ['attraction_feature_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(None, 'attraction_event', 'attraction', ['attraction_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(None, 'attraction_event', 'event_location', ['event_location_id'], ['id']) + op.alter_column('attraction_feature', 'signups_open_time', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=True) + op.alter_column('attraction_feature', 'attraction_id', + existing_type=sa.UUID(), + nullable=True) + op.drop_constraint(op.f('fk_attraction_feature_attraction_id_attraction'), 'attraction_feature', type_='foreignkey') + op.create_foreign_key(None, 'attraction_feature', 'attraction', ['attraction_id'], ['id'], ondelete='CASCADE') + op.alter_column('attraction_notification', 'attraction_event_id', + existing_type=sa.UUID(), + nullable=True) + op.alter_column('attraction_notification', 'attraction_id', + existing_type=sa.UUID(), + nullable=True) + op.alter_column('attraction_notification', 'attendee_id', + existing_type=sa.UUID(), + nullable=True) + op.alter_column('attraction_notification', 'sent_time', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=False) + op.drop_index(op.f('ix_attraction_notification_ident'), table_name='attraction_notification') + op.drop_constraint(op.f('fk_attraction_notification_attraction_id_attraction'), 'attraction_notification', type_='foreignkey') + op.drop_constraint(op.f('fk_attraction_notification_attraction_event_id_attraction_event'), 'attraction_notification', type_='foreignkey') + op.drop_constraint(op.f('fk_attraction_notification_attendee_id_attendee'), 'attraction_notification', type_='foreignkey') + op.create_foreign_key(None, 'attraction_notification', 'attraction', ['attraction_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(None, 'attraction_notification', 'attraction_event', ['attraction_event_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(None, 'attraction_notification', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') + op.alter_column('attraction_notification_reply', 'received_time', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=False) + op.alter_column('attraction_notification_reply', 'sent_time', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=False) + op.drop_index(op.f('ix_attraction_notification_reply_sid'), table_name='attraction_notification_reply') + op.alter_column('attraction_signup', 'attraction_id', + existing_type=sa.UUID(), + nullable=True) + op.alter_column('attraction_signup', 'attraction_event_id', + existing_type=sa.UUID(), + nullable=True) + op.alter_column('attraction_signup', 'attendee_id', + existing_type=sa.UUID(), + nullable=True) + op.alter_column('attraction_signup', 'signup_time', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=False) + op.alter_column('attraction_signup', 'checkin_time', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=False) + op.drop_index(op.f('ix_attraction_signup_checkin_time'), table_name='attraction_signup') + op.drop_constraint(op.f('fk_attraction_signup_attendee_id_attendee'), 'attraction_signup', type_='foreignkey') + op.drop_constraint(op.f('fk_attraction_signup_attraction_event_id_attraction_event'), 'attraction_signup', type_='foreignkey') + op.drop_constraint(op.f('fk_attraction_signup_attraction_id_attraction'), 'attraction_signup', type_='foreignkey') + op.create_foreign_key(None, 'attraction_signup', 'attraction_event', ['attraction_event_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(None, 'attraction_signup', 'attraction', ['attraction_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(None, 'attraction_signup', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') + op.alter_column('automated_email', 'last_send_time', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=True) + op.alter_column('automated_email', 'active_after', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=True) + op.alter_column('automated_email', 'active_before', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=True) + op.drop_constraint(op.f('uq_automated_email_ident'), 'automated_email', type_='unique') + op.alter_column('badge_info', 'picked_up', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=True) + op.alter_column('badge_info', 'reported_lost', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=True) + op.drop_index(op.f('ix_badge_info_ident'), table_name='badge_info') + op.drop_constraint(op.f('fk_badge_info_attendee_id_attendee'), 'badge_info', type_='foreignkey') + op.create_foreign_key(None, 'badge_info', 'attendee', ['attendee_id'], ['id']) + op.alter_column('badge_pickup_group', 'public_id', + existing_type=sa.UUID(), + type_=sqlmodel.sql.sqltypes.AutoString(), + existing_nullable=True) + op.alter_column('bulk_printing_request', 'department_id', + existing_type=sa.UUID(), + nullable=True) + op.drop_constraint(op.f('fk_bulk_printing_request_department_id_department'), 'bulk_printing_request', type_='foreignkey') + op.create_foreign_key(None, 'bulk_printing_request', 'department', ['department_id'], ['id'], ondelete='CASCADE') + op.drop_constraint(op.f('fk_department_parent_id_department'), 'department', type_='foreignkey') + op.create_foreign_key(None, 'department', 'department', ['parent_id'], ['id'], ondelete='CASCADE') + op.alter_column('dept_checklist_item', 'department_id', + existing_type=sa.UUID(), + nullable=True) + op.alter_column('dept_checklist_item', 'attendee_id', + existing_type=sa.UUID(), + nullable=True) + op.drop_constraint(op.f('fk_dept_checklist_item_department_id_department'), 'dept_checklist_item', type_='foreignkey') + op.drop_constraint(op.f('fk_dept_checklist_item_attendee_id_attendee'), 'dept_checklist_item', type_='foreignkey') + op.create_foreign_key(None, 'dept_checklist_item', 'department', ['department_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(None, 'dept_checklist_item', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') + op.alter_column('dept_membership', 'attendee_id', + existing_type=sa.UUID(), + nullable=True) + op.alter_column('dept_membership', 'department_id', + existing_type=sa.UUID(), + nullable=True) + op.drop_constraint(op.f('fk_dept_membership_attendee_id_attendee'), 'dept_membership', type_='foreignkey') + op.drop_constraint(op.f('fk_dept_membership_department_id_department'), 'dept_membership', type_='foreignkey') + op.create_foreign_key(None, 'dept_membership', 'department', ['department_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(None, 'dept_membership', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') + op.alter_column('dept_membership_request', 'attendee_id', + existing_type=sa.UUID(), + nullable=True) + op.drop_constraint(op.f('fk_dept_membership_request_attendee_id_attendee'), 'dept_membership_request', type_='foreignkey') + op.drop_constraint(op.f('fk_dept_membership_request_department_id_department'), 'dept_membership_request', type_='foreignkey') + op.create_foreign_key(None, 'dept_membership_request', 'department', ['department_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(None, 'dept_membership_request', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') + op.alter_column('dept_role', 'department_id', + existing_type=sa.UUID(), + nullable=True) + op.drop_constraint(op.f('fk_dept_role_department_id_department'), 'dept_role', type_='foreignkey') + op.create_foreign_key(None, 'dept_role', 'department', ['department_id'], ['id'], ondelete='CASCADE') + op.alter_column('email', 'fk_id', + existing_type=sa.UUID(), + type_=sqlmodel.sql.sqltypes.AutoString(), + existing_nullable=True) + op.alter_column('email', 'when', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sqlmodel.sql.sqltypes.AutoString(), + existing_nullable=False) + op.drop_constraint(op.f('fk_email_automated_email_id_automated_email'), 'email', type_='foreignkey') + op.create_foreign_key(None, 'email', 'automated_email', ['automated_email_id'], ['id']) + op.alter_column('escalation_ticket', 'resolved', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=True) + op.drop_constraint(op.f('uq_escalation_ticket_ticket_id'), 'escalation_ticket', type_='unique') + op.alter_column('event', 'start_time', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=False) + op.create_unique_constraint(None, 'event', ['attraction_event_id']) + op.drop_constraint(op.f('fk_event_location_id_event_location'), 'event', type_='foreignkey') + op.drop_constraint(op.f('fk_event_department_id_department'), 'event', type_='foreignkey') + op.drop_constraint(op.f('fk_event_attraction_event_id_attraction_event'), 'event', type_='foreignkey') + op.create_foreign_key(None, 'event', 'event_location', ['event_location_id'], ['id']) + op.create_foreign_key(None, 'event', 'department', ['department_id'], ['id']) + op.create_foreign_key(None, 'event', 'attraction_event', ['attraction_event_id'], ['id']) + op.alter_column('event_feedback', 'event_id', + existing_type=sa.UUID(), + nullable=True) + op.alter_column('event_feedback', 'attendee_id', + existing_type=sa.UUID(), + nullable=True) + op.drop_constraint(op.f('fk_event_feedback_event_id_event'), 'event_feedback', type_='foreignkey') + op.create_foreign_key(None, 'event_feedback', 'event', ['event_id'], ['id'], ondelete='CASCADE') + op.drop_constraint(op.f('fk_event_location_department_id_department'), 'event_location', type_='foreignkey') + op.create_foreign_key(None, 'event_location', 'department', ['department_id'], ['id']) + op.alter_column('food_restrictions', 'attendee_id', + existing_type=sa.UUID(), + nullable=True) + op.drop_constraint(op.f('fk_food_restrictions_attendee_id_attendee'), 'food_restrictions', type_='foreignkey') + op.create_foreign_key(None, 'food_restrictions', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') + op.alter_column('group', 'public_id', + existing_type=sa.UUID(), + type_=sqlmodel.sql.sqltypes.AutoString(), + nullable=True) + op.alter_column('group', 'registered', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=False, + existing_server_default=sa.text("timezone('utc'::text, CURRENT_TIMESTAMP)")) + op.alter_column('group', 'approved', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=True) + op.drop_constraint(op.f('fk_leader'), 'group', type_='foreignkey') + op.drop_constraint(op.f('fk_group_shared_with_id_group'), 'group', type_='foreignkey') + op.create_foreign_key(None, 'group', 'attendee', ['leader_id'], ['id']) + op.create_foreign_key(None, 'group', 'group', ['shared_with_id'], ['id']) + op.alter_column('guest_autograph', 'guest_id', + existing_type=sa.UUID(), + nullable=True) + op.drop_constraint(op.f('fk_guest_autograph_guest_id_guest_group'), 'guest_autograph', type_='foreignkey') + op.create_foreign_key(None, 'guest_autograph', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') + op.alter_column('guest_bio', 'guest_id', + existing_type=sa.UUID(), + nullable=True) + op.drop_constraint(op.f('fk_guest_bio_guest_id_guest_group'), 'guest_bio', type_='foreignkey') + op.create_foreign_key(None, 'guest_bio', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') + op.alter_column('guest_charity', 'guest_id', + existing_type=sa.UUID(), + nullable=True) + op.drop_constraint(op.f('fk_guest_charity_guest_id_guest_group'), 'guest_charity', type_='foreignkey') + op.create_foreign_key(None, 'guest_charity', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') + op.alter_column('guest_detailed_travel_plan', 'arrival_time', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=False) + op.alter_column('guest_detailed_travel_plan', 'departure_time', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=False) + op.drop_constraint(op.f('fk_guest_detailed_travel_plan_travel_plans_id_guest_tra_6ad4'), 'guest_detailed_travel_plan', type_='foreignkey') + op.create_foreign_key(None, 'guest_detailed_travel_plan', 'guest_travel_plans', ['travel_plans_id'], ['id'], ondelete='CASCADE') + op.alter_column('guest_group', 'group_id', + existing_type=sa.UUID(), + nullable=True) + op.create_unique_constraint(None, 'guest_group', ['group_id']) + op.drop_constraint(op.f('fk_guest_group_group_id_group'), 'guest_group', type_='foreignkey') + op.drop_constraint(op.f('fk_guest_group_event_id_event'), 'guest_group', type_='foreignkey') + op.create_foreign_key(None, 'guest_group', 'group', ['group_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(None, 'guest_group', 'event', ['event_id'], ['id']) + op.alter_column('guest_hospitality', 'guest_id', + existing_type=sa.UUID(), + nullable=True) + op.drop_constraint(op.f('fk_guest_hospitality_guest_id_guest_group'), 'guest_hospitality', type_='foreignkey') + op.create_foreign_key(None, 'guest_hospitality', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') + op.alter_column('guest_image', 'guest_id', + existing_type=sa.UUID(), + nullable=True) + op.drop_constraint(op.f('fk_guest_image_guest_id_guest_group'), 'guest_image', type_='foreignkey') + op.create_foreign_key(None, 'guest_image', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') + op.alter_column('guest_info', 'guest_id', + existing_type=sa.UUID(), + nullable=True) + op.drop_constraint(op.f('fk_guest_info_guest_id_guest_group'), 'guest_info', type_='foreignkey') + op.create_foreign_key(None, 'guest_info', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') + op.alter_column('guest_interview', 'guest_id', + existing_type=sa.UUID(), + nullable=True) + op.drop_constraint(op.f('fk_guest_interview_guest_id_guest_group'), 'guest_interview', type_='foreignkey') + op.create_foreign_key(None, 'guest_interview', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') + op.alter_column('guest_media_request', 'guest_id', + existing_type=sa.UUID(), + nullable=True) + op.drop_constraint(op.f('fk_guest_media_request_guest_id_guest_group'), 'guest_media_request', type_='foreignkey') + op.create_foreign_key(None, 'guest_media_request', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') + op.alter_column('guest_merch', 'guest_id', + existing_type=sa.UUID(), + nullable=True) + op.alter_column('guest_merch', 'inventory_updated', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=True) + op.drop_constraint(op.f('fk_guest_merch_guest_id_guest_group'), 'guest_merch', type_='foreignkey') + op.create_foreign_key(None, 'guest_merch', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') + op.alter_column('guest_panel', 'guest_id', + existing_type=sa.UUID(), + nullable=True) + op.drop_constraint(op.f('fk_guest_panel_guest_id_guest_group'), 'guest_panel', type_='foreignkey') + op.create_foreign_key(None, 'guest_panel', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') + op.alter_column('guest_stage_plot', 'guest_id', + existing_type=sa.UUID(), + nullable=True) + op.drop_constraint(op.f('fk_guest_stage_plot_guest_id_guest_group'), 'guest_stage_plot', type_='foreignkey') + op.create_foreign_key(None, 'guest_stage_plot', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') + op.alter_column('guest_taxes', 'guest_id', + existing_type=sa.UUID(), + nullable=True) + op.drop_constraint(op.f('fk_guest_taxes_guest_id_guest_group'), 'guest_taxes', type_='foreignkey') + op.create_foreign_key(None, 'guest_taxes', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') + op.alter_column('guest_track', 'guest_id', + existing_type=sa.UUID(), + nullable=True) + op.create_unique_constraint(None, 'guest_track', ['guest_id']) + op.drop_constraint(op.f('fk_guest_track_guest_id_guest_group'), 'guest_track', type_='foreignkey') + op.create_foreign_key(None, 'guest_track', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') + op.alter_column('guest_travel_plans', 'guest_id', + existing_type=sa.UUID(), + nullable=True) + op.drop_constraint(op.f('fk_guest_travel_plans_guest_id_guest_group'), 'guest_travel_plans', type_='foreignkey') + op.create_foreign_key(None, 'guest_travel_plans', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') + op.alter_column('hotel_requests', 'attendee_id', + existing_type=sa.UUID(), + nullable=True) + op.drop_constraint(op.f('fk_hotel_requests_attendee_id_attendee'), 'hotel_requests', type_='foreignkey') + op.create_foreign_key(None, 'hotel_requests', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') + op.alter_column('indie_developer', 'studio_id', + existing_type=sa.UUID(), + nullable=True) + op.drop_constraint(op.f('fk_indie_developer_studio_id_indie_studio'), 'indie_developer', type_='foreignkey') + op.create_foreign_key(None, 'indie_developer', 'indie_studio', ['studio_id'], ['id'], ondelete='CASCADE') + op.alter_column('indie_game', 'studio_id', + existing_type=sa.UUID(), + nullable=True) + op.alter_column('indie_game', 'multiplayer_game_length', + existing_type=sa.INTEGER(), + nullable=False) + op.alter_column('indie_game', 'registered', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=False, + existing_server_default=sa.text("timezone('utc'::text, CURRENT_TIMESTAMP)")) + op.alter_column('indie_game', 'waitlisted', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=True) + op.alter_column('indie_game', 'accepted', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=True) + op.drop_constraint(op.f('fk_indie_game_primary_contact_id_indie_developer'), 'indie_game', type_='foreignkey') + op.drop_constraint(op.f('fk_indie_game_studio_id_indie_studio'), 'indie_game', type_='foreignkey') + op.create_foreign_key(None, 'indie_game', 'indie_studio', ['studio_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(None, 'indie_game', 'indie_developer', ['primary_contact_id'], ['id']) + op.alter_column('indie_game_code', 'game_id', + existing_type=sa.UUID(), + nullable=True) + op.drop_constraint(op.f('fk_indie_game_code_game_id_indie_game'), 'indie_game_code', type_='foreignkey') + op.create_foreign_key(None, 'indie_game_code', 'indie_game', ['game_id'], ['id'], ondelete='CASCADE') + op.alter_column('indie_game_image', 'game_id', + existing_type=sa.UUID(), + nullable=True) + op.drop_constraint(op.f('fk_indie_game_image_game_id_indie_game'), 'indie_game_image', type_='foreignkey') + op.create_foreign_key(None, 'indie_game_image', 'indie_game', ['game_id'], ['id'], ondelete='CASCADE') + op.alter_column('indie_game_review', 'game_id', + existing_type=sa.UUID(), + nullable=True) + op.alter_column('indie_game_review', 'judge_id', + existing_type=sa.UUID(), + nullable=True) + op.drop_constraint(op.f('fk_indie_game_review_game_id_indie_game'), 'indie_game_review', type_='foreignkey') + op.drop_constraint(op.f('fk_indie_game_review_judge_id_indie_judge'), 'indie_game_review', type_='foreignkey') + op.create_foreign_key(None, 'indie_game_review', 'indie_game', ['game_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(None, 'indie_game_review', 'indie_judge', ['judge_id'], ['id'], ondelete='CASCADE') + op.alter_column('indie_judge', 'admin_id', + existing_type=sa.UUID(), + nullable=True) + op.create_unique_constraint(None, 'indie_judge', ['admin_id']) + op.alter_column('indie_studio', 'registered', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=False, + existing_server_default=sa.text("timezone('utc'::text, CURRENT_TIMESTAMP)")) + op.drop_constraint(op.f('uq_indie_studio_name'), 'indie_studio', type_='unique') + op.create_unique_constraint(None, 'indie_studio', ['group_id']) + op.alter_column('job', 'department_id', + existing_type=sa.UUID(), + nullable=True) + op.drop_constraint(op.f('fk_job_department_id_department'), 'job', type_='foreignkey') + op.create_foreign_key(None, 'job', 'department', ['department_id'], ['id'], ondelete='CASCADE') + op.alter_column('job_template', 'department_id', + existing_type=sa.UUID(), + nullable=True) + op.drop_constraint(op.f('fk_job_template_department_id_department'), 'job_template', type_='foreignkey') + op.create_foreign_key(None, 'job_template', 'department', ['department_id'], ['id'], ondelete='CASCADE') + op.alter_column('lottery_application', 'entry_started', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=True) + op.alter_column('lottery_application', 'last_submitted', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=True) + op.alter_column('lottery_application', 'former_parent_id', + existing_type=sa.UUID(), + type_=sqlmodel.sql.sqltypes.AutoString(), + existing_nullable=True) + op.drop_constraint(op.f('uq_lottery_application_response_id'), 'lottery_application', type_='unique') + op.alter_column('m_points_for_cash', 'attendee_id', + existing_type=sa.UUID(), + nullable=True) + op.alter_column('m_points_for_cash', 'when', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=False) + op.drop_constraint(op.f('fk_m_points_for_cash_attendee_id_attendee'), 'm_points_for_cash', type_='foreignkey') + op.create_foreign_key(None, 'm_points_for_cash', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') + op.alter_column('merch_discount', 'attendee_id', + existing_type=sa.UUID(), + nullable=True) + op.drop_constraint(op.f('fk_merch_discount_attendee_id_attendee'), 'merch_discount', type_='foreignkey') + op.create_foreign_key(None, 'merch_discount', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') + op.alter_column('merch_pickup', 'picked_up_by_id', + existing_type=sa.UUID(), + nullable=True) + op.alter_column('merch_pickup', 'picked_up_for_id', + existing_type=sa.UUID(), + nullable=True) + op.alter_column('mits_applicant', 'team_id', + existing_type=sa.UUID(), + nullable=True) + op.drop_constraint(op.f('fk_mits_applicant_team_id_mits_team'), 'mits_applicant', type_='foreignkey') + op.create_foreign_key(None, 'mits_applicant', 'mits_team', ['team_id'], ['id'], ondelete='CASCADE') + op.alter_column('mits_document', 'game_id', + existing_type=sa.UUID(), + nullable=True) + op.drop_constraint(op.f('fk_mits_document_game_id_mits_game'), 'mits_document', type_='foreignkey') + op.create_foreign_key(None, 'mits_document', 'mits_game', ['game_id'], ['id'], ondelete='CASCADE') + op.alter_column('mits_game', 'team_id', + existing_type=sa.UUID(), + nullable=True) + op.drop_constraint(op.f('fk_mits_game_team_id_mits_team'), 'mits_game', type_='foreignkey') + op.create_foreign_key(None, 'mits_game', 'mits_team', ['team_id'], ['id'], ondelete='CASCADE') + op.alter_column('mits_panel_application', 'team_id', + existing_type=sa.UUID(), + nullable=True) + op.create_unique_constraint(None, 'mits_panel_application', ['team_id']) + op.drop_constraint(op.f('fk_mits_panel_application_team_id_mits_team'), 'mits_panel_application', type_='foreignkey') + op.create_foreign_key(None, 'mits_panel_application', 'mits_team', ['team_id'], ['id'], ondelete='CASCADE') + op.alter_column('mits_picture', 'game_id', + existing_type=sa.UUID(), + nullable=True) + op.drop_constraint(op.f('fk_mits_picture_game_id_mits_game'), 'mits_picture', type_='foreignkey') + op.create_foreign_key(None, 'mits_picture', 'mits_game', ['game_id'], ['id'], ondelete='CASCADE') + op.alter_column('mits_team', 'concurrent_attendees', + existing_type=sa.INTEGER(), + nullable=True) + op.alter_column('mits_team', 'submitted', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=True) + op.alter_column('mits_team', 'waiver_signed', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=True) + op.alter_column('mits_team', 'applied', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=False, + existing_server_default=sa.text("timezone('utc'::text, CURRENT_TIMESTAMP)")) + op.alter_column('mits_team', 'duplicate_of', + existing_type=sa.UUID(), + type_=sqlmodel.sql.sqltypes.AutoString(), + existing_nullable=True) + op.alter_column('mits_times', 'team_id', + existing_type=sa.UUID(), + nullable=True) + op.create_unique_constraint(None, 'mits_times', ['team_id']) + op.drop_constraint(op.f('fk_mits_times_team_id_mits_team'), 'mits_times', type_='foreignkey') + op.create_foreign_key(None, 'mits_times', 'mits_team', ['team_id'], ['id'], ondelete='CASCADE') + op.alter_column('model_receipt', 'owner_id', + existing_type=sa.UUID(), + type_=sqlmodel.sql.sqltypes.AutoString(), + existing_nullable=False) + op.alter_column('model_receipt', 'closed', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=True) + op.drop_index(op.f('ix_model_receipt_owner_id'), table_name='model_receipt') + op.alter_column('no_shirt', 'attendee_id', + existing_type=sa.UUID(), + nullable=True) + op.drop_constraint(op.f('fk_no_shirt_attendee_id_attendee'), 'no_shirt', type_='foreignkey') + op.create_foreign_key(None, 'no_shirt', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') + op.alter_column('old_m_point_exchange', 'attendee_id', + existing_type=sa.UUID(), + nullable=True) + op.alter_column('old_m_point_exchange', 'when', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=False) + op.drop_constraint(op.f('fk_old_m_point_exchange_attendee_id_attendee'), 'old_m_point_exchange', type_='foreignkey') + op.create_foreign_key(None, 'old_m_point_exchange', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') + op.alter_column('panel_application', 'applied', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=False, + existing_server_default=sa.text("timezone('utc'::text, CURRENT_TIMESTAMP)")) + op.alter_column('panel_application', 'accepted', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=True) + op.alter_column('panel_application', 'confirmed', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=True) + op.drop_constraint(op.f('fk_panel_application_poc_id_attendee'), 'panel_application', type_='foreignkey') + op.drop_constraint(op.f('fk_panel_application_submitter_id_panel_applicant'), 'panel_application', type_='foreignkey') + op.drop_constraint(op.f('fk_panel_application_event_id_event'), 'panel_application', type_='foreignkey') + op.create_foreign_key(None, 'panel_application', 'event', ['event_id'], ['id']) + op.create_foreign_key(None, 'panel_application', 'attendee', ['poc_id'], ['id']) + op.create_foreign_key(None, 'panel_application', 'panel_applicant', ['submitter_id'], ['id']) + op.alter_column('password_reset', 'generated', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=False, + existing_server_default=sa.text("timezone('utc'::text, CURRENT_TIMESTAMP)")) + op.drop_constraint(op.f('fk_password_reset_attendee_id_attendee_account'), 'password_reset', type_='foreignkey') + op.drop_constraint(op.f('fk_password_reset_admin_id_admin_account'), 'password_reset', type_='foreignkey') + op.create_foreign_key(None, 'password_reset', 'attendee_account', ['attendee_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(None, 'password_reset', 'admin_account', ['admin_id'], ['id'], ondelete='CASCADE') + op.alter_column('print_job', 'attendee_id', + existing_type=sa.UUID(), + nullable=True) + op.alter_column('print_job', 'queued', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=True) + op.alter_column('print_job', 'printed', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=True) + op.drop_constraint(op.f('fk_print_queue_attendee_id_attendee'), 'print_job', type_='foreignkey') + op.create_foreign_key(None, 'print_job', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') + op.alter_column('promo_code', 'expiration_date', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=False) + op.drop_constraint(op.f('fk_promo_code_group_id_promo_code_group'), 'promo_code', type_='foreignkey') + op.create_foreign_key(None, 'promo_code', 'promo_code_group', ['group_id'], ['id']) + op.drop_constraint(op.f('fk_promo_code_group_buyer_id_attendee'), 'promo_code_group', type_='foreignkey') + op.create_foreign_key(None, 'promo_code_group', 'attendee', ['buyer_id'], ['id']) + op.drop_index(op.f('uq_promo_code_word_normalized_word_part_of_speech'), table_name='promo_code_word') + op.create_index('uq_promo_code_word_normalized_word_part_of_speech', 'promo_code_word', [sa.literal_column('lower(trim(word))'), 'part_of_speech'], unique=True) + op.alter_column('receipt_info', 'charged', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=False) + op.alter_column('receipt_info', 'voided', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=True) + op.alter_column('receipt_item', 'purchaser_id', + existing_type=sa.UUID(), + type_=sqlmodel.sql.sqltypes.AutoString(), + existing_nullable=True) + op.alter_column('receipt_item', 'fk_id', + existing_type=sa.UUID(), + type_=sqlmodel.sql.sqltypes.AutoString(), + existing_nullable=True) + op.alter_column('receipt_item', 'added', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=False) + op.alter_column('receipt_item', 'closed', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=True) + op.drop_index(op.f('ix_receipt_item_fk_id'), table_name='receipt_item') + op.drop_index(op.f('ix_receipt_item_purchaser_id'), table_name='receipt_item') + op.drop_constraint(op.f('fk_receipt_item_txn_id_receipt_transaction'), 'receipt_item', type_='foreignkey') + op.drop_constraint(op.f('fk_receipt_item_receipt_id_model_receipt'), 'receipt_item', type_='foreignkey') + op.create_foreign_key(None, 'receipt_item', 'receipt_transaction', ['txn_id'], ['id']) + op.create_foreign_key(None, 'receipt_item', 'model_receipt', ['receipt_id'], ['id'], ondelete='CASCADE') + op.alter_column('receipt_transaction', 'added', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=False) + op.alter_column('receipt_transaction', 'cancelled', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=True) + op.drop_constraint(op.f('fk_receipt_transaction_refunded_txn_id_receipt_transaction'), 'receipt_transaction', type_='foreignkey') + op.drop_constraint(op.f('fk_receipt_transaction_receipt_id_model_receipt'), 'receipt_transaction', type_='foreignkey') + op.drop_constraint(op.f('fk_receipt_transaction_receipt_info_id_receipt_info'), 'receipt_transaction', type_='foreignkey') + op.create_foreign_key(None, 'receipt_transaction', 'receipt_info', ['receipt_info_id'], ['id']) + op.create_foreign_key(None, 'receipt_transaction', 'model_receipt', ['receipt_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(None, 'receipt_transaction', 'receipt_transaction', ['refunded_txn_id'], ['id']) + op.alter_column('report_tracking', 'when', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=False) + op.alter_column('room', 'created', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=False, + existing_server_default=sa.text("timezone('utc'::text, CURRENT_TIMESTAMP)")) + op.alter_column('room_assignment', 'room_id', + existing_type=sa.UUID(), + nullable=True) + op.alter_column('room_assignment', 'attendee_id', + existing_type=sa.UUID(), + nullable=True) + op.drop_constraint(op.f('fk_room_assignment_attendee_id_attendee'), 'room_assignment', type_='foreignkey') + op.drop_constraint(op.f('fk_room_assignment_room_id_room'), 'room_assignment', type_='foreignkey') + op.create_foreign_key(None, 'room_assignment', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(None, 'room_assignment', 'room', ['room_id'], ['id'], ondelete='CASCADE') + op.alter_column('sale', 'when', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=False) + op.drop_constraint(op.f('fk_sale_attendee_id_attendee'), 'sale', type_='foreignkey') + op.create_foreign_key(None, 'sale', 'attendee', ['attendee_id'], ['id']) + op.alter_column('shift', 'job_id', + existing_type=sa.UUID(), + nullable=True) + op.alter_column('shift', 'attendee_id', + existing_type=sa.UUID(), + nullable=True) + op.alter_column('signed_document', 'fk_id', + existing_type=sa.UUID(), + type_=sqlmodel.sql.sqltypes.AutoString(), + existing_nullable=False) + op.alter_column('signed_document', 'last_emailed', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=True) + op.alter_column('signed_document', 'signed', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=True) + op.alter_column('signed_document', 'declined', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=True) + op.drop_index(op.f('ix_signed_document_fk_id'), table_name='signed_document') + op.alter_column('tabletop_checkout', 'game_id', + existing_type=sa.UUID(), + nullable=True) + op.alter_column('tabletop_checkout', 'attendee_id', + existing_type=sa.UUID(), + nullable=True) + op.alter_column('tabletop_checkout', 'checked_out', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=False) + op.alter_column('tabletop_checkout', 'returned', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=True) + op.drop_constraint(op.f('fk_tabletop_checkout_game_id_tabletop_game'), 'tabletop_checkout', type_='foreignkey') + op.drop_constraint(op.f('fk_tabletop_checkout_attendee_id_attendee'), 'tabletop_checkout', type_='foreignkey') + op.create_foreign_key(None, 'tabletop_checkout', 'tabletop_game', ['game_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(None, 'tabletop_checkout', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') + op.alter_column('tabletop_game', 'attendee_id', + existing_type=sa.UUID(), + nullable=True) + op.drop_constraint(op.f('fk_tabletop_game_attendee_id_attendee'), 'tabletop_game', type_='foreignkey') + op.create_foreign_key(None, 'tabletop_game', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') + op.alter_column('terminal_settlement', 'requested', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=False) + op.alter_column('tracking', 'fk_id', + existing_type=sa.UUID(), + type_=sqlmodel.sql.sqltypes.AutoString(), + existing_nullable=False) + op.alter_column('tracking', 'when', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=False) + op.drop_index(op.f('ix_tracking_fk_id'), table_name='tracking') + op.drop_index(op.f('ix_tracking_when'), table_name='tracking') + op.drop_index(op.f('ix_tracking_who'), table_name='tracking') + op.alter_column('txn_request_tracking', 'fk_id', + existing_type=sa.UUID(), + type_=sqlmodel.sql.sqltypes.AutoString(), + existing_nullable=True) + op.alter_column('txn_request_tracking', 'requested', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=False, + existing_server_default=sa.text("timezone('utc'::text, CURRENT_TIMESTAMP)")) + op.alter_column('txn_request_tracking', 'resolved', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=True) + op.drop_constraint(op.f('txn_request_tracking_incr_id_key'), 'txn_request_tracking', type_='unique') + op.alter_column('watch_list', 'birthdate', + existing_type=sa.DATE(), + type_=sa.DateTime(), + existing_nullable=True) + op.alter_column('watch_list', 'expiration', + existing_type=sa.DATE(), + type_=sa.DateTime(), + existing_nullable=True) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.alter_column('watch_list', 'expiration', + existing_type=sa.DateTime(), + type_=sa.DATE(), + existing_nullable=True) + op.alter_column('watch_list', 'birthdate', + existing_type=sa.DateTime(), + type_=sa.DATE(), + existing_nullable=True) + op.create_unique_constraint(op.f('txn_request_tracking_incr_id_key'), 'txn_request_tracking', ['incr_id'], postgresql_nulls_not_distinct=False) + op.alter_column('txn_request_tracking', 'resolved', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=True) + op.alter_column('txn_request_tracking', 'requested', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=False, + existing_server_default=sa.text("timezone('utc'::text, CURRENT_TIMESTAMP)")) + op.alter_column('txn_request_tracking', 'fk_id', + existing_type=sqlmodel.sql.sqltypes.AutoString(), + type_=sa.UUID(), + existing_nullable=True) + op.create_index(op.f('ix_tracking_who'), 'tracking', ['who'], unique=False) + op.create_index(op.f('ix_tracking_when'), 'tracking', ['when'], unique=False) + op.create_index(op.f('ix_tracking_fk_id'), 'tracking', ['fk_id'], unique=False) + op.alter_column('tracking', 'when', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=False) + op.alter_column('tracking', 'fk_id', + existing_type=sqlmodel.sql.sqltypes.AutoString(), + type_=sa.UUID(), + existing_nullable=False) + op.alter_column('terminal_settlement', 'requested', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=False) + op.drop_constraint(None, 'tabletop_game', type_='foreignkey') + op.create_foreign_key(op.f('fk_tabletop_game_attendee_id_attendee'), 'tabletop_game', 'attendee', ['attendee_id'], ['id']) + op.alter_column('tabletop_game', 'attendee_id', + existing_type=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'tabletop_checkout', type_='foreignkey') + op.drop_constraint(None, 'tabletop_checkout', type_='foreignkey') + op.create_foreign_key(op.f('fk_tabletop_checkout_attendee_id_attendee'), 'tabletop_checkout', 'attendee', ['attendee_id'], ['id']) + op.create_foreign_key(op.f('fk_tabletop_checkout_game_id_tabletop_game'), 'tabletop_checkout', 'tabletop_game', ['game_id'], ['id']) + op.alter_column('tabletop_checkout', 'returned', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=True) + op.alter_column('tabletop_checkout', 'checked_out', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=False) + op.alter_column('tabletop_checkout', 'attendee_id', + existing_type=sa.UUID(), + nullable=False) + op.alter_column('tabletop_checkout', 'game_id', + existing_type=sa.UUID(), + nullable=False) + op.create_index(op.f('ix_signed_document_fk_id'), 'signed_document', ['fk_id'], unique=False) + op.alter_column('signed_document', 'declined', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=True) + op.alter_column('signed_document', 'signed', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=True) + op.alter_column('signed_document', 'last_emailed', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=True) + op.alter_column('signed_document', 'fk_id', + existing_type=sqlmodel.sql.sqltypes.AutoString(), + type_=sa.UUID(), + existing_nullable=False) + op.alter_column('shift', 'attendee_id', + existing_type=sa.UUID(), + nullable=False) + op.alter_column('shift', 'job_id', + existing_type=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'sale', type_='foreignkey') + op.create_foreign_key(op.f('fk_sale_attendee_id_attendee'), 'sale', 'attendee', ['attendee_id'], ['id'], ondelete='SET NULL') + op.alter_column('sale', 'when', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=False) + op.drop_constraint(None, 'room_assignment', type_='foreignkey') + op.drop_constraint(None, 'room_assignment', type_='foreignkey') + op.create_foreign_key(op.f('fk_room_assignment_room_id_room'), 'room_assignment', 'room', ['room_id'], ['id']) + op.create_foreign_key(op.f('fk_room_assignment_attendee_id_attendee'), 'room_assignment', 'attendee', ['attendee_id'], ['id']) + op.alter_column('room_assignment', 'attendee_id', + existing_type=sa.UUID(), + nullable=False) + op.alter_column('room_assignment', 'room_id', + existing_type=sa.UUID(), + nullable=False) + op.alter_column('room', 'created', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=False, + existing_server_default=sa.text("timezone('utc'::text, CURRENT_TIMESTAMP)")) + op.alter_column('report_tracking', 'when', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=False) + op.drop_constraint(None, 'receipt_transaction', type_='foreignkey') + op.drop_constraint(None, 'receipt_transaction', type_='foreignkey') + op.drop_constraint(None, 'receipt_transaction', type_='foreignkey') + op.create_foreign_key(op.f('fk_receipt_transaction_receipt_info_id_receipt_info'), 'receipt_transaction', 'receipt_info', ['receipt_info_id'], ['id'], ondelete='SET NULL') + op.create_foreign_key(op.f('fk_receipt_transaction_receipt_id_model_receipt'), 'receipt_transaction', 'model_receipt', ['receipt_id'], ['id'], ondelete='SET NULL') + op.create_foreign_key(op.f('fk_receipt_transaction_refunded_txn_id_receipt_transaction'), 'receipt_transaction', 'receipt_transaction', ['refunded_txn_id'], ['id'], ondelete='SET NULL') + op.alter_column('receipt_transaction', 'cancelled', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=True) + op.alter_column('receipt_transaction', 'added', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=False) + op.drop_constraint(None, 'receipt_item', type_='foreignkey') + op.drop_constraint(None, 'receipt_item', type_='foreignkey') + op.create_foreign_key(op.f('fk_receipt_item_receipt_id_model_receipt'), 'receipt_item', 'model_receipt', ['receipt_id'], ['id'], ondelete='SET NULL') + op.create_foreign_key(op.f('fk_receipt_item_txn_id_receipt_transaction'), 'receipt_item', 'receipt_transaction', ['txn_id'], ['id'], ondelete='SET NULL') + op.create_index(op.f('ix_receipt_item_purchaser_id'), 'receipt_item', ['purchaser_id'], unique=False) + op.create_index(op.f('ix_receipt_item_fk_id'), 'receipt_item', ['fk_id'], unique=False) + op.alter_column('receipt_item', 'closed', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=True) + op.alter_column('receipt_item', 'added', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=False) + op.alter_column('receipt_item', 'fk_id', + existing_type=sqlmodel.sql.sqltypes.AutoString(), + type_=sa.UUID(), + existing_nullable=True) + op.alter_column('receipt_item', 'purchaser_id', + existing_type=sqlmodel.sql.sqltypes.AutoString(), + type_=sa.UUID(), + existing_nullable=True) + op.alter_column('receipt_info', 'voided', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=True) + op.alter_column('receipt_info', 'charged', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=False) + op.drop_index('uq_promo_code_word_normalized_word_part_of_speech', table_name='promo_code_word') + op.create_index(op.f('uq_promo_code_word_normalized_word_part_of_speech'), 'promo_code_word', [sa.literal_column('lower(TRIM(BOTH FROM word))'), 'part_of_speech'], unique=True) + op.drop_constraint(None, 'promo_code_group', type_='foreignkey') + op.create_foreign_key(op.f('fk_promo_code_group_buyer_id_attendee'), 'promo_code_group', 'attendee', ['buyer_id'], ['id'], ondelete='SET NULL') + op.drop_constraint(None, 'promo_code', type_='foreignkey') + op.create_foreign_key(op.f('fk_promo_code_group_id_promo_code_group'), 'promo_code', 'promo_code_group', ['group_id'], ['id'], ondelete='SET NULL') + op.alter_column('promo_code', 'expiration_date', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=False) + op.drop_constraint(None, 'print_job', type_='foreignkey') + op.create_foreign_key(op.f('fk_print_queue_attendee_id_attendee'), 'print_job', 'attendee', ['attendee_id'], ['id']) + op.alter_column('print_job', 'printed', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=True) + op.alter_column('print_job', 'queued', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=True) + op.alter_column('print_job', 'attendee_id', + existing_type=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'password_reset', type_='foreignkey') + op.drop_constraint(None, 'password_reset', type_='foreignkey') + op.create_foreign_key(op.f('fk_password_reset_admin_id_admin_account'), 'password_reset', 'admin_account', ['admin_id'], ['id']) + op.create_foreign_key(op.f('fk_password_reset_attendee_id_attendee_account'), 'password_reset', 'attendee_account', ['attendee_id'], ['id']) + op.alter_column('password_reset', 'generated', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=False, + existing_server_default=sa.text("timezone('utc'::text, CURRENT_TIMESTAMP)")) + op.drop_constraint(None, 'panel_application', type_='foreignkey') + op.drop_constraint(None, 'panel_application', type_='foreignkey') + op.drop_constraint(None, 'panel_application', type_='foreignkey') + op.create_foreign_key(op.f('fk_panel_application_event_id_event'), 'panel_application', 'event', ['event_id'], ['id'], ondelete='SET NULL') + op.create_foreign_key(op.f('fk_panel_application_submitter_id_panel_applicant'), 'panel_application', 'panel_applicant', ['submitter_id'], ['id'], ondelete='SET NULL') + op.create_foreign_key(op.f('fk_panel_application_poc_id_attendee'), 'panel_application', 'attendee', ['poc_id'], ['id'], ondelete='SET NULL') + op.alter_column('panel_application', 'confirmed', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=True) + op.alter_column('panel_application', 'accepted', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=True) + op.alter_column('panel_application', 'applied', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=False, + existing_server_default=sa.text("timezone('utc'::text, CURRENT_TIMESTAMP)")) + op.drop_constraint(None, 'old_m_point_exchange', type_='foreignkey') + op.create_foreign_key(op.f('fk_old_m_point_exchange_attendee_id_attendee'), 'old_m_point_exchange', 'attendee', ['attendee_id'], ['id']) + op.alter_column('old_m_point_exchange', 'when', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=False) + op.alter_column('old_m_point_exchange', 'attendee_id', + existing_type=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'no_shirt', type_='foreignkey') + op.create_foreign_key(op.f('fk_no_shirt_attendee_id_attendee'), 'no_shirt', 'attendee', ['attendee_id'], ['id']) + op.alter_column('no_shirt', 'attendee_id', + existing_type=sa.UUID(), + nullable=False) + op.create_index(op.f('ix_model_receipt_owner_id'), 'model_receipt', ['owner_id'], unique=False) + op.alter_column('model_receipt', 'closed', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=True) + op.alter_column('model_receipt', 'owner_id', + existing_type=sqlmodel.sql.sqltypes.AutoString(), + type_=sa.UUID(), + existing_nullable=False) + op.drop_constraint(None, 'mits_times', type_='foreignkey') + op.create_foreign_key(op.f('fk_mits_times_team_id_mits_team'), 'mits_times', 'mits_team', ['team_id'], ['id']) + op.drop_constraint(None, 'mits_times', type_='unique') + op.alter_column('mits_times', 'team_id', + existing_type=sa.UUID(), + nullable=False) + op.alter_column('mits_team', 'duplicate_of', + existing_type=sqlmodel.sql.sqltypes.AutoString(), + type_=sa.UUID(), + existing_nullable=True) + op.alter_column('mits_team', 'applied', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=False, + existing_server_default=sa.text("timezone('utc'::text, CURRENT_TIMESTAMP)")) + op.alter_column('mits_team', 'waiver_signed', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=True) + op.alter_column('mits_team', 'submitted', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=True) + op.alter_column('mits_team', 'concurrent_attendees', + existing_type=sa.INTEGER(), + nullable=False) + op.drop_constraint(None, 'mits_picture', type_='foreignkey') + op.create_foreign_key(op.f('fk_mits_picture_game_id_mits_game'), 'mits_picture', 'mits_game', ['game_id'], ['id']) + op.alter_column('mits_picture', 'game_id', + existing_type=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'mits_panel_application', type_='foreignkey') + op.create_foreign_key(op.f('fk_mits_panel_application_team_id_mits_team'), 'mits_panel_application', 'mits_team', ['team_id'], ['id']) + op.drop_constraint(None, 'mits_panel_application', type_='unique') + op.alter_column('mits_panel_application', 'team_id', + existing_type=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'mits_game', type_='foreignkey') + op.create_foreign_key(op.f('fk_mits_game_team_id_mits_team'), 'mits_game', 'mits_team', ['team_id'], ['id']) + op.alter_column('mits_game', 'team_id', + existing_type=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'mits_document', type_='foreignkey') + op.create_foreign_key(op.f('fk_mits_document_game_id_mits_game'), 'mits_document', 'mits_game', ['game_id'], ['id']) + op.alter_column('mits_document', 'game_id', + existing_type=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'mits_applicant', type_='foreignkey') + op.create_foreign_key(op.f('fk_mits_applicant_team_id_mits_team'), 'mits_applicant', 'mits_team', ['team_id'], ['id']) + op.alter_column('mits_applicant', 'team_id', + existing_type=sa.UUID(), + nullable=False) + op.alter_column('merch_pickup', 'picked_up_for_id', + existing_type=sa.UUID(), + nullable=False) + op.alter_column('merch_pickup', 'picked_up_by_id', + existing_type=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'merch_discount', type_='foreignkey') + op.create_foreign_key(op.f('fk_merch_discount_attendee_id_attendee'), 'merch_discount', 'attendee', ['attendee_id'], ['id']) + op.alter_column('merch_discount', 'attendee_id', + existing_type=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'm_points_for_cash', type_='foreignkey') + op.create_foreign_key(op.f('fk_m_points_for_cash_attendee_id_attendee'), 'm_points_for_cash', 'attendee', ['attendee_id'], ['id']) + op.alter_column('m_points_for_cash', 'when', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=False) + op.alter_column('m_points_for_cash', 'attendee_id', + existing_type=sa.UUID(), + nullable=False) + op.create_unique_constraint(op.f('uq_lottery_application_response_id'), 'lottery_application', ['response_id'], postgresql_nulls_not_distinct=False) + op.alter_column('lottery_application', 'former_parent_id', + existing_type=sqlmodel.sql.sqltypes.AutoString(), + type_=sa.UUID(), + existing_nullable=True) + op.alter_column('lottery_application', 'last_submitted', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=True) + op.alter_column('lottery_application', 'entry_started', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=True) + op.drop_constraint(None, 'job_template', type_='foreignkey') + op.create_foreign_key(op.f('fk_job_template_department_id_department'), 'job_template', 'department', ['department_id'], ['id']) + op.alter_column('job_template', 'department_id', + existing_type=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'job', type_='foreignkey') + op.create_foreign_key(op.f('fk_job_department_id_department'), 'job', 'department', ['department_id'], ['id']) + op.alter_column('job', 'department_id', + existing_type=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'indie_studio', type_='unique') + op.create_unique_constraint(op.f('uq_indie_studio_name'), 'indie_studio', ['name'], postgresql_nulls_not_distinct=False) + op.alter_column('indie_studio', 'registered', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=False, + existing_server_default=sa.text("timezone('utc'::text, CURRENT_TIMESTAMP)")) + op.drop_constraint(None, 'indie_judge', type_='unique') + op.alter_column('indie_judge', 'admin_id', + existing_type=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'indie_game_review', type_='foreignkey') + op.drop_constraint(None, 'indie_game_review', type_='foreignkey') + op.create_foreign_key(op.f('fk_indie_game_review_judge_id_indie_judge'), 'indie_game_review', 'indie_judge', ['judge_id'], ['id']) + op.create_foreign_key(op.f('fk_indie_game_review_game_id_indie_game'), 'indie_game_review', 'indie_game', ['game_id'], ['id']) + op.alter_column('indie_game_review', 'judge_id', + existing_type=sa.UUID(), + nullable=False) + op.alter_column('indie_game_review', 'game_id', + existing_type=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'indie_game_image', type_='foreignkey') + op.create_foreign_key(op.f('fk_indie_game_image_game_id_indie_game'), 'indie_game_image', 'indie_game', ['game_id'], ['id']) + op.alter_column('indie_game_image', 'game_id', + existing_type=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'indie_game_code', type_='foreignkey') + op.create_foreign_key(op.f('fk_indie_game_code_game_id_indie_game'), 'indie_game_code', 'indie_game', ['game_id'], ['id']) + op.alter_column('indie_game_code', 'game_id', + existing_type=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'indie_game', type_='foreignkey') + op.drop_constraint(None, 'indie_game', type_='foreignkey') + op.create_foreign_key(op.f('fk_indie_game_studio_id_indie_studio'), 'indie_game', 'indie_studio', ['studio_id'], ['id']) + op.create_foreign_key(op.f('fk_indie_game_primary_contact_id_indie_developer'), 'indie_game', 'indie_developer', ['primary_contact_id'], ['id'], ondelete='SET NULL') + op.alter_column('indie_game', 'accepted', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=True) + op.alter_column('indie_game', 'waitlisted', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=True) + op.alter_column('indie_game', 'registered', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=False, + existing_server_default=sa.text("timezone('utc'::text, CURRENT_TIMESTAMP)")) + op.alter_column('indie_game', 'multiplayer_game_length', + existing_type=sa.INTEGER(), + nullable=True) + op.alter_column('indie_game', 'studio_id', + existing_type=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'indie_developer', type_='foreignkey') + op.create_foreign_key(op.f('fk_indie_developer_studio_id_indie_studio'), 'indie_developer', 'indie_studio', ['studio_id'], ['id']) + op.alter_column('indie_developer', 'studio_id', + existing_type=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'hotel_requests', type_='foreignkey') + op.create_foreign_key(op.f('fk_hotel_requests_attendee_id_attendee'), 'hotel_requests', 'attendee', ['attendee_id'], ['id']) + op.alter_column('hotel_requests', 'attendee_id', + existing_type=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'guest_travel_plans', type_='foreignkey') + op.create_foreign_key(op.f('fk_guest_travel_plans_guest_id_guest_group'), 'guest_travel_plans', 'guest_group', ['guest_id'], ['id']) + op.alter_column('guest_travel_plans', 'guest_id', + existing_type=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'guest_track', type_='foreignkey') + op.create_foreign_key(op.f('fk_guest_track_guest_id_guest_group'), 'guest_track', 'guest_group', ['guest_id'], ['id']) + op.drop_constraint(None, 'guest_track', type_='unique') + op.alter_column('guest_track', 'guest_id', + existing_type=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'guest_taxes', type_='foreignkey') + op.create_foreign_key(op.f('fk_guest_taxes_guest_id_guest_group'), 'guest_taxes', 'guest_group', ['guest_id'], ['id']) + op.alter_column('guest_taxes', 'guest_id', + existing_type=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'guest_stage_plot', type_='foreignkey') + op.create_foreign_key(op.f('fk_guest_stage_plot_guest_id_guest_group'), 'guest_stage_plot', 'guest_group', ['guest_id'], ['id']) + op.alter_column('guest_stage_plot', 'guest_id', + existing_type=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'guest_panel', type_='foreignkey') + op.create_foreign_key(op.f('fk_guest_panel_guest_id_guest_group'), 'guest_panel', 'guest_group', ['guest_id'], ['id']) + op.alter_column('guest_panel', 'guest_id', + existing_type=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'guest_merch', type_='foreignkey') + op.create_foreign_key(op.f('fk_guest_merch_guest_id_guest_group'), 'guest_merch', 'guest_group', ['guest_id'], ['id']) + op.alter_column('guest_merch', 'inventory_updated', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=True) + op.alter_column('guest_merch', 'guest_id', + existing_type=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'guest_media_request', type_='foreignkey') + op.create_foreign_key(op.f('fk_guest_media_request_guest_id_guest_group'), 'guest_media_request', 'guest_group', ['guest_id'], ['id']) + op.alter_column('guest_media_request', 'guest_id', + existing_type=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'guest_interview', type_='foreignkey') + op.create_foreign_key(op.f('fk_guest_interview_guest_id_guest_group'), 'guest_interview', 'guest_group', ['guest_id'], ['id']) + op.alter_column('guest_interview', 'guest_id', + existing_type=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'guest_info', type_='foreignkey') + op.create_foreign_key(op.f('fk_guest_info_guest_id_guest_group'), 'guest_info', 'guest_group', ['guest_id'], ['id']) + op.alter_column('guest_info', 'guest_id', + existing_type=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'guest_image', type_='foreignkey') + op.create_foreign_key(op.f('fk_guest_image_guest_id_guest_group'), 'guest_image', 'guest_group', ['guest_id'], ['id']) + op.alter_column('guest_image', 'guest_id', + existing_type=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'guest_hospitality', type_='foreignkey') + op.create_foreign_key(op.f('fk_guest_hospitality_guest_id_guest_group'), 'guest_hospitality', 'guest_group', ['guest_id'], ['id']) + op.alter_column('guest_hospitality', 'guest_id', + existing_type=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'guest_group', type_='foreignkey') + op.drop_constraint(None, 'guest_group', type_='foreignkey') + op.create_foreign_key(op.f('fk_guest_group_event_id_event'), 'guest_group', 'event', ['event_id'], ['id'], ondelete='SET NULL') + op.create_foreign_key(op.f('fk_guest_group_group_id_group'), 'guest_group', 'group', ['group_id'], ['id']) + op.drop_constraint(None, 'guest_group', type_='unique') + op.alter_column('guest_group', 'group_id', + existing_type=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'guest_detailed_travel_plan', type_='foreignkey') + op.create_foreign_key(op.f('fk_guest_detailed_travel_plan_travel_plans_id_guest_tra_6ad4'), 'guest_detailed_travel_plan', 'guest_travel_plans', ['travel_plans_id'], ['id']) + op.alter_column('guest_detailed_travel_plan', 'departure_time', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=False) + op.alter_column('guest_detailed_travel_plan', 'arrival_time', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=False) + op.drop_constraint(None, 'guest_charity', type_='foreignkey') + op.create_foreign_key(op.f('fk_guest_charity_guest_id_guest_group'), 'guest_charity', 'guest_group', ['guest_id'], ['id']) + op.alter_column('guest_charity', 'guest_id', + existing_type=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'guest_bio', type_='foreignkey') + op.create_foreign_key(op.f('fk_guest_bio_guest_id_guest_group'), 'guest_bio', 'guest_group', ['guest_id'], ['id']) + op.alter_column('guest_bio', 'guest_id', + existing_type=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'guest_autograph', type_='foreignkey') + op.create_foreign_key(op.f('fk_guest_autograph_guest_id_guest_group'), 'guest_autograph', 'guest_group', ['guest_id'], ['id']) + op.alter_column('guest_autograph', 'guest_id', + existing_type=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'group', type_='foreignkey') + op.drop_constraint(None, 'group', type_='foreignkey') + op.create_foreign_key(op.f('fk_group_shared_with_id_group'), 'group', 'group', ['shared_with_id'], ['id'], ondelete='SET NULL') + op.create_foreign_key(op.f('fk_leader'), 'group', 'attendee', ['leader_id'], ['id'], ondelete='SET NULL') + op.alter_column('group', 'approved', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=True) + op.alter_column('group', 'registered', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=False, + existing_server_default=sa.text("timezone('utc'::text, CURRENT_TIMESTAMP)")) + op.alter_column('group', 'public_id', + existing_type=sqlmodel.sql.sqltypes.AutoString(), + type_=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'food_restrictions', type_='foreignkey') + op.create_foreign_key(op.f('fk_food_restrictions_attendee_id_attendee'), 'food_restrictions', 'attendee', ['attendee_id'], ['id']) + op.alter_column('food_restrictions', 'attendee_id', + existing_type=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'event_location', type_='foreignkey') + op.create_foreign_key(op.f('fk_event_location_department_id_department'), 'event_location', 'department', ['department_id'], ['id'], ondelete='SET NULL') + op.drop_constraint(None, 'event_feedback', type_='foreignkey') + op.create_foreign_key(op.f('fk_event_feedback_event_id_event'), 'event_feedback', 'event', ['event_id'], ['id']) + op.alter_column('event_feedback', 'attendee_id', + existing_type=sa.UUID(), + nullable=False) + op.alter_column('event_feedback', 'event_id', + existing_type=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'event', type_='foreignkey') + op.drop_constraint(None, 'event', type_='foreignkey') + op.drop_constraint(None, 'event', type_='foreignkey') + op.create_foreign_key(op.f('fk_event_attraction_event_id_attraction_event'), 'event', 'attraction_event', ['attraction_event_id'], ['id'], ondelete='SET NULL') + op.create_foreign_key(op.f('fk_event_department_id_department'), 'event', 'department', ['department_id'], ['id'], ondelete='SET NULL') + op.create_foreign_key(op.f('fk_event_location_id_event_location'), 'event', 'event_location', ['event_location_id'], ['id'], ondelete='SET NULL') + op.drop_constraint(None, 'event', type_='unique') + op.alter_column('event', 'start_time', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=False) + op.create_unique_constraint(op.f('uq_escalation_ticket_ticket_id'), 'escalation_ticket', ['ticket_id'], postgresql_nulls_not_distinct=False) + op.alter_column('escalation_ticket', 'resolved', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=True) + op.drop_constraint(None, 'email', type_='foreignkey') + op.create_foreign_key(op.f('fk_email_automated_email_id_automated_email'), 'email', 'automated_email', ['automated_email_id'], ['id'], ondelete='SET NULL') + op.alter_column('email', 'when', + existing_type=sqlmodel.sql.sqltypes.AutoString(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=False) + op.alter_column('email', 'fk_id', + existing_type=sqlmodel.sql.sqltypes.AutoString(), + type_=sa.UUID(), + existing_nullable=True) + op.drop_constraint(None, 'dept_role', type_='foreignkey') + op.create_foreign_key(op.f('fk_dept_role_department_id_department'), 'dept_role', 'department', ['department_id'], ['id']) + op.alter_column('dept_role', 'department_id', + existing_type=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'dept_membership_request', type_='foreignkey') + op.drop_constraint(None, 'dept_membership_request', type_='foreignkey') + op.create_foreign_key(op.f('fk_dept_membership_request_department_id_department'), 'dept_membership_request', 'department', ['department_id'], ['id']) + op.create_foreign_key(op.f('fk_dept_membership_request_attendee_id_attendee'), 'dept_membership_request', 'attendee', ['attendee_id'], ['id']) + op.alter_column('dept_membership_request', 'attendee_id', + existing_type=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'dept_membership', type_='foreignkey') + op.drop_constraint(None, 'dept_membership', type_='foreignkey') + op.create_foreign_key(op.f('fk_dept_membership_department_id_department'), 'dept_membership', 'department', ['department_id'], ['id']) + op.create_foreign_key(op.f('fk_dept_membership_attendee_id_attendee'), 'dept_membership', 'attendee', ['attendee_id'], ['id']) + op.alter_column('dept_membership', 'department_id', + existing_type=sa.UUID(), + nullable=False) + op.alter_column('dept_membership', 'attendee_id', + existing_type=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'dept_checklist_item', type_='foreignkey') + op.drop_constraint(None, 'dept_checklist_item', type_='foreignkey') + op.create_foreign_key(op.f('fk_dept_checklist_item_attendee_id_attendee'), 'dept_checklist_item', 'attendee', ['attendee_id'], ['id']) + op.create_foreign_key(op.f('fk_dept_checklist_item_department_id_department'), 'dept_checklist_item', 'department', ['department_id'], ['id']) + op.alter_column('dept_checklist_item', 'attendee_id', + existing_type=sa.UUID(), + nullable=False) + op.alter_column('dept_checklist_item', 'department_id', + existing_type=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'department', type_='foreignkey') + op.create_foreign_key(op.f('fk_department_parent_id_department'), 'department', 'department', ['parent_id'], ['id']) + op.drop_constraint(None, 'bulk_printing_request', type_='foreignkey') + op.create_foreign_key(op.f('fk_bulk_printing_request_department_id_department'), 'bulk_printing_request', 'department', ['department_id'], ['id']) + op.alter_column('bulk_printing_request', 'department_id', + existing_type=sa.UUID(), + nullable=False) + op.alter_column('badge_pickup_group', 'public_id', + existing_type=sqlmodel.sql.sqltypes.AutoString(), + type_=sa.UUID(), + existing_nullable=True) + op.drop_constraint(None, 'badge_info', type_='foreignkey') + op.create_foreign_key(op.f('fk_badge_info_attendee_id_attendee'), 'badge_info', 'attendee', ['attendee_id'], ['id'], ondelete='SET NULL') + op.create_index(op.f('ix_badge_info_ident'), 'badge_info', ['ident'], unique=False) + op.alter_column('badge_info', 'reported_lost', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=True) + op.alter_column('badge_info', 'picked_up', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=True) + op.create_unique_constraint(op.f('uq_automated_email_ident'), 'automated_email', ['ident'], postgresql_nulls_not_distinct=False) + op.alter_column('automated_email', 'active_before', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=True) + op.alter_column('automated_email', 'active_after', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=True) + op.alter_column('automated_email', 'last_send_time', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=True) + op.drop_constraint(None, 'attraction_signup', type_='foreignkey') + op.drop_constraint(None, 'attraction_signup', type_='foreignkey') + op.drop_constraint(None, 'attraction_signup', type_='foreignkey') + op.create_foreign_key(op.f('fk_attraction_signup_attraction_id_attraction'), 'attraction_signup', 'attraction', ['attraction_id'], ['id']) + op.create_foreign_key(op.f('fk_attraction_signup_attraction_event_id_attraction_event'), 'attraction_signup', 'attraction_event', ['attraction_event_id'], ['id']) + op.create_foreign_key(op.f('fk_attraction_signup_attendee_id_attendee'), 'attraction_signup', 'attendee', ['attendee_id'], ['id']) + op.create_index(op.f('ix_attraction_signup_checkin_time'), 'attraction_signup', ['checkin_time'], unique=False) + op.alter_column('attraction_signup', 'checkin_time', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=False) + op.alter_column('attraction_signup', 'signup_time', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=False) + op.alter_column('attraction_signup', 'attendee_id', + existing_type=sa.UUID(), + nullable=False) + op.alter_column('attraction_signup', 'attraction_event_id', + existing_type=sa.UUID(), + nullable=False) + op.alter_column('attraction_signup', 'attraction_id', + existing_type=sa.UUID(), + nullable=False) + op.create_index(op.f('ix_attraction_notification_reply_sid'), 'attraction_notification_reply', ['sid'], unique=False) + op.alter_column('attraction_notification_reply', 'sent_time', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=False) + op.alter_column('attraction_notification_reply', 'received_time', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=False) + op.drop_constraint(None, 'attraction_notification', type_='foreignkey') + op.drop_constraint(None, 'attraction_notification', type_='foreignkey') + op.drop_constraint(None, 'attraction_notification', type_='foreignkey') + op.create_foreign_key(op.f('fk_attraction_notification_attendee_id_attendee'), 'attraction_notification', 'attendee', ['attendee_id'], ['id']) + op.create_foreign_key(op.f('fk_attraction_notification_attraction_event_id_attraction_event'), 'attraction_notification', 'attraction_event', ['attraction_event_id'], ['id']) + op.create_foreign_key(op.f('fk_attraction_notification_attraction_id_attraction'), 'attraction_notification', 'attraction', ['attraction_id'], ['id']) + op.create_index(op.f('ix_attraction_notification_ident'), 'attraction_notification', ['ident'], unique=False) + op.alter_column('attraction_notification', 'sent_time', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=False) + op.alter_column('attraction_notification', 'attendee_id', + existing_type=sa.UUID(), + nullable=False) + op.alter_column('attraction_notification', 'attraction_id', + existing_type=sa.UUID(), + nullable=False) + op.alter_column('attraction_notification', 'attraction_event_id', + existing_type=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'attraction_feature', type_='foreignkey') + op.create_foreign_key(op.f('fk_attraction_feature_attraction_id_attraction'), 'attraction_feature', 'attraction', ['attraction_id'], ['id']) + op.alter_column('attraction_feature', 'attraction_id', + existing_type=sa.UUID(), + nullable=False) + op.alter_column('attraction_feature', 'signups_open_time', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=True) + op.drop_constraint(None, 'attraction_event', type_='foreignkey') + op.drop_constraint(None, 'attraction_event', type_='foreignkey') + op.drop_constraint(None, 'attraction_event', type_='foreignkey') + op.create_foreign_key(op.f('fk_attraction_event_attraction_feature_id_attraction_feature'), 'attraction_event', 'attraction_feature', ['attraction_feature_id'], ['id']) + op.create_foreign_key(op.f('fk_attraction_event_location_id_event_location'), 'attraction_event', 'event_location', ['event_location_id'], ['id'], ondelete='SET NULL') + op.create_foreign_key(op.f('fk_attraction_event_attraction_id_attraction'), 'attraction_event', 'attraction', ['attraction_id'], ['id']) + op.alter_column('attraction_event', 'start_time', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=False) + op.alter_column('attraction_event', 'attraction_feature_id', + existing_type=sa.UUID(), + nullable=False) + op.alter_column('attraction_event', 'attraction_id', + existing_type=sa.UUID(), + nullable=False) + op.alter_column('attraction_event', 'signups_open_time', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=True) + op.create_unique_constraint(op.f('uq_attraction_slug'), 'attraction', ['slug'], postgresql_nulls_not_distinct=False) + op.create_unique_constraint(op.f('attraction_name_key'), 'attraction', ['name'], postgresql_nulls_not_distinct=False) + op.alter_column('attraction', 'signups_open_time', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=True) + op.alter_column('attendee_account', 'public_id', + existing_type=sqlmodel.sql.sqltypes.AutoString(), + type_=sa.UUID(), + existing_nullable=True) + op.add_column('attendee', sa.Column('affiliate', sa.VARCHAR(), server_default=sa.text("''::character varying"), autoincrement=False, nullable=False)) + op.drop_constraint(None, 'attendee', type_='foreignkey') + op.drop_constraint(None, 'attendee', type_='foreignkey') + op.drop_constraint(None, 'attendee', type_='foreignkey') + op.drop_constraint(None, 'attendee', type_='foreignkey') + op.create_foreign_key(op.f('fk_attendee_group_id_group'), 'attendee', 'group', ['group_id'], ['id'], ondelete='SET NULL') + op.create_foreign_key(op.f('fk_attendee_badge_pickup_group_id_badge_pickup_group'), 'attendee', 'badge_pickup_group', ['badge_pickup_group_id'], ['id'], ondelete='SET NULL') + op.create_foreign_key(op.f('fk_attendee_watchlist_id_watch_list'), 'attendee', 'watch_list', ['watchlist_id'], ['id'], ondelete='SET NULL') + op.create_foreign_key(op.f('fk_attendee_creator_id_attendee'), 'attendee', 'attendee', ['creator_id'], ['id'], ondelete='SET NULL') + op.alter_column('assigned_panelist', 'event_id', + existing_type=sa.UUID(), + nullable=False) + op.alter_column('assigned_panelist', 'attendee_id', + existing_type=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'artist_marketplace_application', type_='foreignkey') + op.create_foreign_key(op.f('fk_artist_marketplace_application_attendee_id_attendee'), 'artist_marketplace_application', 'attendee', ['attendee_id'], ['id']) + op.drop_constraint(None, 'artist_marketplace_application', type_='unique') + op.alter_column('artist_marketplace_application', 'accepted', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=True) + op.alter_column('artist_marketplace_application', 'registered', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=False, + existing_server_default=sa.text("timezone('utc'::text, CURRENT_TIMESTAMP)")) + op.alter_column('artist_marketplace_application', 'attendee_id', + existing_type=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'art_show_receipt', type_='foreignkey') + op.create_foreign_key(op.f('fk_art_show_receipt_attendee_id_attendee'), 'art_show_receipt', 'attendee', ['attendee_id'], ['id'], ondelete='SET NULL') + op.alter_column('art_show_receipt', 'closed', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=True) + op.drop_constraint(None, 'art_show_piece', type_='foreignkey') + op.drop_constraint(None, 'art_show_piece', type_='foreignkey') + op.drop_constraint(None, 'art_show_piece', type_='foreignkey') + op.create_foreign_key(op.f('fk_art_show_piece_receipt_id_art_show_receipt'), 'art_show_piece', 'art_show_receipt', ['receipt_id'], ['id'], ondelete='SET NULL') + op.create_foreign_key(op.f('fk_art_show_piece_winning_bidder_id_art_show_bidder'), 'art_show_piece', 'art_show_bidder', ['winning_bidder_id'], ['id'], ondelete='SET NULL') + op.create_foreign_key(op.f('fk_art_show_pieces_app_id_art_show_application'), 'art_show_piece', 'art_show_application', ['app_id'], ['id'], ondelete='SET NULL') + op.drop_constraint(None, 'art_show_payment', type_='foreignkey') + op.create_foreign_key(op.f('fk_art_show_payment_receipt_id_art_show_receipt'), 'art_show_payment', 'art_show_receipt', ['receipt_id'], ['id'], ondelete='SET NULL') + op.alter_column('art_show_payment', 'when', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=False) + op.drop_constraint(None, 'art_show_bidder', type_='foreignkey') + op.create_foreign_key(op.f('fk_art_show_bidder_attendee_id_attendee'), 'art_show_bidder', 'attendee', ['attendee_id'], ['id'], ondelete='SET NULL') + op.alter_column('art_show_bidder', 'signed_up', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=True) + op.drop_constraint(None, 'art_show_application', type_='foreignkey') + op.create_foreign_key(op.f('fk_art_show_application_attendee_id_attendee'), 'art_show_application', 'attendee', ['attendee_id'], ['id'], ondelete='SET NULL') + op.drop_constraint(None, 'art_show_application', type_='unique') + op.alter_column('art_show_application', 'default_cost', + existing_type=sa.INTEGER(), + nullable=True) + op.alter_column('art_show_application', 'overridden_price', + existing_type=sa.INTEGER(), + nullable=True) + op.alter_column('art_show_application', 'checked_out', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=True) + op.alter_column('art_show_application', 'checked_in', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=True) + op.drop_constraint(None, 'art_show_agent_code', type_='foreignkey') + op.drop_constraint(None, 'art_show_agent_code', type_='foreignkey') + op.create_foreign_key(op.f('fk_art_show_agent_code_attendee_id_attendee'), 'art_show_agent_code', 'attendee', ['attendee_id'], ['id'], ondelete='SET NULL') + op.create_foreign_key(op.f('fk_art_show_agent_code_app_id_art_show_application'), 'art_show_agent_code', 'art_show_application', ['app_id'], ['id']) + op.alter_column('art_show_agent_code', 'cancelled', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=True) + op.alter_column('art_show_agent_code', 'app_id', + existing_type=sa.UUID(), + nullable=False) + op.drop_constraint(None, 'art_panel_assignment', type_='foreignkey') + op.drop_constraint(None, 'art_panel_assignment', type_='foreignkey') + op.create_foreign_key(op.f('fk_art_panel_assignment_panel_id_art_show_panel'), 'art_panel_assignment', 'art_show_panel', ['panel_id'], ['id']) + op.create_foreign_key(op.f('fk_art_panel_assignment_app_id_art_show_application'), 'art_panel_assignment', 'art_show_application', ['app_id'], ['id']) + op.alter_column('art_panel_assignment', 'panel_id', + existing_type=sa.UUID(), + nullable=False) + op.alter_column('art_panel_assignment', 'app_id', + existing_type=sa.UUID(), + nullable=False) + op.alter_column('arbitrary_charge', 'when', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=False) + op.drop_constraint(None, 'api_token', type_='foreignkey') + op.create_foreign_key(op.f('fk_api_token_admin_account_id_admin_account'), 'api_token', 'admin_account', ['admin_account_id'], ['id']) + op.alter_column('api_token', 'revoked_time', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + nullable=True) + op.alter_column('api_token', 'issued_time', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=False) + op.alter_column('api_token', 'token', + existing_type=sqlmodel.sql.sqltypes.AutoString(), + type_=sa.UUID(), + nullable=False) + op.alter_column('api_token', 'admin_account_id', + existing_type=sa.UUID(), + nullable=False) + op.alter_column('api_job', 'cancelled', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=True) + op.alter_column('api_job', 'completed', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=True) + op.alter_column('api_job', 'queued', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=True) + op.drop_constraint(None, 'admin_account', type_='foreignkey') + op.create_foreign_key(op.f('fk_admin_account_attendee_id_attendee'), 'admin_account', 'attendee', ['attendee_id'], ['id']) + op.alter_column('admin_account', 'attendee_id', + existing_type=sa.UUID(), + nullable=False) + op.alter_column('access_group', 'end_time', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=True) + op.alter_column('access_group', 'start_time', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=True) + op.create_table('attendee_tournament', + sa.Column('id', sa.UUID(), autoincrement=False, nullable=False), + sa.Column('first_name', sa.VARCHAR(), server_default=sa.text("''::character varying"), autoincrement=False, nullable=False), + sa.Column('last_name', sa.VARCHAR(), server_default=sa.text("''::character varying"), autoincrement=False, nullable=False), + sa.Column('email', sa.VARCHAR(), server_default=sa.text("''::character varying"), autoincrement=False, nullable=False), + sa.Column('cellphone', sa.VARCHAR(), server_default=sa.text("''::character varying"), autoincrement=False, nullable=False), + sa.Column('game', sa.VARCHAR(), server_default=sa.text("''::character varying"), autoincrement=False, nullable=False), + sa.Column('availability', sa.VARCHAR(), server_default=sa.text("''::character varying"), autoincrement=False, nullable=False), + sa.Column('format', sa.VARCHAR(), server_default=sa.text("''::character varying"), autoincrement=False, nullable=False), + sa.Column('experience', sa.VARCHAR(), server_default=sa.text("''::character varying"), autoincrement=False, nullable=False), + sa.Column('needs', sa.VARCHAR(), server_default=sa.text("''::character varying"), autoincrement=False, nullable=False), + sa.Column('why', sa.VARCHAR(), server_default=sa.text("''::character varying"), autoincrement=False, nullable=False), + sa.Column('volunteering', sa.BOOLEAN(), server_default=sa.text('false'), autoincrement=False, nullable=False), + sa.Column('status', sa.INTEGER(), server_default=sa.text('239694250'), autoincrement=False, nullable=False), + sa.Column('created', postgresql.TIMESTAMP(timezone=True), server_default=sa.text("timezone('utc'::text, CURRENT_TIMESTAMP)"), autoincrement=False, nullable=False), + sa.Column('last_updated', postgresql.TIMESTAMP(timezone=True), server_default=sa.text("timezone('utc'::text, CURRENT_TIMESTAMP)"), autoincrement=False, nullable=False), + sa.Column('external_id', postgresql.JSONB(astext_type=sa.Text()), server_default=sa.text("'{}'::jsonb"), autoincrement=False, nullable=False), + sa.Column('last_synced', postgresql.JSONB(astext_type=sa.Text()), server_default=sa.text("'{}'::jsonb"), autoincrement=False, nullable=False), + sa.PrimaryKeyConstraint('id', name=op.f('pk_attendee_tournament')) + ) + # ### end Alembic commands ### diff --git a/uber/api.py b/uber/api.py index e3f4ea426..da1bfac76 100644 --- a/uber/api.py +++ b/uber/api.py @@ -219,8 +219,8 @@ def _prepare_attendees_export(attendees, include_account_ids=False, include_apps d['attendee_account_ids'] = [m.id for m in a.managers] if include_apps: - if a.art_show_applications: - d['art_show_app'] = a.art_show_applications[0].to_dict(art_show_import_fields) + if a.art_show_application: + d['art_show_app'] = a.art_show_application.to_dict(art_show_import_fields) if a.marketplace_application: d['marketplace_app'] = a.marketplace_application.to_dict(marketplace_import_fields) diff --git a/uber/forms/__init__.py b/uber/forms/__init__.py index 9172faac3..817eca280 100644 --- a/uber/forms/__init__.py +++ b/uber/forms/__init__.py @@ -465,7 +465,7 @@ def populate_obj(self, obj, is_admin=False): else: try: setattr(obj, name, field.data) - except AttributeError as e: + except (AttributeError, ValueError) as e: pass # Indicates collision between a property name and a field name, like 'badges' for GroupInfo for model_field_name, aliases in self.field_aliases.items(): diff --git a/uber/models/__init__.py b/uber/models/__init__.py index 10650aedd..6d9f271e1 100644 --- a/uber/models/__init__.py +++ b/uber/models/__init__.py @@ -602,7 +602,7 @@ def coerce_column_data(self, column, value): if value is None: return # Totally fine for value to be None - elif value == '' and isinstance(column.type, (Uuid(as_uuid=False), Float, Numeric, Choice, Integer, DateTime, Date)): + elif value == '' and isinstance(column.type, (Uuid, Float, Numeric, Choice, Integer, DateTime, Date)): return None elif isinstance(column.type, Boolean): @@ -1031,7 +1031,7 @@ def access_query_matrix(self): ).outerjoin(ArtShowBidder).filter( or_(Attendee.art_show_bidder != None, # noqa: E711 Attendee.art_show_purchases != None, # noqa: E711 - Attendee.art_show_applications != None, # noqa: E711 + Attendee.art_show_application != None, # noqa: E711 Attendee.art_agent_apps != None) # noqa: E711 ).outerjoin(ArtShowAgentCode).filter( ArtShowAgentCode.attendee_id == Attendee.id, @@ -1399,7 +1399,7 @@ def attendee_from_art_show_app(self, **params): attendee, message = self.create_or_find_attendee_by_id(**params) if message: return attendee, message - elif attendee.art_show_applications: + elif attendee.art_show_application: return attendee, \ 'There is already an art show application for that badge!' diff --git a/uber/models/admin.py b/uber/models/admin.py index b5b4ab1d2..a0beb9d75 100644 --- a/uber/models/admin.py +++ b/uber/models/admin.py @@ -5,7 +5,6 @@ from sqlalchemy import Sequence, Uuid, String, DateTime from sqlalchemy.dialects.postgresql.json import JSONB from sqlalchemy.ext.mutable import MutableDict -from sqlalchemy.orm import backref from sqlalchemy.schema import ForeignKey, Table, UniqueConstraint, Index from sqlalchemy.types import Boolean, Date, Integer from sqlmodel import Field, Relationship @@ -37,29 +36,36 @@ class AdminAccount(MagModel, table=True): """ Attendee: joined AccessGroup: selectin + ApiToken: select PasswordReset: select """ - attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), unique=True)) - access_groups: list['AccessGroup'] = Relationship(sa_relationship=relationship( - 'AccessGroup', backref='admin_accounts', lazy='selectin', cascade='save-update,merge,refresh-expire,expunge', - secondary='admin_access_group')) - hashed: str = Column(String, private=True) + attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE', unique=True) + attendee: 'Attendee' = Relationship( + back_populates="admin_account", sa_relationship_kwargs={'lazy': 'joined', 'cascade': 'save-update,merge,refresh-expire,expunge'}) - password_reset: "PasswordReset" = Relationship(sa_relationship=relationship('PasswordReset', backref='admin_account', lazy='select', uselist=False)) + hashed: str = Column(String, private=True) - api_tokens: list['ApiToken'] = Relationship(sa_relationship=relationship('ApiToken', backref=backref('admin_account', lazy='joined'))) + access_groups: list['AccessGroup'] = Relationship( + back_populates='admin_accounts', + sa_relationship_kwargs={'lazy': 'selectin', 'cascade': 'save-update,merge,refresh-expire,expunge', 'secondary': 'admin_access_group'}) + password_reset: "PasswordReset" = Relationship( + back_populates='admin_account', sa_relationship_kwargs={'lazy': 'select', 'passive_deletes': True}) + api_tokens: list['ApiToken'] = Relationship(back_populates="admin_account", sa_relationship_kwargs={'passive_deletes': True}) active_api_tokens: list['ApiToken'] = Relationship(sa_relationship=relationship( - 'ApiToken', + 'ApiToken', lazy='select', primaryjoin='and_(' 'AdminAccount.id == ApiToken.admin_account_id, ' 'ApiToken.revoked_time == None)', overlaps="admin_account,api_tokens")) - - judge: 'IndieJudge' = Relationship(sa_relationship=relationship('IndieJudge', uselist=False, backref='admin_account')) - print_requests: list['PrintJob'] = Relationship(sa_relationship=relationship('PrintJob', backref='admin_account', - cascade='save-update,merge,refresh-expire,expunge')) - api_jobs: list['ApiJob'] = Relationship(sa_relationship=relationship('ApiJob', backref='admin_account', cascade='save-update,merge,refresh-expire,expunge')) + api_jobs: list['ApiJob'] = Relationship( + back_populates="admin_account", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) + + attractions: list['Attraction'] = Relationship( + back_populates="owner", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge', 'order_by': 'Attraction.name'}) + judge: 'IndieJudge' = Relationship(back_populates="admin_account", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) + print_requests: list['PrintJob'] = Relationship( + back_populates="admin_account", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) def __repr__(self): return f"" @@ -263,8 +269,12 @@ def invalid_api_accesses(self): class PasswordReset(MagModel, table=True): - admin_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('admin_account.id'), unique=True, nullable=True)) - attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee_account.id'), unique=True, nullable=True)) + admin_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='admin_account.id', ondelete='CASCADE', unique=True) + admin_account: 'AdminAccount' = Relationship(back_populates="password_reset") + + attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee_account.id', ondelete='CASCADE', unique=True) + attendee_account: 'AttendeeAccount' = Relationship(back_populates="password_reset") + generated: datetime = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) hashed: str = Column(String, private=True) @@ -294,6 +304,10 @@ class AccessGroup(MagModel, table=True): (CONTACT, 'Contact Info'), (DEPT, 'All Info in Own Dept(s)'), (FULL, 'All Info')] + + admin_accounts: list['AdminAccount'] = Relationship( + back_populates='access_groups', + sa_relationship_kwargs={'secondary': 'admin_access_group', 'cascade': 'save-update,merge,refresh-expire,expunge'}) name: str = Column(String) access: dict[str, int] = Field(sa_type=MutableDict.as_mutable(JSONB), default_factory=dict) @@ -354,8 +368,9 @@ class WatchList(MagModel, table=True): action: str = Column(String) expiration: datetime | None = Column(Date, nullable=True, default=None) active: bool = Column(Boolean, default=True) - attendees: list['Attendee'] = Relationship(sa_relationship=relationship('Attendee', lazy='selectin', - backref=backref('watch_list'), cascade='save-update,merge,refresh-expire,expunge')) + attendees: list['Attendee'] = Relationship( + back_populates="watch_list", + sa_relationship_kwargs={'lazy': 'selectin', 'cascade': 'save-update,merge,refresh-expire,expunge'}) @property def full_name(self): @@ -387,10 +402,10 @@ class EscalationTicket(MagModel, table=True): """ Attendee: selectin """ - attendees: list['Attendee'] = Relationship(sa_relationship=relationship( - 'Attendee', lazy='selectin', backref='escalation_tickets', order_by='Attendee.full_name', - cascade='save-update,merge,refresh-expire,expunge', - secondary='attendee_escalation_ticket')) + attendees: list['Attendee'] = Relationship( + back_populates="escalation_tickets", + sa_relationship_kwargs={'lazy': 'selectin', 'order_by': 'Attendee.full_name', + 'cascade': 'save-update,merge,refresh-expire,expunge', 'secondary': 'attendee_escalation_ticket'}) ticket_id_seq: ClassVar = Sequence('escalation_ticket_ticket_id_seq') ticket_id: int = Column(Integer, ticket_id_seq, server_default=ticket_id_seq.next_value(), unique=True) who: str = Column(String) diff --git a/uber/models/api.py b/uber/models/api.py index 8c917c350..224021c7d 100644 --- a/uber/models/api.py +++ b/uber/models/api.py @@ -3,7 +3,6 @@ from pytz import UTC from sqlalchemy import String, Uuid, DateTime -from sqlalchemy.schema import ForeignKey from sqlalchemy.dialects.postgresql.json import JSONB from sqlalchemy.ext.mutable import MutableDict from sqlmodel import Field, Relationship @@ -22,9 +21,11 @@ class ApiToken(MagModel, table=True): AdminAccount: joined """ - admin_account_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('admin_account.id'))) + admin_account_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='admin_account.id', ondelete='CASCADE') + admin_account: "AdminAccount" = Relationship(back_populates="api_tokens", sa_relationship_kwargs={'lazy': 'joined'}) + token: str | None = Column(Uuid(as_uuid=False), default=lambda: str(uuid.uuid4()), private=True) - access: int = Column(MultiChoice(c.API_ACCESS_OPTS)) + access: str = Column(MultiChoice(c.API_ACCESS_OPTS)) name: str = Column(String) description: str = Column(String) issued_time: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) @@ -48,7 +49,9 @@ def api_delete(self): class ApiJob(MagModel, table=True): - admin_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('admin_account.id'), nullable=True)) + admin_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='admin_account.id', nullable=True) + admin_account: "AdminAccount" = Relationship(back_populates="api_jobs") + admin_name: str = Column(String) # Preserve admin's name in case their account is removed queued: datetime | None = Column(DateTime(timezone=True), nullable=True, default=None) completed: datetime | None = Column(DateTime(timezone=True), nullable=True, default=None) diff --git a/uber/models/art_show.py b/uber/models/art_show.py index 49ead1c7e..0c7448303 100644 --- a/uber/models/art_show.py +++ b/uber/models/art_show.py @@ -15,9 +15,8 @@ from uber.utils import RegistrationCode, get_static_file_path from sqlalchemy.ext.hybrid import hybrid_property -from sqlalchemy.orm import backref from sqlalchemy.types import Integer, Boolean, String, Uuid, DateTime -from sqlalchemy.schema import ForeignKey, UniqueConstraint, Index +from sqlalchemy.schema import UniqueConstraint, Index from sqlmodel import Field, Relationship from typing import ClassVar @@ -32,17 +31,13 @@ class ArtShowAgentCode(MagModel, table=True): """ ArtShowApplication: joined """ - app_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('art_show_application.id'))) - app: 'ArtShowApplication' = Relationship(sa_relationship=relationship('ArtShowApplication', lazy='joined', - backref=backref('agent_codes', cascade='merge,refresh-expire,expunge'), - foreign_keys='ArtShowAgentCode.app_id', - cascade='merge,refresh-expire,expunge')) - attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), - nullable=True)) - attendee: 'Attendee' = Relationship(sa_relationship=relationship('Attendee', - backref=backref('agent_codes', cascade='merge,refresh-expire,expunge'), - foreign_keys='ArtShowAgentCode.attendee_id', - cascade='merge,refresh-expire,expunge')) + + app_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='art_show_application.id', ondelete='CASCADE') + app: 'ArtShowApplication' = Relationship(back_populates="agent_codes", sa_relationship_kwargs={'lazy': 'joined'}) + + attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', nullable=True) + attendee: 'Attendee' = Relationship(back_populates="agent_codes") + code: str = Column(String) cancelled: datetime | None = Column(DateTime(timezone=True), nullable=True) @@ -65,10 +60,10 @@ class ArtShowApplication(MagModel, table=True): ModelReceipt: select """ - attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), - nullable=True)) - attendee: 'Attendee' = Relationship(sa_relationship=relationship('Attendee', lazy='joined', foreign_keys='ArtShowApplication.attendee_id', cascade='save-update, merge', - backref=backref('art_show_applications', cascade='save-update, merge'))) + attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', nullable=True, unique=True) + attendee: 'Attendee' = Relationship( + back_populates="art_show_application", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) + checked_in: datetime | None = Column(DateTime(timezone=True), nullable=True) checked_out: datetime | None = Column(DateTime(timezone=True), nullable=True) locations: str = Column(String) @@ -108,11 +103,18 @@ class ArtShowApplication(MagModel, table=True): primaryjoin='and_(remote(ModelReceipt.owner_id) == foreign(ArtShowApplication.id),' 'ModelReceipt.owner_model == "ArtShowApplication",' 'ModelReceipt.closed == None)', - lazy='select', - uselist=False)) + lazy='select')) default_cost: int = Column(Integer, nullable=True) - assignments: list['ArtPanelAssignment'] = Relationship(sa_relationship=relationship('ArtPanelAssignment', backref=backref('app', lazy='joined'))) + agents: list['Attendee'] = Relationship( + back_populates="art_agent_apps", + sa_relationship_kwargs={ + 'secondaryjoin': 'and_(ArtShowAgentCode.app_id == ArtShowApplication.id, ArtShowAgentCode.cancelled == None)', + 'secondary': 'art_show_agent_code', 'viewonly': True + }) + art_show_pieces: list['ArtShowPiece'] = Relationship(back_populates="app", sa_relationship_kwargs={'passive_deletes': True}) + agent_codes: list['ArtShowAgentCode'] = Relationship(back_populates="app", sa_relationship_kwargs={'passive_deletes': True}) + assignments: list['ArtPanelAssignment'] = Relationship(back_populates="app", sa_relationship_kwargs={'passive_deletes': True}) email_model_name: ClassVar = 'app' @@ -452,21 +454,15 @@ class ArtShowPiece(MagModel, table=True): Attendee (buyer): joined """ - app_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('art_show_application.id', ondelete='SET NULL'), nullable=True)) - app: 'ArtShowApplication' = Relationship(sa_relationship=relationship('ArtShowApplication', foreign_keys='ArtShowPiece.app_id', - cascade='save-update, merge', lazy='joined', - backref=backref('art_show_pieces', - cascade='save-update, merge'))) - receipt_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('art_show_receipt.id', ondelete='SET NULL'), nullable=True)) - receipt: 'ArtShowReceipt' = Relationship(sa_relationship=relationship('ArtShowReceipt', foreign_keys='ArtShowPiece.receipt_id', - cascade='save-update, merge', - overlaps="art_show_purchases,buyer", - backref=backref('pieces', lazy='selectin', cascade='save-update, merge', overlaps="art_show_purchases,buyer"))) - winning_bidder_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('art_show_bidder.id', ondelete='SET NULL'), nullable=True)) - winning_bidder: 'ArtShowBidder' = Relationship(sa_relationship=relationship('ArtShowBidder', foreign_keys='ArtShowPiece.winning_bidder_id', - cascade='save-update, merge', - backref=backref('art_show_pieces', - cascade='save-update, merge'))) + app_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='art_show_application.id', ondelete='CASCADE') + app: 'ArtShowApplication' = Relationship(back_populates="art_show_pieces", sa_relationship_kwargs={'lazy': 'joined'}) + + receipt_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='art_show_receipt.id', nullable=True) + receipt: 'ArtShowReceipt' = Relationship(back_populates="pieces", sa_relationship_kwargs={'overlaps': 'art_show_purchases,buyer'}) + + winning_bidder_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='art_show_bidder.id', nullable=True) + winning_bidder: 'ArtShowBidder' = Relationship(back_populates="art_show_pieces") + piece_id: int = Column(Integer) name: str = Column(String) for_sale: bool = Column(Boolean, default=False) @@ -480,9 +476,12 @@ class ArtShowPiece(MagModel, table=True): winning_bid: int | None = Column(Integer, default=0, nullable=True) no_quick_sale: bool = Column(Boolean, default=False) voice_auctioned: bool = Column(Boolean, default=False) - status: int = Column(Choice(c.ART_PIECE_STATUS_OPTS), default=c.EXPECTED, admin_only=True) + + buyer: 'Attendee' = Relationship( + back_populates="art_show_purchases", + sa_relationship_kwargs={'lazy': 'joined', 'secondary': 'art_show_receipt', 'cascade': 'save-update,merge,refresh-expire,expunge'}) @presave_adjustment def create_piece_id(self): @@ -610,7 +609,8 @@ class ArtShowPanel(MagModel, table=True): start_label: str = Column(String) end_label: str = Column(String) - assignments: list['ArtPanelAssignment'] = Relationship(sa_relationship=relationship('ArtPanelAssignment', lazy='selectin', backref=backref('panel', lazy='joined'))) + assignments: list['ArtPanelAssignment'] = Relationship( + back_populates="panel", sa_relationship_kwargs={'lazy': 'selectin', 'passive_deletes': True}) __table_args__: ClassVar = ( UniqueConstraint('gallery', 'surface_type', 'origin_x', 'origin_y', 'terminus_x', 'terminus_y'), @@ -646,8 +646,12 @@ class ArtPanelAssignment(MagModel, table=True): ArtShowPanel: joined """ - panel_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('art_show_panel.id'))) - app_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('art_show_application.id'))) + app_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='art_show_application.id', ondelete='CASCADE') + app: 'ArtShowApplication' = Relationship(back_populates="assignments", sa_relationship_kwargs={'lazy': 'joined'}) + + panel_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='art_show_panel.id', ondelete='CASCADE') + panel: 'ArtShowPanel' = Relationship(back_populates="assignments", sa_relationship_kwargs={'lazy': 'joined'}) + manual: bool = Column(Boolean, default=False) assigned_side: int = Column(Choice(c.ART_SHOW_PANEL_SIDE_OPTS), default=c.START) @@ -682,11 +686,9 @@ class ArtShowPayment(MagModel, table=True): ArtShowReceipt: joined """ - receipt_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('art_show_receipt.id', ondelete='SET NULL'), nullable=True)) - receipt: 'ArtShowReceipt' = Relationship(sa_relationship=relationship('ArtShowReceipt', lazy='joined', foreign_keys='ArtShowPayment.receipt_id', - cascade='save-update, merge', - backref=backref('art_show_payments', lazy='selectin', - cascade='save-update, merge'))) + receipt_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='art_show_receipt.id', ondelete='CASCADE') + receipt: 'ArtShowReceipt' = Relationship(back_populates="art_show_payments", sa_relationship_kwargs={'lazy': 'joined'}) + amount: int = Column(Integer, default=0) type: int = Column(Choice(c.ART_SHOW_PAYMENT_OPTS), default=c.STRIPE, admin_only=True) when: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) @@ -699,16 +701,19 @@ class ArtShowReceipt(MagModel, table=True): ArtShowPayment: selectin """ + attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE') + attendee: 'Attendee' = Relationship( + back_populates="art_show_receipts", sa_relationship_kwargs={'lazy': 'joined', 'overlaps': 'art_show_purchases,buyer'}) + invoice_num: int = Column(Integer, default=0) - attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), nullable=True)) - attendee: 'Attendee' = Relationship(sa_relationship=relationship('Attendee', foreign_keys='ArtShowReceipt.attendee_id', - cascade='save-update, merge', lazy='joined', - overlaps="art_show_purchases,buyer", - backref=backref('art_show_receipts', - cascade='save-update, merge', - overlaps="art_show_purchases,buyer"))) closed: datetime | None = Column(DateTime(timezone=True), nullable=True) + pieces: list['ArtShowPiece'] = Relationship( + back_populates="receipt", + sa_relationship_kwargs={'lazy': 'selectin', 'cascade': 'save-update,merge,refresh-expire,expunge', 'overlaps': 'art_show_purchases,buyer'}) + art_show_payments: list['ArtShowPayment'] = Relationship( + back_populates="receipt", sa_relationship_kwargs={'lazy': 'selectin', 'passive_deletes': True}) + @presave_adjustment def add_invoice_num(self): if not self.invoice_num: @@ -766,13 +771,19 @@ class ArtShowBidder(MagModel, table=True): Attendee: joined """ - attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), nullable=True)) + attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE') + attendee: 'Attendee' = Relationship( + back_populates="art_show_bidder", sa_relationship_kwargs={'lazy': 'joined', 'cascade': 'save-update,merge,refresh-expire,expunge'}) + bidder_num: str = Column(String) admin_notes: str = Column(String) signed_up: datetime | None = Column(DateTime(timezone=True), nullable=True) email_won_bids: bool = Column(Boolean, default=False) contact_type: int = Column(Choice(c.ART_SHOW_CONTACT_TYPE_OPTS), default=c.EMAIL) + art_show_pieces: list['ArtShowPiece'] = Relationship( + back_populates="winning_bidder", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) + email_model_name: ClassVar = 'bidder' @presave_adjustment diff --git a/uber/models/attendee.py b/uber/models/attendee.py index 19caa0a75..255e7204c 100644 --- a/uber/models/attendee.py +++ b/uber/models/attendee.py @@ -7,10 +7,9 @@ from pytz import UTC from sqlalchemy import and_, case, exists, func, or_, select, not_ -from sqlalchemy.ext.associationproxy import association_proxy from sqlalchemy.ext.hybrid import hybrid_property -from sqlalchemy.orm import backref, subqueryload, aliased, selectinload, joinedload -from sqlalchemy.schema import Column as SQLAlchemyColumn, ForeignKey, Index, Table, UniqueConstraint +from sqlalchemy.orm import subqueryload, aliased, selectinload, joinedload +from sqlalchemy.schema import ForeignKey, Index, Table, UniqueConstraint from sqlalchemy.types import Boolean, Date, Integer, Uuid, String, DateTime from sqlmodel import Field, Relationship from typing import ClassVar @@ -153,10 +152,8 @@ class BadgeInfo(MagModel, table=True): Attendee: joined """ - attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), nullable=True, default=None)) - attendee: 'Attendee' = Relationship(sa_relationship=relationship('Attendee', backref=backref('allocated_badges', cascade='merge,refresh-expire,expunge'), - foreign_keys='BadgeInfo.attendee_id', lazy='joined', - cascade='save-update,merge,refresh-expire,expunge', single_parent=True)) + attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', nullable=True) + attendee: 'Attendee' = Relationship(back_populates="allocated_badges", sa_relationship_kwargs={'lazy': 'joined'}) active: bool = Column(Boolean, default=False) picked_up: datetime | None = Column(DateTime(timezone=True), nullable=True, default=None) reported_lost: datetime | None = Column(DateTime(timezone=True), nullable=True, default=None) @@ -214,35 +211,34 @@ class Attendee(MagModel, TakesPaymentMixin, table=True): DeptMembership: select """ - watchlist_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('watch_list.id', ondelete='set null'), nullable=True)) - group_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('group.id', ondelete='SET NULL'), nullable=True)) - group: 'Group' = Relationship(sa_relationship=relationship( - Group, backref=(backref('attendees', lazy='selectin')), - foreign_keys='Attendee.group_id', lazy='select', cascade='save-update,merge,refresh-expire,expunge')) + watchlist_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='watch_list.id', nullable=True) + watch_list: "WatchList" = Relationship(back_populates="attendees") + + group_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='group.id', nullable=True) + group: 'Group' = Relationship(back_populates="attendees", sa_relationship_kwargs={'foreign_keys': 'Attendee.group_id', 'lazy': 'select'}) - badge_pickup_group_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('badge_pickup_group.id', ondelete='SET NULL'), nullable=True)) - badge_pickup_group: 'BadgePickupGroup' = Relationship(sa_relationship=relationship( - 'BadgePickupGroup', backref=backref('attendees', lazy='selectin', order_by='Attendee.full_name'), foreign_keys='Attendee.badge_pickup_group_id', - cascade='save-update,merge,refresh-expire,expunge', single_parent=True)) - - creator_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='set null'), nullable=True)) - creator: 'Attendee' = Relationship(sa_relationship=relationship( - 'Attendee', - foreign_keys='Attendee.creator_id', - backref=backref('created_badges', order_by='Attendee.full_name'), - cascade='save-update,merge,refresh-expire,expunge', - remote_side='Attendee.id', - single_parent=True)) - - current_attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), nullable=True)) - current_attendee: 'Attendee' = Relationship(sa_relationship=relationship( - 'Attendee', - foreign_keys='Attendee.current_attendee_id', - backref=backref('old_badges', order_by='Attendee.badge_status', cascade='all,delete-orphan'), - cascade='save-update,merge,refresh-expire,expunge', - remote_side='Attendee.id', - single_parent=True)) + badge_pickup_group_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='badge_pickup_group.id', nullable=True) + badge_pickup_group: 'BadgePickupGroup' = Relationship(back_populates="attendees") + + creator_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', nullable=True) + creator: 'Attendee' = Relationship( + back_populates="created_badges", sa_relationship_kwargs={'foreign_keys': 'Attendee.creator_id', 'remote_side': 'Attendee.id'}) + created_badges: list['Attendee'] = Relationship( + back_populates="creator", + sa_relationship_kwargs={'foreign_keys': 'Attendee.creator_id', 'order_by': 'Attendee.full_name', + 'cascade': 'save-update,merge,refresh-expire,expunge'}) + + current_attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', nullable=True) + current_attendee: 'Attendee' = Relationship( + back_populates="old_badges", + sa_relationship_kwargs={'foreign_keys': 'Attendee.current_attendee_id', 'remote_side': 'Attendee.id'}) + old_badges: list['Attendee'] = Relationship( + back_populates="current_attendee", + sa_relationship_kwargs={'foreign_keys': 'Attendee.current_attendee_id', 'order_by': 'Attendee.badge_status', + 'cascade': 'save-update,merge,refresh-expire,expunge'}) + allocated_badges: list['BadgeInfo'] = Relationship( + back_populates="attendee", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) active_badge: 'BadgeInfo' = Relationship(sa_relationship=relationship( 'BadgeInfo', cascade='save-update,merge,refresh-expire,expunge', @@ -262,13 +258,8 @@ class Attendee(MagModel, TakesPaymentMixin, table=True): # # The practical result of this is that we must manually set promo_code_id # in order for the relationship to be persisted. - promo_code_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('promo_code.id'), nullable=True, index=True)) - promo_code: 'PromoCode' = Relationship(sa_relationship=relationship( - 'PromoCode', - lazy='select', - backref=backref('used_by', lazy='selectin', cascade='merge,refresh-expire,expunge'), - foreign_keys='Attendee.promo_code_id', - cascade='merge,refresh-expire,expunge')) + promo_code_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='promo_code.id', nullable=True, index=True) + promo_code: 'PromoCode' = Relationship(back_populates="used_by", sa_relationship_kwargs={'lazy': 'select'}) transfer_code: str = '' @@ -339,34 +330,37 @@ class Attendee(MagModel, TakesPaymentMixin, table=True): primaryjoin='and_(remote(ModelReceipt.owner_id) == foreign(Attendee.id),' 'ModelReceipt.owner_model == "Attendee",' 'ModelReceipt.closed == None)', - lazy='select', - uselist=False)) + lazy='select')) default_cost: int | None - dept_memberships: list['DeptMembership'] = Relationship(sa_relationship=relationship('DeptMembership', backref=backref('attendee', lazy='joined'), lazy='select')) - dept_membership_requests: list['DeptMembershipRequest'] = Relationship(sa_relationship=relationship('DeptMembershipRequest', backref=backref('attendee', lazy='joined'))) - dept_roles: list['DeptRole'] = Relationship(sa_relationship=relationship( - 'DeptRole', - backref='attendees', - secondaryjoin='and_(' - 'dept_membership_dept_role.c.dept_role_id == DeptRole.id, ' - 'dept_membership_dept_role.c.dept_membership_id == DeptMembership.id)', - secondary='join(DeptMembership, dept_membership_dept_role)', - order_by='DeptRole.name', - viewonly=True)) - shifts: list['Shift'] = Relationship(sa_relationship=relationship('Shift', backref=backref('attendee', lazy='joined'))) - jobs: list['Job'] = Relationship(sa_relationship=relationship( - 'Job', - backref='attendees_working_shifts', - secondary='shift', - order_by='Job.name', - viewonly=True)) - depts_where_working: list['Department'] = Relationship(sa_relationship=relationship( - 'Department', - backref='attendees_working_shifts', - secondary='join(Shift, Job)', - order_by='Department.name', - viewonly=True)) + created_groups: list['Group'] = Relationship( + back_populates="creator", + sa_relationship_kwargs={'foreign_keys': 'Group.creator_id', 'order_by': 'Group.name', + 'cascade': 'save-update,merge,refresh-expire,expunge'}) + + dept_memberships: list['DeptMembership'] = Relationship( + back_populates="attendee", sa_relationship_kwargs={'lazy': 'select', 'passive_deletes': True}) + dept_membership_requests: list['DeptMembershipRequest'] = Relationship( + back_populates="attendee", sa_relationship_kwargs={'passive_deletes': True}) + assigned_depts: list['Department'] = Relationship( + back_populates='members', + sa_relationship_kwargs={ + 'order_by': 'Department.name', 'overlaps': 'dept_memberships,attendee', + 'secondary': 'dept_membership', 'cascade': 'save-update,merge,refresh-expire,expunge'}) + dept_roles: list['DeptRole'] = Relationship( + back_populates="attendees", + sa_relationship_kwargs={ + 'secondaryjoin': 'and_(dept_membership_dept_role.c.dept_role_id == DeptRole.id, ' + 'dept_membership_dept_role.c.dept_membership_id == DeptMembership.id)', + 'secondary': 'join(DeptMembership, dept_membership_dept_role)', + 'order_by': 'DeptRole.name', 'viewonly': True}) + shifts: list['Shift'] = Relationship(back_populates="attendee", sa_relationship_kwargs={'passive_deletes': True}) + jobs: list['Job'] = Relationship( + back_populates="attendees_working_shifts", + sa_relationship_kwargs={'secondary': 'shift', 'order_by': 'Job.name', 'viewonly': True}) + depts_where_working: list['Department'] = Relationship( + back_populates="attendees_working_shifts", + sa_relationship_kwargs={'secondary': 'join(Shift, Job)', 'order_by': 'Department.name', 'viewonly': True}) dept_memberships_with_inherent_role: list['DeptMembership'] = Relationship(sa_relationship=relationship( 'DeptMembership', primaryjoin='and_(' @@ -400,6 +394,45 @@ class Attendee(MagModel, TakesPaymentMixin, table=True): 'DeptMembership.is_checklist_admin == True)', viewonly=True)) + checklist_admin_depts: list['Department'] = Relationship( + back_populates="checklist_admins", + sa_relationship_kwargs={ + 'primaryjoin': 'and_(Department.id == DeptMembership.department_id, ' + 'DeptMembership.is_checklist_admin == True)', + 'secondary': 'dept_membership', 'viewonly': True, 'order_by': 'Department.name'}) + depts_with_inherent_role: list['Department'] = Relationship( + back_populates="members_with_inherent_role", + sa_relationship_kwargs={ + 'primaryjoin': 'and_(Department.id == DeptMembership.department_id, ' + 'DeptMembership.has_inherent_role)', + 'secondary': 'dept_membership', 'cascade': 'save-update,merge,refresh-expire,expunge', + 'order_by': 'Department.name'}) + can_admin_checklist_depts: list['Department'] = Relationship( + back_populates="members_who_can_admin_checklist", + sa_relationship_kwargs={ + 'primaryjoin': 'and_(Department.id == DeptMembership.department_id, ' + 'or_(DeptMembership.is_checklist_admin == True, ' + 'DeptMembership.is_dept_head == True))', + 'secondary': 'dept_membership', 'viewonly': True, 'order_by': 'Department.name'}) + poc_depts: list['Department'] = Relationship( + back_populates="pocs", + sa_relationship_kwargs={ + 'primaryjoin': 'and_(Department.id == DeptMembership.department_id, ' + 'DeptMembership.is_poc == True)', + 'secondary': 'dept_membership', 'viewonly': True, 'order_by': 'Department.name'}) + explicitly_requested_depts: list['Department'] = Relationship( + back_populates="explicitly_requesting_attendees", + sa_relationship_kwargs={ + 'cascade': 'save-update,merge,refresh-expire,expunge', + 'secondary': 'dept_membership_request', 'order_by': 'Department.name', + 'overlaps': "attendee,dept_membership_requests,department,membership_requests"}) + requested_depts: list['Department'] = Relationship( + back_populates="requesting_attendees", + sa_relationship_kwargs={ + 'primaryjoin': 'or_(DeptMembershipRequest.department_id == Department.id, ' + 'DeptMembershipRequest.department_id == None)', + 'secondary': 'dept_membership_request', 'order_by': 'Department.name', 'viewonly': True}) + staffing: bool = False agreed_to_volunteer_agreement: bool = False reviewed_emergency_procedures: bool = False @@ -411,25 +444,41 @@ class Attendee(MagModel, TakesPaymentMixin, table=True): can_work_setup: bool = False can_work_teardown: bool = False - # TODO: a record of when an attendee is unable to pickup a shirt - # (which type? swag or staff? prob swag) - no_shirt: 'NoShirt' = Relationship(sa_relationship=relationship('NoShirt', backref=backref('attendee'), uselist=False)) + admin_account: 'AdminAccount' = Relationship(back_populates="attendee", sa_relationship_kwargs={'passive_deletes': True}) + managers: list['AttendeeAccount'] = Relationship( + back_populates="attendees", + sa_relationship_kwargs={'secondary': 'attendee_attendee_account', 'cascade': 'save-update,merge,refresh-expire,expunge'}) - admin_account: 'AdminAccount' = Relationship(sa_relationship=relationship('AdminAccount', lazy='select', backref=backref('attendee', lazy='joined'), uselist=False)) - food_restrictions: 'FoodRestrictions' = Relationship(sa_relationship=relationship( - 'FoodRestrictions', backref=backref('attendee', lazy='joined'), uselist=False)) + agent_codes: list['ArtShowAgentCode'] = Relationship(back_populates="attendee") + art_show_application: 'ArtShowApplication' = Relationship( + back_populates="attendee", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) + art_show_receipts: list['ArtShowReceipt'] = Relationship( + back_populates="attendee", sa_relationship_kwargs={'passive_deletes': True, 'overlaps': 'art_show_purchases,buyer'}) + + marketplace_application: 'ArtistMarketplaceApplication' = Relationship( + back_populates="attendee", sa_relationship_kwargs={'passive_deletes': True}) + + escalation_tickets: list['EscalationTicket'] = Relationship( + back_populates="attendees", sa_relationship_kwargs={'secondary': "attendee_escalation_ticket"}) + food_restrictions: 'FoodRestrictions' = Relationship(back_populates="attendee", sa_relationship_kwargs={'passive_deletes': True}) + + promo_code_groups: list['PromoCodeGroup'] = Relationship( + back_populates="buyer", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) - sales: list['Sale'] = Relationship(sa_relationship=relationship('Sale', backref='attendee', cascade='save-update,merge,refresh-expire,expunge')) - mpoints_for_cash: list['MPointsForCash'] = Relationship(sa_relationship=relationship('MPointsForCash', backref='attendee')) - old_mpoint_exchanges: list['OldMPointExchange'] = Relationship(sa_relationship=relationship('OldMPointExchange', backref='attendee')) - dept_checklist_items: list['DeptChecklistItem'] = Relationship(sa_relationship=relationship('DeptChecklistItem', backref=backref('attendee', lazy='joined'))) + no_shirt: 'NoShirt' = Relationship(back_populates="attendee", sa_relationship_kwargs={'passive_deletes': True}) + sales: list['Sale'] = Relationship(back_populates="attendee", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) + mpoints_for_cash: list['MPointsForCash'] = Relationship(back_populates="attendee", sa_relationship_kwargs={'passive_deletes': True}) + old_mpoint_exchanges: list['OldMPointExchange'] = Relationship(back_populates="attendee", sa_relationship_kwargs={'passive_deletes': True}) + dept_checklist_items: list['DeptChecklistItem'] = Relationship(back_populates="attendee", sa_relationship_kwargs={'passive_deletes': True}) - indie_developer: 'IndieDeveloper' = Relationship(sa_relationship=relationship( - 'IndieDeveloper', backref=backref('attendee'), uselist=False)) + indie_developer: 'IndieDeveloper' = Relationship( + back_populates="attendee", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) hotel_eligible: bool = False - hotel_requests: 'HotelRequests' = Relationship(sa_relationship=relationship('HotelRequests', backref=backref('attendee', lazy='joined'), uselist=False)) - room_assignments: list['RoomAssignment'] = Relationship(sa_relationship=relationship('RoomAssignment', backref=backref('attendee', lazy='joined'))) + hotel_requests: 'HotelRequests' = Relationship(back_populates="attendee", sa_relationship_kwargs={'passive_deletes': True}) + room_assignments: list['RoomAssignment'] = Relationship(back_populates="attendee", sa_relationship_kwargs={'passive_deletes': True}) + lottery_application: 'LotteryApplication' = Relationship( + back_populates="attendee", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) # The PIN/password used by third party hotel reservation systems hotel_pin: str | None = Field(nullable=True, unique=True) @@ -437,15 +486,17 @@ class Attendee(MagModel, TakesPaymentMixin, table=True): # ========================= # mits # ========================= - mits_applicants: list['MITSApplicant'] = Relationship(sa_relationship=relationship('MITSApplicant', backref='attendee')) + mits_applicants: list['MITSApplicant'] = Relationship( + back_populates="attendee", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) # ========================= # panels # ========================= - assigned_panelists: list['AssignedPanelist'] = Relationship(sa_relationship=relationship('AssignedPanelist', backref=backref('attendee', lazy='joined'))) - panel_applicants: list['PanelApplicant'] = Relationship(sa_relationship=relationship('PanelApplicant', backref=backref('attendee', lazy='joined'), cascade='save-update,merge,refresh-expire,expunge')) - panel_applications: list['PanelApplications'] = Relationship(sa_relationship=relationship('PanelApplication', backref='poc')) - panel_feedback: list['EventFeedback'] = Relationship(sa_relationship=relationship('EventFeedback', backref='attendee')) + assigned_panelists: list['AssignedPanelist'] = Relationship(back_populates="attendee", sa_relationship_kwargs={'passive_deletes': True}) + panel_applicants: list['PanelApplicant'] = Relationship( + back_populates="attendee", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) + panel_applications: list['PanelApplication'] = Relationship( + back_populates="poc", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) submitted_panels: list['PanelApplication'] = Relationship(sa_relationship=relationship( 'PanelApplication', secondary='panel_applicant', @@ -453,6 +504,7 @@ class Attendee(MagModel, TakesPaymentMixin, table=True): primaryjoin='and_(Attendee.id == PanelApplicant.attendee_id, PanelApplicant.submitter == True)', viewonly=True )) + panel_feedback: 'EventFeedback' = Relationship(back_populates="attendee", sa_relationship_kwargs={'passive_deletes': True}) # ========================= # attractions @@ -468,37 +520,41 @@ class Attendee(MagModel, TakesPaymentMixin, table=True): notification_pref: int = Field(default=_NOTIFICATION_EMAIL, sa_column=Column(Choice(_NOTIFICATION_PREF_OPTS))) attractions_opt_out: bool = False - attraction_signups: list['AttractionSignup'] = Relationship(sa_relationship=relationship('AttractionSignup', backref=backref('attendee', lazy='joined'), order_by='AttractionSignup.signup_time')) - attraction_event_signups: ClassVar = association_proxy('attraction_signups', 'event') - attraction_notifications: list['AttractionNotifications'] = Relationship(sa_relationship=relationship( - 'AttractionNotification', backref=backref('attendee', lazy='joined'), order_by='AttractionNotification.sent_time')) + attraction_events: list['AttractionEvent'] = Relationship( + back_populates="attendees", + sa_relationship_kwargs={ + 'cascade': 'save-update,merge,refresh-expire,expunge', 'secondary': 'attraction_signup', + 'overlaps': 'attendee,attraction_signups,event,signups'}) + attraction_signups: list['AttractionSignup'] = Relationship( + back_populates="attendee", sa_relationship_kwargs={'order_by': 'AttractionSignup.signup_time', 'passive_deletes': True}) + attraction_notifications: list['AttractionNotification'] = Relationship( + back_populates="attendee", sa_relationship_kwargs={'order_by': 'AttractionNotification.sent_time', 'passive_deletes': True}) # ========================= # tabletop # ========================= - games: list['TabletopGame'] = Relationship(sa_relationship=relationship('TabletopGame', backref='attendee')) - checkouts: list['TabletopCheckout'] = Relationship(sa_relationship=relationship('TabletopCheckout', backref=backref('attendee', lazy='joined'))) + games: list['TabletopGame'] = Relationship(back_populates="attendee", sa_relationship_kwargs={'passive_deletes': True}) + checkouts: list['TabletopCheckout'] = Relationship(back_populates="attendee", sa_relationship_kwargs={'passive_deletes': True}) # ========================= # badge printing # ========================= - print_requests: list['PrintJob'] = Relationship(sa_relationship=relationship('PrintJob', backref=backref('attendee', lazy='joined'), order_by='desc(PrintJob.last_updated)')) + print_requests: list['PrintJob'] = Relationship( + back_populates="attendee", sa_relationship_kwargs={'order_by': 'desc(PrintJob.last_updated)', 'passive_deletes': True}) # ========================= # art show # ========================= - art_show_bidder: 'ArtShowBidder' = Relationship(sa_relationship=relationship('ArtShowBidder', backref=backref('attendee', lazy='joined'), uselist=False)) - art_show_purchases: list['ArtShowPiece'] = Relationship(sa_relationship=relationship( - 'ArtShowPiece', - backref=backref('buyer', lazy='joined'), - cascade='save-update,merge,refresh-expire,expunge', - secondary='art_show_receipt')) - art_agent_apps: list['ArtShowApplication'] = Relationship(sa_relationship=relationship( - 'ArtShowApplication', - backref='agents', - secondaryjoin='and_(ArtShowAgentCode.app_id == ArtShowApplication.id, ArtShowAgentCode.cancelled == None)', - secondary='art_show_agent_code', - viewonly=True)) + art_show_bidder: 'ArtShowBidder' = Relationship(back_populates="attendee", sa_relationship_kwargs={'passive_deletes': True}) + art_show_purchases: list['ArtShowPiece'] = Relationship( + back_populates="buyer", + sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge', 'secondary': 'art_show_receipt'}) + art_agent_apps: list['ArtShowApplication'] = Relationship( + back_populates="agents", + sa_relationship_kwargs={ + 'secondaryjoin': 'and_(ArtShowAgentCode.app_id == ArtShowApplication.id, ArtShowAgentCode.cancelled == None)', + 'secondary': 'art_show_agent_code', 'viewonly': True + }) _attendee_table_args: ClassVar = [ Index('ix_attendee_paid_group_id', 'paid', 'group_id'), @@ -511,7 +567,6 @@ class Attendee(MagModel, TakesPaymentMixin, table=True): def to_dict(self, *args, **kwargs): # Kludgey fix for SQLAlchemy breaking our stuff d = super().to_dict(*args, **kwargs) - d.pop('attraction_event_signups', None) d.pop('receipt_changes', None) d['badge_num'] = self.badge_num return d @@ -876,7 +931,7 @@ def access_sections(self): section_list.append('mits_admin') if c.MIVS in self.ribbon_ints or self.group and self.group.guest and self.group.guest.group_type == c.MIVS: section_list.append('showcase_admin') - if self.art_show_applications or self.art_show_bidder or self.art_show_purchases or self.art_agent_apps: + if self.art_show_application or self.art_show_bidder or self.art_show_purchases or self.art_agent_apps: section_list.append('art_show_admin') if self.marketplace_application: section_list.append('marketplace_admin') @@ -1365,7 +1420,7 @@ def cannot_abandon_badge_check(self, including_last_adult=True): email_only(c.REGDESK_EMAIL), " to cancel your badge") - if self.art_show_applications and self.art_show_applications[0].is_valid: + if self.art_show_application and self.art_show_application.is_valid: return f"Please contact {email_only(c.ART_SHOW_EMAIL)} to cancel your art show application first." if self.art_agent_apps and any(app.is_valid for app in self.art_agent_apps): return "Please ask the artist you're agenting for to {} first.".format( @@ -1595,7 +1650,7 @@ def is_inherently_transferable(self): and not self.overridden_price \ and not self.admin_account \ and not self.dept_memberships_with_inherent_role \ - and (not self.art_show_applications or not self.art_show_applications[0].is_valid) \ + and (not self.art_show_application or not self.art_show_application.is_valid) \ and (not self.art_agent_apps or not any(app.is_valid for app in self.art_agent_apps)) \ and (not self.lottery_application or self.lottery_application.status not in self.dq_lottery_statuses) @@ -1606,7 +1661,7 @@ def transferable_actions(self): if self.lottery_application and self.lottery_application.status == c.COMPLETE: can_do.append("withdraw your hotel lottery entry") - if self.art_show_applications and self.art_show_applications[0].is_valid: + if self.art_show_application and self.art_show_application.is_valid: can_do.append(f"contact {email_only(c.ART_SHOW_EMAIL)} to cancel your art show application") if self.art_agent_apps and any(app.is_valid for app in self.art_agent_apps): can_do.append("ask the artist you're agenting for to {} first.".format( @@ -2531,11 +2586,13 @@ class AttendeeAccount(MagModel, table=True): public_id: str | None = Column(Uuid(as_uuid=False), default=lambda: str(uuid4()), nullable=True) email: str = Column(String) hashed: str = Column(String, private=True) - password_reset: 'PasswordReset' = Relationship(sa_relationship=relationship('PasswordReset', backref='attendee_account', lazy='select', uselist=False)) - attendees: list['Attendee'] = Relationship(sa_relationship=relationship( - 'Attendee', backref='managers', order_by='Attendee.registered', - cascade='save-update,merge,refresh-expire,expunge', - secondary='attendee_attendee_account')) + password_reset: 'PasswordReset' = Relationship( + back_populates="attendee_account", sa_relationship_kwargs={'lazy': 'select', 'passive_deletes': True}) + attendees: list['Attendee'] = Relationship( + back_populates="managers", + sa_relationship_kwargs={ + 'order_by': 'Attendee.registered', 'cascade': 'save-update,merge,refresh-expire,expunge', + 'secondary': 'attendee_attendee_account'}) imported: bool = Column(Boolean, default=False) unused_years: int = Column(Integer, default=0) @@ -2661,6 +2718,10 @@ class BadgePickupGroup(MagModel, table=True): public_id: str | None = Column(Uuid(as_uuid=False), default=lambda: str(uuid4()), nullable=True) account_id: str = Column(String) + attendees: list['Attendee'] = Relationship( + back_populates="badge_pickup_group", + sa_relationship_kwargs={'lazy': 'selectin', 'order_by': 'Attendee.full_name', 'cascade': 'save-update,merge,refresh-expire,expunge'}) + def build_from_account(self, account): for attendee in account.attendees: if attendee.has_badge: @@ -2739,7 +2800,9 @@ class FoodRestrictions(MagModel, table=True): Attendee: joined """ - attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), unique=True)) + attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE', unique=True) + attendee: 'Attendee' = Relationship(back_populates="food_restrictions", sa_relationship_kwargs={'lazy': 'joined'}) + standard: str = Column(MultiChoice(c.FOOD_RESTRICTION_OPTS)) sandwich_pref: str = Column(MultiChoice(c.SANDWICH_OPTS)) freeform: str = Column(String) diff --git a/uber/models/attraction.py b/uber/models/attraction.py index c77ffe150..816dfa4b4 100644 --- a/uber/models/attraction.py +++ b/uber/models/attraction.py @@ -3,10 +3,9 @@ import pytz from sqlalchemy import and_, cast, exists, func, not_ -from sqlalchemy.ext.associationproxy import association_proxy +from sqlalchemy.ext.associationproxy import AssociationProxy, association_proxy from sqlalchemy.ext.hybrid import hybrid_property -from sqlalchemy.orm import backref -from sqlalchemy.schema import ForeignKey, UniqueConstraint +from sqlalchemy.schema import UniqueConstraint from sqlalchemy.sql import text from sqlalchemy.sql.expression import bindparam from sqlalchemy.types import Boolean, Integer, Uuid, String, DateTime @@ -136,6 +135,17 @@ class Attraction(MagModel, AttractionMixin, table=True): (60, '1 hour before checkin'), (120, '2 hours before checkin'), (1440, '1 day before checkin')] + + department_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='department.id', nullable=True) + department: 'Department' = Relationship(back_populates="attractions", sa_relationship_kwargs={'order_by': 'Department.name'}) + + owner_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='admin_account.id', nullable=True) + owner: 'AdminAccount' = Relationship(back_populates="attractions") + owner_attendee: 'Attendee' = Relationship(sa_relationship=relationship( + 'Attendee', + cascade='merge', + secondary='admin_account', + viewonly=True)) name: str = Column(String, unique=True) slug: str = Column(String, unique=True) @@ -146,35 +156,10 @@ class Attraction(MagModel, AttractionMixin, table=True): advance_checkin: int = Column(Integer, default=0) restriction: int = Column(Choice(_RESTRICTION_OPTS), default=_NONE) badge_num_required: bool = Column(Boolean, default=False) - department_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('department.id'), nullable=True)) - owner_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('admin_account.id'), nullable=True)) - - owner: 'AdminAccount' = Relationship(sa_relationship=relationship( - 'AdminAccount', - cascade='save-update,merge', - backref=backref( - 'attractions', - cascade='save-update,merge,refresh-expire,expunge', - uselist=True, - order_by='Attraction.name'))) - owner_attendee: 'Attendee' = Relationship(sa_relationship=relationship( - 'Attendee', - cascade='merge', - secondary='admin_account', - uselist=False, - viewonly=True)) - department: 'Department' = Relationship(sa_relationship=relationship( - 'Department', - cascade='save-update,merge', - backref=backref( - 'attractions', - cascade='save-update,merge', - uselist=True), - order_by='Department.name')) - features: list['AttractionFeature'] = Relationship(sa_relationship=relationship( - 'AttractionFeature', lazy='selectin', - backref=backref('attraction', lazy='joined'), - order_by='[AttractionFeature.name, AttractionFeature.id]')) + + features: list['AttractionFeature'] = Relationship( + back_populates="attraction", + sa_relationship_kwargs={'lazy': 'selectin', 'order_by': '[AttractionFeature.name, AttractionFeature.id]', 'passive_deletes': True}) public_features: list['AttractionFeature'] = Relationship(sa_relationship=relationship( 'AttractionFeature', primaryjoin='and_(' @@ -182,15 +167,12 @@ class Attraction(MagModel, AttractionMixin, table=True): 'AttractionFeature.is_public == True)', viewonly=True, order_by='[AttractionFeature.name, AttractionFeature.id]')) - events: list['AttractionEvent'] = Relationship(sa_relationship=relationship( - 'AttractionEvent', - backref=backref('attraction', lazy='joined'), - order_by='[AttractionEvent.start_time, AttractionEvent.id]')) - signups: list['AttractionSignup'] = Relationship(sa_relationship=relationship( - 'AttractionSignup', - backref=backref('attraction', lazy='joined'), - viewonly=True, - order_by='[AttractionSignup.checkin_time, AttractionSignup.id]')) + events: list['AttractionEvent'] = Relationship( + back_populates="attraction", + sa_relationship_kwargs={'order_by': '[AttractionEvent.start_time, AttractionEvent.id]', 'passive_deletes': True}) + signups: list['AttractionSignup'] = Relationship( + back_populates="attraction", + sa_relationship_kwargs={'viewonly': True, 'order_by': '[AttractionSignup.checkin_time, AttractionSignup.id]'}) @presave_adjustment def slugify_name(self): @@ -354,16 +336,18 @@ class AttractionFeature(MagModel, AttractionMixin, table=True): AttractionEvent: selectin """ + attraction_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attraction.id', ondelete='CASCADE') + attraction: 'Attraction' = Relationship(back_populates="features", sa_relationship_kwargs={'lazy': 'joined'}) + name: str = Column(String) slug: str = Column(String) description: str = Column(String) is_public: bool = Column(Boolean, default=False) badge_num_required: bool = Column(Boolean, default=False) - attraction_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attraction.id'))) - events: list['AttractionEvent'] = Relationship(sa_relationship=relationship( - 'AttractionEvent', backref=backref('feature', lazy='joined'), lazy='selectin', - order_by='[AttractionEvent.start_time, AttractionEvent.id]')) + events: list['AttractionEvent'] = Relationship( + back_populates="feature", + sa_relationship_kwargs={'lazy': 'selectin', 'order_by': '[AttractionEvent.start_time, AttractionEvent.id]', 'passive_deletes': True}) __table_args__: ClassVar = ( UniqueConstraint('name', 'attraction_id'), @@ -487,32 +471,34 @@ class AttractionEvent(MagModel, AttractionMixin, table=True): Event: joined """ - attraction_feature_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attraction_feature.id'))) - attraction_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attraction.id'), index=True)) - event_location_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('event_location.id', ondelete='SET NULL'), nullable=True)) + attraction_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attraction.id', ondelete='CASCADE', index=True) + attraction: 'Attraction' = Relationship(back_populates="events", sa_relationship_kwargs={'lazy': 'joined'}) + + attraction_feature_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attraction_feature.id', ondelete='CASCADE') + feature: 'AttractionFeature' = Relationship(back_populates="events", sa_relationship_kwargs={'lazy': 'joined'}) + + event_location_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='event_location.id', nullable=True) + location: 'EventLocation' = Relationship( + back_populates="attractions", sa_relationship_kwargs={'lazy': 'joined', 'cascade': 'save-update,merge,refresh-expire,expunge'}) start_time: datetime = Column(DateTime(timezone=True), default=c.EPOCH) duration: int = Column(Integer, default=60) - signups: list['AttractionSignup'] = Relationship(sa_relationship=relationship('AttractionSignup', backref=backref('event', lazy='joined'), - order_by='AttractionSignup.checkin_time')) - + schedule_item: 'Event' = Relationship( + back_populates="attraction", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) + signups: list['AttractionSignup'] = Relationship( + back_populates="event", sa_relationship_kwargs={'order_by': 'AttractionSignup.checkin_time', 'passive_deletes': True}) attendee_signups: ClassVar = association_proxy('signups', 'attendee') - - notifications: list['AttractionNotification'] = Relationship(sa_relationship=relationship('AttractionNotification', backref=backref('event', lazy='joined'), - order_by='AttractionNotification.sent_time')) - - notification_replies: list['AttractionNotificationReply'] = Relationship(sa_relationship=relationship( - 'AttractionNotificationReply', backref=backref('event', lazy='joined'), - order_by='AttractionNotificationReply.sid')) - - attendees: list['Attendee'] = Relationship(sa_relationship=relationship( - 'Attendee', - backref=backref('attraction_events', overlaps="attendee,attraction_signups,event,signups"), - cascade='save-update,merge,refresh-expire,expunge', - secondary='attraction_signup', - order_by='attraction_signup.c.signup_time', - overlaps="signups,event,attraction_signups,attendee")) + notifications: list['AttractionNotification'] = Relationship( + back_populates="event", sa_relationship_kwargs={'order_by': 'AttractionNotification.sent_time', 'passive_deletes': True}) + notification_replies: list['AttractionNotificationReply'] = Relationship( + back_populates="event", + sa_relationship_kwargs={'order_by': 'AttractionNotificationReply.sid', 'cascade': 'save-update,merge,refresh-expire,expunge'}) + attendees: list['Attendee'] = Relationship( + back_populates="attraction_events", + sa_relationship_kwargs={ + 'cascade': 'save-update,merge,refresh-expire,expunge', 'secondary': 'attraction_signup', + 'order_by': 'attraction_signup.c.signup_time', 'overlaps': 'signups,event,attraction_signups,attendee'}) @presave_adjustment def _fix_attraction_id(self): @@ -774,26 +760,26 @@ class AttractionSignup(MagModel, table=True): AttractionEvent: joined """ - attraction_event_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attraction_event.id'))) - attraction_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attraction.id'))) - attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'))) + attraction_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attraction.id', ondelete='CASCADE') + attraction: 'Attraction' = Relationship( + back_populates="signups", sa_relationship_kwargs={'lazy': 'joined', 'cascade': 'save-update,merge,refresh-expire,expunge'}) + + attraction_event_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attraction_event.id', ondelete='CASCADE') + event: 'AttractionEvent' = Relationship(back_populates="signups", sa_relationship_kwargs={'lazy': 'joined'}) + + attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE') + attendee: 'Attendee' = Relationship(back_populates="attraction_signups", sa_relationship_kwargs={'lazy': 'joined'}) signup_time: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(pytz.UTC)) checkin_time: datetime = Column(DateTime(timezone=True), default=lambda: utcmin.datetime, index=True) on_waitlist: bool = Column(Boolean, default=False) - notifications: list['AttractionNotification'] = Relationship(sa_relationship=relationship( - 'AttractionNotification', - backref=backref( - 'signup', lazy='joined', - cascade='merge', - uselist=False, - viewonly=True), - primaryjoin='and_(' - 'AttractionSignup.attendee_id == foreign(AttractionNotification.attendee_id),' - 'AttractionSignup.attraction_event_id == foreign(AttractionNotification.attraction_event_id))', - order_by='AttractionNotification.sent_time', - viewonly=True)) + notifications: list['AttractionNotification'] = Relationship( + back_populates="signup", + sa_relationship_kwargs={ + 'order_by': 'AttractionNotification.sent_time', 'viewonly': True, + 'primaryjoin': 'and_(AttractionSignup.attendee_id == foreign(AttractionNotification.attendee_id),' + 'AttractionSignup.attraction_event_id == foreign(AttractionNotification.attraction_event_id))'}) __mapper_args__ = {'confirm_deleted_rows': False} __table_args__ = (UniqueConstraint('attraction_event_id', 'attendee_id'),) @@ -879,9 +865,13 @@ class AttractionNotification(MagModel, table=True): AttractionSignup: joined """ - attraction_event_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attraction_event.id'))) - attraction_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attraction.id'))) - attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'))) + attraction_event_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attraction_event.id', ondelete='CASCADE') + event: 'AttractionEvent' = Relationship(back_populates="notifications", sa_relationship_kwargs={'lazy': 'joined'}) + + attraction_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attraction.id', ondelete='CASCADE') + + attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE') + attendee: 'Attendee' = Relationship(back_populates="attraction_notifications", sa_relationship_kwargs={'lazy': 'joined'}) notification_type: int = Column(Choice(Attendee._NOTIFICATION_PREF_OPTS)) ident: str = Column(String, index=True) @@ -890,6 +880,13 @@ class AttractionNotification(MagModel, table=True): subject: str = Column(String) body: str = Column(String) + signup: 'AttractionSignup' = Relationship( + back_populates="notifications", + sa_relationship_kwargs={ + 'lazy': 'joined', 'viewonly': True, + 'primaryjoin': 'and_(AttractionSignup.attendee_id == foreign(AttractionNotification.attendee_id),' + 'AttractionSignup.attraction_event_id == foreign(AttractionNotification.attraction_event_id))'}) + @presave_adjustment def _fix_attraction_id(self): if not self.attraction_id and self.event: @@ -901,9 +898,11 @@ class AttractionNotificationReply(MagModel, table=True): AttractionEvent: joined """ - attraction_event_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attraction_event.id'), nullable=True)) - attraction_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attraction.id'), nullable=True)) - attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), nullable=True)) + attraction_event_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attraction_event.id', nullable=True) + event: 'AttractionEvent' = Relationship(back_populates="notification_replies", sa_relationship_kwargs={'lazy': 'joined'}) + + attraction_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attraction.id', nullable=True) + attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', nullable=True) notification_type: int = Column(Choice(Attendee._NOTIFICATION_PREF_OPTS)) from_phonenumber: str = Column(String) diff --git a/uber/models/badge_printing.py b/uber/models/badge_printing.py index 8ab3096f4..bf5eb06d7 100644 --- a/uber/models/badge_printing.py +++ b/uber/models/badge_printing.py @@ -1,7 +1,6 @@ from datetime import datetime from sqlalchemy.dialects.postgresql.json import JSONB from sqlalchemy.ext.mutable import MutableDict -from sqlalchemy.schema import ForeignKey from sqlalchemy.types import Boolean, Integer, Uuid, String, DateTime from sqlmodel import Field, Relationship from typing import Any @@ -18,8 +17,11 @@ class PrintJob(MagModel, table=True): Attendee: joined """ - attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'))) - admin_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('admin_account.id'), nullable=True)) + attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE') + attendee: 'Attendee' = Relationship(back_populates="print_requests", sa_relationship_kwargs={'lazy': 'joined'}) + + admin_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='admin_account.id', nullable=True) + admin_account: "AdminAccount" = Relationship(back_populates="print_requests") admin_name: str = Column(String) # Preserve admin's name in case their account is removed printer_id: str = Column(String) diff --git a/uber/models/commerce.py b/uber/models/commerce.py index f6b7747fa..d9b2d2c55 100644 --- a/uber/models/commerce.py +++ b/uber/models/commerce.py @@ -6,11 +6,9 @@ from sqlalchemy import func, or_ from sqlalchemy.sql.functions import coalesce -from sqlalchemy.schema import ForeignKey from sqlalchemy.types import Boolean, Integer, String, DateTime, Uuid, JSON from sqlalchemy.dialects.postgresql.json import JSONB from sqlalchemy.ext.mutable import MutableDict -from sqlalchemy.orm import backref from sqlmodel import Field, Relationship from typing import Any, ClassVar @@ -41,13 +39,13 @@ class ArbitraryCharge(MagModel, table=True): class MerchDiscount(MagModel, table=True): """Staffers can apply a single-use discount to any merch purchases.""" - attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), unique=True)) + attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE', unique=True) uses: int = Column(Integer) class MerchPickup(MagModel, table=True): - picked_up_by_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'))) - picked_up_for_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), unique=True)) + picked_up_by_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', nullable=True) + picked_up_for_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', unique=True, nullable=True) picked_up_by: 'Attendee' = Relationship(sa_relationship=relationship( Attendee, primaryjoin='MerchPickup.picked_up_by_id == Attendee.id', @@ -59,7 +57,9 @@ class MerchPickup(MagModel, table=True): class MPointsForCash(MagModel, table=True): - attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'))) + attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE') + attendee: 'Attendee' = Relationship(back_populates="mpoints_for_cash") + amount: int = Column(Integer) when: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) @@ -69,17 +69,23 @@ class NoShirt(MagModel, table=True): Used to track when someone tried to pick up a shirt they were owed when we were out of stock, so that we can contact them later. """ - attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), unique=True)) + + attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE', unique=True) + attendee: 'Attendee' = Relationship(back_populates="no_shirt") class OldMPointExchange(MagModel, table=True): - attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'))) + attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE') + attendee: 'Attendee' = Relationship(back_populates="old_mpoint_exchanges") + amount: int = Column(Integer) when: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) class Sale(MagModel, table=True): - attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='set null'), nullable=True)) + attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', nullable=True) + attendee: 'Attendee' = Relationship(back_populates="sales") + what: str = Column(String) cash: int = Column(Integer, default=0) mpoints: int = Column(Integer, default=0) @@ -107,6 +113,11 @@ class ModelReceipt(MagModel, table=True): owner_model: str = Column(String) closed: datetime | None = Column(DateTime(timezone=True), nullable=True) + receipt_txns: list['ReceiptTransaction'] = Relationship( + back_populates="receipt", sa_relationship_kwargs={'lazy': 'selectin', 'passive_deletes': True}) + receipt_items: list['ReceiptItem'] = Relationship( + back_populates="receipt", sa_relationship_kwargs={'lazy': 'selectin', 'passive_deletes': True}) + def close_all_items(self, session): for item in self.open_receipt_items: if item.receipt_txn: @@ -320,6 +331,7 @@ def process_full_refund(self, session, model, who='non-admin', exclude_fees=Fals class ReceiptTransaction(MagModel, table=True): """ ModelReceipt: joined + ReceiptInfo: select Transactions have two key properties: whether or not they were done through Stripe, and whether they represent a payment or a refund. @@ -336,20 +348,20 @@ class ReceiptTransaction(MagModel, table=True): plus it allows admins to refund Stripe payments per item. """ - receipt_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('model_receipt.id', ondelete='SET NULL'), nullable=True)) - receipt: 'ModelReceipt' = Relationship(sa_relationship=relationship('ModelReceipt', foreign_keys='ReceiptTransaction.receipt_id', - cascade='save-update, merge', lazy='joined', - backref=backref('receipt_txns', lazy='selectin', cascade='save-update, merge'))) - receipt_info_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('receipt_info.id', ondelete='SET NULL'), nullable=True)) - receipt_info: 'ReceiptInfo' = Relationship(sa_relationship=relationship('ReceiptInfo', foreign_keys='ReceiptTransaction.receipt_info_id', - cascade='save-update, merge', - backref=backref('receipt_txns', lazy='selectin', cascade='save-update, merge'))) - refunded_txn_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('receipt_transaction.id', ondelete='SET NULL'), nullable=True)) - refunded_txn: 'ReceiptTransaction' = Relationship(sa_relationship=relationship('ReceiptTransaction', foreign_keys='ReceiptTransaction.refunded_txn_id', - backref=backref('refund_txns', order_by='ReceiptTransaction.added'), - cascade='save-update,merge,refresh-expire,expunge', - remote_side='ReceiptTransaction.id', - single_parent=True)) + receipt_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='model_receipt.id', ondelete='CASCADE') + receipt: 'ModelReceipt' = Relationship(back_populates="receipt_txns", sa_relationship_kwargs={'lazy': 'joined'}) + + receipt_info_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='receipt_info.id', nullable=True) + receipt_info: 'ReceiptInfo' = Relationship(back_populates="receipt_txns", sa_relationship_kwargs={'lazy': 'select'}) + + refunded_txn_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='receipt_transaction.id', nullable=True) + refunded_txn: 'ReceiptTransaction' = Relationship( + back_populates="refund_txns", + sa_relationship_kwargs={'foreign_keys': 'ReceiptTransaction.refunded_txn_id', 'remote_side': 'ReceiptTransaction.id'}) + refund_txns: list['ReceiptTransaction'] = Relationship( + back_populates="refunded_txn", + sa_relationship_kwargs={'order_by': 'ReceiptTransaction.added', 'cascade': 'save-update,merge,refresh-expire,expunge'}) + refunded: int = Column(Integer, default=0) intent_id: str = Column(String) charge_id: str = Column(String) @@ -365,6 +377,9 @@ class ReceiptTransaction(MagModel, table=True): who: str = Column(String) desc: str = Column(String) + receipt_items: list['ReceiptItem'] = Relationship( + back_populates="receipt_txn", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) + @property def available_actions(self): # A list of actions that admins can do to this item. @@ -548,15 +563,13 @@ class ReceiptItem(MagModel, table=True): ReceiptTransaction: joined """ + receipt_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='model_receipt.id', ondelete='CASCADE') + receipt: 'ModelReceipt' = Relationship(back_populates="receipt_items", sa_relationship_kwargs={'lazy': 'joined'}) + + txn_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='receipt_transaction.id', nullable=True) + receipt_txn: 'ReceiptTransaction' = Relationship(back_populates="receipt_items", sa_relationship_kwargs={'lazy': 'joined'}) + purchaser_id: str | None = Column(Uuid(as_uuid=False), index=True, nullable=True) - receipt_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('model_receipt.id', ondelete='SET NULL'), nullable=True)) - receipt: 'ModelReceipt' = Relationship(sa_relationship=relationship('ModelReceipt', foreign_keys='ReceiptItem.receipt_id', - cascade='save-update, merge', lazy='joined', - backref=backref('receipt_items', lazy='selectin', cascade='save-update, merge'))) - txn_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('receipt_transaction.id', ondelete='SET NULL'), nullable=True)) - receipt_txn: 'ReceiptTransaction' = Relationship(sa_relationship=relationship('ReceiptTransaction', foreign_keys='ReceiptItem.txn_id', - cascade='save-update, merge', lazy='joined', - backref=backref('receipt_items', cascade='save-update, merge'))) fk_id: str | None = Column(Uuid(as_uuid=False), index=True, nullable=True) fk_model: str = Column(String) department: int = Column(Choice(c.RECEIPT_ITEM_DEPT_OPTS), default=c.OTHER_RECEIPT_ITEM) @@ -568,7 +581,7 @@ class ReceiptItem(MagModel, table=True): added: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) closed: datetime | None = Column(DateTime(timezone=True), nullable=True) who: str = Column(String) - des: str = Column(String) + desc: str = Column(String) admin_notes: str = Column(String) revert_change: dict[str, Any] = Field(sa_type=JSON, default_factory=dict) @@ -647,6 +660,9 @@ class ReceiptInfo(MagModel, table=True): signature: str = Column(String) receipt_html: str = Column(String) + receipt_txns: list['ReceiptTransaction'] = Relationship( + back_populates="receipt_info", sa_relationship_kwargs={'lazy': 'selectin', 'cascade': 'save-update,merge,refresh-expire,expunge'}) + @property def response_code_str(self): if not self.txn_info or not self.txn_info['response']: diff --git a/uber/models/department.py b/uber/models/department.py index 91cd8c423..76618021f 100644 --- a/uber/models/department.py +++ b/uber/models/department.py @@ -3,7 +3,6 @@ import six from sqlalchemy import and_, exists, func, or_, select from sqlalchemy.ext.hybrid import hybrid_property -from sqlalchemy.orm import backref from sqlalchemy.schema import ForeignKey, Table, UniqueConstraint, Index from sqlalchemy.sql import text from sqlalchemy.types import Boolean, Float, Integer, Time, Uuid, String, DateTime @@ -69,10 +68,14 @@ class DeptChecklistItem(MagModel, table=True): Department: joined """ - department_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('department.id'))) - attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'))) - slug: str = Column(String) - comments: str = Column(String, default='') + department_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='department.id', ondelete='CASCADE') + department: 'Department' = Relationship(back_populates="dept_checklist_items", sa_relationship_kwargs={'lazy': 'joined'}) + + attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE') + attendee: 'Attendee' = Relationship(back_populates="dept_checklist_items", sa_relationship_kwargs={'lazy': 'joined'}) + + slug: str = '' + comments: str = '' __table_args__: ClassVar = ( UniqueConstraint('department_id', 'attendee_id', 'slug'), @@ -80,21 +83,22 @@ class DeptChecklistItem(MagModel, table=True): class BulkPrintingRequest(MagModel, table=True): - department_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('department.id'))) - link: str = Column(String) - copies: str = Column(Integer) - print_orientation: int = Column(Choice(c.PRINT_ORIENTATION_OPTS), default=c.PORTRAIT) - cut_orientation: int = Column(Choice(c.CUT_ORIENTATION_OPTS), default=c.NONE) - color: int = Column(Choice(c.PRINT_REQUEST_COLOR_OPTS), default=c.BW) - paper_type: int = Column(Choice(c.PRINT_REQUEST_PAPER_TYPE_OPTS), default=c.STANDARD) - paper_type_text: str = Column(String) - size: int = Column(Choice(c.PRINT_REQUEST_SIZE_OPTS), default=c.STANDARD) - size_text: str = Column(String) - double_sided: bool = Column(Boolean, default=False) - stapled: bool = Column(Boolean, default=False) - notes: str = Column(String) - required: bool = Column(Boolean, default=False) - link_is_shared: bool = Column(Boolean, default=False) + department_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='department.id', ondelete='CASCADE') + + link: str = '' + copies: int = 0 + print_orientation: int = Field(sa_column=Column(Choice(c.PRINT_ORIENTATION_OPTS), default=c.PORTRAIT)) + cut_orientation: int = Field(sa_column=Column(Choice(c.CUT_ORIENTATION_OPTS), default=c.NONE)) + color: int = Field(sa_column=Column(Choice(c.PRINT_REQUEST_COLOR_OPTS), default=c.BW)) + paper_type: int = Field(sa_column=Column(Choice(c.PRINT_REQUEST_PAPER_TYPE_OPTS), default=c.STANDARD)) + paper_type_text: str = '' + size: int = Field(sa_column=Column(Choice(c.PRINT_REQUEST_SIZE_OPTS), default=c.STANDARD)) + size_text: str = '' + double_sided: bool = False + stapled: bool = False + notes: str = '' + required: bool = False + link_is_shared: bool = False class DeptMembership(MagModel, table=True): @@ -104,11 +108,21 @@ class DeptMembership(MagModel, table=True): DeptRole: selectin """ - is_dept_head: bool = Column(Boolean, default=False) - is_poc: bool = Column(Boolean, default=False) - is_checklist_admin: bool = Column(Boolean, default=False) - attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'))) - department_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('department.id'))) + attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE') + attendee: 'Attendee' = Relationship(back_populates="dept_memberships", sa_relationship_kwargs={'lazy': 'joined'}) + + department_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='department.id', ondelete='CASCADE') + department: 'Department' = Relationship( + back_populates="memberships", sa_relationship_kwargs={'lazy': 'joined', 'overlaps': 'assigned_depts,members'}) + + is_dept_head: bool = False + is_poc: bool = False + is_checklist_admin: bool = False + + dept_roles: list['DeptRole'] = Relationship( + back_populates="dept_memberships", + sa_relationship_kwargs={ + 'lazy': 'selectin', 'cascade': 'save-update,merge,refresh-expire,expunge', 'secondary': 'dept_membership_dept_role'}) __mapper_args__: ClassVar = {'confirm_deleted_rows': False} __table_args__: ClassVar = ( @@ -153,12 +167,14 @@ class DeptMembershipRequest(MagModel, table=True): Department: joined """ - attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'))) + attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE') + attendee: 'Attendee' = Relationship(back_populates="dept_membership_requests", sa_relationship_kwargs={'lazy': 'joined'}) # A NULL value for the department_id indicates the attendee is willing # to volunteer for any department (they checked "Anything" for # "Where do you want to help?"). - department_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('department.id'), nullable=True)) + department_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='department.id', ondelete='CASCADE', nullable=True) + department: 'Department' = Relationship(back_populates="membership_requests", sa_relationship_kwargs={'lazy': 'joined'}) __mapper_args__: ClassVar = {'confirm_deleted_rows': False} __table_args__: ClassVar = ( @@ -173,15 +189,28 @@ class DeptRole(MagModel, table=True): Department: joined """ - name: str = Column(String) - description: str = Column(String) - department_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('department.id'))) - - dept_memberships: list['DeptMembership'] = Relationship(sa_relationship=relationship( - 'DeptMembership', - backref=backref('dept_roles', lazy='selectin'), - cascade='save-update,merge,refresh-expire,expunge', - secondary='dept_membership_dept_role')) + department_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='department.id', ondelete='CASCADE') + department: 'Department' = Relationship(back_populates="dept_roles", sa_relationship_kwargs={'lazy': 'joined'}) + + name: str = '' + description: str = '' + + jobs: list['Job'] = Relationship( + back_populates="required_roles", + sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge', 'secondary': 'job_required_role'}) + job_templates: list['JobTemplate'] = Relationship( + back_populates="required_roles", + sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge', 'secondary': 'job_template_required_role'}) + dept_memberships: list['DeptMembership'] = Relationship( + back_populates="dept_roles", + sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge', 'secondary': 'dept_membership_dept_role'}) + attendees: list['Attendee'] = Relationship( + back_populates="dept_roles", + sa_relationship_kwargs={ + 'secondaryjoin': 'and_(dept_membership_dept_role.c.dept_role_id == DeptRole.id, ' + 'dept_membership_dept_role.c.dept_membership_id == DeptMembership.id)', + 'secondary': 'join(DeptMembership, dept_membership_dept_role)', + 'viewonly': True}) __table_args__: ClassVar = ( UniqueConstraint('name', 'department_id'), @@ -223,96 +252,86 @@ def dept_memberships_ids(self, value): class Department(MagModel, table=True): - name: str = Column(String, unique=True) - description: str = Column(String) - solicits_volunteers: bool = Column(Boolean, default=True) - parent_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('department.id'), nullable=True)) - max_consecutive_minutes: int = Column(Integer, default=0) - from_email: str = Column(String) - manages_panels: bool = Column(Boolean, default=False) - handles_cash: bool = Column(Boolean, default=False) - panels_desc: str = Column(String) - - jobs: list['Job'] = Relationship(sa_relationship=relationship('Job', backref=backref('department', lazy='joined'))) - job_templates: list['JobTemplate'] = Relationship(sa_relationship=relationship('JobTemplate', backref=backref('department', lazy='joined'))) - locations: list['EventLocation'] = Relationship(sa_relationship=relationship('EventLocation', backref='department')) - events: list['Event'] = Relationship(sa_relationship=relationship('Event', backref='department')) - - dept_checklist_items: list['DeptChecklistItem'] = Relationship(sa_relationship=relationship('DeptChecklistItem', backref=backref('department', lazy='joined'))) - dept_roles: list['DeptRole'] = Relationship(sa_relationship=relationship('DeptRole', backref=backref('department', lazy='joined'))) + parent_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='department.id', ondelete='CASCADE', nullable=True) + parent: 'Department' = Relationship(back_populates="sub_depts", sa_relationship_kwargs={'remote_side': 'Department.id'}) + sub_depts: list['Department'] = Relationship(back_populates="parent", sa_relationship_kwargs={'order_by': 'Department.name'}) + + name: str = Field(sa_column=Column(String, unique=True, default='')) + description: str = '' + solicits_volunteers: bool = True + max_consecutive_minutes: int = 0 + from_email: str = '' + manages_panels: bool = False + handles_cash: bool = False + panels_desc: str = '' + + locations: list['EventLocation'] = Relationship( + back_populates="department", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) + events: list['Event'] = Relationship( + back_populates="department", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) + attractions: list['Attraction'] = Relationship( + back_populates="department", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) + + jobs: list['Job'] = Relationship(back_populates="department", sa_relationship_kwargs={'passive_deletes': True}) + job_templates: list['JobTemplate'] = Relationship(back_populates="department", sa_relationship_kwargs={'passive_deletes': True}) + attendees_working_shifts: list['Attendee'] = Relationship( + back_populates="depts_where_working", + sa_relationship_kwargs={'secondary': 'join(Shift, Job)', 'viewonly': True}) + + dept_checklist_items: list['DeptChecklistItem'] = Relationship(back_populates="department", sa_relationship_kwargs={'passive_deletes': True}) + dept_roles: list['DeptRole'] = Relationship(back_populates="department", sa_relationship_kwargs={'passive_deletes': True}) dept_heads: list['Attendee'] = Relationship(sa_relationship=relationship( 'Attendee', - backref=backref('headed_depts', order_by='Department.name'), primaryjoin='and_(' 'Department.id == DeptMembership.department_id, ' 'DeptMembership.is_dept_head == True)', secondary='dept_membership', order_by='Attendee.full_name', viewonly=True)) - checklist_admins: list['Attendee'] = Relationship(sa_relationship=relationship( - 'Attendee', - backref=backref('checklist_admin_depts', order_by='Department.name'), - primaryjoin='and_(' - 'Department.id == DeptMembership.department_id, ' - 'DeptMembership.is_checklist_admin == True)', - secondary='dept_membership', - order_by='Attendee.full_name', - viewonly=True)) - members_with_inherent_role: list['Attendee'] = Relationship(sa_relationship=relationship( - 'Attendee', - backref=backref('depts_with_inherent_role', order_by='Department.name'), - primaryjoin='and_(' - 'Department.id == DeptMembership.department_id, ' - 'DeptMembership.has_inherent_role)', - secondary='dept_membership', - order_by='Attendee.full_name', - viewonly=True)) - members_who_can_admin_checklist: list['Attendee'] = Relationship(sa_relationship=relationship( - 'Attendee', - backref=backref('can_admin_checklist_depts', order_by='Department.name'), - primaryjoin='and_(' - 'Department.id == DeptMembership.department_id, ' - 'or_(' - 'DeptMembership.is_checklist_admin == True, ' - 'DeptMembership.is_dept_head == True))', - secondary='dept_membership', - order_by='Attendee.full_name', - viewonly=True)) - pocs: list['Attendee'] = Relationship(sa_relationship=relationship( - 'Attendee', - backref=backref('poc_depts', order_by='Department.name'), - primaryjoin='and_(' - 'Department.id == DeptMembership.department_id, ' - 'DeptMembership.is_poc == True)', - secondary='dept_membership', - order_by='Attendee.full_name', - viewonly=True)) - members: list['Attendee'] = Relationship(sa_relationship=relationship( - 'Attendee', - backref=backref('assigned_depts', order_by='Department.name', overlaps="dept_memberships,attendee"), - cascade='save-update,merge,refresh-expire,expunge', - order_by='Attendee.full_name', - overlaps="attendee,dept_memberships", - secondary='dept_membership')) - memberships: list['DeptMembership'] = Relationship(sa_relationship=relationship('DeptMembership', backref=backref('department', lazy='joined', overlaps="assigned_depts,members"), - overlaps="assigned_depts,members")) - membership_requests: list['DeptMembershipRequest'] = Relationship(sa_relationship=relationship('DeptMembershipRequest', backref=backref('department', lazy='joined'))) - explicitly_requesting_attendees: list['Attendee'] = Relationship(sa_relationship=relationship( - 'Attendee', - backref=backref('explicitly_requested_depts', order_by='Department.name', overlaps="attendee,dept_membership_requests,department,membership_requests"), - cascade='save-update,merge,refresh-expire,expunge', - secondary='dept_membership_request', - order_by='Attendee.full_name', - overlaps="membership_requests,department,attendee,dept_membership_requests")) - requesting_attendees: list['Attendee'] = Relationship(sa_relationship=relationship( - 'Attendee', - backref=backref('requested_depts', order_by='Department.name'), - primaryjoin='or_(' - 'DeptMembershipRequest.department_id == Department.id, ' - 'DeptMembershipRequest.department_id == None)', - secondary='dept_membership_request', - order_by='Attendee.full_name', - viewonly=True)) + checklist_admins: list['Attendee'] = Relationship( + back_populates="checklist_admin_depts", + sa_relationship_kwargs={ + 'primaryjoin': 'and_(Department.id == DeptMembership.department_id, ' + 'DeptMembership.is_checklist_admin == True)', + 'secondary': 'dept_membership', 'viewonly': True, 'order_by': 'Attendee.full_name'}) + members_with_inherent_role: list['Attendee'] = Relationship( + sa_relationship_kwargs={ + 'primaryjoin': 'and_(Department.id == DeptMembership.department_id, ' + 'DeptMembership.has_inherent_role)', + 'secondary': 'dept_membership', 'viewonly': True, 'order_by': 'Attendee.full_name'}) + members_who_can_admin_checklist: list['Attendee'] = Relationship( + back_populates="can_admin_checklist_depts", + sa_relationship_kwargs={ + 'primaryjoin': 'and_(Department.id == DeptMembership.department_id, ' + 'or_(DeptMembership.is_checklist_admin == True, ' + 'DeptMembership.is_dept_head == True))', + 'secondary': 'dept_membership', 'viewonly': True, 'order_by': 'Attendee.full_name'}) + pocs: list['Attendee'] = Relationship( + back_populates="poc_depts", + sa_relationship_kwargs={ + 'primaryjoin': 'and_(Department.id == DeptMembership.department_id, ' + 'DeptMembership.is_poc == True)', + 'secondary': 'dept_membership', 'viewonly': True, 'order_by': 'Attendee.full_name'}) + members: list['Attendee'] = Relationship( + back_populates='assigned_depts', + sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge', 'secondary': 'dept_membership', + 'order_by': 'Attendee.full_name', 'overlaps': 'attendee,dept_memberships'}) + memberships: list['DeptMembership'] = Relationship( + back_populates="department", sa_relationship_kwargs={'overlaps': 'assigned_depts,members', 'passive_deletes': True}) + membership_requests: list['DeptMembershipRequest'] = Relationship( + back_populates="department", sa_relationship_kwargs={'cascade': 'all', 'passive_deletes': True}) + explicitly_requesting_attendees: list['Attendee'] = Relationship( + back_populates="explicitly_requested_depts", + sa_relationship_kwargs={ + 'cascade': 'save-update,merge,refresh-expire,expunge', + 'secondary': 'dept_membership_request', + 'order_by': 'Attendee.full_name', 'overlaps': 'membership_requests,department,attendee,dept_membership_requests'}) + requesting_attendees: list['Attendee'] = Relationship( + back_populates="requested_depts", + sa_relationship_kwargs={ + 'primaryjoin': 'or_(DeptMembershipRequest.department_id == Department.id, ' + 'DeptMembershipRequest.department_id == None)', + 'secondary': 'dept_membership_request', 'order_by': 'Attendee.full_name', 'viewonly': True}) unassigned_requesting_attendees: list['Attendee'] = Relationship(sa_relationship=relationship( 'Attendee', primaryjoin='and_(or_(' @@ -334,12 +353,6 @@ class Department(MagModel, table=True): secondary='dept_membership_request', order_by='Attendee.full_name', viewonly=True)) - parent: 'Department' = Relationship(sa_relationship=relationship( - 'Department', - backref=backref('sub_depts', order_by='Department.name', cascade='all,delete-orphan'), - cascade='save-update,merge,refresh-expire,expunge', - remote_side='Department.id', - single_parent=True)) @hybrid_property def member_count(self): @@ -438,23 +451,28 @@ class Job(MagModel, table=True): (_ONLY_MEMBERS, 'Members of this department'), (_ALL_VOLUNTEERS, 'All volunteers')] - job_template_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('job_template.id'), nullable=True)) - department_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('department.id'))) - - name: str = Column(String) - description: str = Column(String) - start_time: datetime = Column(DateTime(timezone=True)) - duration: int = Column(Integer) - weight: float = Column(Float, default=1) - slots: int = Column(Integer) - extra15: bool = Column(Boolean, default=False) - visibility: int = Column(Choice(_VISIBILITY_OPTS), default=_ONLY_MEMBERS) - all_roles_required: bool = Column(Boolean, default=True) - - required_roles: list['DeptRole'] = Relationship(sa_relationship=relationship( - 'DeptRole', backref='jobs', lazy='selectin', - cascade='save-update,merge,refresh-expire,expunge', secondary='job_required_role')) - shifts: list['Shift'] = Relationship(sa_relationship=relationship('Shift', backref=backref('job', lazy='joined'), lazy='selectin')) + job_template_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='job_template.id', nullable=True) + template: 'JobTemplate' = Relationship(back_populates="jobs", sa_relationship_kwargs={'lazy': 'select'}) + + department_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='department.id', ondelete='CASCADE') + department: 'Department' = Relationship(back_populates="jobs", sa_relationship_kwargs={'lazy': 'joined'}) + + name: str = '' + description: str = '' + start_time: datetime = Field(sa_type=DateTime(timezone=True)) + duration: int = 0 + weight: float = 1 + slots: int = 1 + extra15: bool = False + visibility: int = Field(sa_column=Column(Choice(_VISIBILITY_OPTS), default=_ONLY_MEMBERS)) + all_roles_required: bool = True + + attendees_working_shifts: list['Attendee'] = Relationship( + back_populates="jobs", sa_relationship_kwargs={'secondary': 'shift', 'viewonly': True}) + required_roles: list['DeptRole'] = Relationship( + back_populates="jobs", + sa_relationship_kwargs={'lazy': 'selectin', 'cascade': 'save-update,merge,refresh-expire,expunge', 'secondary': 'job_required_role'}) + shifts: list['Shift'] = Relationship(back_populates="job", sa_relationship_kwargs={'lazy': 'selectin', 'passive_deletes': True}) __table_args__: ClassVar = ( Index('ix_job_department_id', 'department_id'), @@ -717,28 +735,30 @@ class JobTemplate(MagModel, table=True): DeptRole: selectin """ - department_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('department.id'))) - - template_name: str = Column(String) - type: int = Column(Choice(c.JOB_TEMPLATE_TYPE_OPTS), default=c.FILL_GAPS) - name: str = Column(String) - description: str = Column(String) - duration: int = Column(Integer) - weight: float = Column(Float, default=1) - extra15: bool = Column(Boolean, default=False) - visibility: int = Column(Choice(Job._VISIBILITY_OPTS), default=Job._ONLY_MEMBERS) - all_roles_required: bool = Column(Boolean, default=True) - - min_slots: int = Column(Integer) # Future improvement: a bulk-edit for slots in jobs by time of day - days: str = Column(MultiChoice(c.JOB_DAY_OPTS)) - open_time: time | None = Column(Time, nullable=True) - close_time: time | None = Column(Time, nullable=True) - interval: int = Column(Integer, nullable=True) - - required_roles: list['DeptRole'] = Relationship(sa_relationship=relationship( - 'DeptRole', backref='job_templates', lazy='selectin', - cascade='save-update,merge,refresh-expire,expunge', secondary='job_template_required_role')) - jobs: list['Job'] = Relationship(sa_relationship=relationship('Job', backref=backref('template', lazy='select'), cascade='save-update,merge,refresh-expire,expunge')) + department_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='department.id', ondelete='CASCADE') + department: 'Department' = Relationship(back_populates="job_templates", sa_relationship_kwargs={'lazy': 'joined'}) + + template_name: str = '' + type: int = Field(sa_column=Column(Choice(c.JOB_TEMPLATE_TYPE_OPTS), default=c.FILL_GAPS)) + name: str = '' + description: str = '' + duration: int = 0 + weight: float = 1 + extra15: bool = False + visibility: int = Field(sa_column=Column(Choice(Job._VISIBILITY_OPTS), default=Job._ONLY_MEMBERS)) + all_roles_required: bool = True + + min_slots: int = 1 # Future improvement: a bulk-edit for slots in jobs by time of day + days: str = Field(sa_column=Column(MultiChoice(c.JOB_DAY_OPTS))) + open_time: time | None = Field(sa_column=Column(Time, nullable=True)) + close_time: time | None = Field(sa_column=Column(Time, nullable=True)) + interval: int = Field(sa_column=Column(Integer, nullable=True)) + + jobs: list['Job'] = Relationship(back_populates="template", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) + required_roles: list['DeptRole'] = Relationship( + back_populates="job_templates", + sa_relationship_kwargs={ + 'lazy': 'selectin', 'cascade': 'save-update,merge,refresh-expire,expunge', 'secondary': 'job_template_required_role'}) @presave_adjustment def zero_slots(self): @@ -954,11 +974,15 @@ class Shift(MagModel, table=True): Job: joined """ - job_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('job.id', ondelete='cascade'))) - attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='cascade'))) - worked: int = Column(Choice(c.WORKED_STATUS_OPTS), default=c.SHIFT_UNMARKED) - rating: int = Column(Choice(c.RATING_OPTS), default=c.UNRATED) - comment: str = Column(String) + job_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='job.id', ondelete='CASCADE') + job: 'Job' = Relationship(back_populates="shifts", sa_relationship_kwargs={'lazy': 'joined'}) + + attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE') + attendee: 'Attendee' = Relationship(back_populates="shifts", sa_relationship_kwargs={'lazy': 'joined'}) + + worked: int = Field(sa_column=Column(Choice(c.WORKED_STATUS_OPTS), default=c.SHIFT_UNMARKED)) + rating: int = Field(sa_column=Column(Choice(c.RATING_OPTS), default=c.UNRATED)) + comment: str = '' __table_args__: ClassVar = ( Index('ix_shift_job_id', 'job_id'), diff --git a/uber/models/email.py b/uber/models/email.py index 4f3b18de9..a50cfcd7c 100644 --- a/uber/models/email.py +++ b/uber/models/email.py @@ -10,7 +10,6 @@ from sqlalchemy.dialects.postgresql.json import JSONB from sqlalchemy.ext.hybrid import hybrid_property from sqlalchemy.ext.mutable import MutableDict -from sqlalchemy.orm import backref from sqlalchemy.schema import ForeignKey from sqlalchemy.types import Boolean, Integer, String, Uuid, DateTime from sqlmodel import Field, Relationship @@ -88,7 +87,9 @@ class AutomatedEmail(MagModel, BaseEmailMixin, table=True): active_before: datetime | None = Column(DateTime(timezone=True), nullable=True, default=None) revert_changes: dict[str, Any] = Field(sa_type=MutableDict.as_mutable(JSONB), default_factory=dict) - emails: list['Email'] = Relationship(sa_relationship=relationship('Email', backref=backref('automated_email', lazy='joined'), order_by='Email.id')) + emails: list['Email'] = Relationship( + back_populates="automated_email", + sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge', 'order_by': 'Email.id'}) @presave_adjustment def date_adjustments(self): @@ -353,8 +354,8 @@ class Email(MagModel, BaseEmailMixin, table=True): AutomatedEmail: joined """ - automated_email_id: str | None = Field(sa_column=Column( - Uuid(as_uuid=False), ForeignKey('automated_email.id', ondelete='set null'), nullable=True, default=None, index=True)) + automated_email_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='automated_email.id', nullable=True, index=True) + automated_email: 'AutomatedEmail' = Relationship(back_populates="emails", sa_relationship_kwargs={'lazy': 'joined'}) fk_id: str | None = Column(Uuid(as_uuid=False), nullable=True) ident: str = Column(String) diff --git a/uber/models/group.py b/uber/models/group.py index c22467a31..4a3943e7e 100644 --- a/uber/models/group.py +++ b/uber/models/group.py @@ -30,15 +30,19 @@ class Group(MagModel, TakesPaymentMixin, table=True): ModelReceipt: select """ + leader_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', nullable=True) + leader: 'Attendee' = Relationship(sa_relationship=relationship('Attendee', foreign_keys='Group.leader_id', post_update=True, cascade='all')) + + creator_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', nullable=True) + creator: 'Attendee' = Relationship( + back_populates="created_groups", sa_relationship_kwargs={'foreign_keys': 'Group.creator_id', 'remote_side': 'Attendee.id'}) + + shared_with_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='group.id', nullable=True) + shared_with: 'Group' = Relationship( + back_populates="table_shares", sa_relationship_kwargs={'foreign_keys': 'Group.shared_with_id', 'remote_side': 'Group.id'}) + table_shares: list['Group'] = Relationship(back_populates="shared_with", sa_relationship_kwargs={'viewonly': True}) + public_id: str | None = Column(Uuid(as_uuid=False), default=lambda: str(uuid4())) - shared_with_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('group.id', ondelete='SET NULL'), nullable=True)) - shared_with: 'Group' = Relationship(sa_relationship=relationship( - 'Group', - foreign_keys='Group.shared_with_id', - backref=backref('table_shares', viewonly=True), - cascade='save-update,merge,refresh-expire,expunge', - remote_side='Group.id', - single_parent=True)) name: str = Column(String) tables: Decimal = Column(Numeric, default=0) zip_code: str = Column(String) @@ -66,35 +70,25 @@ class Group(MagModel, TakesPaymentMixin, table=True): status: int = Column(Choice(c.DEALER_STATUS_OPTS), default=c.UNAPPROVED, admin_only=True) registered: datetime = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) approved: datetime | None = Column(DateTime(timezone=True), nullable=True) - leader_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id', use_alter=True, name='fk_leader', ondelete='SET NULL'), - nullable=True)) - creator_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), nullable=True)) - - creator: 'Attendee' = Relationship(sa_relationship=relationship( - 'Attendee', - foreign_keys='Group.creator_id', - backref=backref('created_groups', order_by='Group.name'), - cascade='save-update,merge,refresh-expire,expunge', - remote_side='Attendee.id', - single_parent=True)) - leader: 'Attendee' = Relationship(sa_relationship=relationship('Attendee', foreign_keys='Group.leader_id', post_update=True, cascade='all')) - studio: 'IndieStudio' = Relationship(sa_relationship=relationship('IndieStudio', uselist=False, backref='group', - cascade='save-update,merge,refresh-expire,expunge')) - guest: 'GuestGroup' = Relationship(sa_relationship=relationship('GuestGroup', backref=backref('group', lazy='joined'), uselist=False)) + + attendees: list['Attendee'] = Relationship( + back_populates="group", + sa_relationship_kwargs={'foreign_keys': 'Attendee.group_id', 'lazy': 'selectin', 'cascade': 'save-update,merge,refresh-expire,expunge'}) + studio: 'IndieStudio' = Relationship(back_populates="group", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) + guest: 'GuestGroup' = Relationship(back_populates="group", sa_relationship_kwargs={'passive_deletes': True}) + active_receipt: 'ModelReceipt' = Relationship(sa_relationship=relationship( 'ModelReceipt', cascade='save-update,merge,refresh-expire,expunge', primaryjoin='and_(remote(ModelReceipt.owner_id) == foreign(Group.id),' 'ModelReceipt.owner_model == "Group",' 'ModelReceipt.closed == None)', - lazy='select', - uselist=False)) + lazy='select')) terms_conditions_doc: 'SignedDocument' = Relationship(sa_relationship=relationship( 'SignedDocument', cascade='save-update,merge,refresh-expire,expunge', primaryjoin='and_(SignedDocument.fk_id == foreign(Group.id),' 'SignedDocument.model == "Group")', - uselist=False, overlaps="active_receipt")) _repr_attr_names: ClassVar = ['name'] diff --git a/uber/models/guests.py b/uber/models/guests.py index 342470534..4f64d3f53 100644 --- a/uber/models/guests.py +++ b/uber/models/guests.py @@ -7,8 +7,6 @@ from datetime import datetime, timedelta from markupsafe import Markup -from sqlalchemy.orm import backref -from sqlalchemy.schema import ForeignKey from sqlalchemy.types import Boolean, Integer, String, DateTime, Uuid, JSON from sqlmodel import Field, Relationship from typing import Any, ClassVar @@ -35,33 +33,37 @@ class GuestGroup(MagModel, table=True): Group: joined """ - group_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('group.id'))) - event_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('event.id', ondelete='SET NULL'), nullable=True)) + group_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='group.id', ondelete='CASCADE', unique=True) + group: 'Group' = Relationship(back_populates="guest", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) + + event_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='event.id', nullable=True) + event: 'Event' = Relationship(back_populates="guest") + group_type: int = Column(Choice(c.GROUP_TYPE_OPTS), default=c.BAND) num_hotel_rooms: int = Column(Integer, default=1, admin_only=True) payment: int = Column(Integer, default=0, admin_only=True) vehicles: int = Column(Integer, default=1, admin_only=True) estimated_loadin_minutes: int = Column(Integer, default=c.DEFAULT_LOADIN_MINUTES, admin_only=True) estimated_performance_minutes: int = Column(Integer, default=c.DEFAULT_PERFORMANCE_MINUTES, admin_only=True) - wants_mc: bool | None = Column(Boolean, nullable=True) needs_rehearsal: int | None = Column(Choice(c.GUEST_REHEARSAL_OPTS), nullable=True) badges_assigned: bool = Column(Boolean, default=False) - info: 'GuestInfo' = Relationship(sa_relationship=relationship('GuestInfo', backref=backref('guest', lazy='joined'), uselist=False)) - images: list['GuestImage'] = Relationship(sa_relationship=relationship( - 'GuestImage', backref=backref('guest'), order_by='GuestImage.id')) - bio: 'GuestBio' = Relationship(sa_relationship=relationship('GuestBio', backref=backref('guest', lazy='joined'), uselist=False)) - taxes: 'GuestTaxes' = Relationship(sa_relationship=relationship('GuestTaxes', backref=backref('guest', lazy='joined'), uselist=False)) - stage_plot: 'GuestStagePlot' = Relationship(sa_relationship=relationship('GuestStagePlot', backref=backref('guest', lazy='joined'), uselist=False)) - panel: 'GuestPanel' = Relationship(sa_relationship=relationship('GuestPanel', backref=backref('guest', lazy='joined'), uselist=False)) - merch: 'GuestMerch' = Relationship(sa_relationship=relationship('GuestMerch', backref=backref('guest', lazy='joined'), uselist=False)) - tracks: list['GuestTrack'] = Relationship(sa_relationship=relationship('GuestTrack', backref=backref('guest', lazy='joined'))) - charity: 'GuestCharity' = Relationship(sa_relationship=relationship('GuestCharity', backref=backref('guest', lazy='joined'), uselist=False)) - autograph: 'GuestAutograph' = Relationship(sa_relationship=relationship('GuestAutograph', backref=backref('guest', lazy='joined'), uselist=False)) - interview: 'GuestInterview' = Relationship(sa_relationship=relationship('GuestInterview', backref=backref('guest', lazy='joined'), uselist=False)) - travel_plans: 'GuestTravelPlans' = Relationship(sa_relationship=relationship('GuestTravelPlans', backref=backref('guest', lazy='joined'), uselist=False)) - hospitality: 'GuestHospitality' = Relationship(sa_relationship=relationship('GuestHospitality', backref=backref('guest', lazy='joined'), uselist=False)) - media_request: 'GuestMediaRequest' = Relationship(sa_relationship=relationship('GuestMediaRequest', backref=backref('guest', lazy='joined'), uselist=False)) + + info: 'GuestInfo' = Relationship(back_populates="guest", sa_relationship_kwargs={'passive_deletes': True}) + images: list['GuestImage'] = Relationship( + back_populates="guest", sa_relationship_kwargs={'order_by': 'GuestImage.id', 'passive_deletes': True}) + bio: 'GuestBio' = Relationship(back_populates="guest", sa_relationship_kwargs={'passive_deletes': True}) + taxes: 'GuestTaxes' = Relationship(back_populates="guest", sa_relationship_kwargs={'passive_deletes': True}) + stage_plot: 'GuestStagePlot' = Relationship(back_populates="guest", sa_relationship_kwargs={'passive_deletes': True}) + panel: 'GuestPanel' = Relationship(back_populates="guest", sa_relationship_kwargs={'passive_deletes': True}) + merch: 'GuestMerch' = Relationship(back_populates="guest", sa_relationship_kwargs={'passive_deletes': True}) + tracks: list['GuestTrack'] = Relationship(back_populates="guest", sa_relationship_kwargs={'passive_deletes': True}) + charity: 'GuestCharity' = Relationship(back_populates="guest", sa_relationship_kwargs={'passive_deletes': True}) + autograph: 'GuestAutograph' = Relationship(back_populates="guest", sa_relationship_kwargs={'passive_deletes': True}) + interview: 'GuestInterview' = Relationship(back_populates="guest", sa_relationship_kwargs={'passive_deletes': True}) + travel_plans: 'GuestTravelPlans' = Relationship(back_populates="guest", sa_relationship_kwargs={'passive_deletes': True}) + hospitality: 'GuestHospitality' = Relationship(back_populates="guest", sa_relationship_kwargs={'passive_deletes': True}) + media_request: 'GuestMediaRequest' = Relationship(back_populates="guest", sa_relationship_kwargs={'passive_deletes': True}) email_model_name: ClassVar = 'guest' @@ -301,7 +303,9 @@ class GuestInfo(MagModel, table=True): GuestGroup: joined """ - guest_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True)) + guest_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='guest_group.id', ondelete='CASCADE', unique=True) + guest: 'GuestGroup' = Relationship(back_populates="info", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) + poc_phone: str = Column(String) performer_count: int = Column(Integer, default=0) bringing_vehicle: bool = Column(Boolean, default=False) @@ -314,7 +318,8 @@ def status(self): class GuestImage(MagModel, GuidebookImageMixin, table=True): - guest_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'))) + guest_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='guest_group.id', ondelete='CASCADE') + guest: 'GuestGroup' = Relationship(back_populates="images") @property def url(self): @@ -335,7 +340,9 @@ class GuestBio(MagModel, table=True): GuestGroup: joined """ - guest_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True)) + guest_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='guest_group.id', ondelete='CASCADE', unique=True) + guest: 'GuestGroup' = Relationship(back_populates="bio", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) + desc: str = Column(String) member_info: str = Column(String) website: str = Column(String) @@ -359,7 +366,9 @@ class GuestTaxes(MagModel, table=True): GuestGroup: joined """ - guest_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True)) + guest_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='guest_group.id', ondelete='CASCADE', unique=True) + guest: 'GuestGroup' = Relationship(back_populates="taxes", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) + w9_sent: bool = Column(Boolean, default=False) @property @@ -372,7 +381,9 @@ class GuestStagePlot(MagModel, table=True): GuestGroup: joined """ - guest_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True)) + guest_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='guest_group.id', ondelete='CASCADE', unique=True) + guest: 'GuestGroup' = Relationship(back_populates="stage_plot", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) + filename: str = Column(String) content_type: str = Column(String) notes: str = Column(String) @@ -412,7 +423,9 @@ class GuestPanel(MagModel, table=True): GuestGroup: joined """ - guest_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True)) + guest_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='guest_group.id', ondelete='CASCADE', unique=True) + guest: 'GuestGroup' = Relationship(back_populates="panel", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) + wants_panel: int | None = Column(Choice(c.GUEST_PANEL_OPTS), nullable=True) name: str = Column(String) length: str = Column(String) @@ -430,7 +443,9 @@ class GuestTrack(MagModel, table=True): GuestGroup: joined """ - guest_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'))) + guest_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='guest_group.id', ondelete='CASCADE', unique=True) + guest: 'GuestGroup' = Relationship(back_populates="tracks", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) + filename: str = Column(String) content_type: str = Column(String) extension: str = Column(String) @@ -475,7 +490,9 @@ class GuestMerch(MagModel, table=True): _inventory_file_regex: ClassVar = re.compile(r'^(audio|image)(|\-\d+)$') _inventory_filename_regex: ClassVar = re.compile(r'^(audio|image)(|\-\d+)_filename$') - guest_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True)) + guest_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='guest_group.id', ondelete='CASCADE', unique=True) + guest: 'GuestGroup' = Relationship(back_populates="merch", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) + selling_merch: int | None = Column(Choice(c.GUEST_MERCH_OPTS), nullable=True) delivery_method: int | None = Column(Choice(c.GUEST_MERCH_DELIVERY_OPTS), nullable=True) payout_method: int | None = Column(Choice(c.GUEST_MERCH_PAYOUT_METHOD_OPTS), nullable=True) @@ -774,7 +791,9 @@ class GuestCharity(MagModel, table=True): GuestGroup: joined """ - guest_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True)) + guest_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='guest_group.id', ondelete='CASCADE', unique=True) + guest: 'GuestGroup' = Relationship(back_populates="charity", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) + donating: int | None = Column(Choice(c.GUEST_CHARITY_OPTS), nullable=True) desc: str = Column(String) @@ -793,7 +812,9 @@ class GuestAutograph(MagModel, table=True): GuestGroup: joined """ - guest_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True)) + guest_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='guest_group.id', ondelete='CASCADE', unique=True) + guest: 'GuestGroup' = Relationship(back_populates="autograph", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) + num: int = Column(Integer, default=0) length: int = Column(Integer, default=60) # session length in minutes rock_island_autographs: bool | None = Column(Boolean, nullable=True) @@ -810,7 +831,9 @@ class GuestInterview(MagModel, table=True): GuestGroup: joined """ - guest_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True)) + guest_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='guest_group.id', ondelete='CASCADE', unique=True) + guest: 'GuestGroup' = Relationship(back_populates="interview", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) + will_interview: bool = Column(Boolean, default=False) email: str = Column(String) direct_contact: bool = Column(Boolean, default=False) @@ -828,12 +851,17 @@ class GuestTravelPlans(MagModel, table=True): GuestDetailedTravelPlan: selectin """ - guest_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True)) + guest_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='guest_group.id', ondelete='CASCADE', unique=True) + guest: 'GuestGroup' = Relationship(back_populates="travel_plans", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) + modes: str = Column(MultiChoice(c.GUEST_TRAVEL_OPTS), default=c.OTHER) modes_text: str = Column(String) details: str = Column(String) completed: bool = Column(Boolean, default=False) + detailed_travel_plans: list['GuestDetailedTravelPlan'] = Relationship( + back_populates="travel_plans", sa_relationship_kwargs={'lazy': 'selectin', 'passive_deletes': True}) + @property def num_detailed_travel_plans(self): return len(self.detailed_travel_plans) @@ -844,7 +872,9 @@ class GuestHospitality(MagModel, table=True): GuestGroup: joined """ - guest_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True)) + guest_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='guest_group.id', ondelete='CASCADE', unique=True) + guest: 'GuestGroup' = Relationship(back_populates="hospitality", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) + completed: bool = Column(Boolean, default=False) @@ -853,7 +883,9 @@ class GuestMediaRequest(MagModel, table=True): GuestGroup: joined """ - guest_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('guest_group.id'), unique=True)) + guest_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='guest_group.id', ondelete='CASCADE', unique=True) + guest: 'GuestGroup' = Relationship(back_populates="media_request", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) + completed: bool = Column(Boolean, default=False) @@ -862,10 +894,9 @@ class GuestDetailedTravelPlan(MagModel, table=True): GuestTravelPlans: joined """ - travel_plans_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('guest_travel_plans.id'), nullable=True)) - travel_plans: 'GuestTravelPlans' = Relationship(sa_relationship=relationship('GuestTravelPlans', foreign_keys='GuestDetailedTravelPlan.travel_plans_id', single_parent=True, - backref=backref('detailed_travel_plans', lazy='selectin'), lazy='joined', - cascade='save-update,merge,refresh-expire,expunge')) + travel_plans_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='guest_travel_plans.id', ondelete='CASCADE') + travel_plans: 'GuestTravelPlans' = Relationship(back_populates="detailed_travel_plans", sa_relationship_kwargs={'lazy': 'joined'}) + mode: int = Column(Choice(c.GUEST_TRAVEL_OPTS)) mode_text: str = Column(String) traveller: str = Column(String) diff --git a/uber/models/hotel.py b/uber/models/hotel.py index 8ea6b041a..ef999e91b 100644 --- a/uber/models/hotel.py +++ b/uber/models/hotel.py @@ -9,8 +9,6 @@ from sqlalchemy.dialects.postgresql.json import JSONB from sqlalchemy.ext.hybrid import hybrid_property from sqlalchemy.ext.mutable import MutableDict -from sqlalchemy.orm import backref -from sqlalchemy.schema import ForeignKey from sqlalchemy.types import Boolean, Date, Integer, String, DateTime, Uuid from sqlmodel import Field, Relationship from typing import Any, ClassVar @@ -72,7 +70,9 @@ class HotelRequests(MagModel, NightsMixin, table=True): Attendee: joined """ - attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), unique=True)) + attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE', unique=True) + attendee: 'Attendee' = Relationship(back_populates="hotel_requests", sa_relationship_kwargs={'lazy': 'joined'}) + nights: str = Column(MultiChoice(c.NIGHT_OPTS)) wanted_roommates: str = Column(String) unwanted_roommates: str = Column(String) @@ -97,7 +97,8 @@ class Room(MagModel, NightsMixin, table=True): locked_in: bool = Column(Boolean, default=False) nights: str = Column(MultiChoice(c.NIGHT_OPTS)) created: datetime = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) - assignments: list['RoomAssignment'] = Relationship(sa_relationship=relationship('RoomAssignment', backref=backref('room', lazy='joined'))) + + assignments: list['RoomAssignment'] = Relationship(back_populates="room", sa_relationship_kwargs={'passive_deletes': True}) @property def email(self): @@ -127,8 +128,11 @@ class RoomAssignment(MagModel, table=True): Room: joined """ - room_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('room.id'))) - attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'))) + room_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='room.id', ondelete='CASCADE') + room: 'Room' = Relationship(back_populates="assignments", sa_relationship_kwargs={'lazy': 'joined'}) + + attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE') + attendee: 'Attendee' = Relationship(back_populates="room_assignments", sa_relationship_kwargs={'lazy': 'joined'}) class LotteryApplication(MagModel, table=True): @@ -137,13 +141,11 @@ class LotteryApplication(MagModel, table=True): LotteryApplication (parent_application): joined """ - attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), unique=True, nullable=True)) - attendee: 'Attendee' = Relationship(sa_relationship=relationship('Attendee', lazy='joined', backref=backref('lottery_application', uselist=False), - cascade='save-update,merge,refresh-expire,expunge', - uselist=False)) + attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', nullable=True, unique=True) + attendee: 'Attendee' = Relationship(back_populates="lottery_application", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) + invite_code: str = Column(String) # Not used for now but we're keeping it for later confirmation_num: str = Column(String) - response_id_seq: ClassVar = Sequence('lottery_application_response_id_seq') response_id: int = Column(Integer, response_id_seq, server_default=response_id_seq.next_value(), unique=True) status: int = Column(Choice(c.HOTEL_LOTTERY_STATUS_OPTS), default=c.PARTIAL, admin_only=True) @@ -181,15 +183,13 @@ class LotteryApplication(MagModel, table=True): booking_url_hidden: bool = Column(Boolean, default=True) # If this is set then the above values are ignored - parent_application_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('lottery_application.id'), nullable=True)) - parent_application: 'LotteryApplication' = Relationship(sa_relationship=relationship( - 'LotteryApplication', - lazy='joined', - foreign_keys='LotteryApplication.parent_application_id', - backref=backref('group_members'), - cascade='save-update,merge,refresh-expire,expunge', - remote_side='LotteryApplication.id', - single_parent=True)) + parent_application_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='lottery_application.id', nullable=True) + parent_application: 'LotteryApplication' = Relationship( + back_populates="group_members", + sa_relationship_kwargs={'lazy': 'joined', 'foreign_keys': 'LotteryApplication.parent_application_id', + 'remote_side': 'LotteryApplication.id'}) + group_members: list['LotteryApplication'] = Relationship( + back_populates="parent_application", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) former_parent_id: str | None = Column(Uuid(as_uuid=False), nullable=True) room_group_name: str = Column(String) diff --git a/uber/models/marketplace.py b/uber/models/marketplace.py index a194ced2d..e37c69d06 100644 --- a/uber/models/marketplace.py +++ b/uber/models/marketplace.py @@ -24,10 +24,8 @@ class ArtistMarketplaceApplication(MagModel, table=True): MATCHING_DEALER_FIELDS: ClassVar = ['email_address', 'website', 'name'] - attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'))) - attendee: 'Attendee' = Relationship(sa_relationship=relationship('Attendee', lazy='joined', backref=backref('marketplace_application', uselist=False), - cascade='save-update,merge,refresh-expire,expunge', - uselist=False)) + attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE', unique=True) + attendee: 'Attendee' = Relationship(back_populates="marketplace_application", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) name: str = Column(String) display_name: str = Column(String) email_address: str = Column(String) @@ -40,6 +38,9 @@ class ArtistMarketplaceApplication(MagModel, table=True): status: int = Column(Choice(c.MARKETPLACE_STATUS_OPTS), default=c.PENDING, admin_only=True) registered: datetime = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) accepted: datetime | None = Column(DateTime(timezone=True), nullable=True) + admin_notes: str = Column(String, admin_only=True) + overridden_price: int | None = Column(Integer, nullable=True, admin_only=True) + receipt_items: list['ReceiptItem'] = Relationship(sa_relationship=relationship('ReceiptItem', primaryjoin='and_(' 'ReceiptItem.fk_model == "ArtistMarketplaceApplication", ' @@ -47,9 +48,6 @@ class ArtistMarketplaceApplication(MagModel, table=True): viewonly=True, uselist=True)) - admin_notes: str = Column(String, admin_only=True) - overridden_price: int | None = Column(Integer, nullable=True, admin_only=True) - email_model_name: ClassVar = 'app' @presave_adjustment diff --git a/uber/models/mits.py b/uber/models/mits.py index 5c06d2e25..d156d65f8 100644 --- a/uber/models/mits.py +++ b/uber/models/mits.py @@ -5,8 +5,6 @@ from pytz import UTC from sqlalchemy import and_ -from sqlalchemy.orm import backref -from sqlalchemy.schema import ForeignKey from sqlalchemy.types import Boolean, Integer, Uuid, DateTime, String from sqlalchemy.ext.hybrid import hybrid_property from sqlmodel import Field, Relationship @@ -42,10 +40,10 @@ class MITSTeam(MagModel, table=True): applied: datetime = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) status: int = Column(Choice(c.MITS_APP_STATUS), default=c.PENDING, admin_only=True) - applicants: list['MITSApplicant'] = Relationship(sa_relationship=relationship('MITSApplicant', backref=backref('team', lazy='joined'))) - games: list['MITSGame'] = Relationship(sa_relationship=relationship('MITSGame', lazy='selectin', backref=backref('team', lazy='joined'))) - schedule: 'MITSTimes' = Relationship(sa_relationship=relationship('MITSTimes', uselist=False, backref=backref('team', lazy='joined'))) - panel_app: 'MITSPanelApplication' = Relationship(sa_relationship=relationship('MITSPanelApplication', uselist=False, backref=backref('team', lazy='joined'))) + applicants: list['MITSApplicant'] = Relationship(back_populates="team", sa_relationship_kwargs={'passive_deletes': True}) + games: list['MITSGame'] = Relationship(back_populates="team", sa_relationship_kwargs={'passive_deletes': True}) + schedule: 'MITSTimes' = Relationship(back_populates="team", sa_relationship_kwargs={'passive_deletes': True}) + panel_app: 'MITSPanelApplication' = Relationship(back_populates="team", sa_relationship_kwargs={'passive_deletes': True}) duplicate_of: str | None = Column(Uuid(as_uuid=False), nullable=True) deleted: bool = Column(Boolean, default=False) @@ -142,8 +140,12 @@ class MITSApplicant(MagModel, table=True): MITSTeam: joined """ - team_id: str | None = Field(sa_column=Column(ForeignKey('mits_team.id'))) - attendee_id: str | None = Field(sa_column=Column(ForeignKey('attendee.id'), nullable=True)) + team_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='mits_team.id', ondelete='CASCADE') + team: 'MITSTeam' = Relationship(back_populates="applicants", sa_relationship_kwargs={'lazy': 'joined'}) + + attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', nullable=True) + attendee: 'Attendee' = Relationship(back_populates="mits_applicants") + primary_contact: bool = Column(Boolean, default=False) first_name: str = Column(String) last_name: str = Column(String) @@ -177,7 +179,9 @@ class MITSGame(MagModel, table=True): MITSDocument: selectin """ - team_id: str | None = Field(sa_column=Column(ForeignKey('mits_team.id'))) + team_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='mits_team.id', ondelete='CASCADE') + team: 'MITSTeam' = Relationship(back_populates="games", sa_relationship_kwargs={'lazy': 'joined'}) + name: str = Column(String) promo_blurb: str = Column(String) description: str = Column(String) @@ -192,8 +196,9 @@ class MITSGame(MagModel, table=True): unlicensed: bool = Column(Boolean, default=False) professional: bool = Column(Boolean, default=False) tournament: bool = Column(Boolean, default=False) - pictures: list['MITSPicture'] = Relationship(sa_relationship=relationship('MITSPicture', lazy='selectin', backref=backref('game', lazy='joined'))) - documents: list['MITSDocument'] = Relationship(sa_relationship=relationship('MITSDocument', lazy='selectin', backref=backref('game', lazy='joined'))) + + pictures: list['MITSPicture'] = Relationship(back_populates="game", sa_relationship_kwargs={'passive_deletes': True}) + documents: list['MITSDocument'] = Relationship(back_populates="game", sa_relationship_kwargs={'passive_deletes': True}) @hybrid_property def has_been_accepted(self): @@ -252,7 +257,9 @@ class MITSPicture(MagModel, GuidebookImageMixin, table=True): MITSGame: joined """ - game_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('mits_game.id'))) + game_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='mits_game.id', ondelete='CASCADE') + game: 'MITSGame' = Relationship(back_populates="pictures", sa_relationship_kwargs={'lazy': 'joined'}) + description: str = Column(String) @property @@ -269,7 +276,9 @@ class MITSDocument(MagModel, table=True): MITSGame: joined """ - game_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('mits_game.id'))) + game_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='mits_game.id', ondelete='CASCADE') + game: 'MITSGame' = Relationship(back_populates="documents", sa_relationship_kwargs={'lazy': 'joined'}) + filename: str = Column(String) description: str = Column(String) @@ -287,7 +296,9 @@ class MITSTimes(MagModel, table=True): MITSTeam: joined """ - team_id: str | None = Field(sa_column=Column(ForeignKey('mits_team.id'))) + team_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='mits_team.id', ondelete='CASCADE', unique=True) + team: 'MITSTeam' = Relationship(back_populates="schedule", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) + showcase_availability: str = Column(MultiChoice(c.MITS_SHOWCASE_SCHEDULE_OPTS)) availability: str = Column(MultiChoice(c.MITS_SCHEDULE_OPTS)) @@ -297,7 +308,9 @@ class MITSPanelApplication(MagModel, table=True): MITSTeam: joined """ - team_id: str | None = Field(sa_column=Column(ForeignKey('mits_team.id'))) + team_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='mits_team.id', ondelete='CASCADE', unique=True) + team: 'MITSTeam' = Relationship(back_populates="panel_app", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) + name: str = Column(String) description: str = Column(String) length: int = Column(Choice(c.PANEL_STRICT_LENGTH_OPTS), default=c.SIXTY_MIN) diff --git a/uber/models/panels.py b/uber/models/panels.py index 5abaeffb2..61cde9eca 100644 --- a/uber/models/panels.py +++ b/uber/models/panels.py @@ -2,7 +2,6 @@ from datetime import datetime, timedelta from pytz import UTC -from sqlalchemy.orm import backref from sqlalchemy.schema import ForeignKey, Table, UniqueConstraint, Index from sqlalchemy.types import Boolean, Integer, Uuid, String, DateTime from sqlalchemy.ext.hybrid import hybrid_property @@ -32,15 +31,17 @@ class EventLocation(MagModel, table=True): - department_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('department.id', ondelete='SET NULL'), nullable=True)) + department_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='department.id', nullable=True) + department: 'Department' = Relationship(back_populates="locations") + name: str = Column(String) room: str = Column(String) tracks: str = Column(MultiChoice(c.EVENT_TRACK_OPTS)) - events: list['Event'] = Relationship(sa_relationship=relationship('Event', backref=backref('location', lazy='joined', cascade="save-update,merge"), - cascade="save-update,merge", single_parent=True)) - attractions: list['AttractionEvent'] = Relationship(sa_relationship=relationship('AttractionEvent', backref=backref('location', lazy='joined', cascade="save-update,merge"), - cascade="save-update,merge", single_parent=True)) + events: list['Event'] = Relationship( + back_populates="location", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) + attractions: list['AttractionEvent'] = Relationship( + back_populates="location", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) @property def schedule_name(self): @@ -85,9 +86,15 @@ class Event(MagModel, table=True): EventLocation: joined """ - event_location_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('event_location.id', ondelete='SET NULL'), nullable=True)) - department_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('department.id', ondelete='SET NULL'), nullable=True)) - attraction_event_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attraction_event.id', ondelete='SET NULL'), nullable=True)) + event_location_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='event_location.id', nullable=True) + location: 'EventLocation' = Relationship(back_populates="events", sa_relationship_kwargs={'lazy': 'joined'}) + + department_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='department.id', nullable=True) + department: 'Department' = Relationship(back_populates="events") + + attraction_event_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attraction_event.id', nullable=True, unique=True) + attraction: 'AttractionEvent' = Relationship(back_populates="schedule_item", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) + start_time: datetime = Column(DateTime(timezone=True)) duration: int = Column(Integer, default=60) name: str = Column(String, nullable=False) @@ -95,15 +102,11 @@ class Event(MagModel, table=True): public_description: str = Column(String) tracks: str = Column(MultiChoice(c.EVENT_TRACK_OPTS)) - assigned_panelists: list['AssignedPanelist'] = Relationship(sa_relationship=relationship('AssignedPanelist', backref=backref('event', lazy='joined'))) - applications: list['PanelApplication'] = Relationship(sa_relationship=relationship('PanelApplication', backref=backref('event', lazy='joined', cascade="save-update,merge"), - cascade="save-update,merge")) - panel_feedback: list['EventFeedback'] = Relationship(sa_relationship=relationship('EventFeedback', backref='event')) - guest: 'GuestGroup' = Relationship(sa_relationship=relationship('GuestGroup', backref=backref('event', cascade="save-update,merge"), - cascade='save-update,merge')) - attraction: 'AttractionEvent' = Relationship(sa_relationship=relationship('AttractionEvent', backref=backref( - 'schedule_item', lazy='joined', cascade="save-update,merge", uselist=False - ), cascade='save-update,merge')) + assigned_panelists: list['AssignedPanelist'] = Relationship(back_populates="event", sa_relationship_kwargs={'passive_deletes': True}) + applications: list['PanelApplication'] = Relationship( + back_populates="event", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) + panel_feedback: list['EventFeedback'] = Relationship(back_populates="event", sa_relationship_kwargs={'passive_deletes': True}) + guest: 'GuestGroup' = Relationship(back_populates="event", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) @property def minutes(self): @@ -165,8 +168,11 @@ class AssignedPanelist(MagModel, table=True): Event: joined """ - attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='cascade'))) - event_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('event.id', ondelete='cascade'))) + attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE') + attendee: 'Attendee' = Relationship(back_populates="assigned_panelists", sa_relationship_kwargs={'lazy': 'joined'}) + + event_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='event.id', ondelete='CASCADE') + event: 'Event' = Relationship(back_populates="assigned_panelists", sa_relationship_kwargs={'lazy': 'joined'}) def __repr__(self): if self.attendee: @@ -182,9 +188,14 @@ class PanelApplication(MagModel, table=True): PanelApplicant: selectin """ - event_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('event.id', ondelete='SET NULL'), nullable=True)) - poc_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), nullable=True)) - submitter_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('panel_applicant.id', ondelete='SET NULL'), nullable=True)) + event_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='event.id', nullable=True) + event: 'Event' = Relationship(back_populates="applications", sa_relationship_kwargs={'lazy': 'joined'}) + + poc_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', nullable=True) + poc: 'Attendee' = Relationship(back_populates="panel_applications") + + submitter_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='panel_applicant.id', nullable=True) + name: str = Column(String) length: int = Column(Choice(c.PANEL_LENGTH_OPTS), default=c.SIXTY_MIN) length_text: str = Column(String) @@ -221,9 +232,9 @@ class PanelApplication(MagModel, table=True): comments: str = Column(String, admin_only=True) tags: str = Column(UniqueList, admin_only=True) - applicants: list['PanelApplicant'] = Relationship(sa_relationship=relationship('PanelApplicant', lazy='selectin', backref=backref('applications', lazy='selectin'), - cascade='save-update,merge,refresh-expire,expunge', - secondary='panel_applicant_application')) + applicants: list['PanelApplicant'] = Relationship( + back_populates="applications", + sa_relationship_kwargs={'lazy': 'selectin', 'cascade': 'save-update,merge,refresh-expire,expunge', 'secondary': 'panel_applicant_application'}) email_model_name: ClassVar = 'app' @@ -339,7 +350,9 @@ class PanelApplicant(MagModel, table=True): PanelApplicant: selectin """ - attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), nullable=True)) + attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='SET NULL', nullable=True) + attendee: 'Attendee' = Relationship(back_populates="panel_applicants", sa_relationship_kwargs={'lazy': 'joined'}) + submitter: bool = Column(Boolean, default=False) first_name: str = Column(String) last_name: str = Column(String) @@ -357,6 +370,10 @@ class PanelApplicant(MagModel, table=True): display_name: str = Column(String) social_media_info: str = Column(String) + applications: list['PanelApplication'] = Relationship( + back_populates="applicants", + sa_relationship_kwargs={'lazy': 'selectin', 'cascade': 'save-update,merge,refresh-expire,expunge', 'secondary': 'panel_applicant_application'}) + @property def has_credentials(self): return any([self.occupation, self.website, self.other_credentials]) @@ -381,8 +398,12 @@ def check_if_still_submitter(self, app_id): class EventFeedback(MagModel, table=True): - event_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('event.id'))) - attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='cascade'))) + event_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='event.id', ondelete='CASCADE') + event: 'Event' = Relationship(back_populates="panel_feedback") + + attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE') + attendee: 'Attendee' = Relationship(back_populates="panel_feedback") + headcount_starting: int = Column(Integer, default=0) headcount_during: int = Column(Integer, default=0) comments: str = Column(String) diff --git a/uber/models/promo_code.py b/uber/models/promo_code.py index 0c8a1cb48..c00e7524c 100644 --- a/uber/models/promo_code.py +++ b/uber/models/promo_code.py @@ -9,8 +9,7 @@ from dateutil import parser as dateparser from sqlalchemy import exists, func, select, CheckConstraint from sqlalchemy.ext.hybrid import hybrid_property -from sqlalchemy.orm import backref -from sqlalchemy.schema import Index, ForeignKey +from sqlalchemy.schema import Index from sqlalchemy.types import Integer, Uuid, String, DateTime from sqlmodel import Field, Relationship from typing import ClassVar @@ -136,14 +135,15 @@ class PromoCodeGroup(MagModel, table=True): PromoCode: selectin """ + buyer_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', nullable=True) + buyer: 'Attendee' = Relationship(back_populates="promo_code_groups", sa_relationship_kwargs={'lazy': 'joined'}) + name: str = Column(String) code: str = Column(String, admin_only=True) registered: datetime = Field(sa_column=Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC))) - buyer_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id', ondelete='SET NULL'), nullable=True)) - buyer: 'Attendee' = Relationship(sa_relationship=relationship( - 'Attendee', backref='promo_code_groups', lazy='joined', - foreign_keys='PromoCodeGroup.buyer_id', - cascade='save-update,merge,refresh-expire,expunge')) + + promo_codes: list['PromoCode'] = Relationship( + back_populates="group", sa_relationship_kwargs={'lazy': 'selectin', 'cascade': 'save-update,merge,refresh-expire,expunge'}) email_model_name: ClassVar = 'group' @@ -314,6 +314,8 @@ class PromoCode(MagModel, table=True): (_FIXED_PRICE, 'Fixed Price'), (_PERCENT_DISCOUNT, 'Percent Discount')] + group_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='promo_code_group.id', nullable=True) + group: 'PromoCodeGroup' = Relationship(back_populates="promo_codes", sa_relationship_kwargs={'lazy': 'joined'}) code: str = Column(String) discount: int | None = Column(Integer, nullable=True, default=None) @@ -322,12 +324,10 @@ class PromoCode(MagModel, table=True): uses_allowed: int | None = Column(Integer, nullable=True, default=None) cost: int | None = Column(Integer, nullable=True, default=None) admin_notes: str = Column(String) - - group_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('promo_code_group.id', ondelete='SET NULL'), nullable=True)) - group: 'PromoCodeGroup' = Relationship(sa_relationship=relationship( - PromoCodeGroup, backref=backref('promo_codes', lazy='selectin'), lazy='joined', - foreign_keys='PromoCode.group_id', - cascade='save-update,merge,refresh-expire,expunge')) + + used_by: list['Attendee'] = Relationship( + back_populates="promo_code", sa_relationship_kwargs={'lazy': 'selectin', 'cascade': 'merge,refresh-expire,expunge'} + ) _repr_attr_names: ClassVar = ('code',) diff --git a/uber/models/showcase.py b/uber/models/showcase.py index f849af062..57033347e 100644 --- a/uber/models/showcase.py +++ b/uber/models/showcase.py @@ -8,8 +8,7 @@ from markupsafe import Markup from pytz import UTC from sqlalchemy import func, case, or_ -from sqlalchemy.orm import backref -from sqlalchemy.schema import ForeignKey, UniqueConstraint +from sqlalchemy.schema import UniqueConstraint from sqlalchemy.types import Boolean, Integer, String, DateTime, Uuid from sqlalchemy.ext.hybrid import hybrid_property from sqlmodel import Field, Relationship @@ -43,7 +42,9 @@ class IndieJudge(MagModel, ReviewMixin, table=True): IndieGameReview: selectin """ - admin_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('admin_account.id'))) + admin_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='admin_account.id', nullable=True, unique=True) + admin_account: "AdminAccount" = Relationship(back_populates="judge", sa_relationship_kwargs={'single_parent': True}) + status: int = Column(Choice(c.MIVS_JUDGE_STATUS_OPTS), default=c.UNCONFIRMED) assignable_showcases: str = Column(MultiChoice(c.SHOWCASE_GAME_TYPE_OPTS)) all_games_showcases: str = Column(MultiChoice(c.SHOWCASE_GAME_TYPE_OPTS)) @@ -54,8 +55,9 @@ class IndieJudge(MagModel, ReviewMixin, table=True): vr_text: str = Column(String) staff_notes: str = Column(String) - codes: list['IndieGameCode'] = Relationship(sa_relationship=relationship('IndieGameCode', lazy='selectin', backref=backref('judge', lazy='joined'))) - reviews: list['IndieGameReview'] = Relationship(sa_relationship=relationship('IndieGameReview', lazy='selectin', backref=backref('judge', lazy='joined'))) + codes: list['IndieGameCode'] = Relationship( + back_populates="judge", sa_relationship_kwargs={'lazy': 'selectin', 'cascade': 'save-update,merge,refresh-expire,expunge'}) + reviews: list['IndieGameReview'] = Relationship(back_populates="judge", sa_relationship_kwargs={'lazy': 'selectin', 'passive_deletes': True}) email_model_name: ClassVar = 'judge' @@ -140,7 +142,9 @@ class IndieStudio(MagModel, table=True): IndieGame: selectin """ - group_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('group.id'), nullable=True)) + group_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='group.id', nullable=True, unique=True) + group: 'Group' = Relationship(back_populates="studio", sa_relationship_kwargs={'single_parent': True}) + name: str = Column(String, unique=True) website: str = Column(String) other_links: str = Column(UniqueList) @@ -163,12 +167,10 @@ class IndieStudio(MagModel, table=True): show_info_updated: bool = Column(Boolean, default=False) logistics_updated: bool = Column(Boolean, default=False) - games: list['IndieGame'] = Relationship(sa_relationship=relationship( - 'IndieGame', backref=backref('studio', lazy='joined'), lazy='selectin', order_by='IndieGame.title')) - developers: list['IndieDeveloper'] = Relationship(sa_relationship=relationship( - 'IndieDeveloper', - backref=backref('studio', lazy='joined'), - order_by='IndieDeveloper.last_name')) + games: list['IndieGame'] = Relationship( + back_populates="studio", sa_relationship_kwargs={'lazy': 'selectin', 'order_by': 'IndieGame.title', 'passive_deletes': True}) + developers: list['IndieDeveloper'] = Relationship( + back_populates="studio", sa_relationship_kwargs={'order_by': 'IndieDeveloper.last_name', 'passive_deletes': True}) email_model_name: ClassVar = 'studio' @@ -328,8 +330,11 @@ class IndieDeveloper(MagModel, table=True): IndieStudio: joined """ - studio_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('indie_studio.id'))) - attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'), nullable=True)) + studio_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='indie_studio.id', ondelete='CASCADE') + studio: 'IndieStudio' = Relationship(back_populates="developers", sa_relationship_kwargs={'lazy': 'joined'}) + + attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', nullable=True) + attendee: 'Attendee' = Relationship(back_populates="indie_developer") gets_emails: bool = Column(Boolean, default=False) first_name: str = Column(String) @@ -339,6 +344,9 @@ class IndieDeveloper(MagModel, table=True): agreed_coc: bool = Column(Boolean, default=False) agreed_data_policy: bool = Column(Boolean, default=False) + arcade_games: list['IndieGame'] = Relationship(back_populates="primary_contact", + sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) + @property def email_to_address(self): return self.attendee.email if self.attendee else self.email @@ -368,10 +376,11 @@ class IndieGame(MagModel, ReviewMixin, table=True): IndieGameImage: selectin """ - studio_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('indie_studio.id'))) - primary_contact_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('indie_developer.id', ondelete='SET NULL'), nullable=True)) - primary_contact: 'IndieDeveloper' = Relationship(sa_relationship=relationship(IndieDeveloper, backref='arcade_games', lazy='joined', - foreign_keys='IndieGame.primary_contact_id', cascade='save-update,merge,refresh-expire,expunge')) + studio_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='indie_studio.id', ondelete='CASCADE') + studio: 'IndieStudio' = Relationship(back_populates="games", sa_relationship_kwargs={'lazy': 'joined'}) + + primary_contact_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='indie_developer.id', nullable=True) + primary_contact: 'IndieDeveloper' = Relationship(back_populates="arcade_games", sa_relationship_kwargs={'lazy': 'joined'}) title: str = Column(String) brief_description: str = Column(String) @@ -440,10 +449,10 @@ class IndieGame(MagModel, ReviewMixin, table=True): waitlisted: datetime | None = Column(DateTime(timezone=True), nullable=True) accepted: datetime | None = Column(DateTime(timezone=True), nullable=True) - codes: list['IndieGameCode'] = Relationship(sa_relationship=relationship('IndieGameCode', lazy='selectin', backref=backref('game', lazy='joined'))) - reviews: list['IndieGameReview'] = Relationship(sa_relationship=relationship('IndieGameReview', backref=backref('game', lazy='joined'))) - images: list['IndieGameImage'] = Relationship(sa_relationship=relationship( - 'IndieGameImage', lazy='selectin', backref=backref('game', lazy='joined'), order_by='IndieGameImage.id')) + codes: list['IndieGameCode'] = Relationship(back_populates="game", sa_relationship_kwargs={'lazy': 'selectin', 'passive_deletes': True}) + reviews: list['IndieGameReview'] = Relationship(back_populates="game", sa_relationship_kwargs={'passive_deletes': True}) + images: list['IndieGameImage'] = Relationship( + back_populates="game", sa_relationship_kwargs={'lazy': 'selectin', 'order_by': 'IndieGameImage.id', 'passive_deletes': True}) email_model_name: ClassVar = 'game' @@ -683,7 +692,9 @@ class IndieGameImage(MagModel, GuidebookImageMixin, table=True): IndieGame: joined """ - game_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('indie_game.id'))) + game_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='indie_game.id', ondelete='CASCADE') + game: 'IndieGame' = Relationship(back_populates="images", sa_relationship_kwargs={'lazy': 'joined'}) + description: str = Column(String) use_in_promo: bool = Column(Boolean, default=False) is_screenshot: bool = Column(Boolean, default=True) @@ -728,8 +739,12 @@ class IndieGameCode(MagModel, table=True): IndieJudge: joined """ - game_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('indie_game.id'))) - judge_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('indie_judge.id'), nullable=True)) + game_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='indie_game.id', ondelete='CASCADE') + game: 'IndieGame' = Relationship(back_populates="codes", sa_relationship_kwargs={'lazy': 'joined'}) + + judge_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='indie_judge.id', nullable=True) + judge: 'IndieJudge' = Relationship(back_populates="codes", sa_relationship_kwargs={'lazy': 'joined'}) + code: str = Column(String) unlimited_use: bool = Column(Boolean, default=False) judge_notes: str = Column(String, admin_only=True) # TODO: Remove? @@ -745,8 +760,12 @@ class IndieGameReview(MagModel, table=True): IndieJudge: joined """ - game_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('indie_game.id'))) - judge_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('indie_judge.id'))) + game_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='indie_game.id', ondelete='CASCADE') + game: 'IndieGame' = Relationship(back_populates="reviews", sa_relationship_kwargs={'lazy': 'joined'}) + + judge_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='indie_judge.id', ondelete='CASCADE') + judge: 'IndieJudge' = Relationship(back_populates="reviews", sa_relationship_kwargs={'lazy': 'joined'}) + video_status: int = Column( Choice(c.MIVS_VIDEO_REVIEW_STATUS_OPTS), default=c.PENDING) game_status: int = Column( diff --git a/uber/models/tabletop.py b/uber/models/tabletop.py index dd08ccf50..47415c481 100644 --- a/uber/models/tabletop.py +++ b/uber/models/tabletop.py @@ -1,8 +1,6 @@ from datetime import datetime from pytz import UTC -from sqlalchemy.orm import backref -from sqlalchemy.schema import ForeignKey from sqlalchemy.types import Boolean, DateTime, String, Uuid from sqlmodel import Field, Relationship from typing import ClassVar @@ -15,11 +13,15 @@ class TabletopGame(MagModel, table=True): + attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE') + attendee: 'Attendee' = Relationship(back_populates="games") + code: str = Column(String) name: str = Column(String) - attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'))) returned: bool = Column(Boolean, default=False) - checkouts: list['TabletopCheckout'] = Relationship(sa_relationship=relationship('TabletopCheckout', order_by='TabletopCheckout.checked_out', backref=backref('game', lazy='joined'))) + + checkouts: list['TabletopCheckout'] = Relationship( + back_populates="game", sa_relationship_kwargs={'order_by': 'TabletopCheckout.checked_out', 'passive_deletes': True}) _repr_attr_names: ClassVar = ['name'] @@ -37,7 +39,11 @@ class TabletopCheckout(MagModel, table=True): TabletopGame: joined """ - game_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('tabletop_game.id'))) - attendee_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), ForeignKey('attendee.id'))) + game_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='tabletop_game.id', ondelete='CASCADE') + game: 'TabletopGame' = Relationship(back_populates="checkouts", sa_relationship_kwargs={'lazy': 'joined'}) + + attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE') + attendee: 'Attendee' = Relationship(back_populates="checkouts", sa_relationship_kwargs={'lazy': 'joined'}) + checked_out: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) returned: datetime | None = Column(DateTime(timezone=True), nullable=True) diff --git a/uber/site_sections/art_show_reports.py b/uber/site_sections/art_show_reports.py index 93b1a6df5..b4cfbd109 100644 --- a/uber/site_sections/art_show_reports.py +++ b/uber/site_sections/art_show_reports.py @@ -476,8 +476,8 @@ def bidder_csv(self, out, session): ]) for bidder in session.query(ArtShowBidder).join(ArtShowBidder.attendee): - if bidder.attendee.badge_status == c.NOT_ATTENDING and bidder.attendee.art_show_applications: - address_model = bidder.attendee.art_show_applications[0] + if bidder.attendee.badge_status == c.NOT_ATTENDING and bidder.attendee.art_show_application: + address_model = bidder.attendee.art_show_application else: address_model = bidder.attendee diff --git a/uber/site_sections/reg_admin.py b/uber/site_sections/reg_admin.py index bc47651bb..f7caac7b6 100644 --- a/uber/site_sections/reg_admin.py +++ b/uber/site_sections/reg_admin.py @@ -278,15 +278,14 @@ def receipt_items(self, session, id, message='', highlight_id=''): other_receipts = set() if isinstance(model, Attendee): - for app in model.art_show_applications: - other_receipt = session.get_receipt_by_model(app, options=options) - if other_receipt: - other_receipt.changes = session.query(Tracking).filter( - or_(Tracking.links.like('%model_receipt({})%' - .format(other_receipt.id)), - and_(Tracking.model == 'ModelReceipt', - Tracking.fk_id == other_receipt.id))).order_by(Tracking.when).all() - other_receipts.add(other_receipt) + other_receipt = session.get_receipt_by_model(model.art_show_application, options=options) + if other_receipt: + other_receipt.changes = session.query(Tracking).filter( + or_(Tracking.links.like('%model_receipt({})%' + .format(other_receipt.id)), + and_(Tracking.model == 'ModelReceipt', + Tracking.fk_id == other_receipt.id))).order_by(Tracking.when).all() + other_receipts.add(other_receipt) closed_receipts = set() closed_receipt_query = session.query(ModelReceipt).filter(ModelReceipt.owner_id == id, diff --git a/uber/site_sections/registration.py b/uber/site_sections/registration.py index 7d6da0f2a..53589f0fe 100644 --- a/uber/site_sections/registration.py +++ b/uber/site_sections/registration.py @@ -49,6 +49,7 @@ def load_attendee(session, params): attendee = Attendee() else: attendee = session.query(Attendee).filter(Attendee.id == id).options( + selectinload(Attendee.assigned_depts), selectinload(Attendee.dept_membership_requests), selectinload(Attendee.dept_memberships_with_role), selectinload(Attendee.dept_memberships_with_inherent_role), diff --git a/uber/templates/art_show_admin/bidder_signup.html b/uber/templates/art_show_admin/bidder_signup.html index 412dbf6cd..0cca6f0ba 100644 --- a/uber/templates/art_show_admin/bidder_signup.html +++ b/uber/templates/art_show_admin/bidder_signup.html @@ -110,12 +110,12 @@

Bidder Management

{% if c.PREASSIGNED_BADGE_TYPES %}{{ attendee.badge_printed_name }}{% endif %} {% if c.NUMBERED_BADGES %}{{ attendee.badge_num }}{% endif %} - - {% for app in attendee.art_show_applications %} - {{ app.display_name }} + + {% if attendee.art_show_application %} + {{ attendee.art_show_application.display_name }} {% else %} N/A - {% endfor %} + {% endif %} {% set show_edit_btn = attendee.art_show_bidder and attendee.art_show_bidder.signed_up %} @@ -182,11 +182,11 @@

Bidder Management

{% if c.PREASSIGNED_BADGE_TYPES %}{{ attendee.badge_printed_name }}{% endif %} {% if c.NUMBERED_BADGES %}{{ attendee.badge_num }}{% endif %} - {% for app in attendee.art_show_applications %} - {{ app.display_name }} + {% if attendee.art_show_application %} + {{ attendee.art_show_application.display_name }} {% else %} N/A - {% endfor %} + {% endif %} {% set show_edit_btn = attendee.art_show_bidder and attendee.art_show_bidder.signed_up %} diff --git a/uber/templates/confirm_tabs.html b/uber/templates/confirm_tabs.html index c3b897417..63d434f24 100644 --- a/uber/templates/confirm_tabs.html +++ b/uber/templates/confirm_tabs.html @@ -44,13 +44,13 @@ {% endfor %} -{% for art_show_app in attendee.art_show_applications %} +{% if attendee.art_show_application %} -{% endfor %} +{% endif %} {% if attendee.marketplace_application %}
  • - {% if c.ART_SHOW_ENABLED and c.ART_SHOW_OPEN and not attendee.art_show_applications %} + {% if c.ART_SHOW_ENABLED and c.ART_SHOW_OPEN and not attendee.art_show_application %} @@ -109,6 +109,3 @@
    • {% endif %} - -{% if not attendee.art_show_applications and c.ART_SHOW_OPEN %} -{% endif %} diff --git a/uber/templates/preregistration/attendee_card.html b/uber/templates/preregistration/attendee_card.html index 862a2ed83..efc20d6f2 100644 --- a/uber/templates/preregistration/attendee_card.html +++ b/uber/templates/preregistration/attendee_card.html @@ -66,9 +66,9 @@ View/Edit Registration {% endif %} - {% if attendee.art_show_applications or c.ART_SHOW_OPEN %} - {% if attendee.art_show_applications %} - + {% if attendee.art_show_application or c.ART_SHOW_OPEN %} + {% if attendee.art_show_application %} +   View Art Show App {% else %} diff --git a/uber/templates/reg_admin/attendee_account_form.html b/uber/templates/reg_admin/attendee_account_form.html index 0c18e049b..1d01c315b 100644 --- a/uber/templates/reg_admin/attendee_account_form.html +++ b/uber/templates/reg_admin/attendee_account_form.html @@ -81,11 +81,11 @@

    {{ account.email }} Attendee Account

    View Receipt - {% for app in attendee.art_show_applications %} - View Application + {% if attendee.art_show_application %} + View Application {% else %} N/A - {% endfor %} + {% endif %} {% if attendee.marketplace_application %} From 32e3eeaf0904d25952fc3b3d0c35723e05881e26 Mon Sep 17 00:00:00 2001 From: Victoria Earl Date: Thu, 19 Feb 2026 17:37:35 +0100 Subject: [PATCH 10/20] Fix models for migration generation Adds a new version of the relationship and column overrides to account for the use of Field() and Relationship() on their own, and updates some types of fields to use sa_type instead of sa_column in order to get to server to stop generating the wrong kind of column in migrations. Also removes datetime.utcnow() as it's deprecated. --- ...=> b34f03d164c6_relationships_overhaul.py} | 1311 ++--------------- tests/uber/test_custom_tags.py | 4 +- uber/api.py | 6 +- uber/custom_tags.py | 2 +- uber/models/__init__.py | 4 +- uber/models/admin.py | 54 +- uber/models/api.py | 33 +- uber/models/art_show.py | 16 +- uber/models/attendee.py | 23 +- uber/models/attraction.py | 18 +- uber/models/badge_printing.py | 8 +- uber/models/commerce.py | 34 +- uber/models/department.py | 6 +- uber/models/email.py | 15 +- uber/models/group.py | 11 +- uber/models/guests.py | 11 +- uber/models/hotel.py | 11 +- uber/models/legal.py | 11 +- uber/models/marketplace.py | 9 +- uber/models/mits.py | 13 +- uber/models/panels.py | 13 +- uber/models/promo_code.py | 7 +- uber/models/showcase.py | 13 +- uber/models/tabletop.py | 7 +- uber/models/tracking.py | 17 +- uber/models/types.py | 68 +- uber/payments.py | 6 +- uber/site_sections/badge_printing.py | 6 +- uber/site_sections/devtools.py | 2 +- uber/site_sections/registration.py | 6 +- uber/tasks/redis.py | 2 +- 31 files changed, 337 insertions(+), 1410 deletions(-) rename alembic/versions/{6500aca85560_relationships_overhaul.py => b34f03d164c6_relationships_overhaul.py} (50%) diff --git a/alembic/versions/6500aca85560_relationships_overhaul.py b/alembic/versions/b34f03d164c6_relationships_overhaul.py similarity index 50% rename from alembic/versions/6500aca85560_relationships_overhaul.py rename to alembic/versions/b34f03d164c6_relationships_overhaul.py index 6cb761fc6..47555b6c1 100644 --- a/alembic/versions/6500aca85560_relationships_overhaul.py +++ b/alembic/versions/b34f03d164c6_relationships_overhaul.py @@ -1,21 +1,20 @@ """Relationships overhaul -Revision ID: 6500aca85560 +Revision ID: b34f03d164c6 Revises: 3d942ce689fc -Create Date: 2026-02-19 00:25:38.129029 +Create Date: 2026-02-19 16:25:44.877345 """ # revision identifiers, used by Alembic. -revision = '6500aca85560' +revision = 'b34f03d164c6' down_revision = '3d942ce689fc' branch_labels = None depends_on = None from alembic import op import sqlalchemy as sa -import sqlmodel from sqlalchemy.dialects import postgresql @@ -53,83 +52,19 @@ def sqlite_column_reflect_listener(inspector, table, column_info): def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### op.drop_table('attendee_tournament') - op.alter_column('access_group', 'start_time', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=True) - op.alter_column('access_group', 'end_time', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=True) - op.alter_column('admin_account', 'attendee_id', - existing_type=sa.UUID(), - nullable=True) op.drop_constraint(op.f('fk_admin_account_attendee_id_attendee'), 'admin_account', type_='foreignkey') op.create_foreign_key(None, 'admin_account', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') - op.alter_column('api_job', 'queued', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=True) - op.alter_column('api_job', 'completed', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=True) - op.alter_column('api_job', 'cancelled', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=True) - op.alter_column('api_token', 'admin_account_id', - existing_type=sa.UUID(), - nullable=True) - op.alter_column('api_token', 'token', - existing_type=sa.UUID(), - type_=sqlmodel.sql.sqltypes.AutoString(), - nullable=True) - op.alter_column('api_token', 'issued_time', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=False) - op.alter_column('api_token', 'revoked_time', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - nullable=False) op.drop_constraint(op.f('fk_api_token_admin_account_id_admin_account'), 'api_token', type_='foreignkey') op.create_foreign_key(None, 'api_token', 'admin_account', ['admin_account_id'], ['id'], ondelete='CASCADE') - op.alter_column('arbitrary_charge', 'when', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=False) - op.alter_column('art_panel_assignment', 'app_id', - existing_type=sa.UUID(), - nullable=True) - op.alter_column('art_panel_assignment', 'panel_id', - existing_type=sa.UUID(), - nullable=True) - op.drop_constraint(op.f('fk_art_panel_assignment_app_id_art_show_application'), 'art_panel_assignment', type_='foreignkey') op.drop_constraint(op.f('fk_art_panel_assignment_panel_id_art_show_panel'), 'art_panel_assignment', type_='foreignkey') + op.drop_constraint(op.f('fk_art_panel_assignment_app_id_art_show_application'), 'art_panel_assignment', type_='foreignkey') op.create_foreign_key(None, 'art_panel_assignment', 'art_show_application', ['app_id'], ['id'], ondelete='CASCADE') op.create_foreign_key(None, 'art_panel_assignment', 'art_show_panel', ['panel_id'], ['id'], ondelete='CASCADE') - op.alter_column('art_show_agent_code', 'app_id', - existing_type=sa.UUID(), - nullable=True) - op.alter_column('art_show_agent_code', 'cancelled', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=True) - op.drop_constraint(op.f('fk_art_show_agent_code_app_id_art_show_application'), 'art_show_agent_code', type_='foreignkey') op.drop_constraint(op.f('fk_art_show_agent_code_attendee_id_attendee'), 'art_show_agent_code', type_='foreignkey') - op.create_foreign_key(None, 'art_show_agent_code', 'attendee', ['attendee_id'], ['id']) + op.drop_constraint(op.f('fk_art_show_agent_code_app_id_art_show_application'), 'art_show_agent_code', type_='foreignkey') op.create_foreign_key(None, 'art_show_agent_code', 'art_show_application', ['app_id'], ['id'], ondelete='CASCADE') - op.alter_column('art_show_application', 'checked_in', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=True) - op.alter_column('art_show_application', 'checked_out', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=True) + op.create_foreign_key(None, 'art_show_agent_code', 'attendee', ['attendee_id'], ['id']) op.alter_column('art_show_application', 'overridden_price', existing_type=sa.INTEGER(), nullable=False) @@ -139,419 +74,161 @@ def upgrade(): op.create_unique_constraint(None, 'art_show_application', ['attendee_id']) op.drop_constraint(op.f('fk_art_show_application_attendee_id_attendee'), 'art_show_application', type_='foreignkey') op.create_foreign_key(None, 'art_show_application', 'attendee', ['attendee_id'], ['id']) - op.alter_column('art_show_bidder', 'signed_up', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=True) + op.alter_column('art_show_bidder', 'attendee_id', + existing_type=sa.UUID(), + nullable=False) op.drop_constraint(op.f('fk_art_show_bidder_attendee_id_attendee'), 'art_show_bidder', type_='foreignkey') op.create_foreign_key(None, 'art_show_bidder', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') - op.alter_column('art_show_payment', 'when', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=False) + op.alter_column('art_show_payment', 'receipt_id', + existing_type=sa.UUID(), + nullable=False) op.drop_constraint(op.f('fk_art_show_payment_receipt_id_art_show_receipt'), 'art_show_payment', type_='foreignkey') op.create_foreign_key(None, 'art_show_payment', 'art_show_receipt', ['receipt_id'], ['id'], ondelete='CASCADE') - op.drop_constraint(op.f('fk_art_show_pieces_app_id_art_show_application'), 'art_show_piece', type_='foreignkey') - op.drop_constraint(op.f('fk_art_show_piece_winning_bidder_id_art_show_bidder'), 'art_show_piece', type_='foreignkey') + op.alter_column('art_show_piece', 'app_id', + existing_type=sa.UUID(), + nullable=False) op.drop_constraint(op.f('fk_art_show_piece_receipt_id_art_show_receipt'), 'art_show_piece', type_='foreignkey') - op.create_foreign_key(None, 'art_show_piece', 'art_show_bidder', ['winning_bidder_id'], ['id']) + op.drop_constraint(op.f('fk_art_show_piece_winning_bidder_id_art_show_bidder'), 'art_show_piece', type_='foreignkey') + op.drop_constraint(op.f('fk_art_show_pieces_app_id_art_show_application'), 'art_show_piece', type_='foreignkey') op.create_foreign_key(None, 'art_show_piece', 'art_show_receipt', ['receipt_id'], ['id']) + op.create_foreign_key(None, 'art_show_piece', 'art_show_bidder', ['winning_bidder_id'], ['id']) op.create_foreign_key(None, 'art_show_piece', 'art_show_application', ['app_id'], ['id'], ondelete='CASCADE') - op.alter_column('art_show_receipt', 'closed', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=True) + op.alter_column('art_show_receipt', 'attendee_id', + existing_type=sa.UUID(), + nullable=False) op.drop_constraint(op.f('fk_art_show_receipt_attendee_id_attendee'), 'art_show_receipt', type_='foreignkey') op.create_foreign_key(None, 'art_show_receipt', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') - op.alter_column('artist_marketplace_application', 'attendee_id', - existing_type=sa.UUID(), - nullable=True) - op.alter_column('artist_marketplace_application', 'registered', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=False, - existing_server_default=sa.text("timezone('utc'::text, CURRENT_TIMESTAMP)")) - op.alter_column('artist_marketplace_application', 'accepted', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=True) op.create_unique_constraint(None, 'artist_marketplace_application', ['attendee_id']) op.drop_constraint(op.f('fk_artist_marketplace_application_attendee_id_attendee'), 'artist_marketplace_application', type_='foreignkey') op.create_foreign_key(None, 'artist_marketplace_application', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') - op.alter_column('assigned_panelist', 'attendee_id', - existing_type=sa.UUID(), - nullable=True) - op.alter_column('assigned_panelist', 'event_id', - existing_type=sa.UUID(), - nullable=True) op.drop_constraint(op.f('fk_attendee_creator_id_attendee'), 'attendee', type_='foreignkey') op.drop_constraint(op.f('fk_attendee_watchlist_id_watch_list'), 'attendee', type_='foreignkey') - op.drop_constraint(op.f('fk_attendee_badge_pickup_group_id_badge_pickup_group'), 'attendee', type_='foreignkey') op.drop_constraint(op.f('fk_attendee_group_id_group'), 'attendee', type_='foreignkey') + op.drop_constraint(op.f('fk_attendee_badge_pickup_group_id_badge_pickup_group'), 'attendee', type_='foreignkey') op.create_foreign_key(None, 'attendee', 'attendee', ['creator_id'], ['id']) op.create_foreign_key(None, 'attendee', 'watch_list', ['watchlist_id'], ['id']) - op.create_foreign_key(None, 'attendee', 'badge_pickup_group', ['badge_pickup_group_id'], ['id']) op.create_foreign_key(None, 'attendee', 'group', ['group_id'], ['id']) + op.create_foreign_key(None, 'attendee', 'badge_pickup_group', ['badge_pickup_group_id'], ['id']) op.drop_column('attendee', 'affiliate') - op.alter_column('attendee_account', 'public_id', - existing_type=sa.UUID(), - type_=sqlmodel.sql.sqltypes.AutoString(), - existing_nullable=True) - op.alter_column('attraction', 'signups_open_time', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=True) op.drop_constraint(op.f('attraction_name_key'), 'attraction', type_='unique') op.drop_constraint(op.f('uq_attraction_slug'), 'attraction', type_='unique') - op.alter_column('attraction_event', 'signups_open_time', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=True) - op.alter_column('attraction_event', 'attraction_id', - existing_type=sa.UUID(), - nullable=True) - op.alter_column('attraction_event', 'attraction_feature_id', - existing_type=sa.UUID(), - nullable=True) - op.alter_column('attraction_event', 'start_time', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=False) + op.drop_constraint(op.f('fk_attraction_event_attraction_feature_id_attraction_feature'), 'attraction_event', type_='foreignkey') op.drop_constraint(op.f('fk_attraction_event_attraction_id_attraction'), 'attraction_event', type_='foreignkey') op.drop_constraint(op.f('fk_attraction_event_location_id_event_location'), 'attraction_event', type_='foreignkey') - op.drop_constraint(op.f('fk_attraction_event_attraction_feature_id_attraction_feature'), 'attraction_event', type_='foreignkey') op.create_foreign_key(None, 'attraction_event', 'attraction_feature', ['attraction_feature_id'], ['id'], ondelete='CASCADE') op.create_foreign_key(None, 'attraction_event', 'attraction', ['attraction_id'], ['id'], ondelete='CASCADE') op.create_foreign_key(None, 'attraction_event', 'event_location', ['event_location_id'], ['id']) - op.alter_column('attraction_feature', 'signups_open_time', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=True) - op.alter_column('attraction_feature', 'attraction_id', - existing_type=sa.UUID(), - nullable=True) op.drop_constraint(op.f('fk_attraction_feature_attraction_id_attraction'), 'attraction_feature', type_='foreignkey') op.create_foreign_key(None, 'attraction_feature', 'attraction', ['attraction_id'], ['id'], ondelete='CASCADE') - op.alter_column('attraction_notification', 'attraction_event_id', - existing_type=sa.UUID(), - nullable=True) - op.alter_column('attraction_notification', 'attraction_id', - existing_type=sa.UUID(), - nullable=True) - op.alter_column('attraction_notification', 'attendee_id', - existing_type=sa.UUID(), - nullable=True) - op.alter_column('attraction_notification', 'sent_time', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=False) op.drop_index(op.f('ix_attraction_notification_ident'), table_name='attraction_notification') op.drop_constraint(op.f('fk_attraction_notification_attraction_id_attraction'), 'attraction_notification', type_='foreignkey') op.drop_constraint(op.f('fk_attraction_notification_attraction_event_id_attraction_event'), 'attraction_notification', type_='foreignkey') op.drop_constraint(op.f('fk_attraction_notification_attendee_id_attendee'), 'attraction_notification', type_='foreignkey') - op.create_foreign_key(None, 'attraction_notification', 'attraction', ['attraction_id'], ['id'], ondelete='CASCADE') op.create_foreign_key(None, 'attraction_notification', 'attraction_event', ['attraction_event_id'], ['id'], ondelete='CASCADE') op.create_foreign_key(None, 'attraction_notification', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') - op.alter_column('attraction_notification_reply', 'received_time', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=False) - op.alter_column('attraction_notification_reply', 'sent_time', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=False) + op.create_foreign_key(None, 'attraction_notification', 'attraction', ['attraction_id'], ['id'], ondelete='CASCADE') op.drop_index(op.f('ix_attraction_notification_reply_sid'), table_name='attraction_notification_reply') - op.alter_column('attraction_signup', 'attraction_id', - existing_type=sa.UUID(), - nullable=True) - op.alter_column('attraction_signup', 'attraction_event_id', - existing_type=sa.UUID(), - nullable=True) - op.alter_column('attraction_signup', 'attendee_id', - existing_type=sa.UUID(), - nullable=True) - op.alter_column('attraction_signup', 'signup_time', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=False) - op.alter_column('attraction_signup', 'checkin_time', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=False) - op.drop_index(op.f('ix_attraction_signup_checkin_time'), table_name='attraction_signup') op.drop_constraint(op.f('fk_attraction_signup_attendee_id_attendee'), 'attraction_signup', type_='foreignkey') - op.drop_constraint(op.f('fk_attraction_signup_attraction_event_id_attraction_event'), 'attraction_signup', type_='foreignkey') op.drop_constraint(op.f('fk_attraction_signup_attraction_id_attraction'), 'attraction_signup', type_='foreignkey') - op.create_foreign_key(None, 'attraction_signup', 'attraction_event', ['attraction_event_id'], ['id'], ondelete='CASCADE') - op.create_foreign_key(None, 'attraction_signup', 'attraction', ['attraction_id'], ['id'], ondelete='CASCADE') + op.drop_constraint(op.f('fk_attraction_signup_attraction_event_id_attraction_event'), 'attraction_signup', type_='foreignkey') op.create_foreign_key(None, 'attraction_signup', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') - op.alter_column('automated_email', 'last_send_time', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=True) - op.alter_column('automated_email', 'active_after', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=True) - op.alter_column('automated_email', 'active_before', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=True) + op.create_foreign_key(None, 'attraction_signup', 'attraction', ['attraction_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(None, 'attraction_signup', 'attraction_event', ['attraction_event_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('uq_automated_email_ident'), 'automated_email', type_='unique') - op.alter_column('badge_info', 'picked_up', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=True) - op.alter_column('badge_info', 'reported_lost', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=True) op.drop_index(op.f('ix_badge_info_ident'), table_name='badge_info') op.drop_constraint(op.f('fk_badge_info_attendee_id_attendee'), 'badge_info', type_='foreignkey') op.create_foreign_key(None, 'badge_info', 'attendee', ['attendee_id'], ['id']) - op.alter_column('badge_pickup_group', 'public_id', - existing_type=sa.UUID(), - type_=sqlmodel.sql.sqltypes.AutoString(), - existing_nullable=True) - op.alter_column('bulk_printing_request', 'department_id', - existing_type=sa.UUID(), - nullable=True) op.drop_constraint(op.f('fk_bulk_printing_request_department_id_department'), 'bulk_printing_request', type_='foreignkey') op.create_foreign_key(None, 'bulk_printing_request', 'department', ['department_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_department_parent_id_department'), 'department', type_='foreignkey') op.create_foreign_key(None, 'department', 'department', ['parent_id'], ['id'], ondelete='CASCADE') - op.alter_column('dept_checklist_item', 'department_id', - existing_type=sa.UUID(), - nullable=True) - op.alter_column('dept_checklist_item', 'attendee_id', - existing_type=sa.UUID(), - nullable=True) op.drop_constraint(op.f('fk_dept_checklist_item_department_id_department'), 'dept_checklist_item', type_='foreignkey') op.drop_constraint(op.f('fk_dept_checklist_item_attendee_id_attendee'), 'dept_checklist_item', type_='foreignkey') op.create_foreign_key(None, 'dept_checklist_item', 'department', ['department_id'], ['id'], ondelete='CASCADE') op.create_foreign_key(None, 'dept_checklist_item', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') - op.alter_column('dept_membership', 'attendee_id', - existing_type=sa.UUID(), - nullable=True) - op.alter_column('dept_membership', 'department_id', - existing_type=sa.UUID(), - nullable=True) - op.drop_constraint(op.f('fk_dept_membership_attendee_id_attendee'), 'dept_membership', type_='foreignkey') op.drop_constraint(op.f('fk_dept_membership_department_id_department'), 'dept_membership', type_='foreignkey') - op.create_foreign_key(None, 'dept_membership', 'department', ['department_id'], ['id'], ondelete='CASCADE') + op.drop_constraint(op.f('fk_dept_membership_attendee_id_attendee'), 'dept_membership', type_='foreignkey') op.create_foreign_key(None, 'dept_membership', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') - op.alter_column('dept_membership_request', 'attendee_id', - existing_type=sa.UUID(), - nullable=True) + op.create_foreign_key(None, 'dept_membership', 'department', ['department_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_dept_membership_request_attendee_id_attendee'), 'dept_membership_request', type_='foreignkey') op.drop_constraint(op.f('fk_dept_membership_request_department_id_department'), 'dept_membership_request', type_='foreignkey') - op.create_foreign_key(None, 'dept_membership_request', 'department', ['department_id'], ['id'], ondelete='CASCADE') op.create_foreign_key(None, 'dept_membership_request', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') - op.alter_column('dept_role', 'department_id', - existing_type=sa.UUID(), - nullable=True) + op.create_foreign_key(None, 'dept_membership_request', 'department', ['department_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_dept_role_department_id_department'), 'dept_role', type_='foreignkey') op.create_foreign_key(None, 'dept_role', 'department', ['department_id'], ['id'], ondelete='CASCADE') - op.alter_column('email', 'fk_id', - existing_type=sa.UUID(), - type_=sqlmodel.sql.sqltypes.AutoString(), - existing_nullable=True) - op.alter_column('email', 'when', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sqlmodel.sql.sqltypes.AutoString(), - existing_nullable=False) op.drop_constraint(op.f('fk_email_automated_email_id_automated_email'), 'email', type_='foreignkey') op.create_foreign_key(None, 'email', 'automated_email', ['automated_email_id'], ['id']) - op.alter_column('escalation_ticket', 'resolved', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=True) - op.drop_constraint(op.f('uq_escalation_ticket_ticket_id'), 'escalation_ticket', type_='unique') - op.alter_column('event', 'start_time', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=False) op.create_unique_constraint(None, 'event', ['attraction_event_id']) - op.drop_constraint(op.f('fk_event_location_id_event_location'), 'event', type_='foreignkey') - op.drop_constraint(op.f('fk_event_department_id_department'), 'event', type_='foreignkey') op.drop_constraint(op.f('fk_event_attraction_event_id_attraction_event'), 'event', type_='foreignkey') - op.create_foreign_key(None, 'event', 'event_location', ['event_location_id'], ['id']) - op.create_foreign_key(None, 'event', 'department', ['department_id'], ['id']) + op.drop_constraint(op.f('fk_event_department_id_department'), 'event', type_='foreignkey') + op.drop_constraint(op.f('fk_event_location_id_event_location'), 'event', type_='foreignkey') op.create_foreign_key(None, 'event', 'attraction_event', ['attraction_event_id'], ['id']) - op.alter_column('event_feedback', 'event_id', - existing_type=sa.UUID(), - nullable=True) - op.alter_column('event_feedback', 'attendee_id', - existing_type=sa.UUID(), - nullable=True) + op.create_foreign_key(None, 'event', 'department', ['department_id'], ['id']) + op.create_foreign_key(None, 'event', 'event_location', ['event_location_id'], ['id']) op.drop_constraint(op.f('fk_event_feedback_event_id_event'), 'event_feedback', type_='foreignkey') op.create_foreign_key(None, 'event_feedback', 'event', ['event_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_event_location_department_id_department'), 'event_location', type_='foreignkey') op.create_foreign_key(None, 'event_location', 'department', ['department_id'], ['id']) - op.alter_column('food_restrictions', 'attendee_id', - existing_type=sa.UUID(), - nullable=True) op.drop_constraint(op.f('fk_food_restrictions_attendee_id_attendee'), 'food_restrictions', type_='foreignkey') op.create_foreign_key(None, 'food_restrictions', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') - op.alter_column('group', 'public_id', - existing_type=sa.UUID(), - type_=sqlmodel.sql.sqltypes.AutoString(), - nullable=True) - op.alter_column('group', 'registered', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=False, - existing_server_default=sa.text("timezone('utc'::text, CURRENT_TIMESTAMP)")) - op.alter_column('group', 'approved', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=True) op.drop_constraint(op.f('fk_leader'), 'group', type_='foreignkey') op.drop_constraint(op.f('fk_group_shared_with_id_group'), 'group', type_='foreignkey') op.create_foreign_key(None, 'group', 'attendee', ['leader_id'], ['id']) op.create_foreign_key(None, 'group', 'group', ['shared_with_id'], ['id']) - op.alter_column('guest_autograph', 'guest_id', - existing_type=sa.UUID(), - nullable=True) op.drop_constraint(op.f('fk_guest_autograph_guest_id_guest_group'), 'guest_autograph', type_='foreignkey') op.create_foreign_key(None, 'guest_autograph', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') - op.alter_column('guest_bio', 'guest_id', - existing_type=sa.UUID(), - nullable=True) op.drop_constraint(op.f('fk_guest_bio_guest_id_guest_group'), 'guest_bio', type_='foreignkey') op.create_foreign_key(None, 'guest_bio', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') - op.alter_column('guest_charity', 'guest_id', - existing_type=sa.UUID(), - nullable=True) op.drop_constraint(op.f('fk_guest_charity_guest_id_guest_group'), 'guest_charity', type_='foreignkey') op.create_foreign_key(None, 'guest_charity', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') - op.alter_column('guest_detailed_travel_plan', 'arrival_time', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=False) - op.alter_column('guest_detailed_travel_plan', 'departure_time', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=False) + op.alter_column('guest_detailed_travel_plan', 'travel_plans_id', + existing_type=sa.UUID(), + nullable=False) op.drop_constraint(op.f('fk_guest_detailed_travel_plan_travel_plans_id_guest_tra_6ad4'), 'guest_detailed_travel_plan', type_='foreignkey') op.create_foreign_key(None, 'guest_detailed_travel_plan', 'guest_travel_plans', ['travel_plans_id'], ['id'], ondelete='CASCADE') - op.alter_column('guest_group', 'group_id', - existing_type=sa.UUID(), - nullable=True) op.create_unique_constraint(None, 'guest_group', ['group_id']) op.drop_constraint(op.f('fk_guest_group_group_id_group'), 'guest_group', type_='foreignkey') op.drop_constraint(op.f('fk_guest_group_event_id_event'), 'guest_group', type_='foreignkey') op.create_foreign_key(None, 'guest_group', 'group', ['group_id'], ['id'], ondelete='CASCADE') op.create_foreign_key(None, 'guest_group', 'event', ['event_id'], ['id']) - op.alter_column('guest_hospitality', 'guest_id', - existing_type=sa.UUID(), - nullable=True) op.drop_constraint(op.f('fk_guest_hospitality_guest_id_guest_group'), 'guest_hospitality', type_='foreignkey') op.create_foreign_key(None, 'guest_hospitality', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') - op.alter_column('guest_image', 'guest_id', - existing_type=sa.UUID(), - nullable=True) op.drop_constraint(op.f('fk_guest_image_guest_id_guest_group'), 'guest_image', type_='foreignkey') op.create_foreign_key(None, 'guest_image', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') - op.alter_column('guest_info', 'guest_id', - existing_type=sa.UUID(), - nullable=True) op.drop_constraint(op.f('fk_guest_info_guest_id_guest_group'), 'guest_info', type_='foreignkey') op.create_foreign_key(None, 'guest_info', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') - op.alter_column('guest_interview', 'guest_id', - existing_type=sa.UUID(), - nullable=True) op.drop_constraint(op.f('fk_guest_interview_guest_id_guest_group'), 'guest_interview', type_='foreignkey') op.create_foreign_key(None, 'guest_interview', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') - op.alter_column('guest_media_request', 'guest_id', - existing_type=sa.UUID(), - nullable=True) op.drop_constraint(op.f('fk_guest_media_request_guest_id_guest_group'), 'guest_media_request', type_='foreignkey') op.create_foreign_key(None, 'guest_media_request', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') - op.alter_column('guest_merch', 'guest_id', - existing_type=sa.UUID(), - nullable=True) - op.alter_column('guest_merch', 'inventory_updated', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=True) op.drop_constraint(op.f('fk_guest_merch_guest_id_guest_group'), 'guest_merch', type_='foreignkey') op.create_foreign_key(None, 'guest_merch', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') - op.alter_column('guest_panel', 'guest_id', - existing_type=sa.UUID(), - nullable=True) op.drop_constraint(op.f('fk_guest_panel_guest_id_guest_group'), 'guest_panel', type_='foreignkey') op.create_foreign_key(None, 'guest_panel', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') - op.alter_column('guest_stage_plot', 'guest_id', - existing_type=sa.UUID(), - nullable=True) op.drop_constraint(op.f('fk_guest_stage_plot_guest_id_guest_group'), 'guest_stage_plot', type_='foreignkey') op.create_foreign_key(None, 'guest_stage_plot', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') - op.alter_column('guest_taxes', 'guest_id', - existing_type=sa.UUID(), - nullable=True) op.drop_constraint(op.f('fk_guest_taxes_guest_id_guest_group'), 'guest_taxes', type_='foreignkey') op.create_foreign_key(None, 'guest_taxes', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') - op.alter_column('guest_track', 'guest_id', - existing_type=sa.UUID(), - nullable=True) op.create_unique_constraint(None, 'guest_track', ['guest_id']) op.drop_constraint(op.f('fk_guest_track_guest_id_guest_group'), 'guest_track', type_='foreignkey') op.create_foreign_key(None, 'guest_track', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') - op.alter_column('guest_travel_plans', 'guest_id', - existing_type=sa.UUID(), - nullable=True) op.drop_constraint(op.f('fk_guest_travel_plans_guest_id_guest_group'), 'guest_travel_plans', type_='foreignkey') op.create_foreign_key(None, 'guest_travel_plans', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') - op.alter_column('hotel_requests', 'attendee_id', - existing_type=sa.UUID(), - nullable=True) op.drop_constraint(op.f('fk_hotel_requests_attendee_id_attendee'), 'hotel_requests', type_='foreignkey') op.create_foreign_key(None, 'hotel_requests', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') - op.alter_column('indie_developer', 'studio_id', - existing_type=sa.UUID(), - nullable=True) op.drop_constraint(op.f('fk_indie_developer_studio_id_indie_studio'), 'indie_developer', type_='foreignkey') op.create_foreign_key(None, 'indie_developer', 'indie_studio', ['studio_id'], ['id'], ondelete='CASCADE') - op.alter_column('indie_game', 'studio_id', - existing_type=sa.UUID(), - nullable=True) op.alter_column('indie_game', 'multiplayer_game_length', existing_type=sa.INTEGER(), nullable=False) - op.alter_column('indie_game', 'registered', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=False, - existing_server_default=sa.text("timezone('utc'::text, CURRENT_TIMESTAMP)")) - op.alter_column('indie_game', 'waitlisted', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=True) - op.alter_column('indie_game', 'accepted', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=True) op.drop_constraint(op.f('fk_indie_game_primary_contact_id_indie_developer'), 'indie_game', type_='foreignkey') op.drop_constraint(op.f('fk_indie_game_studio_id_indie_studio'), 'indie_game', type_='foreignkey') - op.create_foreign_key(None, 'indie_game', 'indie_studio', ['studio_id'], ['id'], ondelete='CASCADE') op.create_foreign_key(None, 'indie_game', 'indie_developer', ['primary_contact_id'], ['id']) - op.alter_column('indie_game_code', 'game_id', - existing_type=sa.UUID(), - nullable=True) + op.create_foreign_key(None, 'indie_game', 'indie_studio', ['studio_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_indie_game_code_game_id_indie_game'), 'indie_game_code', type_='foreignkey') op.create_foreign_key(None, 'indie_game_code', 'indie_game', ['game_id'], ['id'], ondelete='CASCADE') - op.alter_column('indie_game_image', 'game_id', - existing_type=sa.UUID(), - nullable=True) op.drop_constraint(op.f('fk_indie_game_image_game_id_indie_game'), 'indie_game_image', type_='foreignkey') op.create_foreign_key(None, 'indie_game_image', 'indie_game', ['game_id'], ['id'], ondelete='CASCADE') - op.alter_column('indie_game_review', 'game_id', - existing_type=sa.UUID(), - nullable=True) - op.alter_column('indie_game_review', 'judge_id', - existing_type=sa.UUID(), - nullable=True) op.drop_constraint(op.f('fk_indie_game_review_game_id_indie_game'), 'indie_game_review', type_='foreignkey') op.drop_constraint(op.f('fk_indie_game_review_judge_id_indie_judge'), 'indie_game_review', type_='foreignkey') op.create_foreign_key(None, 'indie_game_review', 'indie_game', ['game_id'], ['id'], ondelete='CASCADE') @@ -560,48 +237,15 @@ def upgrade(): existing_type=sa.UUID(), nullable=True) op.create_unique_constraint(None, 'indie_judge', ['admin_id']) - op.alter_column('indie_studio', 'registered', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=False, - existing_server_default=sa.text("timezone('utc'::text, CURRENT_TIMESTAMP)")) op.drop_constraint(op.f('uq_indie_studio_name'), 'indie_studio', type_='unique') op.create_unique_constraint(None, 'indie_studio', ['group_id']) - op.alter_column('job', 'department_id', - existing_type=sa.UUID(), - nullable=True) op.drop_constraint(op.f('fk_job_department_id_department'), 'job', type_='foreignkey') op.create_foreign_key(None, 'job', 'department', ['department_id'], ['id'], ondelete='CASCADE') - op.alter_column('job_template', 'department_id', - existing_type=sa.UUID(), - nullable=True) op.drop_constraint(op.f('fk_job_template_department_id_department'), 'job_template', type_='foreignkey') op.create_foreign_key(None, 'job_template', 'department', ['department_id'], ['id'], ondelete='CASCADE') - op.alter_column('lottery_application', 'entry_started', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=True) - op.alter_column('lottery_application', 'last_submitted', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=True) - op.alter_column('lottery_application', 'former_parent_id', - existing_type=sa.UUID(), - type_=sqlmodel.sql.sqltypes.AutoString(), - existing_nullable=True) op.drop_constraint(op.f('uq_lottery_application_response_id'), 'lottery_application', type_='unique') - op.alter_column('m_points_for_cash', 'attendee_id', - existing_type=sa.UUID(), - nullable=True) - op.alter_column('m_points_for_cash', 'when', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=False) op.drop_constraint(op.f('fk_m_points_for_cash_attendee_id_attendee'), 'm_points_for_cash', type_='foreignkey') op.create_foreign_key(None, 'm_points_for_cash', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') - op.alter_column('merch_discount', 'attendee_id', - existing_type=sa.UUID(), - nullable=True) op.drop_constraint(op.f('fk_merch_discount_attendee_id_attendee'), 'merch_discount', type_='foreignkey') op.create_foreign_key(None, 'merch_discount', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') op.alter_column('merch_pickup', 'picked_up_by_id', @@ -610,567 +254,159 @@ def upgrade(): op.alter_column('merch_pickup', 'picked_up_for_id', existing_type=sa.UUID(), nullable=True) - op.alter_column('mits_applicant', 'team_id', - existing_type=sa.UUID(), - nullable=True) op.drop_constraint(op.f('fk_mits_applicant_team_id_mits_team'), 'mits_applicant', type_='foreignkey') op.create_foreign_key(None, 'mits_applicant', 'mits_team', ['team_id'], ['id'], ondelete='CASCADE') - op.alter_column('mits_document', 'game_id', - existing_type=sa.UUID(), - nullable=True) op.drop_constraint(op.f('fk_mits_document_game_id_mits_game'), 'mits_document', type_='foreignkey') op.create_foreign_key(None, 'mits_document', 'mits_game', ['game_id'], ['id'], ondelete='CASCADE') - op.alter_column('mits_game', 'team_id', - existing_type=sa.UUID(), - nullable=True) op.drop_constraint(op.f('fk_mits_game_team_id_mits_team'), 'mits_game', type_='foreignkey') op.create_foreign_key(None, 'mits_game', 'mits_team', ['team_id'], ['id'], ondelete='CASCADE') - op.alter_column('mits_panel_application', 'team_id', - existing_type=sa.UUID(), - nullable=True) op.create_unique_constraint(None, 'mits_panel_application', ['team_id']) op.drop_constraint(op.f('fk_mits_panel_application_team_id_mits_team'), 'mits_panel_application', type_='foreignkey') op.create_foreign_key(None, 'mits_panel_application', 'mits_team', ['team_id'], ['id'], ondelete='CASCADE') - op.alter_column('mits_picture', 'game_id', - existing_type=sa.UUID(), - nullable=True) op.drop_constraint(op.f('fk_mits_picture_game_id_mits_game'), 'mits_picture', type_='foreignkey') op.create_foreign_key(None, 'mits_picture', 'mits_game', ['game_id'], ['id'], ondelete='CASCADE') op.alter_column('mits_team', 'concurrent_attendees', existing_type=sa.INTEGER(), nullable=True) - op.alter_column('mits_team', 'submitted', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=True) - op.alter_column('mits_team', 'waiver_signed', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=True) - op.alter_column('mits_team', 'applied', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=False, - existing_server_default=sa.text("timezone('utc'::text, CURRENT_TIMESTAMP)")) - op.alter_column('mits_team', 'duplicate_of', - existing_type=sa.UUID(), - type_=sqlmodel.sql.sqltypes.AutoString(), - existing_nullable=True) - op.alter_column('mits_times', 'team_id', - existing_type=sa.UUID(), - nullable=True) op.create_unique_constraint(None, 'mits_times', ['team_id']) op.drop_constraint(op.f('fk_mits_times_team_id_mits_team'), 'mits_times', type_='foreignkey') op.create_foreign_key(None, 'mits_times', 'mits_team', ['team_id'], ['id'], ondelete='CASCADE') - op.alter_column('model_receipt', 'owner_id', - existing_type=sa.UUID(), - type_=sqlmodel.sql.sqltypes.AutoString(), - existing_nullable=False) - op.alter_column('model_receipt', 'closed', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=True) - op.drop_index(op.f('ix_model_receipt_owner_id'), table_name='model_receipt') - op.alter_column('no_shirt', 'attendee_id', - existing_type=sa.UUID(), - nullable=True) op.drop_constraint(op.f('fk_no_shirt_attendee_id_attendee'), 'no_shirt', type_='foreignkey') op.create_foreign_key(None, 'no_shirt', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') - op.alter_column('old_m_point_exchange', 'attendee_id', - existing_type=sa.UUID(), - nullable=True) - op.alter_column('old_m_point_exchange', 'when', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=False) op.drop_constraint(op.f('fk_old_m_point_exchange_attendee_id_attendee'), 'old_m_point_exchange', type_='foreignkey') op.create_foreign_key(None, 'old_m_point_exchange', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') - op.alter_column('panel_application', 'applied', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=False, - existing_server_default=sa.text("timezone('utc'::text, CURRENT_TIMESTAMP)")) - op.alter_column('panel_application', 'accepted', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=True) - op.alter_column('panel_application', 'confirmed', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=True) + op.drop_constraint(op.f('fk_panel_application_event_id_event'), 'panel_application', type_='foreignkey') op.drop_constraint(op.f('fk_panel_application_poc_id_attendee'), 'panel_application', type_='foreignkey') op.drop_constraint(op.f('fk_panel_application_submitter_id_panel_applicant'), 'panel_application', type_='foreignkey') - op.drop_constraint(op.f('fk_panel_application_event_id_event'), 'panel_application', type_='foreignkey') - op.create_foreign_key(None, 'panel_application', 'event', ['event_id'], ['id']) op.create_foreign_key(None, 'panel_application', 'attendee', ['poc_id'], ['id']) + op.create_foreign_key(None, 'panel_application', 'event', ['event_id'], ['id']) op.create_foreign_key(None, 'panel_application', 'panel_applicant', ['submitter_id'], ['id']) - op.alter_column('password_reset', 'generated', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=False, - existing_server_default=sa.text("timezone('utc'::text, CURRENT_TIMESTAMP)")) - op.drop_constraint(op.f('fk_password_reset_attendee_id_attendee_account'), 'password_reset', type_='foreignkey') + op.alter_column('password_reset', 'admin_id', + existing_type=sa.UUID(), + nullable=False) + op.alter_column('password_reset', 'attendee_id', + existing_type=sa.UUID(), + nullable=False) op.drop_constraint(op.f('fk_password_reset_admin_id_admin_account'), 'password_reset', type_='foreignkey') - op.create_foreign_key(None, 'password_reset', 'attendee_account', ['attendee_id'], ['id'], ondelete='CASCADE') + op.drop_constraint(op.f('fk_password_reset_attendee_id_attendee_account'), 'password_reset', type_='foreignkey') op.create_foreign_key(None, 'password_reset', 'admin_account', ['admin_id'], ['id'], ondelete='CASCADE') - op.alter_column('print_job', 'attendee_id', - existing_type=sa.UUID(), - nullable=True) - op.alter_column('print_job', 'queued', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=True) - op.alter_column('print_job', 'printed', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=True) + op.create_foreign_key(None, 'password_reset', 'attendee_account', ['attendee_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_print_queue_attendee_id_attendee'), 'print_job', type_='foreignkey') op.create_foreign_key(None, 'print_job', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') - op.alter_column('promo_code', 'expiration_date', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=False) op.drop_constraint(op.f('fk_promo_code_group_id_promo_code_group'), 'promo_code', type_='foreignkey') op.create_foreign_key(None, 'promo_code', 'promo_code_group', ['group_id'], ['id']) op.drop_constraint(op.f('fk_promo_code_group_buyer_id_attendee'), 'promo_code_group', type_='foreignkey') op.create_foreign_key(None, 'promo_code_group', 'attendee', ['buyer_id'], ['id']) op.drop_index(op.f('uq_promo_code_word_normalized_word_part_of_speech'), table_name='promo_code_word') op.create_index('uq_promo_code_word_normalized_word_part_of_speech', 'promo_code_word', [sa.literal_column('lower(trim(word))'), 'part_of_speech'], unique=True) - op.alter_column('receipt_info', 'charged', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=False) - op.alter_column('receipt_info', 'voided', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=True) - op.alter_column('receipt_item', 'purchaser_id', + op.alter_column('receipt_item', 'receipt_id', existing_type=sa.UUID(), - type_=sqlmodel.sql.sqltypes.AutoString(), - existing_nullable=True) - op.alter_column('receipt_item', 'fk_id', - existing_type=sa.UUID(), - type_=sqlmodel.sql.sqltypes.AutoString(), - existing_nullable=True) - op.alter_column('receipt_item', 'added', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=False) - op.alter_column('receipt_item', 'closed', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=True) - op.drop_index(op.f('ix_receipt_item_fk_id'), table_name='receipt_item') - op.drop_index(op.f('ix_receipt_item_purchaser_id'), table_name='receipt_item') + nullable=False) op.drop_constraint(op.f('fk_receipt_item_txn_id_receipt_transaction'), 'receipt_item', type_='foreignkey') op.drop_constraint(op.f('fk_receipt_item_receipt_id_model_receipt'), 'receipt_item', type_='foreignkey') op.create_foreign_key(None, 'receipt_item', 'receipt_transaction', ['txn_id'], ['id']) op.create_foreign_key(None, 'receipt_item', 'model_receipt', ['receipt_id'], ['id'], ondelete='CASCADE') - op.alter_column('receipt_transaction', 'added', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=False) - op.alter_column('receipt_transaction', 'cancelled', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=True) + op.alter_column('receipt_transaction', 'receipt_id', + existing_type=sa.UUID(), + nullable=False) op.drop_constraint(op.f('fk_receipt_transaction_refunded_txn_id_receipt_transaction'), 'receipt_transaction', type_='foreignkey') - op.drop_constraint(op.f('fk_receipt_transaction_receipt_id_model_receipt'), 'receipt_transaction', type_='foreignkey') op.drop_constraint(op.f('fk_receipt_transaction_receipt_info_id_receipt_info'), 'receipt_transaction', type_='foreignkey') + op.drop_constraint(op.f('fk_receipt_transaction_receipt_id_model_receipt'), 'receipt_transaction', type_='foreignkey') + op.create_foreign_key(None, 'receipt_transaction', 'receipt_transaction', ['refunded_txn_id'], ['id']) op.create_foreign_key(None, 'receipt_transaction', 'receipt_info', ['receipt_info_id'], ['id']) op.create_foreign_key(None, 'receipt_transaction', 'model_receipt', ['receipt_id'], ['id'], ondelete='CASCADE') - op.create_foreign_key(None, 'receipt_transaction', 'receipt_transaction', ['refunded_txn_id'], ['id']) - op.alter_column('report_tracking', 'when', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=False) - op.alter_column('room', 'created', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=False, - existing_server_default=sa.text("timezone('utc'::text, CURRENT_TIMESTAMP)")) - op.alter_column('room_assignment', 'room_id', - existing_type=sa.UUID(), - nullable=True) - op.alter_column('room_assignment', 'attendee_id', - existing_type=sa.UUID(), - nullable=True) op.drop_constraint(op.f('fk_room_assignment_attendee_id_attendee'), 'room_assignment', type_='foreignkey') op.drop_constraint(op.f('fk_room_assignment_room_id_room'), 'room_assignment', type_='foreignkey') op.create_foreign_key(None, 'room_assignment', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') op.create_foreign_key(None, 'room_assignment', 'room', ['room_id'], ['id'], ondelete='CASCADE') - op.alter_column('sale', 'when', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=False) op.drop_constraint(op.f('fk_sale_attendee_id_attendee'), 'sale', type_='foreignkey') op.create_foreign_key(None, 'sale', 'attendee', ['attendee_id'], ['id']) - op.alter_column('shift', 'job_id', - existing_type=sa.UUID(), - nullable=True) - op.alter_column('shift', 'attendee_id', - existing_type=sa.UUID(), - nullable=True) - op.alter_column('signed_document', 'fk_id', - existing_type=sa.UUID(), - type_=sqlmodel.sql.sqltypes.AutoString(), - existing_nullable=False) - op.alter_column('signed_document', 'last_emailed', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=True) - op.alter_column('signed_document', 'signed', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=True) - op.alter_column('signed_document', 'declined', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=True) - op.drop_index(op.f('ix_signed_document_fk_id'), table_name='signed_document') - op.alter_column('tabletop_checkout', 'game_id', - existing_type=sa.UUID(), - nullable=True) - op.alter_column('tabletop_checkout', 'attendee_id', - existing_type=sa.UUID(), - nullable=True) - op.alter_column('tabletop_checkout', 'checked_out', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=False) - op.alter_column('tabletop_checkout', 'returned', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=True) op.drop_constraint(op.f('fk_tabletop_checkout_game_id_tabletop_game'), 'tabletop_checkout', type_='foreignkey') op.drop_constraint(op.f('fk_tabletop_checkout_attendee_id_attendee'), 'tabletop_checkout', type_='foreignkey') op.create_foreign_key(None, 'tabletop_checkout', 'tabletop_game', ['game_id'], ['id'], ondelete='CASCADE') op.create_foreign_key(None, 'tabletop_checkout', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') - op.alter_column('tabletop_game', 'attendee_id', - existing_type=sa.UUID(), - nullable=True) op.drop_constraint(op.f('fk_tabletop_game_attendee_id_attendee'), 'tabletop_game', type_='foreignkey') op.create_foreign_key(None, 'tabletop_game', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') - op.alter_column('terminal_settlement', 'requested', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=False) - op.alter_column('tracking', 'fk_id', - existing_type=sa.UUID(), - type_=sqlmodel.sql.sqltypes.AutoString(), - existing_nullable=False) - op.alter_column('tracking', 'when', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=False) - op.drop_index(op.f('ix_tracking_fk_id'), table_name='tracking') - op.drop_index(op.f('ix_tracking_when'), table_name='tracking') op.drop_index(op.f('ix_tracking_who'), table_name='tracking') - op.alter_column('txn_request_tracking', 'fk_id', - existing_type=sa.UUID(), - type_=sqlmodel.sql.sqltypes.AutoString(), - existing_nullable=True) - op.alter_column('txn_request_tracking', 'requested', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=False, - existing_server_default=sa.text("timezone('utc'::text, CURRENT_TIMESTAMP)")) - op.alter_column('txn_request_tracking', 'resolved', - existing_type=postgresql.TIMESTAMP(timezone=True), - type_=sa.DateTime(), - existing_nullable=True) op.drop_constraint(op.f('txn_request_tracking_incr_id_key'), 'txn_request_tracking', type_='unique') - op.alter_column('watch_list', 'birthdate', - existing_type=sa.DATE(), - type_=sa.DateTime(), - existing_nullable=True) - op.alter_column('watch_list', 'expiration', - existing_type=sa.DATE(), - type_=sa.DateTime(), - existing_nullable=True) - # ### end Alembic commands ### def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.alter_column('watch_list', 'expiration', - existing_type=sa.DateTime(), - type_=sa.DATE(), - existing_nullable=True) - op.alter_column('watch_list', 'birthdate', - existing_type=sa.DateTime(), - type_=sa.DATE(), - existing_nullable=True) op.create_unique_constraint(op.f('txn_request_tracking_incr_id_key'), 'txn_request_tracking', ['incr_id'], postgresql_nulls_not_distinct=False) - op.alter_column('txn_request_tracking', 'resolved', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=True) - op.alter_column('txn_request_tracking', 'requested', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=False, - existing_server_default=sa.text("timezone('utc'::text, CURRENT_TIMESTAMP)")) - op.alter_column('txn_request_tracking', 'fk_id', - existing_type=sqlmodel.sql.sqltypes.AutoString(), - type_=sa.UUID(), - existing_nullable=True) op.create_index(op.f('ix_tracking_who'), 'tracking', ['who'], unique=False) - op.create_index(op.f('ix_tracking_when'), 'tracking', ['when'], unique=False) - op.create_index(op.f('ix_tracking_fk_id'), 'tracking', ['fk_id'], unique=False) - op.alter_column('tracking', 'when', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=False) - op.alter_column('tracking', 'fk_id', - existing_type=sqlmodel.sql.sqltypes.AutoString(), - type_=sa.UUID(), - existing_nullable=False) - op.alter_column('terminal_settlement', 'requested', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=False) op.drop_constraint(None, 'tabletop_game', type_='foreignkey') op.create_foreign_key(op.f('fk_tabletop_game_attendee_id_attendee'), 'tabletop_game', 'attendee', ['attendee_id'], ['id']) - op.alter_column('tabletop_game', 'attendee_id', - existing_type=sa.UUID(), - nullable=False) op.drop_constraint(None, 'tabletop_checkout', type_='foreignkey') op.drop_constraint(None, 'tabletop_checkout', type_='foreignkey') op.create_foreign_key(op.f('fk_tabletop_checkout_attendee_id_attendee'), 'tabletop_checkout', 'attendee', ['attendee_id'], ['id']) op.create_foreign_key(op.f('fk_tabletop_checkout_game_id_tabletop_game'), 'tabletop_checkout', 'tabletop_game', ['game_id'], ['id']) - op.alter_column('tabletop_checkout', 'returned', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=True) - op.alter_column('tabletop_checkout', 'checked_out', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=False) - op.alter_column('tabletop_checkout', 'attendee_id', - existing_type=sa.UUID(), - nullable=False) - op.alter_column('tabletop_checkout', 'game_id', - existing_type=sa.UUID(), - nullable=False) - op.create_index(op.f('ix_signed_document_fk_id'), 'signed_document', ['fk_id'], unique=False) - op.alter_column('signed_document', 'declined', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=True) - op.alter_column('signed_document', 'signed', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=True) - op.alter_column('signed_document', 'last_emailed', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=True) - op.alter_column('signed_document', 'fk_id', - existing_type=sqlmodel.sql.sqltypes.AutoString(), - type_=sa.UUID(), - existing_nullable=False) - op.alter_column('shift', 'attendee_id', - existing_type=sa.UUID(), - nullable=False) - op.alter_column('shift', 'job_id', - existing_type=sa.UUID(), - nullable=False) op.drop_constraint(None, 'sale', type_='foreignkey') op.create_foreign_key(op.f('fk_sale_attendee_id_attendee'), 'sale', 'attendee', ['attendee_id'], ['id'], ondelete='SET NULL') - op.alter_column('sale', 'when', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=False) op.drop_constraint(None, 'room_assignment', type_='foreignkey') op.drop_constraint(None, 'room_assignment', type_='foreignkey') op.create_foreign_key(op.f('fk_room_assignment_room_id_room'), 'room_assignment', 'room', ['room_id'], ['id']) op.create_foreign_key(op.f('fk_room_assignment_attendee_id_attendee'), 'room_assignment', 'attendee', ['attendee_id'], ['id']) - op.alter_column('room_assignment', 'attendee_id', - existing_type=sa.UUID(), - nullable=False) - op.alter_column('room_assignment', 'room_id', - existing_type=sa.UUID(), - nullable=False) - op.alter_column('room', 'created', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=False, - existing_server_default=sa.text("timezone('utc'::text, CURRENT_TIMESTAMP)")) - op.alter_column('report_tracking', 'when', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=False) op.drop_constraint(None, 'receipt_transaction', type_='foreignkey') op.drop_constraint(None, 'receipt_transaction', type_='foreignkey') op.drop_constraint(None, 'receipt_transaction', type_='foreignkey') - op.create_foreign_key(op.f('fk_receipt_transaction_receipt_info_id_receipt_info'), 'receipt_transaction', 'receipt_info', ['receipt_info_id'], ['id'], ondelete='SET NULL') op.create_foreign_key(op.f('fk_receipt_transaction_receipt_id_model_receipt'), 'receipt_transaction', 'model_receipt', ['receipt_id'], ['id'], ondelete='SET NULL') + op.create_foreign_key(op.f('fk_receipt_transaction_receipt_info_id_receipt_info'), 'receipt_transaction', 'receipt_info', ['receipt_info_id'], ['id'], ondelete='SET NULL') op.create_foreign_key(op.f('fk_receipt_transaction_refunded_txn_id_receipt_transaction'), 'receipt_transaction', 'receipt_transaction', ['refunded_txn_id'], ['id'], ondelete='SET NULL') - op.alter_column('receipt_transaction', 'cancelled', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=True) - op.alter_column('receipt_transaction', 'added', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=False) + op.alter_column('receipt_transaction', 'receipt_id', + existing_type=sa.UUID(), + nullable=True) op.drop_constraint(None, 'receipt_item', type_='foreignkey') op.drop_constraint(None, 'receipt_item', type_='foreignkey') op.create_foreign_key(op.f('fk_receipt_item_receipt_id_model_receipt'), 'receipt_item', 'model_receipt', ['receipt_id'], ['id'], ondelete='SET NULL') op.create_foreign_key(op.f('fk_receipt_item_txn_id_receipt_transaction'), 'receipt_item', 'receipt_transaction', ['txn_id'], ['id'], ondelete='SET NULL') - op.create_index(op.f('ix_receipt_item_purchaser_id'), 'receipt_item', ['purchaser_id'], unique=False) - op.create_index(op.f('ix_receipt_item_fk_id'), 'receipt_item', ['fk_id'], unique=False) - op.alter_column('receipt_item', 'closed', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=True) - op.alter_column('receipt_item', 'added', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=False) - op.alter_column('receipt_item', 'fk_id', - existing_type=sqlmodel.sql.sqltypes.AutoString(), - type_=sa.UUID(), - existing_nullable=True) - op.alter_column('receipt_item', 'purchaser_id', - existing_type=sqlmodel.sql.sqltypes.AutoString(), - type_=sa.UUID(), - existing_nullable=True) - op.alter_column('receipt_info', 'voided', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=True) - op.alter_column('receipt_info', 'charged', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=False) + op.alter_column('receipt_item', 'receipt_id', + existing_type=sa.UUID(), + nullable=True) op.drop_index('uq_promo_code_word_normalized_word_part_of_speech', table_name='promo_code_word') op.create_index(op.f('uq_promo_code_word_normalized_word_part_of_speech'), 'promo_code_word', [sa.literal_column('lower(TRIM(BOTH FROM word))'), 'part_of_speech'], unique=True) op.drop_constraint(None, 'promo_code_group', type_='foreignkey') op.create_foreign_key(op.f('fk_promo_code_group_buyer_id_attendee'), 'promo_code_group', 'attendee', ['buyer_id'], ['id'], ondelete='SET NULL') op.drop_constraint(None, 'promo_code', type_='foreignkey') op.create_foreign_key(op.f('fk_promo_code_group_id_promo_code_group'), 'promo_code', 'promo_code_group', ['group_id'], ['id'], ondelete='SET NULL') - op.alter_column('promo_code', 'expiration_date', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=False) op.drop_constraint(None, 'print_job', type_='foreignkey') op.create_foreign_key(op.f('fk_print_queue_attendee_id_attendee'), 'print_job', 'attendee', ['attendee_id'], ['id']) - op.alter_column('print_job', 'printed', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=True) - op.alter_column('print_job', 'queued', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=True) - op.alter_column('print_job', 'attendee_id', - existing_type=sa.UUID(), - nullable=False) op.drop_constraint(None, 'password_reset', type_='foreignkey') op.drop_constraint(None, 'password_reset', type_='foreignkey') - op.create_foreign_key(op.f('fk_password_reset_admin_id_admin_account'), 'password_reset', 'admin_account', ['admin_id'], ['id']) op.create_foreign_key(op.f('fk_password_reset_attendee_id_attendee_account'), 'password_reset', 'attendee_account', ['attendee_id'], ['id']) - op.alter_column('password_reset', 'generated', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=False, - existing_server_default=sa.text("timezone('utc'::text, CURRENT_TIMESTAMP)")) + op.create_foreign_key(op.f('fk_password_reset_admin_id_admin_account'), 'password_reset', 'admin_account', ['admin_id'], ['id']) + op.alter_column('password_reset', 'attendee_id', + existing_type=sa.UUID(), + nullable=True) + op.alter_column('password_reset', 'admin_id', + existing_type=sa.UUID(), + nullable=True) op.drop_constraint(None, 'panel_application', type_='foreignkey') op.drop_constraint(None, 'panel_application', type_='foreignkey') op.drop_constraint(None, 'panel_application', type_='foreignkey') - op.create_foreign_key(op.f('fk_panel_application_event_id_event'), 'panel_application', 'event', ['event_id'], ['id'], ondelete='SET NULL') op.create_foreign_key(op.f('fk_panel_application_submitter_id_panel_applicant'), 'panel_application', 'panel_applicant', ['submitter_id'], ['id'], ondelete='SET NULL') op.create_foreign_key(op.f('fk_panel_application_poc_id_attendee'), 'panel_application', 'attendee', ['poc_id'], ['id'], ondelete='SET NULL') - op.alter_column('panel_application', 'confirmed', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=True) - op.alter_column('panel_application', 'accepted', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=True) - op.alter_column('panel_application', 'applied', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=False, - existing_server_default=sa.text("timezone('utc'::text, CURRENT_TIMESTAMP)")) + op.create_foreign_key(op.f('fk_panel_application_event_id_event'), 'panel_application', 'event', ['event_id'], ['id'], ondelete='SET NULL') op.drop_constraint(None, 'old_m_point_exchange', type_='foreignkey') op.create_foreign_key(op.f('fk_old_m_point_exchange_attendee_id_attendee'), 'old_m_point_exchange', 'attendee', ['attendee_id'], ['id']) - op.alter_column('old_m_point_exchange', 'when', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=False) - op.alter_column('old_m_point_exchange', 'attendee_id', - existing_type=sa.UUID(), - nullable=False) op.drop_constraint(None, 'no_shirt', type_='foreignkey') op.create_foreign_key(op.f('fk_no_shirt_attendee_id_attendee'), 'no_shirt', 'attendee', ['attendee_id'], ['id']) - op.alter_column('no_shirt', 'attendee_id', - existing_type=sa.UUID(), - nullable=False) - op.create_index(op.f('ix_model_receipt_owner_id'), 'model_receipt', ['owner_id'], unique=False) - op.alter_column('model_receipt', 'closed', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=True) - op.alter_column('model_receipt', 'owner_id', - existing_type=sqlmodel.sql.sqltypes.AutoString(), - type_=sa.UUID(), - existing_nullable=False) op.drop_constraint(None, 'mits_times', type_='foreignkey') op.create_foreign_key(op.f('fk_mits_times_team_id_mits_team'), 'mits_times', 'mits_team', ['team_id'], ['id']) op.drop_constraint(None, 'mits_times', type_='unique') - op.alter_column('mits_times', 'team_id', - existing_type=sa.UUID(), - nullable=False) - op.alter_column('mits_team', 'duplicate_of', - existing_type=sqlmodel.sql.sqltypes.AutoString(), - type_=sa.UUID(), - existing_nullable=True) - op.alter_column('mits_team', 'applied', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=False, - existing_server_default=sa.text("timezone('utc'::text, CURRENT_TIMESTAMP)")) - op.alter_column('mits_team', 'waiver_signed', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=True) - op.alter_column('mits_team', 'submitted', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=True) op.alter_column('mits_team', 'concurrent_attendees', existing_type=sa.INTEGER(), nullable=False) op.drop_constraint(None, 'mits_picture', type_='foreignkey') op.create_foreign_key(op.f('fk_mits_picture_game_id_mits_game'), 'mits_picture', 'mits_game', ['game_id'], ['id']) - op.alter_column('mits_picture', 'game_id', - existing_type=sa.UUID(), - nullable=False) op.drop_constraint(None, 'mits_panel_application', type_='foreignkey') op.create_foreign_key(op.f('fk_mits_panel_application_team_id_mits_team'), 'mits_panel_application', 'mits_team', ['team_id'], ['id']) op.drop_constraint(None, 'mits_panel_application', type_='unique') - op.alter_column('mits_panel_application', 'team_id', - existing_type=sa.UUID(), - nullable=False) op.drop_constraint(None, 'mits_game', type_='foreignkey') op.create_foreign_key(op.f('fk_mits_game_team_id_mits_team'), 'mits_game', 'mits_team', ['team_id'], ['id']) - op.alter_column('mits_game', 'team_id', - existing_type=sa.UUID(), - nullable=False) op.drop_constraint(None, 'mits_document', type_='foreignkey') op.create_foreign_key(op.f('fk_mits_document_game_id_mits_game'), 'mits_document', 'mits_game', ['game_id'], ['id']) - op.alter_column('mits_document', 'game_id', - existing_type=sa.UUID(), - nullable=False) op.drop_constraint(None, 'mits_applicant', type_='foreignkey') op.create_foreign_key(op.f('fk_mits_applicant_team_id_mits_team'), 'mits_applicant', 'mits_team', ['team_id'], ['id']) - op.alter_column('mits_applicant', 'team_id', - existing_type=sa.UUID(), - nullable=False) op.alter_column('merch_pickup', 'picked_up_for_id', existing_type=sa.UUID(), nullable=False) @@ -1179,48 +415,15 @@ def downgrade(): nullable=False) op.drop_constraint(None, 'merch_discount', type_='foreignkey') op.create_foreign_key(op.f('fk_merch_discount_attendee_id_attendee'), 'merch_discount', 'attendee', ['attendee_id'], ['id']) - op.alter_column('merch_discount', 'attendee_id', - existing_type=sa.UUID(), - nullable=False) op.drop_constraint(None, 'm_points_for_cash', type_='foreignkey') op.create_foreign_key(op.f('fk_m_points_for_cash_attendee_id_attendee'), 'm_points_for_cash', 'attendee', ['attendee_id'], ['id']) - op.alter_column('m_points_for_cash', 'when', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=False) - op.alter_column('m_points_for_cash', 'attendee_id', - existing_type=sa.UUID(), - nullable=False) op.create_unique_constraint(op.f('uq_lottery_application_response_id'), 'lottery_application', ['response_id'], postgresql_nulls_not_distinct=False) - op.alter_column('lottery_application', 'former_parent_id', - existing_type=sqlmodel.sql.sqltypes.AutoString(), - type_=sa.UUID(), - existing_nullable=True) - op.alter_column('lottery_application', 'last_submitted', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=True) - op.alter_column('lottery_application', 'entry_started', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=True) op.drop_constraint(None, 'job_template', type_='foreignkey') op.create_foreign_key(op.f('fk_job_template_department_id_department'), 'job_template', 'department', ['department_id'], ['id']) - op.alter_column('job_template', 'department_id', - existing_type=sa.UUID(), - nullable=False) op.drop_constraint(None, 'job', type_='foreignkey') op.create_foreign_key(op.f('fk_job_department_id_department'), 'job', 'department', ['department_id'], ['id']) - op.alter_column('job', 'department_id', - existing_type=sa.UUID(), - nullable=False) op.drop_constraint(None, 'indie_studio', type_='unique') op.create_unique_constraint(op.f('uq_indie_studio_name'), 'indie_studio', ['name'], postgresql_nulls_not_distinct=False) - op.alter_column('indie_studio', 'registered', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=False, - existing_server_default=sa.text("timezone('utc'::text, CURRENT_TIMESTAMP)")) op.drop_constraint(None, 'indie_judge', type_='unique') op.alter_column('indie_judge', 'admin_id', existing_type=sa.UUID(), @@ -1229,306 +432,108 @@ def downgrade(): op.drop_constraint(None, 'indie_game_review', type_='foreignkey') op.create_foreign_key(op.f('fk_indie_game_review_judge_id_indie_judge'), 'indie_game_review', 'indie_judge', ['judge_id'], ['id']) op.create_foreign_key(op.f('fk_indie_game_review_game_id_indie_game'), 'indie_game_review', 'indie_game', ['game_id'], ['id']) - op.alter_column('indie_game_review', 'judge_id', - existing_type=sa.UUID(), - nullable=False) - op.alter_column('indie_game_review', 'game_id', - existing_type=sa.UUID(), - nullable=False) op.drop_constraint(None, 'indie_game_image', type_='foreignkey') op.create_foreign_key(op.f('fk_indie_game_image_game_id_indie_game'), 'indie_game_image', 'indie_game', ['game_id'], ['id']) - op.alter_column('indie_game_image', 'game_id', - existing_type=sa.UUID(), - nullable=False) op.drop_constraint(None, 'indie_game_code', type_='foreignkey') op.create_foreign_key(op.f('fk_indie_game_code_game_id_indie_game'), 'indie_game_code', 'indie_game', ['game_id'], ['id']) - op.alter_column('indie_game_code', 'game_id', - existing_type=sa.UUID(), - nullable=False) op.drop_constraint(None, 'indie_game', type_='foreignkey') op.drop_constraint(None, 'indie_game', type_='foreignkey') op.create_foreign_key(op.f('fk_indie_game_studio_id_indie_studio'), 'indie_game', 'indie_studio', ['studio_id'], ['id']) op.create_foreign_key(op.f('fk_indie_game_primary_contact_id_indie_developer'), 'indie_game', 'indie_developer', ['primary_contact_id'], ['id'], ondelete='SET NULL') - op.alter_column('indie_game', 'accepted', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=True) - op.alter_column('indie_game', 'waitlisted', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=True) - op.alter_column('indie_game', 'registered', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=False, - existing_server_default=sa.text("timezone('utc'::text, CURRENT_TIMESTAMP)")) op.alter_column('indie_game', 'multiplayer_game_length', existing_type=sa.INTEGER(), nullable=True) - op.alter_column('indie_game', 'studio_id', - existing_type=sa.UUID(), - nullable=False) op.drop_constraint(None, 'indie_developer', type_='foreignkey') op.create_foreign_key(op.f('fk_indie_developer_studio_id_indie_studio'), 'indie_developer', 'indie_studio', ['studio_id'], ['id']) - op.alter_column('indie_developer', 'studio_id', - existing_type=sa.UUID(), - nullable=False) op.drop_constraint(None, 'hotel_requests', type_='foreignkey') op.create_foreign_key(op.f('fk_hotel_requests_attendee_id_attendee'), 'hotel_requests', 'attendee', ['attendee_id'], ['id']) - op.alter_column('hotel_requests', 'attendee_id', - existing_type=sa.UUID(), - nullable=False) op.drop_constraint(None, 'guest_travel_plans', type_='foreignkey') op.create_foreign_key(op.f('fk_guest_travel_plans_guest_id_guest_group'), 'guest_travel_plans', 'guest_group', ['guest_id'], ['id']) - op.alter_column('guest_travel_plans', 'guest_id', - existing_type=sa.UUID(), - nullable=False) op.drop_constraint(None, 'guest_track', type_='foreignkey') op.create_foreign_key(op.f('fk_guest_track_guest_id_guest_group'), 'guest_track', 'guest_group', ['guest_id'], ['id']) op.drop_constraint(None, 'guest_track', type_='unique') - op.alter_column('guest_track', 'guest_id', - existing_type=sa.UUID(), - nullable=False) op.drop_constraint(None, 'guest_taxes', type_='foreignkey') op.create_foreign_key(op.f('fk_guest_taxes_guest_id_guest_group'), 'guest_taxes', 'guest_group', ['guest_id'], ['id']) - op.alter_column('guest_taxes', 'guest_id', - existing_type=sa.UUID(), - nullable=False) op.drop_constraint(None, 'guest_stage_plot', type_='foreignkey') op.create_foreign_key(op.f('fk_guest_stage_plot_guest_id_guest_group'), 'guest_stage_plot', 'guest_group', ['guest_id'], ['id']) - op.alter_column('guest_stage_plot', 'guest_id', - existing_type=sa.UUID(), - nullable=False) op.drop_constraint(None, 'guest_panel', type_='foreignkey') op.create_foreign_key(op.f('fk_guest_panel_guest_id_guest_group'), 'guest_panel', 'guest_group', ['guest_id'], ['id']) - op.alter_column('guest_panel', 'guest_id', - existing_type=sa.UUID(), - nullable=False) op.drop_constraint(None, 'guest_merch', type_='foreignkey') op.create_foreign_key(op.f('fk_guest_merch_guest_id_guest_group'), 'guest_merch', 'guest_group', ['guest_id'], ['id']) - op.alter_column('guest_merch', 'inventory_updated', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=True) - op.alter_column('guest_merch', 'guest_id', - existing_type=sa.UUID(), - nullable=False) op.drop_constraint(None, 'guest_media_request', type_='foreignkey') op.create_foreign_key(op.f('fk_guest_media_request_guest_id_guest_group'), 'guest_media_request', 'guest_group', ['guest_id'], ['id']) - op.alter_column('guest_media_request', 'guest_id', - existing_type=sa.UUID(), - nullable=False) op.drop_constraint(None, 'guest_interview', type_='foreignkey') op.create_foreign_key(op.f('fk_guest_interview_guest_id_guest_group'), 'guest_interview', 'guest_group', ['guest_id'], ['id']) - op.alter_column('guest_interview', 'guest_id', - existing_type=sa.UUID(), - nullable=False) op.drop_constraint(None, 'guest_info', type_='foreignkey') op.create_foreign_key(op.f('fk_guest_info_guest_id_guest_group'), 'guest_info', 'guest_group', ['guest_id'], ['id']) - op.alter_column('guest_info', 'guest_id', - existing_type=sa.UUID(), - nullable=False) op.drop_constraint(None, 'guest_image', type_='foreignkey') op.create_foreign_key(op.f('fk_guest_image_guest_id_guest_group'), 'guest_image', 'guest_group', ['guest_id'], ['id']) - op.alter_column('guest_image', 'guest_id', - existing_type=sa.UUID(), - nullable=False) op.drop_constraint(None, 'guest_hospitality', type_='foreignkey') op.create_foreign_key(op.f('fk_guest_hospitality_guest_id_guest_group'), 'guest_hospitality', 'guest_group', ['guest_id'], ['id']) - op.alter_column('guest_hospitality', 'guest_id', - existing_type=sa.UUID(), - nullable=False) op.drop_constraint(None, 'guest_group', type_='foreignkey') op.drop_constraint(None, 'guest_group', type_='foreignkey') op.create_foreign_key(op.f('fk_guest_group_event_id_event'), 'guest_group', 'event', ['event_id'], ['id'], ondelete='SET NULL') op.create_foreign_key(op.f('fk_guest_group_group_id_group'), 'guest_group', 'group', ['group_id'], ['id']) op.drop_constraint(None, 'guest_group', type_='unique') - op.alter_column('guest_group', 'group_id', - existing_type=sa.UUID(), - nullable=False) op.drop_constraint(None, 'guest_detailed_travel_plan', type_='foreignkey') op.create_foreign_key(op.f('fk_guest_detailed_travel_plan_travel_plans_id_guest_tra_6ad4'), 'guest_detailed_travel_plan', 'guest_travel_plans', ['travel_plans_id'], ['id']) - op.alter_column('guest_detailed_travel_plan', 'departure_time', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=False) - op.alter_column('guest_detailed_travel_plan', 'arrival_time', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=False) + op.alter_column('guest_detailed_travel_plan', 'travel_plans_id', + existing_type=sa.UUID(), + nullable=True) op.drop_constraint(None, 'guest_charity', type_='foreignkey') op.create_foreign_key(op.f('fk_guest_charity_guest_id_guest_group'), 'guest_charity', 'guest_group', ['guest_id'], ['id']) - op.alter_column('guest_charity', 'guest_id', - existing_type=sa.UUID(), - nullable=False) op.drop_constraint(None, 'guest_bio', type_='foreignkey') op.create_foreign_key(op.f('fk_guest_bio_guest_id_guest_group'), 'guest_bio', 'guest_group', ['guest_id'], ['id']) - op.alter_column('guest_bio', 'guest_id', - existing_type=sa.UUID(), - nullable=False) op.drop_constraint(None, 'guest_autograph', type_='foreignkey') op.create_foreign_key(op.f('fk_guest_autograph_guest_id_guest_group'), 'guest_autograph', 'guest_group', ['guest_id'], ['id']) - op.alter_column('guest_autograph', 'guest_id', - existing_type=sa.UUID(), - nullable=False) op.drop_constraint(None, 'group', type_='foreignkey') op.drop_constraint(None, 'group', type_='foreignkey') op.create_foreign_key(op.f('fk_group_shared_with_id_group'), 'group', 'group', ['shared_with_id'], ['id'], ondelete='SET NULL') op.create_foreign_key(op.f('fk_leader'), 'group', 'attendee', ['leader_id'], ['id'], ondelete='SET NULL') - op.alter_column('group', 'approved', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=True) - op.alter_column('group', 'registered', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=False, - existing_server_default=sa.text("timezone('utc'::text, CURRENT_TIMESTAMP)")) - op.alter_column('group', 'public_id', - existing_type=sqlmodel.sql.sqltypes.AutoString(), - type_=sa.UUID(), - nullable=False) op.drop_constraint(None, 'food_restrictions', type_='foreignkey') op.create_foreign_key(op.f('fk_food_restrictions_attendee_id_attendee'), 'food_restrictions', 'attendee', ['attendee_id'], ['id']) - op.alter_column('food_restrictions', 'attendee_id', - existing_type=sa.UUID(), - nullable=False) op.drop_constraint(None, 'event_location', type_='foreignkey') op.create_foreign_key(op.f('fk_event_location_department_id_department'), 'event_location', 'department', ['department_id'], ['id'], ondelete='SET NULL') op.drop_constraint(None, 'event_feedback', type_='foreignkey') op.create_foreign_key(op.f('fk_event_feedback_event_id_event'), 'event_feedback', 'event', ['event_id'], ['id']) - op.alter_column('event_feedback', 'attendee_id', - existing_type=sa.UUID(), - nullable=False) - op.alter_column('event_feedback', 'event_id', - existing_type=sa.UUID(), - nullable=False) op.drop_constraint(None, 'event', type_='foreignkey') op.drop_constraint(None, 'event', type_='foreignkey') op.drop_constraint(None, 'event', type_='foreignkey') - op.create_foreign_key(op.f('fk_event_attraction_event_id_attraction_event'), 'event', 'attraction_event', ['attraction_event_id'], ['id'], ondelete='SET NULL') - op.create_foreign_key(op.f('fk_event_department_id_department'), 'event', 'department', ['department_id'], ['id'], ondelete='SET NULL') op.create_foreign_key(op.f('fk_event_location_id_event_location'), 'event', 'event_location', ['event_location_id'], ['id'], ondelete='SET NULL') + op.create_foreign_key(op.f('fk_event_department_id_department'), 'event', 'department', ['department_id'], ['id'], ondelete='SET NULL') + op.create_foreign_key(op.f('fk_event_attraction_event_id_attraction_event'), 'event', 'attraction_event', ['attraction_event_id'], ['id'], ondelete='SET NULL') op.drop_constraint(None, 'event', type_='unique') - op.alter_column('event', 'start_time', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=False) - op.create_unique_constraint(op.f('uq_escalation_ticket_ticket_id'), 'escalation_ticket', ['ticket_id'], postgresql_nulls_not_distinct=False) - op.alter_column('escalation_ticket', 'resolved', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=True) op.drop_constraint(None, 'email', type_='foreignkey') op.create_foreign_key(op.f('fk_email_automated_email_id_automated_email'), 'email', 'automated_email', ['automated_email_id'], ['id'], ondelete='SET NULL') - op.alter_column('email', 'when', - existing_type=sqlmodel.sql.sqltypes.AutoString(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=False) - op.alter_column('email', 'fk_id', - existing_type=sqlmodel.sql.sqltypes.AutoString(), - type_=sa.UUID(), - existing_nullable=True) op.drop_constraint(None, 'dept_role', type_='foreignkey') op.create_foreign_key(op.f('fk_dept_role_department_id_department'), 'dept_role', 'department', ['department_id'], ['id']) - op.alter_column('dept_role', 'department_id', - existing_type=sa.UUID(), - nullable=False) op.drop_constraint(None, 'dept_membership_request', type_='foreignkey') op.drop_constraint(None, 'dept_membership_request', type_='foreignkey') op.create_foreign_key(op.f('fk_dept_membership_request_department_id_department'), 'dept_membership_request', 'department', ['department_id'], ['id']) op.create_foreign_key(op.f('fk_dept_membership_request_attendee_id_attendee'), 'dept_membership_request', 'attendee', ['attendee_id'], ['id']) - op.alter_column('dept_membership_request', 'attendee_id', - existing_type=sa.UUID(), - nullable=False) op.drop_constraint(None, 'dept_membership', type_='foreignkey') op.drop_constraint(None, 'dept_membership', type_='foreignkey') - op.create_foreign_key(op.f('fk_dept_membership_department_id_department'), 'dept_membership', 'department', ['department_id'], ['id']) op.create_foreign_key(op.f('fk_dept_membership_attendee_id_attendee'), 'dept_membership', 'attendee', ['attendee_id'], ['id']) - op.alter_column('dept_membership', 'department_id', - existing_type=sa.UUID(), - nullable=False) - op.alter_column('dept_membership', 'attendee_id', - existing_type=sa.UUID(), - nullable=False) + op.create_foreign_key(op.f('fk_dept_membership_department_id_department'), 'dept_membership', 'department', ['department_id'], ['id']) op.drop_constraint(None, 'dept_checklist_item', type_='foreignkey') op.drop_constraint(None, 'dept_checklist_item', type_='foreignkey') op.create_foreign_key(op.f('fk_dept_checklist_item_attendee_id_attendee'), 'dept_checklist_item', 'attendee', ['attendee_id'], ['id']) op.create_foreign_key(op.f('fk_dept_checklist_item_department_id_department'), 'dept_checklist_item', 'department', ['department_id'], ['id']) - op.alter_column('dept_checklist_item', 'attendee_id', - existing_type=sa.UUID(), - nullable=False) - op.alter_column('dept_checklist_item', 'department_id', - existing_type=sa.UUID(), - nullable=False) op.drop_constraint(None, 'department', type_='foreignkey') op.create_foreign_key(op.f('fk_department_parent_id_department'), 'department', 'department', ['parent_id'], ['id']) op.drop_constraint(None, 'bulk_printing_request', type_='foreignkey') op.create_foreign_key(op.f('fk_bulk_printing_request_department_id_department'), 'bulk_printing_request', 'department', ['department_id'], ['id']) - op.alter_column('bulk_printing_request', 'department_id', - existing_type=sa.UUID(), - nullable=False) - op.alter_column('badge_pickup_group', 'public_id', - existing_type=sqlmodel.sql.sqltypes.AutoString(), - type_=sa.UUID(), - existing_nullable=True) op.drop_constraint(None, 'badge_info', type_='foreignkey') op.create_foreign_key(op.f('fk_badge_info_attendee_id_attendee'), 'badge_info', 'attendee', ['attendee_id'], ['id'], ondelete='SET NULL') op.create_index(op.f('ix_badge_info_ident'), 'badge_info', ['ident'], unique=False) - op.alter_column('badge_info', 'reported_lost', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=True) - op.alter_column('badge_info', 'picked_up', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=True) op.create_unique_constraint(op.f('uq_automated_email_ident'), 'automated_email', ['ident'], postgresql_nulls_not_distinct=False) - op.alter_column('automated_email', 'active_before', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=True) - op.alter_column('automated_email', 'active_after', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=True) - op.alter_column('automated_email', 'last_send_time', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=True) op.drop_constraint(None, 'attraction_signup', type_='foreignkey') op.drop_constraint(None, 'attraction_signup', type_='foreignkey') op.drop_constraint(None, 'attraction_signup', type_='foreignkey') - op.create_foreign_key(op.f('fk_attraction_signup_attraction_id_attraction'), 'attraction_signup', 'attraction', ['attraction_id'], ['id']) op.create_foreign_key(op.f('fk_attraction_signup_attraction_event_id_attraction_event'), 'attraction_signup', 'attraction_event', ['attraction_event_id'], ['id']) + op.create_foreign_key(op.f('fk_attraction_signup_attraction_id_attraction'), 'attraction_signup', 'attraction', ['attraction_id'], ['id']) op.create_foreign_key(op.f('fk_attraction_signup_attendee_id_attendee'), 'attraction_signup', 'attendee', ['attendee_id'], ['id']) - op.create_index(op.f('ix_attraction_signup_checkin_time'), 'attraction_signup', ['checkin_time'], unique=False) - op.alter_column('attraction_signup', 'checkin_time', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=False) - op.alter_column('attraction_signup', 'signup_time', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=False) - op.alter_column('attraction_signup', 'attendee_id', - existing_type=sa.UUID(), - nullable=False) - op.alter_column('attraction_signup', 'attraction_event_id', - existing_type=sa.UUID(), - nullable=False) - op.alter_column('attraction_signup', 'attraction_id', - existing_type=sa.UUID(), - nullable=False) op.create_index(op.f('ix_attraction_notification_reply_sid'), 'attraction_notification_reply', ['sid'], unique=False) - op.alter_column('attraction_notification_reply', 'sent_time', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=False) - op.alter_column('attraction_notification_reply', 'received_time', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=False) op.drop_constraint(None, 'attraction_notification', type_='foreignkey') op.drop_constraint(None, 'attraction_notification', type_='foreignkey') op.drop_constraint(None, 'attraction_notification', type_='foreignkey') @@ -1536,112 +541,52 @@ def downgrade(): op.create_foreign_key(op.f('fk_attraction_notification_attraction_event_id_attraction_event'), 'attraction_notification', 'attraction_event', ['attraction_event_id'], ['id']) op.create_foreign_key(op.f('fk_attraction_notification_attraction_id_attraction'), 'attraction_notification', 'attraction', ['attraction_id'], ['id']) op.create_index(op.f('ix_attraction_notification_ident'), 'attraction_notification', ['ident'], unique=False) - op.alter_column('attraction_notification', 'sent_time', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=False) - op.alter_column('attraction_notification', 'attendee_id', - existing_type=sa.UUID(), - nullable=False) - op.alter_column('attraction_notification', 'attraction_id', - existing_type=sa.UUID(), - nullable=False) - op.alter_column('attraction_notification', 'attraction_event_id', - existing_type=sa.UUID(), - nullable=False) op.drop_constraint(None, 'attraction_feature', type_='foreignkey') op.create_foreign_key(op.f('fk_attraction_feature_attraction_id_attraction'), 'attraction_feature', 'attraction', ['attraction_id'], ['id']) - op.alter_column('attraction_feature', 'attraction_id', - existing_type=sa.UUID(), - nullable=False) - op.alter_column('attraction_feature', 'signups_open_time', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=True) op.drop_constraint(None, 'attraction_event', type_='foreignkey') op.drop_constraint(None, 'attraction_event', type_='foreignkey') op.drop_constraint(None, 'attraction_event', type_='foreignkey') - op.create_foreign_key(op.f('fk_attraction_event_attraction_feature_id_attraction_feature'), 'attraction_event', 'attraction_feature', ['attraction_feature_id'], ['id']) op.create_foreign_key(op.f('fk_attraction_event_location_id_event_location'), 'attraction_event', 'event_location', ['event_location_id'], ['id'], ondelete='SET NULL') op.create_foreign_key(op.f('fk_attraction_event_attraction_id_attraction'), 'attraction_event', 'attraction', ['attraction_id'], ['id']) - op.alter_column('attraction_event', 'start_time', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=False) - op.alter_column('attraction_event', 'attraction_feature_id', - existing_type=sa.UUID(), - nullable=False) - op.alter_column('attraction_event', 'attraction_id', - existing_type=sa.UUID(), - nullable=False) - op.alter_column('attraction_event', 'signups_open_time', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=True) + op.create_foreign_key(op.f('fk_attraction_event_attraction_feature_id_attraction_feature'), 'attraction_event', 'attraction_feature', ['attraction_feature_id'], ['id']) op.create_unique_constraint(op.f('uq_attraction_slug'), 'attraction', ['slug'], postgresql_nulls_not_distinct=False) op.create_unique_constraint(op.f('attraction_name_key'), 'attraction', ['name'], postgresql_nulls_not_distinct=False) - op.alter_column('attraction', 'signups_open_time', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=True) - op.alter_column('attendee_account', 'public_id', - existing_type=sqlmodel.sql.sqltypes.AutoString(), - type_=sa.UUID(), - existing_nullable=True) op.add_column('attendee', sa.Column('affiliate', sa.VARCHAR(), server_default=sa.text("''::character varying"), autoincrement=False, nullable=False)) op.drop_constraint(None, 'attendee', type_='foreignkey') op.drop_constraint(None, 'attendee', type_='foreignkey') op.drop_constraint(None, 'attendee', type_='foreignkey') op.drop_constraint(None, 'attendee', type_='foreignkey') - op.create_foreign_key(op.f('fk_attendee_group_id_group'), 'attendee', 'group', ['group_id'], ['id'], ondelete='SET NULL') op.create_foreign_key(op.f('fk_attendee_badge_pickup_group_id_badge_pickup_group'), 'attendee', 'badge_pickup_group', ['badge_pickup_group_id'], ['id'], ondelete='SET NULL') + op.create_foreign_key(op.f('fk_attendee_group_id_group'), 'attendee', 'group', ['group_id'], ['id'], ondelete='SET NULL') op.create_foreign_key(op.f('fk_attendee_watchlist_id_watch_list'), 'attendee', 'watch_list', ['watchlist_id'], ['id'], ondelete='SET NULL') op.create_foreign_key(op.f('fk_attendee_creator_id_attendee'), 'attendee', 'attendee', ['creator_id'], ['id'], ondelete='SET NULL') - op.alter_column('assigned_panelist', 'event_id', - existing_type=sa.UUID(), - nullable=False) - op.alter_column('assigned_panelist', 'attendee_id', - existing_type=sa.UUID(), - nullable=False) op.drop_constraint(None, 'artist_marketplace_application', type_='foreignkey') op.create_foreign_key(op.f('fk_artist_marketplace_application_attendee_id_attendee'), 'artist_marketplace_application', 'attendee', ['attendee_id'], ['id']) op.drop_constraint(None, 'artist_marketplace_application', type_='unique') - op.alter_column('artist_marketplace_application', 'accepted', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=True) - op.alter_column('artist_marketplace_application', 'registered', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=False, - existing_server_default=sa.text("timezone('utc'::text, CURRENT_TIMESTAMP)")) - op.alter_column('artist_marketplace_application', 'attendee_id', - existing_type=sa.UUID(), - nullable=False) op.drop_constraint(None, 'art_show_receipt', type_='foreignkey') op.create_foreign_key(op.f('fk_art_show_receipt_attendee_id_attendee'), 'art_show_receipt', 'attendee', ['attendee_id'], ['id'], ondelete='SET NULL') - op.alter_column('art_show_receipt', 'closed', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=True) + op.alter_column('art_show_receipt', 'attendee_id', + existing_type=sa.UUID(), + nullable=True) op.drop_constraint(None, 'art_show_piece', type_='foreignkey') op.drop_constraint(None, 'art_show_piece', type_='foreignkey') op.drop_constraint(None, 'art_show_piece', type_='foreignkey') - op.create_foreign_key(op.f('fk_art_show_piece_receipt_id_art_show_receipt'), 'art_show_piece', 'art_show_receipt', ['receipt_id'], ['id'], ondelete='SET NULL') - op.create_foreign_key(op.f('fk_art_show_piece_winning_bidder_id_art_show_bidder'), 'art_show_piece', 'art_show_bidder', ['winning_bidder_id'], ['id'], ondelete='SET NULL') op.create_foreign_key(op.f('fk_art_show_pieces_app_id_art_show_application'), 'art_show_piece', 'art_show_application', ['app_id'], ['id'], ondelete='SET NULL') + op.create_foreign_key(op.f('fk_art_show_piece_winning_bidder_id_art_show_bidder'), 'art_show_piece', 'art_show_bidder', ['winning_bidder_id'], ['id'], ondelete='SET NULL') + op.create_foreign_key(op.f('fk_art_show_piece_receipt_id_art_show_receipt'), 'art_show_piece', 'art_show_receipt', ['receipt_id'], ['id'], ondelete='SET NULL') + op.alter_column('art_show_piece', 'app_id', + existing_type=sa.UUID(), + nullable=True) op.drop_constraint(None, 'art_show_payment', type_='foreignkey') op.create_foreign_key(op.f('fk_art_show_payment_receipt_id_art_show_receipt'), 'art_show_payment', 'art_show_receipt', ['receipt_id'], ['id'], ondelete='SET NULL') - op.alter_column('art_show_payment', 'when', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=False) + op.alter_column('art_show_payment', 'receipt_id', + existing_type=sa.UUID(), + nullable=True) op.drop_constraint(None, 'art_show_bidder', type_='foreignkey') op.create_foreign_key(op.f('fk_art_show_bidder_attendee_id_attendee'), 'art_show_bidder', 'attendee', ['attendee_id'], ['id'], ondelete='SET NULL') - op.alter_column('art_show_bidder', 'signed_up', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=True) + op.alter_column('art_show_bidder', 'attendee_id', + existing_type=sa.UUID(), + nullable=True) op.drop_constraint(None, 'art_show_application', type_='foreignkey') op.create_foreign_key(op.f('fk_art_show_application_attendee_id_attendee'), 'art_show_application', 'attendee', ['attendee_id'], ['id'], ondelete='SET NULL') op.drop_constraint(None, 'art_show_application', type_='unique') @@ -1651,81 +596,18 @@ def downgrade(): op.alter_column('art_show_application', 'overridden_price', existing_type=sa.INTEGER(), nullable=True) - op.alter_column('art_show_application', 'checked_out', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=True) - op.alter_column('art_show_application', 'checked_in', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=True) op.drop_constraint(None, 'art_show_agent_code', type_='foreignkey') op.drop_constraint(None, 'art_show_agent_code', type_='foreignkey') - op.create_foreign_key(op.f('fk_art_show_agent_code_attendee_id_attendee'), 'art_show_agent_code', 'attendee', ['attendee_id'], ['id'], ondelete='SET NULL') op.create_foreign_key(op.f('fk_art_show_agent_code_app_id_art_show_application'), 'art_show_agent_code', 'art_show_application', ['app_id'], ['id']) - op.alter_column('art_show_agent_code', 'cancelled', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=True) - op.alter_column('art_show_agent_code', 'app_id', - existing_type=sa.UUID(), - nullable=False) + op.create_foreign_key(op.f('fk_art_show_agent_code_attendee_id_attendee'), 'art_show_agent_code', 'attendee', ['attendee_id'], ['id'], ondelete='SET NULL') op.drop_constraint(None, 'art_panel_assignment', type_='foreignkey') op.drop_constraint(None, 'art_panel_assignment', type_='foreignkey') - op.create_foreign_key(op.f('fk_art_panel_assignment_panel_id_art_show_panel'), 'art_panel_assignment', 'art_show_panel', ['panel_id'], ['id']) op.create_foreign_key(op.f('fk_art_panel_assignment_app_id_art_show_application'), 'art_panel_assignment', 'art_show_application', ['app_id'], ['id']) - op.alter_column('art_panel_assignment', 'panel_id', - existing_type=sa.UUID(), - nullable=False) - op.alter_column('art_panel_assignment', 'app_id', - existing_type=sa.UUID(), - nullable=False) - op.alter_column('arbitrary_charge', 'when', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=False) + op.create_foreign_key(op.f('fk_art_panel_assignment_panel_id_art_show_panel'), 'art_panel_assignment', 'art_show_panel', ['panel_id'], ['id']) op.drop_constraint(None, 'api_token', type_='foreignkey') op.create_foreign_key(op.f('fk_api_token_admin_account_id_admin_account'), 'api_token', 'admin_account', ['admin_account_id'], ['id']) - op.alter_column('api_token', 'revoked_time', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - nullable=True) - op.alter_column('api_token', 'issued_time', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=False) - op.alter_column('api_token', 'token', - existing_type=sqlmodel.sql.sqltypes.AutoString(), - type_=sa.UUID(), - nullable=False) - op.alter_column('api_token', 'admin_account_id', - existing_type=sa.UUID(), - nullable=False) - op.alter_column('api_job', 'cancelled', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=True) - op.alter_column('api_job', 'completed', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=True) - op.alter_column('api_job', 'queued', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=True) op.drop_constraint(None, 'admin_account', type_='foreignkey') op.create_foreign_key(op.f('fk_admin_account_attendee_id_attendee'), 'admin_account', 'attendee', ['attendee_id'], ['id']) - op.alter_column('admin_account', 'attendee_id', - existing_type=sa.UUID(), - nullable=False) - op.alter_column('access_group', 'end_time', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=True) - op.alter_column('access_group', 'start_time', - existing_type=sa.DateTime(), - type_=postgresql.TIMESTAMP(timezone=True), - existing_nullable=True) op.create_table('attendee_tournament', sa.Column('id', sa.UUID(), autoincrement=False, nullable=False), sa.Column('first_name', sa.VARCHAR(), server_default=sa.text("''::character varying"), autoincrement=False, nullable=False), @@ -1746,4 +628,3 @@ def downgrade(): sa.Column('last_synced', postgresql.JSONB(astext_type=sa.Text()), server_default=sa.text("'{}'::jsonb"), autoincrement=False, nullable=False), sa.PrimaryKeyConstraint('id', name=op.f('pk_attendee_tournament')) ) - # ### end Alembic commands ### diff --git a/tests/uber/test_custom_tags.py b/tests/uber/test_custom_tags.py index fa0a822dd..5a484a90a 100644 --- a/tests/uber/test_custom_tags.py +++ b/tests/uber/test_custom_tags.py @@ -37,7 +37,7 @@ def test_filters_allow_empty_arg(self, filter_function, test_input, expected): ([1, 30, 100, 100, 20, 12, 2], {}), ]) def test_timedelta_filter(self, timedelta_args, timedelta_kwargs): - dt = datetime.utcnow() + dt = datetime.now(UTC) td = timedelta(*timedelta_args, **timedelta_kwargs) expected = dt + td assert expected == timedelta_filter(dt, *timedelta_args, **timedelta_kwargs) @@ -49,7 +49,7 @@ def test_timedelta_filter_with_empty_date(self): assert timedelta_filter('', 1, 3600) is None def test_timedelta_filter_in_template(self): - dt = datetime.utcnow() + dt = datetime.now(UTC) env = JinjaEnv.env() template = env.from_string('{{ dt|timedelta(days=-5)|datetime("%A, %B %-e") }}') expected = (dt + timedelta(days=-5)).strftime("%A, %B %-e") diff --git a/uber/api.py b/uber/api.py index da1bfac76..69acd557b 100644 --- a/uber/api.py +++ b/uber/api.py @@ -1699,7 +1699,7 @@ def get_pending(self, printer_ids='', restart=False, dry_run=False): if not restart or not errors: results[job.id] = self._build_job_json_data(job) if not dry_run: - job.queued = datetime.utcnow() + job.queued = datetime.now(UTC) session.add(job) session.commit() @@ -1793,7 +1793,7 @@ def mark_complete(self, job_ids=''): for job in jobs: results[job.id] = self._build_job_json_data(job) - job.printed = datetime.utcnow() + job.printed = datetime.now(UTC) session.add(job) session.commit() @@ -1839,7 +1839,7 @@ def clear_jobs(self, printer_ids='', all=False, invalidate=False, error=''): else: job.errors = error else: - job.printed = datetime.utcnow() + job.printed = datetime.now(UTC) session.add(job) session.commit() diff --git a/uber/custom_tags.py b/uber/custom_tags.py index 96e2c23c2..0d7a13341 100644 --- a/uber/custom_tags.py +++ b/uber/custom_tags.py @@ -117,7 +117,7 @@ def full_date_local(dt): @JinjaEnv.jinja_export def now(): - return datetime.utcnow() + return datetime.now(UTC) @JinjaEnv.jinja_export diff --git a/uber/models/__init__.py b/uber/models/__init__.py index 6d9f271e1..ecd535be1 100644 --- a/uber/models/__init__.py +++ b/uber/models/__init__.py @@ -30,13 +30,13 @@ from sqlalchemy.orm.attributes import get_history, instance_state from sqlalchemy.schema import MetaData, UniqueConstraint from sqlalchemy.types import Boolean, Integer, Float, Date, Numeric, DateTime, Uuid, JSON -from sqlmodel import Field, SQLModel +from sqlmodel import SQLModel import uber from uber.config import c, create_namespace_uuid from uber.errors import HTTPRedirect from uber.decorators import cost_property, presave_adjustment, suffix_property, cached_classproperty, classproperty -from uber.models.types import Choice, DefaultColumn as Column, MultiChoice, utcnow, UniqueList +from uber.models.types import Choice, MultiChoice, utcnow, UniqueList, DefaultField as Field from uber.utils import check_csrf, normalize_email_legacy, create_new_hash, DeptChecklistConf, \ RegistrationCode, listify from uber.payments import ReceiptManager diff --git a/uber/models/admin.py b/uber/models/admin.py index a0beb9d75..9a729e714 100644 --- a/uber/models/admin.py +++ b/uber/models/admin.py @@ -7,12 +7,12 @@ from sqlalchemy.ext.mutable import MutableDict from sqlalchemy.schema import ForeignKey, Table, UniqueConstraint, Index from sqlalchemy.types import Boolean, Date, Integer -from sqlmodel import Field, Relationship from typing import ClassVar from uber.config import c from uber.decorators import presave_adjustment, classproperty -from uber.models.types import default_relationship as relationship, utcnow, DefaultColumn as Column +from uber.models.types import (default_relationship as relationship, utcnow, + DefaultColumn as Column, DefaultField as Field, DefaultRelationship as Relationship) from uber.models import MagModel from uber.utils import listify @@ -44,7 +44,7 @@ class AdminAccount(MagModel, table=True): attendee: 'Attendee' = Relationship( back_populates="admin_account", sa_relationship_kwargs={'lazy': 'joined', 'cascade': 'save-update,merge,refresh-expire,expunge'}) - hashed: str = Column(String, private=True) + hashed: str = Field(sa_column=Column(String, private=True)) access_groups: list['AccessGroup'] = Relationship( back_populates='admin_accounts', @@ -250,7 +250,7 @@ def disable_api_access(self): self.remove_disabled_api_keys(invalid_api) def remove_disabled_api_keys(self, invalid_api): - revoked_time = datetime.utcnow() + revoked_time = datetime.now(UTC) for api_token in self.active_api_tokens: if invalid_api.intersection(api_token.access_ints): api_token.revoked_time = revoked_time @@ -275,7 +275,7 @@ class PasswordReset(MagModel, table=True): attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee_account.id', ondelete='CASCADE', unique=True) attendee_account: 'AttendeeAccount' = Relationship(back_populates="password_reset") - generated: datetime = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) + generated: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) hashed: str = Column(String, private=True) @property @@ -309,11 +309,11 @@ class AccessGroup(MagModel, table=True): back_populates='access_groups', sa_relationship_kwargs={'secondary': 'admin_access_group', 'cascade': 'save-update,merge,refresh-expire,expunge'}) - name: str = Column(String) + name: str = '' access: dict[str, int] = Field(sa_type=MutableDict.as_mutable(JSONB), default_factory=dict) read_only_access: dict[str, int] = Field(sa_type=MutableDict.as_mutable(JSONB), default_factory=dict) - start_time: datetime | None = Column(DateTime(timezone=True), nullable=True) - end_time: datetime | None = Column(DateTime(timezone=True), nullable=True) + start_time: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) + end_time: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) def __repr__(self): return f"" @@ -332,9 +332,9 @@ def has_any_access(self, access_to, read_only=False): @property def is_valid(self): - if self.start_time and self.start_time > datetime.utcnow().replace(tzinfo=UTC): + if self.start_time and self.start_time > datetime.now(UTC): return False - if self.end_time and self.end_time < datetime.utcnow().replace(tzinfo=UTC): + if self.end_time and self.end_time < datetime.now(UTC): return False return True @@ -360,14 +360,14 @@ class WatchList(MagModel, table=True): Attendee: selectin """ - first_names: str = Column(String) - last_name: str = Column(String) - email: str = Column(String, default='') - birthdate: datetime | None = Column(Date, nullable=True, default=None) - reason: str = Column(String) - action: str = Column(String) - expiration: datetime | None = Column(Date, nullable=True, default=None) - active: bool = Column(Boolean, default=True) + first_names: str = '' + last_name: str = '' + email: str = '' + birthdate: datetime | None = Field(sa_column=Column(Date, nullable=True, default=None)) + reason: str = '' + action: str = '' + expiration: datetime | None = Field(sa_column=Column(Date, nullable=True, default=None)) + active: bool = True attendees: list['Attendee'] = Relationship( back_populates="watch_list", sa_relationship_kwargs={'lazy': 'selectin', 'cascade': 'save-update,merge,refresh-expire,expunge'}) @@ -407,11 +407,11 @@ class EscalationTicket(MagModel, table=True): sa_relationship_kwargs={'lazy': 'selectin', 'order_by': 'Attendee.full_name', 'cascade': 'save-update,merge,refresh-expire,expunge', 'secondary': 'attendee_escalation_ticket'}) ticket_id_seq: ClassVar = Sequence('escalation_ticket_ticket_id_seq') - ticket_id: int = Column(Integer, ticket_id_seq, server_default=ticket_id_seq.next_value(), unique=True) - who: str = Column(String) - description: str = Column(String) - admin_notes: str = Column(String) - resolved: datetime | None = Column(DateTime(timezone=True), nullable=True) + ticket_id: int = Field(sa_column=Column(Integer, ticket_id_seq, server_default=ticket_id_seq.next_value(), unique=True)) + who: str = '' + description: str = '' + admin_notes: str = '' + resolved: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) @property def attendee_names(self): @@ -419,10 +419,10 @@ def attendee_names(self): class WorkstationAssignment(MagModel, table=True): - reg_station_id: int = Column(Integer) - printer_id: str = Column(String) - minor_printer_id: str = Column(String) - terminal_id: str = Column(String) + reg_station_id: int = 0 + printer_id: str = '' + minor_printer_id: str = '' + terminal_id: str = '' @property def separate_printers(self): diff --git a/uber/models/api.py b/uber/models/api.py index 224021c7d..8dc8ba270 100644 --- a/uber/models/api.py +++ b/uber/models/api.py @@ -5,12 +5,11 @@ from sqlalchemy import String, Uuid, DateTime from sqlalchemy.dialects.postgresql.json import JSONB from sqlalchemy.ext.mutable import MutableDict -from sqlmodel import Field, Relationship from typing import Any from uber.config import c from uber.models import MagModel -from uber.models.types import DefaultColumn as Column, MultiChoice +from uber.models.types import DefaultColumn as Column, MultiChoice, DefaultField as Field, DefaultRelationship as Relationship __all__ = ['ApiToken', 'ApiJob'] @@ -24,12 +23,12 @@ class ApiToken(MagModel, table=True): admin_account_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='admin_account.id', ondelete='CASCADE') admin_account: "AdminAccount" = Relationship(back_populates="api_tokens", sa_relationship_kwargs={'lazy': 'joined'}) - token: str | None = Column(Uuid(as_uuid=False), default=lambda: str(uuid.uuid4()), private=True) - access: str = Column(MultiChoice(c.API_ACCESS_OPTS)) - name: str = Column(String) - description: str = Column(String) - issued_time: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) - revoked_time: datetime = Column(DateTime(timezone=True), default=None, nullable=True) + token: str | None = Field(sa_type=Uuid(as_uuid=False), default_factory=lambda: str(uuid.uuid4()), private=True) + access: str = Field(sa_column=Column(MultiChoice(c.API_ACCESS_OPTS))) + name: str = '' + description: str = '' + issued_time: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) + revoked_time: datetime = Field(sa_type=DateTime(timezone=True), default=None, nullable=True) @property def api_read(self): @@ -52,13 +51,13 @@ class ApiJob(MagModel, table=True): admin_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='admin_account.id', nullable=True) admin_account: "AdminAccount" = Relationship(back_populates="api_jobs") - admin_name: str = Column(String) # Preserve admin's name in case their account is removed - queued: datetime | None = Column(DateTime(timezone=True), nullable=True, default=None) - completed: datetime | None = Column(DateTime(timezone=True), nullable=True, default=None) - cancelled: datetime | None = Column(DateTime(timezone=True), nullable=True, default=None) - job_name: str = Column(String) - target_server: str = Column(String) - query: str = Column(String) - api_token: str = Column(String) - errors: str = Column(String) + admin_name: str = '' # Preserve admin's name in case their account is removed + queued: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True, default=None) + completed: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True, default=None) + cancelled: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True, default=None) + job_name: str = '' + target_server: str = '' + query: str = '' + api_token: str = '' + errors: str = '' json_data: dict[str, Any] = Field(sa_type=MutableDict.as_mutable(JSONB), default_factory=dict) diff --git a/uber/models/art_show.py b/uber/models/art_show.py index 0c7448303..31589fb71 100644 --- a/uber/models/art_show.py +++ b/uber/models/art_show.py @@ -11,13 +11,13 @@ from uber.config import c from uber.models import MagModel from uber.decorators import presave_adjustment, classproperty -from uber.models.types import Choice, DefaultColumn as Column, default_relationship as relationship +from uber.models.types import (Choice, DefaultColumn as Column, default_relationship as relationship, + DefaultField as Field, DefaultRelationship as Relationship) from uber.utils import RegistrationCode, get_static_file_path from sqlalchemy.ext.hybrid import hybrid_property from sqlalchemy.types import Integer, Boolean, String, Uuid, DateTime from sqlalchemy.schema import UniqueConstraint, Index -from sqlmodel import Field, Relationship from typing import ClassVar log = logging.getLogger(__name__) @@ -39,7 +39,7 @@ class ArtShowAgentCode(MagModel, table=True): attendee: 'Attendee' = Relationship(back_populates="agent_codes") code: str = Column(String) - cancelled: datetime | None = Column(DateTime(timezone=True), nullable=True) + cancelled: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) @hybrid_property def normalized_code(self): @@ -64,8 +64,8 @@ class ArtShowApplication(MagModel, table=True): attendee: 'Attendee' = Relationship( back_populates="art_show_application", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) - checked_in: datetime | None = Column(DateTime(timezone=True), nullable=True) - checked_out: datetime | None = Column(DateTime(timezone=True), nullable=True) + checked_in: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) + checked_out: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) locations: str = Column(String) artist_name: str = Column(String) artist_id: str = Column(String, admin_only=True) @@ -691,7 +691,7 @@ class ArtShowPayment(MagModel, table=True): amount: int = Column(Integer, default=0) type: int = Column(Choice(c.ART_SHOW_PAYMENT_OPTS), default=c.STRIPE, admin_only=True) - when: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) + when: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) class ArtShowReceipt(MagModel, table=True): @@ -706,7 +706,7 @@ class ArtShowReceipt(MagModel, table=True): back_populates="art_show_receipts", sa_relationship_kwargs={'lazy': 'joined', 'overlaps': 'art_show_purchases,buyer'}) invoice_num: int = Column(Integer, default=0) - closed: datetime | None = Column(DateTime(timezone=True), nullable=True) + closed: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) pieces: list['ArtShowPiece'] = Relationship( back_populates="receipt", @@ -777,7 +777,7 @@ class ArtShowBidder(MagModel, table=True): bidder_num: str = Column(String) admin_notes: str = Column(String) - signed_up: datetime | None = Column(DateTime(timezone=True), nullable=True) + signed_up: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) email_won_bids: bool = Column(Boolean, default=False) contact_type: int = Column(Choice(c.ART_SHOW_CONTACT_TYPE_OPTS), default=c.EMAIL) diff --git a/uber/models/attendee.py b/uber/models/attendee.py index 255e7204c..c9b3f2515 100644 --- a/uber/models/attendee.py +++ b/uber/models/attendee.py @@ -10,8 +10,7 @@ from sqlalchemy.ext.hybrid import hybrid_property from sqlalchemy.orm import subqueryload, aliased, selectinload, joinedload from sqlalchemy.schema import ForeignKey, Index, Table, UniqueConstraint -from sqlalchemy.types import Boolean, Date, Integer, Uuid, String, DateTime -from sqlmodel import Field, Relationship +from sqlalchemy.types import Boolean, Integer, Uuid, String, DateTime from typing import ClassVar import uber @@ -22,7 +21,7 @@ from uber.models import MagModel from uber.models.group import Group from uber.models.types import default_relationship as relationship, utcnow, Choice, DefaultColumn as Column, \ - MultiChoice, TakesPaymentMixin + MultiChoice, TakesPaymentMixin, DefaultField as Field, DefaultRelationship as Relationship from uber.utils import add_opt, get_age_from_birthday, get_age_conf_from_birthday, hour_day_format, \ localized_now, mask_string, normalize_email, normalize_email_legacy, remove_opt, RegistrationCode, listify, groupify @@ -155,8 +154,8 @@ class BadgeInfo(MagModel, table=True): attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', nullable=True) attendee: 'Attendee' = Relationship(back_populates="allocated_badges", sa_relationship_kwargs={'lazy': 'joined'}) active: bool = Column(Boolean, default=False) - picked_up: datetime | None = Column(DateTime(timezone=True), nullable=True, default=None) - reported_lost: datetime | None = Column(DateTime(timezone=True), nullable=True, default=None) + picked_up: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True, default=None) + reported_lost: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True, default=None) ident: int = Column(Integer, default=0, index=True) def __repr__(self): @@ -293,7 +292,7 @@ class Attendee(MagModel, TakesPaymentMixin, table=True): for_review: str = '' admin_notes: str = '' - public_id: str | None = Field(sa_column=Column(Uuid(as_uuid=False), default=lambda: str(uuid4()))) + public_id: str | None = Field(sa_type=Uuid(as_uuid=False), default_factory=lambda: str(uuid4())) badge_type: int = Field(default=c.ATTENDEE_BADGE, sa_column=Column(Choice(c.BADGE_OPTS))) badge_status: int = Field(default=c.NEW_STATUS, sa_column=Column(Choice(c.BADGE_STATUS_OPTS), index=True, admin_only=True)) ribbon: str = Field(default='', sa_column=Column(MultiChoice(c.RIBBON_OPTS), admin_only=True)) @@ -312,9 +311,9 @@ class Attendee(MagModel, TakesPaymentMixin, table=True): can_transfer: bool = False reg_station: int | None - registered: datetime = Field(default_factory=lambda: datetime.now(UTC), sa_column=Column(DateTime(timezone=True), server_default=utcnow())) - confirmed: datetime | None = Field(sa_column=Column(DateTime(timezone=True), nullable=True, default=None)) - checked_in: datetime | None = Field(sa_column=Column(DateTime(timezone=True), nullable=True)) + registered: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) + confirmed: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True, default=None) + checked_in: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) paid: int = Field(default=c.NOT_PAID, sa_column=Column(Choice(c.PAYMENT_OPTS), index=True, admin_only=True)) badge_cost: int | None @@ -436,7 +435,7 @@ class Attendee(MagModel, TakesPaymentMixin, table=True): staffing: bool = False agreed_to_volunteer_agreement: bool = False reviewed_emergency_procedures: bool = False - reviewed_cash_handling: datetime | None = Field(sa_column=Column(DateTime(timezone=True), nullable=True, default=None)) + reviewed_cash_handling: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True, default=None) name_in_credits: str | None walk_on_volunteer: bool = False nonshift_minutes: int = 0 @@ -2583,7 +2582,7 @@ class AttendeeAccount(MagModel, table=True): PasswordReset: select """ - public_id: str | None = Column(Uuid(as_uuid=False), default=lambda: str(uuid4()), nullable=True) + public_id: str | None = Field(sa_type=Uuid(as_uuid=False), default_factory=lambda: str(uuid4()), nullable=True) email: str = Column(String) hashed: str = Column(String, private=True) password_reset: 'PasswordReset' = Relationship( @@ -2715,7 +2714,7 @@ class BadgePickupGroup(MagModel, table=True): Attendee: selectin """ - public_id: str | None = Column(Uuid(as_uuid=False), default=lambda: str(uuid4()), nullable=True) + public_id: str | None = Field(sa_type=Uuid(as_uuid=False), default_factory=lambda: str(uuid4()), nullable=True) account_id: str = Column(String) attendees: list['Attendee'] = Relationship( diff --git a/uber/models/attraction.py b/uber/models/attraction.py index 816dfa4b4..0d76d4363 100644 --- a/uber/models/attraction.py +++ b/uber/models/attraction.py @@ -9,14 +9,14 @@ from sqlalchemy.sql import text from sqlalchemy.sql.expression import bindparam from sqlalchemy.types import Boolean, Integer, Uuid, String, DateTime -from sqlmodel import Field, Relationship from typing import ClassVar from uber.config import c from uber.custom_tags import humanize_timedelta, location_event_name, location_room_name from uber.decorators import presave_adjustment, render, classproperty from uber.models import MagModel, Attendee -from uber.models.types import default_relationship as relationship, Choice, DefaultColumn as Column, utcmin +from uber.models.types import (default_relationship as relationship, Choice, DefaultColumn as Column, utcmin, + DefaultField as Field, DefaultRelationship as Relationship) from uber.utils import evening_datetime, noon_datetime, localized_now, slugify, listify, groupify @@ -31,7 +31,7 @@ class AttractionMixin(): waitlist_available: bool = Column(Boolean, default=True) waitlist_slots: int = Column(Integer, default=10) signups_open_relative: int = Column(Integer, default=c.DEFAULT_ATTRACTIONS_SIGNUPS_MINUTES) - signups_open_time: datetime | None = Column(DateTime(timezone=True), nullable=True) + signups_open_time: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) slots: int = Column(Integer, default=1) @classproperty @@ -481,7 +481,7 @@ class AttractionEvent(MagModel, AttractionMixin, table=True): location: 'EventLocation' = Relationship( back_populates="attractions", sa_relationship_kwargs={'lazy': 'joined', 'cascade': 'save-update,merge,refresh-expire,expunge'}) - start_time: datetime = Column(DateTime(timezone=True), default=c.EPOCH) + start_time: datetime = Field(sa_type=DateTime(timezone=True), default=c.EPOCH) duration: int = Column(Integer, default=60) schedule_item: 'Event' = Relationship( @@ -770,8 +770,8 @@ class AttractionSignup(MagModel, table=True): attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE') attendee: 'Attendee' = Relationship(back_populates="attraction_signups", sa_relationship_kwargs={'lazy': 'joined'}) - signup_time: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(pytz.UTC)) - checkin_time: datetime = Column(DateTime(timezone=True), default=lambda: utcmin.datetime, index=True) + signup_time: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(pytz.UTC)) + checkin_time: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: utcmin.datetime, index=True) on_waitlist: bool = Column(Boolean, default=False) notifications: list['AttractionNotification'] = Relationship( @@ -876,7 +876,7 @@ class AttractionNotification(MagModel, table=True): notification_type: int = Column(Choice(Attendee._NOTIFICATION_PREF_OPTS)) ident: str = Column(String, index=True) sid: str = Column(String) - sent_time: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(pytz.UTC)) + sent_time: datetime = Field(sa_type=DateTime(timezone=True), default=lambda: datetime.now(pytz.UTC)) subject: str = Column(String) body: str = Column(String) @@ -908,8 +908,8 @@ class AttractionNotificationReply(MagModel, table=True): from_phonenumber: str = Column(String) to_phonenumber: str = Column(String) sid: str = Column(String, index=True) - received_time: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(pytz.UTC)) - sent_time: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(pytz.UTC)) + received_time: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(pytz.UTC)) + sent_time: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(pytz.UTC)) body: str = Column(String) @presave_adjustment diff --git a/uber/models/badge_printing.py b/uber/models/badge_printing.py index bf5eb06d7..25b910ead 100644 --- a/uber/models/badge_printing.py +++ b/uber/models/badge_printing.py @@ -2,11 +2,11 @@ from sqlalchemy.dialects.postgresql.json import JSONB from sqlalchemy.ext.mutable import MutableDict from sqlalchemy.types import Boolean, Integer, Uuid, String, DateTime -from sqlmodel import Field, Relationship from typing import Any from uber.models import MagModel -from uber.models.types import DefaultColumn as Column, default_relationship as relationship +from uber.models.types import (DefaultColumn as Column, default_relationship as relationship, + DefaultField as Field, DefaultRelationship as Relationship) __all__ = ['PrintJob'] @@ -27,8 +27,8 @@ class PrintJob(MagModel, table=True): printer_id: str = Column(String) reg_station: int | None = Column(Integer, nullable=True) print_fee: int = Column(Integer, default=0) - queued: datetime | None = Column(DateTime(timezone=True), nullable=True, default=None) - printed: datetime | None = Column(DateTime(timezone=True), nullable=True, default=None) + queued: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True, default=None) + printed: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True, default=None) ready: bool = Column(Boolean, default=True) errors: str = Column(String) is_minor: bool = Column(Boolean) diff --git a/uber/models/commerce.py b/uber/models/commerce.py index d9b2d2c55..e53ef5143 100644 --- a/uber/models/commerce.py +++ b/uber/models/commerce.py @@ -9,7 +9,6 @@ from sqlalchemy.types import Boolean, Integer, String, DateTime, Uuid, JSON from sqlalchemy.dialects.postgresql.json import JSONB from sqlalchemy.ext.mutable import MutableDict -from sqlmodel import Field, Relationship from typing import Any, ClassVar from uber.config import c @@ -17,7 +16,8 @@ from uber.decorators import presave_adjustment, classproperty from uber.models import MagModel from uber.models.attendee import Attendee -from uber.models.types import default_relationship as relationship, Choice, DefaultColumn as Column +from uber.models.types import (default_relationship as relationship, Choice, DefaultColumn as Column, + DefaultField as Field, DefaultRelationship as Relationship) from uber.payments import ReceiptManager log = logging.getLogger(__name__) @@ -31,7 +31,7 @@ class ArbitraryCharge(MagModel, table=True): amount: int = Column(Integer) what: str = Column(String) - when: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) + when: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) reg_station: int | None = Column(Integer, nullable=True) _repr_attr_names: ClassVar = ['what'] @@ -61,7 +61,7 @@ class MPointsForCash(MagModel, table=True): attendee: 'Attendee' = Relationship(back_populates="mpoints_for_cash") amount: int = Column(Integer) - when: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) + when: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) class NoShirt(MagModel, table=True): @@ -79,7 +79,7 @@ class OldMPointExchange(MagModel, table=True): attendee: 'Attendee' = Relationship(back_populates="old_mpoint_exchanges") amount: int = Column(Integer) - when: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) + when: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) class Sale(MagModel, table=True): @@ -89,7 +89,7 @@ class Sale(MagModel, table=True): what: str = Column(String) cash: int = Column(Integer, default=0) mpoints: int = Column(Integer, default=0) - when: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) + when: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) reg_station: int | None = Column(Integer, nullable=True) payment_method: int = Column(Choice(c.SALE_OPTS), default=c.MERCH) @@ -109,9 +109,9 @@ class ModelReceipt(MagModel, table=True): receipts. """ invoice_num: int = Column(Integer, default=0) - owner_id: str = Column(Uuid(as_uuid=False), index=True) + owner_id: str = Field(sa_type=Uuid(as_uuid=False), index=True) owner_model: str = Column(String) - closed: datetime | None = Column(DateTime(timezone=True), nullable=True) + closed: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) receipt_txns: list['ReceiptTransaction'] = Relationship( back_populates="receipt", sa_relationship_kwargs={'lazy': 'selectin', 'passive_deletes': True}) @@ -371,9 +371,9 @@ class ReceiptTransaction(MagModel, table=True): amount: int = Column(Integer) txn_total: int = Column(Integer, default=0) processing_fee: int = Column(Integer, default=0) - added: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) + added: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) on_hold: bool = Column(Boolean, default=False) - cancelled: datetime | None = Column(DateTime(timezone=True), nullable=True) + cancelled: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) who: str = Column(String) desc: str = Column(String) @@ -569,8 +569,8 @@ class ReceiptItem(MagModel, table=True): txn_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='receipt_transaction.id', nullable=True) receipt_txn: 'ReceiptTransaction' = Relationship(back_populates="receipt_items", sa_relationship_kwargs={'lazy': 'joined'}) - purchaser_id: str | None = Column(Uuid(as_uuid=False), index=True, nullable=True) - fk_id: str | None = Column(Uuid(as_uuid=False), index=True, nullable=True) + purchaser_id: str | None = Field(sa_type=Uuid(as_uuid=False), index=True, nullable=True) + fk_id: str | None = Field(sa_type=Uuid(as_uuid=False), index=True, nullable=True) fk_model: str = Column(String) department: int = Column(Choice(c.RECEIPT_ITEM_DEPT_OPTS), default=c.OTHER_RECEIPT_ITEM) category: int = Column(Choice(c.RECEIPT_CATEGORY_OPTS), default=c.OTHER) @@ -578,8 +578,8 @@ class ReceiptItem(MagModel, table=True): comped: bool = Column(Boolean, default=False) reverted: bool = Column(Boolean, default=False) count: int = Column(Integer, default=1) - added: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) - closed: datetime | None = Column(DateTime(timezone=True), nullable=True) + added: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) + closed: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) who: str = Column(String) desc: str = Column(String) admin_notes: str = Column(String) @@ -652,8 +652,8 @@ class ReceiptInfo(MagModel, table=True): fk_email_id: str = Column(String) terminal_id: str = Column(String) reference_id: str = Column(String) - charged: datetime = Column(DateTime(timezone=True)) - voided: datetime | None = Column(DateTime(timezone=True), nullable=True) + charged: datetime = Field(sa_type=DateTime(timezone=True)) + voided: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) card_data: dict[str, Any] = Field(sa_type=MutableDict.as_mutable(JSONB), default_factory=dict) emv_data: dict[str, Any] = Field(sa_type=MutableDict.as_mutable(JSONB), default_factory=dict) txn_info: dict[str, Any] = Field(sa_type=MutableDict.as_mutable(JSONB), default_factory=dict) @@ -776,7 +776,7 @@ def cavv_str(self): class TerminalSettlement(MagModel, table=True): batch_timestamp: str = Column(String) batch_who: str = Column(String) - requested: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) + requested: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) workstation_num: int = Column(Integer, default=0) terminal_id: str = Column(String) response: dict[str, Any] = Field(sa_type=MutableDict.as_mutable(JSONB), default_factory=dict) diff --git a/uber/models/department.py b/uber/models/department.py index 76618021f..32cf5cdb5 100644 --- a/uber/models/department.py +++ b/uber/models/department.py @@ -5,8 +5,7 @@ from sqlalchemy.ext.hybrid import hybrid_property from sqlalchemy.schema import ForeignKey, Table, UniqueConstraint, Index from sqlalchemy.sql import text -from sqlalchemy.types import Boolean, Float, Integer, Time, Uuid, String, DateTime -from sqlmodel import Field, Relationship +from sqlalchemy.types import Integer, Time, Uuid, String, DateTime from typing import ClassVar from uber.config import c @@ -15,7 +14,8 @@ from uber.utils import groupify from uber.models import MagModel from uber.models.attendee import Attendee -from uber.models.types import default_relationship as relationship, Choice, DefaultColumn as Column, UniqueList, MultiChoice +from uber.models.types import (default_relationship as relationship, Choice, DefaultColumn as Column, MultiChoice, + DefaultField as Field, DefaultRelationship as Relationship) __all__ = [ diff --git a/uber/models/email.py b/uber/models/email.py index a50cfcd7c..5e4b81b3b 100644 --- a/uber/models/email.py +++ b/uber/models/email.py @@ -10,9 +10,7 @@ from sqlalchemy.dialects.postgresql.json import JSONB from sqlalchemy.ext.hybrid import hybrid_property from sqlalchemy.ext.mutable import MutableDict -from sqlalchemy.schema import ForeignKey from sqlalchemy.types import Boolean, Integer, String, Uuid, DateTime -from sqlmodel import Field, Relationship from typing import Any, ClassVar from uber import utils @@ -20,7 +18,8 @@ from uber.decorators import presave_adjustment, renderable_data, cached_property, classproperty from uber.jinja import JinjaEnv from uber.models import MagModel -from uber.models.types import DefaultColumn as Column, default_relationship as relationship +from uber.models.types import (DefaultColumn as Column, default_relationship as relationship, + DefaultField as Field, DefaultRelationship as Relationship) from uber.utils import normalize_newlines, request_cached_context, groupify log = logging.getLogger(__name__) @@ -78,13 +77,13 @@ class AutomatedEmail(MagModel, BaseEmailMixin, table=True): needs_approval: bool = Column(Boolean, default=True) unapproved_count: int = Column(Integer, default=0) currently_sending: bool = Column(Boolean, default=False) - last_send_time: datetime | None = Column(DateTime(timezone=True), nullable=True, default=None) + last_send_time: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True, default=None) allow_at_the_con: bool = Column(Boolean, default=False) allow_post_con: bool = Column(Boolean, default=False) - active_after: datetime | None = Column(DateTime(timezone=True), nullable=True, default=None) - active_before: datetime | None = Column(DateTime(timezone=True), nullable=True, default=None) + active_after: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True, default=None) + active_before: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True, default=None) revert_changes: dict[str, Any] = Field(sa_type=MutableDict.as_mutable(JSONB), default_factory=dict) emails: list['Email'] = Relationship( @@ -357,10 +356,10 @@ class Email(MagModel, BaseEmailMixin, table=True): automated_email_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='automated_email.id', nullable=True, index=True) automated_email: 'AutomatedEmail' = Relationship(back_populates="emails", sa_relationship_kwargs={'lazy': 'joined'}) - fk_id: str | None = Column(Uuid(as_uuid=False), nullable=True) + fk_id: str | None = Field(sa_type=Uuid(as_uuid=False), nullable=True) ident: str = Column(String) to: str = Column(String) - when: str = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) + when: str = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) @cached_property def fk(self): diff --git a/uber/models/group.py b/uber/models/group.py index 4a3943e7e..b552d3bdb 100644 --- a/uber/models/group.py +++ b/uber/models/group.py @@ -6,10 +6,7 @@ from pytz import UTC from sqlalchemy import and_, exists, or_, func, select, not_ from sqlalchemy.ext.hybrid import hybrid_property -from sqlalchemy.orm import backref -from sqlalchemy.schema import ForeignKey from sqlalchemy.types import Boolean, Integer, Numeric, String, DateTime, Uuid -from sqlmodel import Field, Relationship from typing import ClassVar from uber.config import c @@ -17,7 +14,7 @@ from uber.decorators import presave_adjustment from uber.models import MagModel from uber.models.types import default_relationship as relationship, utcnow, Choice, DefaultColumn as Column, \ - MultiChoice, TakesPaymentMixin + MultiChoice, TakesPaymentMixin, DefaultField as Field, DefaultRelationship as Relationship from uber.utils import add_opt @@ -42,7 +39,7 @@ class Group(MagModel, TakesPaymentMixin, table=True): back_populates="table_shares", sa_relationship_kwargs={'foreign_keys': 'Group.shared_with_id', 'remote_side': 'Group.id'}) table_shares: list['Group'] = Relationship(back_populates="shared_with", sa_relationship_kwargs={'viewonly': True}) - public_id: str | None = Column(Uuid(as_uuid=False), default=lambda: str(uuid4())) + public_id: str | None = Field(sa_type=Uuid(as_uuid=False), default_factory=lambda: str(uuid4())) name: str = Column(String) tables: Decimal = Column(Numeric, default=0) zip_code: str = Column(String) @@ -68,8 +65,8 @@ class Group(MagModel, TakesPaymentMixin, table=True): convert_badges: bool = Column(Boolean, default=False, admin_only=True) admin_notes: str = Column(String, admin_only=True) status: int = Column(Choice(c.DEALER_STATUS_OPTS), default=c.UNAPPROVED, admin_only=True) - registered: datetime = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) - approved: datetime | None = Column(DateTime(timezone=True), nullable=True) + registered: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) + approved: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) attendees: list['Attendee'] = Relationship( back_populates="group", diff --git a/uber/models/guests.py b/uber/models/guests.py index 4f64d3f53..73ab1336f 100644 --- a/uber/models/guests.py +++ b/uber/models/guests.py @@ -8,15 +8,14 @@ from markupsafe import Markup from sqlalchemy.types import Boolean, Integer, String, DateTime, Uuid, JSON -from sqlmodel import Field, Relationship from typing import Any, ClassVar from uber.config import c from uber.custom_tags import yesno from uber.decorators import presave_adjustment, classproperty from uber.models import MagModel -from uber.models.types import (default_relationship as relationship, Choice, DefaultColumn as Column, - MultiChoice, GuidebookImageMixin) +from uber.models.types import (Choice, DefaultColumn as Column, MultiChoice, GuidebookImageMixin, + DefaultField as Field, DefaultRelationship as Relationship) from uber.utils import filename_extension, slugify log = logging.getLogger(__name__) @@ -510,7 +509,7 @@ class GuestMerch(MagModel, table=True): checkout_time: int | None = Column(Choice(c.GUEST_MERCH_CHECKOUT_TIMES), nullable=True) merch_events: str = Column(String) inventory: dict[Any, Any] = Field(sa_type=JSON, default_factory=dict) - inventory_updated: datetime | None = Column(DateTime(timezone=True), nullable=True) + inventory_updated: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) extra_info: str = Column(String) tax_phone: str = Column(String) @@ -904,9 +903,9 @@ class GuestDetailedTravelPlan(MagModel, table=True): luggage_needs: str = Column(String) contact_email: str = Column(String) contact_phone: str = Column(String) - arrival_time: datetime = Column(DateTime(timezone=True)) + arrival_time: datetime = Field(sa_type=DateTime(timezone=True)) arrival_details: str = Column(String) - departure_time: datetime = Column(DateTime(timezone=True)) + departure_time: datetime = Field(sa_type=DateTime(timezone=True)) departure_details: str = Column(String) extra_details: str = Column(String) diff --git a/uber/models/hotel.py b/uber/models/hotel.py index ef999e91b..581ef0e17 100644 --- a/uber/models/hotel.py +++ b/uber/models/hotel.py @@ -10,14 +10,13 @@ from sqlalchemy.ext.hybrid import hybrid_property from sqlalchemy.ext.mutable import MutableDict from sqlalchemy.types import Boolean, Date, Integer, String, DateTime, Uuid -from sqlmodel import Field, Relationship from typing import Any, ClassVar from uber.config import c from uber.custom_tags import readable_join, datetime_local_filter from uber.decorators import presave_adjustment from uber.models import MagModel -from uber.models.types import Choice, default_relationship as relationship, utcnow, DefaultColumn as Column, MultiChoice +from uber.models.types import Choice, utcnow, DefaultColumn as Column, MultiChoice, DefaultField as Field, DefaultRelationship as Relationship from uber.utils import RegistrationCode log = logging.getLogger(__name__) @@ -96,7 +95,7 @@ class Room(MagModel, NightsMixin, table=True): message: str = Column(String) locked_in: bool = Column(Boolean, default=False) nights: str = Column(MultiChoice(c.NIGHT_OPTS)) - created: datetime = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) + created: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) assignments: list['RoomAssignment'] = Relationship(back_populates="room", sa_relationship_kwargs={'passive_deletes': True}) @@ -149,11 +148,11 @@ class LotteryApplication(MagModel, table=True): response_id_seq: ClassVar = Sequence('lottery_application_response_id_seq') response_id: int = Column(Integer, response_id_seq, server_default=response_id_seq.next_value(), unique=True) status: int = Column(Choice(c.HOTEL_LOTTERY_STATUS_OPTS), default=c.PARTIAL, admin_only=True) - entry_started: datetime | None = Column(DateTime(timezone=True), nullable=True) + entry_started: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) entry_metadata: dict[str, Any] = Field(sa_type=MutableDict.as_mutable(JSONB), default_factory=dict) entry_type: int | None = Column(Choice(c.HOTEL_LOTTERY_ENTRY_TYPE_OPTS), nullable=True) current_step: int = Column(Integer, default=0) - last_submitted: datetime | None = Column(DateTime(timezone=True), nullable=True) + last_submitted: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) admin_notes: str = Column(String) is_staff_entry: bool = Column(Boolean, default=False) @@ -190,7 +189,7 @@ class LotteryApplication(MagModel, table=True): 'remote_side': 'LotteryApplication.id'}) group_members: list['LotteryApplication'] = Relationship( back_populates="parent_application", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) - former_parent_id: str | None = Column(Uuid(as_uuid=False), nullable=True) + former_parent_id: str | None = Field(sa_type=Uuid(as_uuid=False), nullable=True) room_group_name: str = Column(String) email_model_name: ClassVar = 'app' diff --git a/uber/models/legal.py b/uber/models/legal.py index cd46089b7..dba3b2ea9 100644 --- a/uber/models/legal.py +++ b/uber/models/legal.py @@ -1,23 +1,22 @@ from datetime import datetime from sqlalchemy.types import Uuid, String, DateTime -from sqlmodel import Field, Relationship from uber.decorators import presave_adjustment from uber.models import MagModel -from uber.models.types import DefaultColumn as Column +from uber.models.types import DefaultColumn as Column, DefaultField as Field, DefaultRelationship as Relationship __all__ = ['SignedDocument'] class SignedDocument(MagModel, table=True): - fk_id: str = Column(Uuid(as_uuid=False), index=True) + fk_id: str = Field(sa_type=Uuid(as_uuid=False), index=True) model: str = Column(String) document_id: str = Column(String) - last_emailed: datetime | None = Column(DateTime(timezone=True), nullable=True, default=None) + last_emailed: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True, default=None) link: str = Column(String) ident: str = Column(String) - signed: datetime | None = Column(DateTime(timezone=True), nullable=True, default=None) - declined: datetime | None = Column(DateTime(timezone=True), nullable=True, default=None) + signed: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True, default=None) + declined: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True, default=None) @presave_adjustment def null_to_strings(self): diff --git a/uber/models/marketplace.py b/uber/models/marketplace.py index e37c69d06..55ad4199e 100644 --- a/uber/models/marketplace.py +++ b/uber/models/marketplace.py @@ -2,15 +2,14 @@ from uber.custom_tags import email_only, email_to_link from uber.models import MagModel from uber.decorators import presave_adjustment -from uber.models.types import Choice, DefaultColumn as Column, default_relationship as relationship, MultiChoice, utcnow +from uber.models.types import (Choice, DefaultColumn as Column, default_relationship as relationship, utcnow, + DefaultField as Field, DefaultRelationship as Relationship) from datetime import datetime from markupsafe import Markup from pytz import UTC from sqlalchemy.orm import backref from sqlalchemy.types import Boolean, Integer, Uuid, String, DateTime -from sqlalchemy.schema import ForeignKey -from sqlmodel import Field, Relationship from typing import ClassVar @@ -36,8 +35,8 @@ class ArtistMarketplaceApplication(MagModel, table=True): accessibility_requests: str = Column(String) status: int = Column(Choice(c.MARKETPLACE_STATUS_OPTS), default=c.PENDING, admin_only=True) - registered: datetime = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) - accepted: datetime | None = Column(DateTime(timezone=True), nullable=True) + registered: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) + accepted: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) admin_notes: str = Column(String, admin_only=True) overridden_price: int | None = Column(Integer, nullable=True, admin_only=True) diff --git a/uber/models/mits.py b/uber/models/mits.py index d156d65f8..885363bc1 100644 --- a/uber/models/mits.py +++ b/uber/models/mits.py @@ -7,13 +7,12 @@ from sqlalchemy import and_ from sqlalchemy.types import Boolean, Integer, Uuid, DateTime, String from sqlalchemy.ext.hybrid import hybrid_property -from sqlmodel import Field, Relationship from typing import ClassVar from uber.config import c from uber.models import MagModel -from uber.models.types import (default_relationship as relationship, utcnow, Choice, DefaultColumn as Column, - MultiChoice, GuidebookImageMixin) +from uber.models.types import (utcnow, Choice, DefaultColumn as Column, MultiChoice, GuidebookImageMixin, + DefaultField as Field, DefaultRelationship as Relationship) from uber.utils import slugify @@ -33,11 +32,11 @@ class MITSTeam(MagModel, table=True): showcase_interest: bool | None = Column(Boolean, nullable=True, admin_only=True) want_to_sell: bool = Column(Boolean, default=False) address: str = Column(String) - submitted: datetime | None = Column(DateTime(timezone=True), nullable=True) + submitted: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) waiver_signature: str = Column(String) - waiver_signed: datetime | None = Column(DateTime(timezone=True), nullable=True) + waiver_signed: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) - applied: datetime = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) + applied: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) status: int = Column(Choice(c.MITS_APP_STATUS), default=c.PENDING, admin_only=True) applicants: list['MITSApplicant'] = Relationship(back_populates="team", sa_relationship_kwargs={'passive_deletes': True}) @@ -45,7 +44,7 @@ class MITSTeam(MagModel, table=True): schedule: 'MITSTimes' = Relationship(back_populates="team", sa_relationship_kwargs={'passive_deletes': True}) panel_app: 'MITSPanelApplication' = Relationship(back_populates="team", sa_relationship_kwargs={'passive_deletes': True}) - duplicate_of: str | None = Column(Uuid(as_uuid=False), nullable=True) + duplicate_of: str | None = Field(sa_type=Uuid(as_uuid=False), nullable=True) deleted: bool = Column(Boolean, default=False) # We've found that a lot of people start filling out an application and # then instead of continuing their application just start over fresh and diff --git a/uber/models/panels.py b/uber/models/panels.py index 61cde9eca..f6011281a 100644 --- a/uber/models/panels.py +++ b/uber/models/panels.py @@ -5,14 +5,13 @@ from sqlalchemy.schema import ForeignKey, Table, UniqueConstraint, Index from sqlalchemy.types import Boolean, Integer, Uuid, String, DateTime from sqlalchemy.ext.hybrid import hybrid_property -from sqlmodel import Field, Relationship from typing import ClassVar from uber.config import c from uber.decorators import presave_adjustment from uber.models import MagModel -from uber.models.types import default_relationship as relationship, utcnow, Choice, DefaultColumn as Column, \ - MultiChoice, UniqueList +from uber.models.types import (utcnow, Choice, DefaultColumn as Column, MultiChoice, UniqueList, + DefaultField as Field, DefaultRelationship as Relationship) __all__ = ['AssignedPanelist', 'Event', 'EventLocation', 'EventFeedback', 'PanelApplicant', 'PanelApplication'] @@ -95,7 +94,7 @@ class Event(MagModel, table=True): attraction_event_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attraction_event.id', nullable=True, unique=True) attraction: 'AttractionEvent' = Relationship(back_populates="schedule_item", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) - start_time: datetime = Column(DateTime(timezone=True)) + start_time: datetime = Field(sa_type=DateTime(timezone=True)) duration: int = Column(Integer, default=60) name: str = Column(String, nullable=False) description: str = Column(String) @@ -225,9 +224,9 @@ class PanelApplication(MagModel, table=True): record: int = Column(Choice(c.LIVESTREAM_OPTS), default=c.OPT_IN) panelist_bringing: str = Column(String) extra_info: str = Column(String) - applied: datetime = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) - accepted: datetime | None = Column(DateTime(timezone=True), nullable=True) - confirmed: datetime | None = Column(DateTime(timezone=True), nullable=True) + applied: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) + accepted: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) + confirmed: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) status: int = Column(Choice(c.PANEL_APP_STATUS_OPTS), default=c.PENDING, admin_only=True) comments: str = Column(String, admin_only=True) tags: str = Column(UniqueList, admin_only=True) diff --git a/uber/models/promo_code.py b/uber/models/promo_code.py index c00e7524c..44459ca02 100644 --- a/uber/models/promo_code.py +++ b/uber/models/promo_code.py @@ -11,13 +11,12 @@ from sqlalchemy.ext.hybrid import hybrid_property from sqlalchemy.schema import Index from sqlalchemy.types import Integer, Uuid, String, DateTime -from sqlmodel import Field, Relationship from typing import ClassVar from uber.config import c from uber.decorators import presave_adjustment from uber.models import MagModel -from uber.models.types import default_relationship as relationship, utcnow, DefaultColumn as Column, Choice +from uber.models.types import utcnow, DefaultColumn as Column, Choice, DefaultField as Field, DefaultRelationship as Relationship from uber.utils import localized_now, RegistrationCode @@ -140,7 +139,7 @@ class PromoCodeGroup(MagModel, table=True): name: str = Column(String) code: str = Column(String, admin_only=True) - registered: datetime = Field(sa_column=Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC))) + registered: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) promo_codes: list['PromoCode'] = Relationship( back_populates="group", sa_relationship_kwargs={'lazy': 'selectin', 'cascade': 'save-update,merge,refresh-expire,expunge'}) @@ -320,7 +319,7 @@ class PromoCode(MagModel, table=True): code: str = Column(String) discount: int | None = Column(Integer, nullable=True, default=None) discount_type: int = Column(Choice(_DISCOUNT_TYPE_OPTS), default=_FIXED_DISCOUNT) - expiration_date: datetime = Column(DateTime(timezone=True), default=c.ESCHATON) + expiration_date: datetime = Field(sa_type=DateTime(timezone=True), default=c.ESCHATON) uses_allowed: int | None = Column(Integer, nullable=True, default=None) cost: int | None = Column(Integer, nullable=True, default=None) admin_notes: str = Column(String) diff --git a/uber/models/showcase.py b/uber/models/showcase.py index 57033347e..25633490f 100644 --- a/uber/models/showcase.py +++ b/uber/models/showcase.py @@ -11,15 +11,14 @@ from sqlalchemy.schema import UniqueConstraint from sqlalchemy.types import Boolean, Integer, String, DateTime, Uuid from sqlalchemy.ext.hybrid import hybrid_property -from sqlmodel import Field, Relationship from typing import ClassVar from uber.config import c from uber.custom_tags import readable_join, datetime_local_filter from uber.decorators import presave_adjustment from uber.models import MagModel, Attendee -from uber.models.types import default_relationship as relationship, utcnow, \ - Choice, DefaultColumn as Column, MultiChoice, GuidebookImageMixin, UniqueList +from uber.models.types import (utcnow, Choice, DefaultColumn as Column, MultiChoice, GuidebookImageMixin, UniqueList, + DefaultField as Field, DefaultRelationship as Relationship) from uber.utils import localized_now, make_url, remove_opt, slugify log = logging.getLogger(__name__) @@ -152,7 +151,7 @@ class IndieStudio(MagModel, table=True): status: int = Column( Choice(c.MIVS_STUDIO_STATUS_OPTS), default=c.NEW, admin_only=True) staff_notes: str = Column(String, admin_only=True) - registered: datetime = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) + registered: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) accepted_core_hours: bool = Column(Boolean, default=False) discussion_emails: str = Column(String) @@ -445,9 +444,9 @@ class IndieGame(MagModel, ReviewMixin, table=True): status: int = Column( Choice(c.MIVS_GAME_STATUS_OPTS), default=c.NEW, admin_only=True) judge_notes: str = Column(String, admin_only=True) - registered: datetime = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) - waitlisted: datetime | None = Column(DateTime(timezone=True), nullable=True) - accepted: datetime | None = Column(DateTime(timezone=True), nullable=True) + registered: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) + waitlisted: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) + accepted: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) codes: list['IndieGameCode'] = Relationship(back_populates="game", sa_relationship_kwargs={'lazy': 'selectin', 'passive_deletes': True}) reviews: list['IndieGameReview'] = Relationship(back_populates="game", sa_relationship_kwargs={'passive_deletes': True}) diff --git a/uber/models/tabletop.py b/uber/models/tabletop.py index 47415c481..85652df49 100644 --- a/uber/models/tabletop.py +++ b/uber/models/tabletop.py @@ -2,11 +2,10 @@ from pytz import UTC from sqlalchemy.types import Boolean, DateTime, String, Uuid -from sqlmodel import Field, Relationship from typing import ClassVar from uber.models import MagModel -from uber.models.types import default_relationship as relationship, DefaultColumn as Column +from uber.models.types import DefaultColumn as Column, DefaultField as Field, DefaultRelationship as Relationship __all__ = ['TabletopGame', 'TabletopCheckout'] @@ -45,5 +44,5 @@ class TabletopCheckout(MagModel, table=True): attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE') attendee: 'Attendee' = Relationship(back_populates="checkouts", sa_relationship_kwargs={'lazy': 'joined'}) - checked_out: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) - returned: datetime | None = Column(DateTime(timezone=True), nullable=True) + checked_out: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) + returned: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) diff --git a/uber/models/tracking.py b/uber/models/tracking.py index 04d5393e3..a6047607a 100644 --- a/uber/models/tracking.py +++ b/uber/models/tracking.py @@ -15,7 +15,6 @@ from sqlalchemy.dialects.postgresql.json import JSONB from sqlalchemy.ext.mutable import MutableDict from sqlalchemy.orm.exc import NoResultFound -from sqlmodel import Field, Relationship from typing import Any, ClassVar from uber.serializer import serializer @@ -24,7 +23,7 @@ from uber.models import MagModel from uber.models.admin import AdminAccount from uber.models.email import Email -from uber.models.types import Choice, DefaultColumn as Column, MultiChoice, utcnow +from uber.models.types import Choice, DefaultColumn as Column, MultiChoice, utcnow, DefaultField as Field log = logging.getLogger(__name__) @@ -34,7 +33,7 @@ class ReportTracking(MagModel, table=True): - when: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC)) + when: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) who: str = Column(String) supervisor: str = Column(String) page: str = Column(String) @@ -59,7 +58,7 @@ def track_report(cls, params): class PageViewTracking(MagModel, table=True): - when: datetime = Field(default_factory=lambda: datetime.now(UTC), sa_column=Column(DateTime(timezone=True))) + when: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) who: str = '' supervisor: str = '' page: str = '' @@ -111,9 +110,9 @@ def track_pageview(cls): class Tracking(MagModel, table=True): - fk_id: str = Column(Uuid(as_uuid=False), index=True) + fk_id: str = Field(sa_type=Uuid(as_uuid=False), index=True) model: str = Column(String) - when: datetime = Column(DateTime(timezone=True), default=lambda: datetime.now(UTC), index=True) + when: datetime = Field(sa_type=DateTime(timezone=True), default=lambda: datetime.now(UTC), index=True) who: str = Column(String, index=True) supervisor: str = Column(String) page: str = Column(String) @@ -288,12 +287,12 @@ def _insert(session): class TxnRequestTracking(MagModel, table=True): incr_id_seq: ClassVar = Sequence('txn_request_tracking_incr_id_seq') incr_id: int = Column(Integer, incr_id_seq, server_default=incr_id_seq.next_value(), unique=True) - fk_id: str | None = Column(Uuid(as_uuid=False), nullable=True) + fk_id: str | None = Field(sa_type=Uuid(as_uuid=False), nullable=True) workstation_num: int = Column(Integer, default=0) terminal_id: str = Column(String) who: str = Column(String) - requested: datetime = Column(DateTime(timezone=True), server_default=utcnow(), default=lambda: datetime.now(UTC)) - resolved: datetime | None = Column(DateTime(timezone=True), nullable=True) + requested: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) + resolved: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) success: bool = Column(Boolean, default=False) response: dict[Any, Any] = Field(sa_type=MutableDict.as_mutable(JSONB), default_factory=dict) internal_error: str = Column(String) diff --git a/uber/models/types.py b/uber/models/types.py index 2425d6071..5acdd5d5f 100644 --- a/uber/models/types.py +++ b/uber/models/types.py @@ -12,13 +12,14 @@ from sqlalchemy.schema import Column from sqlalchemy.sql.expression import FunctionElement from sqlalchemy.types import Boolean, Integer, TypeDecorator, String, DateTime, Uuid, JSON +from sqlmodel import Field, Relationship from uber.config import c, _config as config -from uber.utils import url_domain, listify, camel +from uber.utils import listify __all__ = [ 'default_relationship', 'relationship', 'utcmin', 'utcnow', 'Choice', - 'Column', 'DefaultColumn', 'MultiChoice', + 'Column', 'DefaultColumn', 'DefaultField', 'DefaultRelationship', 'MultiChoice', 'TakesPaymentMixin', 'GuidebookImageMixin'] @@ -52,6 +53,41 @@ def DefaultColumn(*args, admin_only=False, private=False, **kwargs): return col +def DefaultField(*args, private=False, **kwargs): + """ + Returns a SQLModel Field with the given parameters, except that instead + of the regular defaults, we've overridden the following defaults if no + value is provided for the following parameters: + + Field Old Default New Default + ----- ------------ ----------- + nullable True False + default None '' (only for String fields) + server_default None + """ + sa_column = kwargs.get('sa_column', None) + if sa_column is not None: + # DefaultColumn does what we need here + return SQLModelField(*args, **kwargs) + + sa_kwargs = kwargs.pop('sa_column_kwargs', {}) + + # Not a typo -- some of our kwargs are handled by SQLModel.Field + # and others are stored in a dictionary that gets passed to SQLAlchemy + kwargs.setdefault('nullable', False) + col_type = kwargs.get('sa_type', None) + if col_type is String or isinstance(col_type, (String, MultiChoice)): + kwargs.setdefault('default', '') + + default = kwargs.get('default') + if isinstance(default, (int, str)): + sa_kwargs.setdefault('server_default', str(default)) + + col = SQLModelField(*args, **kwargs) + col.private = private + return col + + def default_relationship(*args, **kwargs): """ Returns a SQLAlchemy relationship with the given parameters, except that @@ -71,13 +107,39 @@ def default_relationship(*args, **kwargs): return SQLAlchemy_relationship(*args, **kwargs) +def DefaultRelationship(*args, **kwargs): + """ + Returns a SQLModel Relationship with the given parameters, except that + instead of the regular defaults, we've overridden the following defaults + if no value is provided for the following parameters: + cascade now defaults to 'all,delete-orphan' + lazy now default to raise + """ + sa_relationship = kwargs.get('sa_relationship', None) + if sa_relationship is not None: + # default_relationship does what we need here + return SQLModelRelationship(*args, **kwargs) + + sa_kwargs = kwargs.pop('sa_relationship_kwargs', {}) + if sa_kwargs.get("viewonly", False): + # Recent versions of SQLAlchemy won't allow cascades that cause writes + # on viewonly relationships. + sa_kwargs.setdefault('cascade', 'expunge,refresh-expire,merge') + else: + sa_kwargs.setdefault('cascade', 'all,delete-orphan') + sa_kwargs.setdefault('lazy', 'raise') + return SQLModelRelationship(*args, **kwargs, sa_relationship_kwargs=sa_kwargs) + + # Alias Column and relationship to maintain backwards compatibility class SQLAlchemy_Column(Column): admin_only = None Column = DefaultColumn -SQLAlchemy_relationship, relationship = relationship, default_relationship +SQLModelField, Field = Field, DefaultField +SQLAlchemy_relationship, relationship = relationship, default_relationship +SQLModelRelationship, Relationship = Relationship, DefaultRelationship class utcmax(FunctionElement): """ diff --git a/uber/payments.py b/uber/payments.py index 2a7ad5d6b..d761dbe3e 100644 --- a/uber/payments.py +++ b/uber/payments.py @@ -1059,7 +1059,7 @@ def process_spin_refund(self, department=None): return_response_json = return_response.json() self.tracker.response = return_response_json - self.tracker.resolved = datetime.utcnow() + self.tracker.resolved = datetime.now(UTC) self.spin_request.log_api_response(return_response_json) @@ -1167,7 +1167,7 @@ def process_sale_response(self, session, response): except AttributeError: response_json = response self.tracker.response = response_json - self.tracker.resolved = datetime.utcnow() + self.tracker.resolved = datetime.now(UTC) receipt_items_to_add = self.get_receipt_items_to_add() if receipt_items_to_add: @@ -1191,7 +1191,7 @@ def process_sale_response(self, session, response): if self.tracker: self.tracker.response = void_response_json - self.tracker.resolved = datetime.utcnow() + self.tracker.resolved = datetime.now(UTC) self.log_api_response(void_response_json) if self.api_response_successful(void_response_json): diff --git a/uber/site_sections/badge_printing.py b/uber/site_sections/badge_printing.py index 3ad582740..8ff2eab5c 100644 --- a/uber/site_sections/badge_printing.py +++ b/uber/site_sections/badge_printing.py @@ -88,8 +88,8 @@ def print_next_badge(self, session, printer_id=''): ribbon = ' / '.join(attendee.ribbon_labels) if attendee.ribbon else '' - badge.queued = datetime.utcnow() - badge.printed = datetime.utcnow() + badge.queued = datetime.now(UTC) + badge.printed = datetime.now(UTC) session.add(attendee) session.commit() @@ -203,7 +203,7 @@ def mark_as_printed(self, session, id): else: success = True message = "Job marked as printed." - job.printed = datetime.utcnow() + job.printed = datetime.now(UTC) session.add(job) session.commit() diff --git a/uber/site_sections/devtools.py b/uber/site_sections/devtools.py index ac92353ce..ba3ec6c64 100644 --- a/uber/site_sections/devtools.py +++ b/uber/site_sections/devtools.py @@ -234,7 +234,7 @@ def health(self, session): db_read_time += time.perf_counter() return json.dumps({ - 'server_current_timestamp': int(datetime.utcnow().timestamp()), + 'server_current_timestamp': int(datetime.now(UTC).timestamp()), 'session_read_count': read_count, 'session_commit_time': session_commit_time, 'db_read_time': db_read_time, diff --git a/uber/site_sections/registration.py b/uber/site_sections/registration.py index 53589f0fe..59dc3d080 100644 --- a/uber/site_sections/registration.py +++ b/uber/site_sections/registration.py @@ -381,7 +381,7 @@ def check_terminal_payment(self, session, model_id, model_name, **params): if response: response_json = response.json() if req.api_response_successful(response_json): - tracker.resolved = datetime.utcnow() + tracker.resolved = datetime.now(UTC) tracker.response = response_json tracker.internal_error = '' session.add(tracker) @@ -394,7 +394,7 @@ def check_terminal_payment(self, session, model_id, model_name, **params): error = req.error_message_from_response(response_json) if error != "Not found": return {'success': False, 'message': f"Error checking status of last transaction: {error}"} - tracker.resolved = datetime.utcnow() + tracker.resolved = datetime.now(UTC) session.add(tracker) session.commit() prior_error = terminal_status.get('last_error') @@ -1456,7 +1456,7 @@ def stats(self): 'badges_sold': c.BADGES_SOLD, 'remaining_badges': c.REMAINING_BADGES, 'badges_price': c.BADGE_PRICE, - 'server_current_timestamp': int(datetime.utcnow().timestamp()), + 'server_current_timestamp': int(datetime.now(UTC).timestamp()), 'warn_if_server_browser_time_mismatch': c.WARN_IF_SERVER_BROWSER_TIME_MISMATCH }) diff --git a/uber/tasks/redis.py b/uber/tasks/redis.py index 456fc62ad..58d8b1a7f 100644 --- a/uber/tasks/redis.py +++ b/uber/tasks/redis.py @@ -23,7 +23,7 @@ def expire_processed_saml_assertions(): rsession = c.REDIS_STORE.pipeline() for key, val in c.REDIS_STORE.hscan(c.REDIS_PREFIX + 'processed_saml_assertions')[1].items(): - if int(val) < datetime.utcnow().timestamp(): + if int(val) < datetime.now(UTC).timestamp(): rsession.hdel(c.REDIS_PREFIX + 'processed_saml_assertions', key) rsession.execute() From 8712e07bb9f70cdda0fa3ea826ca59fbc3e55a4d Mon Sep 17 00:00:00 2001 From: Victoria Earl Date: Fri, 20 Feb 2026 00:54:03 +0100 Subject: [PATCH 11/20] Dial in SQLModel overhaul Fixes FK key name generation and the corresponding migration, and finishes converting all columns to SQLModel. --- ...=> 6902e1cceec6_relationships_overhaul.py} | 574 +++++++++--------- uber/forms/department.py | 5 +- uber/forms/showcase.py | 2 +- uber/models/__init__.py | 10 +- uber/models/admin.py | 35 +- uber/models/api.py | 2 +- uber/models/art_show.py | 156 ++--- uber/models/attendee.py | 167 ++--- uber/models/attraction.py | 93 +-- uber/models/badge_printing.py | 17 +- uber/models/commerce.py | 112 ++-- uber/models/department.py | 78 +-- uber/models/email.py | 41 +- uber/models/group.py | 66 +- uber/models/guests.py | 238 ++++---- uber/models/hotel.py | 111 ++-- uber/models/legal.py | 10 +- uber/models/marketplace.py | 28 +- uber/models/mits.py | 108 ++-- uber/models/panels.py | 140 ++--- uber/models/promo_code.py | 22 +- uber/models/showcase.py | 256 ++++---- uber/models/tabletop.py | 11 +- uber/models/tracking.py | 38 +- uber/models/types.py | 19 +- uber/site_sections/dept_admin.py | 3 +- uber/site_sections/dept_checklist.py | 2 +- uber/site_sections/preregistration.py | 11 +- uber/site_sections/registration.py | 7 + uber/site_sections/showcase.py | 4 +- uber/templates/forms/showcase/developer.html | 8 +- uber/templates/showcase/index.html | 2 +- uber/templates/showcase_judging/studio.html | 2 +- 33 files changed, 1217 insertions(+), 1161 deletions(-) rename alembic/versions/{b34f03d164c6_relationships_overhaul.py => 6902e1cceec6_relationships_overhaul.py} (52%) diff --git a/alembic/versions/b34f03d164c6_relationships_overhaul.py b/alembic/versions/6902e1cceec6_relationships_overhaul.py similarity index 52% rename from alembic/versions/b34f03d164c6_relationships_overhaul.py rename to alembic/versions/6902e1cceec6_relationships_overhaul.py index 47555b6c1..b73b0b2ff 100644 --- a/alembic/versions/b34f03d164c6_relationships_overhaul.py +++ b/alembic/versions/6902e1cceec6_relationships_overhaul.py @@ -1,14 +1,14 @@ """Relationships overhaul -Revision ID: b34f03d164c6 +Revision ID: 6902e1cceec6 Revises: 3d942ce689fc -Create Date: 2026-02-19 16:25:44.877345 +Create Date: 2026-02-19 23:44:29.239394 """ # revision identifiers, used by Alembic. -revision = 'b34f03d164c6' +revision = '6902e1cceec6' down_revision = '3d942ce689fc' branch_labels = None depends_on = None @@ -52,202 +52,196 @@ def sqlite_column_reflect_listener(inspector, table, column_info): def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### op.drop_table('attendee_tournament') op.drop_constraint(op.f('fk_admin_account_attendee_id_attendee'), 'admin_account', type_='foreignkey') - op.create_foreign_key(None, 'admin_account', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_admin_account_attendee_id_attendee'), 'admin_account', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_api_token_admin_account_id_admin_account'), 'api_token', type_='foreignkey') - op.create_foreign_key(None, 'api_token', 'admin_account', ['admin_account_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_api_token_admin_account_id_admin_account'), 'api_token', 'admin_account', ['admin_account_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_art_panel_assignment_panel_id_art_show_panel'), 'art_panel_assignment', type_='foreignkey') op.drop_constraint(op.f('fk_art_panel_assignment_app_id_art_show_application'), 'art_panel_assignment', type_='foreignkey') - op.create_foreign_key(None, 'art_panel_assignment', 'art_show_application', ['app_id'], ['id'], ondelete='CASCADE') - op.create_foreign_key(None, 'art_panel_assignment', 'art_show_panel', ['panel_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_art_panel_assignment_app_id_art_show_application'), 'art_panel_assignment', 'art_show_application', ['app_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_art_panel_assignment_panel_id_art_show_panel'), 'art_panel_assignment', 'art_show_panel', ['panel_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_art_show_agent_code_attendee_id_attendee'), 'art_show_agent_code', type_='foreignkey') op.drop_constraint(op.f('fk_art_show_agent_code_app_id_art_show_application'), 'art_show_agent_code', type_='foreignkey') - op.create_foreign_key(None, 'art_show_agent_code', 'art_show_application', ['app_id'], ['id'], ondelete='CASCADE') - op.create_foreign_key(None, 'art_show_agent_code', 'attendee', ['attendee_id'], ['id']) - op.alter_column('art_show_application', 'overridden_price', - existing_type=sa.INTEGER(), - nullable=False) - op.alter_column('art_show_application', 'default_cost', - existing_type=sa.INTEGER(), - nullable=False) - op.create_unique_constraint(None, 'art_show_application', ['attendee_id']) + op.create_foreign_key(op.f('fk_art_show_agent_code_attendee_id_attendee'), 'art_show_agent_code', 'attendee', ['attendee_id'], ['id']) + op.create_foreign_key(op.f('fk_art_show_agent_code_app_id_art_show_application'), 'art_show_agent_code', 'art_show_application', ['app_id'], ['id'], ondelete='CASCADE') + op.create_unique_constraint(op.f('uq_art_show_application_attendee_id'), 'art_show_application', ['attendee_id']) op.drop_constraint(op.f('fk_art_show_application_attendee_id_attendee'), 'art_show_application', type_='foreignkey') - op.create_foreign_key(None, 'art_show_application', 'attendee', ['attendee_id'], ['id']) + op.create_foreign_key(op.f('fk_art_show_application_attendee_id_attendee'), 'art_show_application', 'attendee', ['attendee_id'], ['id']) op.alter_column('art_show_bidder', 'attendee_id', existing_type=sa.UUID(), nullable=False) op.drop_constraint(op.f('fk_art_show_bidder_attendee_id_attendee'), 'art_show_bidder', type_='foreignkey') - op.create_foreign_key(None, 'art_show_bidder', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_art_show_bidder_attendee_id_attendee'), 'art_show_bidder', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') op.alter_column('art_show_payment', 'receipt_id', existing_type=sa.UUID(), nullable=False) op.drop_constraint(op.f('fk_art_show_payment_receipt_id_art_show_receipt'), 'art_show_payment', type_='foreignkey') - op.create_foreign_key(None, 'art_show_payment', 'art_show_receipt', ['receipt_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_art_show_payment_receipt_id_art_show_receipt'), 'art_show_payment', 'art_show_receipt', ['receipt_id'], ['id'], ondelete='CASCADE') op.alter_column('art_show_piece', 'app_id', existing_type=sa.UUID(), nullable=False) - op.drop_constraint(op.f('fk_art_show_piece_receipt_id_art_show_receipt'), 'art_show_piece', type_='foreignkey') op.drop_constraint(op.f('fk_art_show_piece_winning_bidder_id_art_show_bidder'), 'art_show_piece', type_='foreignkey') + op.drop_constraint(op.f('fk_art_show_piece_receipt_id_art_show_receipt'), 'art_show_piece', type_='foreignkey') op.drop_constraint(op.f('fk_art_show_pieces_app_id_art_show_application'), 'art_show_piece', type_='foreignkey') - op.create_foreign_key(None, 'art_show_piece', 'art_show_receipt', ['receipt_id'], ['id']) - op.create_foreign_key(None, 'art_show_piece', 'art_show_bidder', ['winning_bidder_id'], ['id']) - op.create_foreign_key(None, 'art_show_piece', 'art_show_application', ['app_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_art_show_piece_receipt_id_art_show_receipt'), 'art_show_piece', 'art_show_receipt', ['receipt_id'], ['id']) + op.create_foreign_key(op.f('fk_art_show_piece_winning_bidder_id_art_show_bidder'), 'art_show_piece', 'art_show_bidder', ['winning_bidder_id'], ['id']) + op.create_foreign_key(op.f('fk_art_show_piece_app_id_art_show_application'), 'art_show_piece', 'art_show_application', ['app_id'], ['id'], ondelete='CASCADE') op.alter_column('art_show_receipt', 'attendee_id', existing_type=sa.UUID(), nullable=False) op.drop_constraint(op.f('fk_art_show_receipt_attendee_id_attendee'), 'art_show_receipt', type_='foreignkey') - op.create_foreign_key(None, 'art_show_receipt', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') - op.create_unique_constraint(None, 'artist_marketplace_application', ['attendee_id']) + op.create_foreign_key(op.f('fk_art_show_receipt_attendee_id_attendee'), 'art_show_receipt', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') + op.create_unique_constraint(op.f('uq_artist_marketplace_application_attendee_id'), 'artist_marketplace_application', ['attendee_id']) op.drop_constraint(op.f('fk_artist_marketplace_application_attendee_id_attendee'), 'artist_marketplace_application', type_='foreignkey') - op.create_foreign_key(None, 'artist_marketplace_application', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') - op.drop_constraint(op.f('fk_attendee_creator_id_attendee'), 'attendee', type_='foreignkey') - op.drop_constraint(op.f('fk_attendee_watchlist_id_watch_list'), 'attendee', type_='foreignkey') + op.create_foreign_key(op.f('fk_artist_marketplace_application_attendee_id_attendee'), 'artist_marketplace_application', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_attendee_group_id_group'), 'attendee', type_='foreignkey') + op.drop_constraint(op.f('fk_attendee_creator_id_attendee'), 'attendee', type_='foreignkey') op.drop_constraint(op.f('fk_attendee_badge_pickup_group_id_badge_pickup_group'), 'attendee', type_='foreignkey') - op.create_foreign_key(None, 'attendee', 'attendee', ['creator_id'], ['id']) - op.create_foreign_key(None, 'attendee', 'watch_list', ['watchlist_id'], ['id']) - op.create_foreign_key(None, 'attendee', 'group', ['group_id'], ['id']) - op.create_foreign_key(None, 'attendee', 'badge_pickup_group', ['badge_pickup_group_id'], ['id']) + op.drop_constraint(op.f('fk_attendee_watchlist_id_watch_list'), 'attendee', type_='foreignkey') + op.create_foreign_key(op.f('fk_attendee_watchlist_id_watch_list'), 'attendee', 'watch_list', ['watchlist_id'], ['id']) + op.create_foreign_key(op.f('fk_attendee_badge_pickup_group_id_badge_pickup_group'), 'attendee', 'badge_pickup_group', ['badge_pickup_group_id'], ['id']) + op.create_foreign_key(op.f('fk_attendee_group_id_group'), 'attendee', 'group', ['group_id'], ['id']) + op.create_foreign_key(op.f('fk_attendee_creator_id_attendee'), 'attendee', 'attendee', ['creator_id'], ['id']) op.drop_column('attendee', 'affiliate') op.drop_constraint(op.f('attraction_name_key'), 'attraction', type_='unique') - op.drop_constraint(op.f('uq_attraction_slug'), 'attraction', type_='unique') - op.drop_constraint(op.f('fk_attraction_event_attraction_feature_id_attraction_feature'), 'attraction_event', type_='foreignkey') - op.drop_constraint(op.f('fk_attraction_event_attraction_id_attraction'), 'attraction_event', type_='foreignkey') + op.create_unique_constraint(op.f('uq_attraction_name'), 'attraction', ['name']) op.drop_constraint(op.f('fk_attraction_event_location_id_event_location'), 'attraction_event', type_='foreignkey') - op.create_foreign_key(None, 'attraction_event', 'attraction_feature', ['attraction_feature_id'], ['id'], ondelete='CASCADE') - op.create_foreign_key(None, 'attraction_event', 'attraction', ['attraction_id'], ['id'], ondelete='CASCADE') - op.create_foreign_key(None, 'attraction_event', 'event_location', ['event_location_id'], ['id']) + op.drop_constraint(op.f('fk_attraction_event_attraction_id_attraction'), 'attraction_event', type_='foreignkey') + op.drop_constraint(op.f('fk_attraction_event_attraction_feature_id_attraction_feature'), 'attraction_event', type_='foreignkey') + op.create_foreign_key(op.f('fk_attraction_event_attraction_id_attraction'), 'attraction_event', 'attraction', ['attraction_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_attraction_event_attraction_feature_id_attraction_feature'), 'attraction_event', 'attraction_feature', ['attraction_feature_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_attraction_event_event_location_id_event_location'), 'attraction_event', 'event_location', ['event_location_id'], ['id']) + op.drop_constraint(op.f('attraction_feature_name_attraction_id_key'), 'attraction_feature', type_='unique') + op.create_unique_constraint(op.f('uq_attraction_feature_name'), 'attraction_feature', ['name', 'attraction_id']) op.drop_constraint(op.f('fk_attraction_feature_attraction_id_attraction'), 'attraction_feature', type_='foreignkey') - op.create_foreign_key(None, 'attraction_feature', 'attraction', ['attraction_id'], ['id'], ondelete='CASCADE') - op.drop_index(op.f('ix_attraction_notification_ident'), table_name='attraction_notification') - op.drop_constraint(op.f('fk_attraction_notification_attraction_id_attraction'), 'attraction_notification', type_='foreignkey') + op.create_foreign_key(op.f('fk_attraction_feature_attraction_id_attraction'), 'attraction_feature', 'attraction', ['attraction_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_attraction_notification_attraction_event_id_attraction_event'), 'attraction_notification', type_='foreignkey') op.drop_constraint(op.f('fk_attraction_notification_attendee_id_attendee'), 'attraction_notification', type_='foreignkey') - op.create_foreign_key(None, 'attraction_notification', 'attraction_event', ['attraction_event_id'], ['id'], ondelete='CASCADE') - op.create_foreign_key(None, 'attraction_notification', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') - op.create_foreign_key(None, 'attraction_notification', 'attraction', ['attraction_id'], ['id'], ondelete='CASCADE') - op.drop_index(op.f('ix_attraction_notification_reply_sid'), table_name='attraction_notification_reply') + op.drop_constraint(op.f('fk_attraction_notification_attraction_id_attraction'), 'attraction_notification', type_='foreignkey') + op.create_foreign_key(op.f('fk_attraction_notification_attraction_event_id_attraction_event'), 'attraction_notification', 'attraction_event', ['attraction_event_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_attraction_notification_attraction_id_attraction'), 'attraction_notification', 'attraction', ['attraction_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_attraction_notification_attendee_id_attendee'), 'attraction_notification', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_attraction_signup_attendee_id_attendee'), 'attraction_signup', type_='foreignkey') op.drop_constraint(op.f('fk_attraction_signup_attraction_id_attraction'), 'attraction_signup', type_='foreignkey') op.drop_constraint(op.f('fk_attraction_signup_attraction_event_id_attraction_event'), 'attraction_signup', type_='foreignkey') - op.create_foreign_key(None, 'attraction_signup', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') - op.create_foreign_key(None, 'attraction_signup', 'attraction', ['attraction_id'], ['id'], ondelete='CASCADE') - op.create_foreign_key(None, 'attraction_signup', 'attraction_event', ['attraction_event_id'], ['id'], ondelete='CASCADE') - op.drop_constraint(op.f('uq_automated_email_ident'), 'automated_email', type_='unique') - op.drop_index(op.f('ix_badge_info_ident'), table_name='badge_info') + op.create_foreign_key(op.f('fk_attraction_signup_attraction_id_attraction'), 'attraction_signup', 'attraction', ['attraction_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_attraction_signup_attendee_id_attendee'), 'attraction_signup', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_attraction_signup_attraction_event_id_attraction_event'), 'attraction_signup', 'attraction_event', ['attraction_event_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_badge_info_attendee_id_attendee'), 'badge_info', type_='foreignkey') - op.create_foreign_key(None, 'badge_info', 'attendee', ['attendee_id'], ['id']) + op.create_foreign_key(op.f('fk_badge_info_attendee_id_attendee'), 'badge_info', 'attendee', ['attendee_id'], ['id']) + op.add_column('bulk_printing_request', sa.Column('important', sa.Boolean(), nullable=False)) op.drop_constraint(op.f('fk_bulk_printing_request_department_id_department'), 'bulk_printing_request', type_='foreignkey') - op.create_foreign_key(None, 'bulk_printing_request', 'department', ['department_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_bulk_printing_request_department_id_department'), 'bulk_printing_request', 'department', ['department_id'], ['id'], ondelete='CASCADE') + op.drop_column('bulk_printing_request', 'required') + op.drop_constraint(op.f('department_name_key'), 'department', type_='unique') + op.create_unique_constraint(op.f('uq_department_name'), 'department', ['name']) op.drop_constraint(op.f('fk_department_parent_id_department'), 'department', type_='foreignkey') - op.create_foreign_key(None, 'department', 'department', ['parent_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_department_parent_id_department'), 'department', 'department', ['parent_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_dept_checklist_item_department_id_department'), 'dept_checklist_item', type_='foreignkey') op.drop_constraint(op.f('fk_dept_checklist_item_attendee_id_attendee'), 'dept_checklist_item', type_='foreignkey') - op.create_foreign_key(None, 'dept_checklist_item', 'department', ['department_id'], ['id'], ondelete='CASCADE') - op.create_foreign_key(None, 'dept_checklist_item', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_dept_checklist_item_department_id_department'), 'dept_checklist_item', 'department', ['department_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_dept_checklist_item_attendee_id_attendee'), 'dept_checklist_item', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_dept_membership_department_id_department'), 'dept_membership', type_='foreignkey') op.drop_constraint(op.f('fk_dept_membership_attendee_id_attendee'), 'dept_membership', type_='foreignkey') - op.create_foreign_key(None, 'dept_membership', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') - op.create_foreign_key(None, 'dept_membership', 'department', ['department_id'], ['id'], ondelete='CASCADE') - op.drop_constraint(op.f('fk_dept_membership_request_attendee_id_attendee'), 'dept_membership_request', type_='foreignkey') + op.create_foreign_key(op.f('fk_dept_membership_department_id_department'), 'dept_membership', 'department', ['department_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_dept_membership_attendee_id_attendee'), 'dept_membership', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_dept_membership_request_department_id_department'), 'dept_membership_request', type_='foreignkey') - op.create_foreign_key(None, 'dept_membership_request', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') - op.create_foreign_key(None, 'dept_membership_request', 'department', ['department_id'], ['id'], ondelete='CASCADE') + op.drop_constraint(op.f('fk_dept_membership_request_attendee_id_attendee'), 'dept_membership_request', type_='foreignkey') + op.create_foreign_key(op.f('fk_dept_membership_request_attendee_id_attendee'), 'dept_membership_request', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_dept_membership_request_department_id_department'), 'dept_membership_request', 'department', ['department_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_dept_role_department_id_department'), 'dept_role', type_='foreignkey') - op.create_foreign_key(None, 'dept_role', 'department', ['department_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_dept_role_department_id_department'), 'dept_role', 'department', ['department_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_email_automated_email_id_automated_email'), 'email', type_='foreignkey') - op.create_foreign_key(None, 'email', 'automated_email', ['automated_email_id'], ['id']) - op.create_unique_constraint(None, 'event', ['attraction_event_id']) - op.drop_constraint(op.f('fk_event_attraction_event_id_attraction_event'), 'event', type_='foreignkey') + op.create_foreign_key(op.f('fk_email_automated_email_id_automated_email'), 'email', 'automated_email', ['automated_email_id'], ['id']) + op.create_unique_constraint(op.f('uq_event_attraction_event_id'), 'event', ['attraction_event_id']) op.drop_constraint(op.f('fk_event_department_id_department'), 'event', type_='foreignkey') op.drop_constraint(op.f('fk_event_location_id_event_location'), 'event', type_='foreignkey') - op.create_foreign_key(None, 'event', 'attraction_event', ['attraction_event_id'], ['id']) - op.create_foreign_key(None, 'event', 'department', ['department_id'], ['id']) - op.create_foreign_key(None, 'event', 'event_location', ['event_location_id'], ['id']) + op.drop_constraint(op.f('fk_event_attraction_event_id_attraction_event'), 'event', type_='foreignkey') + op.create_foreign_key(op.f('fk_event_department_id_department'), 'event', 'department', ['department_id'], ['id']) + op.create_foreign_key(op.f('fk_event_event_location_id_event_location'), 'event', 'event_location', ['event_location_id'], ['id']) + op.create_foreign_key(op.f('fk_event_attraction_event_id_attraction_event'), 'event', 'attraction_event', ['attraction_event_id'], ['id']) op.drop_constraint(op.f('fk_event_feedback_event_id_event'), 'event_feedback', type_='foreignkey') - op.create_foreign_key(None, 'event_feedback', 'event', ['event_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_event_feedback_event_id_event'), 'event_feedback', 'event', ['event_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_event_location_department_id_department'), 'event_location', type_='foreignkey') - op.create_foreign_key(None, 'event_location', 'department', ['department_id'], ['id']) + op.create_foreign_key(op.f('fk_event_location_department_id_department'), 'event_location', 'department', ['department_id'], ['id']) op.drop_constraint(op.f('fk_food_restrictions_attendee_id_attendee'), 'food_restrictions', type_='foreignkey') - op.create_foreign_key(None, 'food_restrictions', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') - op.drop_constraint(op.f('fk_leader'), 'group', type_='foreignkey') + op.create_foreign_key(op.f('fk_food_restrictions_attendee_id_attendee'), 'food_restrictions', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_group_shared_with_id_group'), 'group', type_='foreignkey') - op.create_foreign_key(None, 'group', 'attendee', ['leader_id'], ['id']) - op.create_foreign_key(None, 'group', 'group', ['shared_with_id'], ['id']) + op.drop_constraint(op.f('fk_leader'), 'group', type_='foreignkey') + op.create_foreign_key(op.f('fk_group_leader_id_attendee'), 'group', 'attendee', ['leader_id'], ['id']) + op.create_foreign_key(op.f('fk_group_shared_with_id_group'), 'group', 'group', ['shared_with_id'], ['id']) op.drop_constraint(op.f('fk_guest_autograph_guest_id_guest_group'), 'guest_autograph', type_='foreignkey') - op.create_foreign_key(None, 'guest_autograph', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_guest_autograph_guest_id_guest_group'), 'guest_autograph', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_guest_bio_guest_id_guest_group'), 'guest_bio', type_='foreignkey') - op.create_foreign_key(None, 'guest_bio', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_guest_bio_guest_id_guest_group'), 'guest_bio', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_guest_charity_guest_id_guest_group'), 'guest_charity', type_='foreignkey') - op.create_foreign_key(None, 'guest_charity', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_guest_charity_guest_id_guest_group'), 'guest_charity', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') op.alter_column('guest_detailed_travel_plan', 'travel_plans_id', existing_type=sa.UUID(), nullable=False) op.drop_constraint(op.f('fk_guest_detailed_travel_plan_travel_plans_id_guest_tra_6ad4'), 'guest_detailed_travel_plan', type_='foreignkey') - op.create_foreign_key(None, 'guest_detailed_travel_plan', 'guest_travel_plans', ['travel_plans_id'], ['id'], ondelete='CASCADE') - op.create_unique_constraint(None, 'guest_group', ['group_id']) + op.create_foreign_key(op.f('fk_guest_detailed_travel_plan_travel_plans_id_guest_travel_plans'), 'guest_detailed_travel_plan', 'guest_travel_plans', ['travel_plans_id'], ['id'], ondelete='CASCADE') + op.create_unique_constraint(op.f('uq_guest_group_group_id'), 'guest_group', ['group_id']) op.drop_constraint(op.f('fk_guest_group_group_id_group'), 'guest_group', type_='foreignkey') op.drop_constraint(op.f('fk_guest_group_event_id_event'), 'guest_group', type_='foreignkey') - op.create_foreign_key(None, 'guest_group', 'group', ['group_id'], ['id'], ondelete='CASCADE') - op.create_foreign_key(None, 'guest_group', 'event', ['event_id'], ['id']) + op.create_foreign_key(op.f('fk_guest_group_group_id_group'), 'guest_group', 'group', ['group_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_guest_group_event_id_event'), 'guest_group', 'event', ['event_id'], ['id']) op.drop_constraint(op.f('fk_guest_hospitality_guest_id_guest_group'), 'guest_hospitality', type_='foreignkey') - op.create_foreign_key(None, 'guest_hospitality', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_guest_hospitality_guest_id_guest_group'), 'guest_hospitality', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_guest_image_guest_id_guest_group'), 'guest_image', type_='foreignkey') - op.create_foreign_key(None, 'guest_image', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_guest_image_guest_id_guest_group'), 'guest_image', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_guest_info_guest_id_guest_group'), 'guest_info', type_='foreignkey') - op.create_foreign_key(None, 'guest_info', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_guest_info_guest_id_guest_group'), 'guest_info', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_guest_interview_guest_id_guest_group'), 'guest_interview', type_='foreignkey') - op.create_foreign_key(None, 'guest_interview', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_guest_interview_guest_id_guest_group'), 'guest_interview', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_guest_media_request_guest_id_guest_group'), 'guest_media_request', type_='foreignkey') - op.create_foreign_key(None, 'guest_media_request', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_guest_media_request_guest_id_guest_group'), 'guest_media_request', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_guest_merch_guest_id_guest_group'), 'guest_merch', type_='foreignkey') - op.create_foreign_key(None, 'guest_merch', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_guest_merch_guest_id_guest_group'), 'guest_merch', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_guest_panel_guest_id_guest_group'), 'guest_panel', type_='foreignkey') - op.create_foreign_key(None, 'guest_panel', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_guest_panel_guest_id_guest_group'), 'guest_panel', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_guest_stage_plot_guest_id_guest_group'), 'guest_stage_plot', type_='foreignkey') - op.create_foreign_key(None, 'guest_stage_plot', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_guest_stage_plot_guest_id_guest_group'), 'guest_stage_plot', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_guest_taxes_guest_id_guest_group'), 'guest_taxes', type_='foreignkey') - op.create_foreign_key(None, 'guest_taxes', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') - op.create_unique_constraint(None, 'guest_track', ['guest_id']) + op.create_foreign_key(op.f('fk_guest_taxes_guest_id_guest_group'), 'guest_taxes', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') + op.create_unique_constraint(op.f('uq_guest_track_guest_id'), 'guest_track', ['guest_id']) op.drop_constraint(op.f('fk_guest_track_guest_id_guest_group'), 'guest_track', type_='foreignkey') - op.create_foreign_key(None, 'guest_track', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_guest_track_guest_id_guest_group'), 'guest_track', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_guest_travel_plans_guest_id_guest_group'), 'guest_travel_plans', type_='foreignkey') - op.create_foreign_key(None, 'guest_travel_plans', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_guest_travel_plans_guest_id_guest_group'), 'guest_travel_plans', 'guest_group', ['guest_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_hotel_requests_attendee_id_attendee'), 'hotel_requests', type_='foreignkey') - op.create_foreign_key(None, 'hotel_requests', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_hotel_requests_attendee_id_attendee'), 'hotel_requests', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') + op.add_column('indie_developer', sa.Column('receives_emails', sa.Boolean(), nullable=False)) op.drop_constraint(op.f('fk_indie_developer_studio_id_indie_studio'), 'indie_developer', type_='foreignkey') - op.create_foreign_key(None, 'indie_developer', 'indie_studio', ['studio_id'], ['id'], ondelete='CASCADE') - op.alter_column('indie_game', 'multiplayer_game_length', - existing_type=sa.INTEGER(), - nullable=False) - op.drop_constraint(op.f('fk_indie_game_primary_contact_id_indie_developer'), 'indie_game', type_='foreignkey') + op.create_foreign_key(op.f('fk_indie_developer_studio_id_indie_studio'), 'indie_developer', 'indie_studio', ['studio_id'], ['id'], ondelete='CASCADE') + op.drop_column('indie_developer', 'gets_emails') op.drop_constraint(op.f('fk_indie_game_studio_id_indie_studio'), 'indie_game', type_='foreignkey') - op.create_foreign_key(None, 'indie_game', 'indie_developer', ['primary_contact_id'], ['id']) - op.create_foreign_key(None, 'indie_game', 'indie_studio', ['studio_id'], ['id'], ondelete='CASCADE') + op.drop_constraint(op.f('fk_indie_game_primary_contact_id_indie_developer'), 'indie_game', type_='foreignkey') + op.create_foreign_key(op.f('fk_indie_game_primary_contact_id_indie_developer'), 'indie_game', 'indie_developer', ['primary_contact_id'], ['id']) + op.create_foreign_key(op.f('fk_indie_game_studio_id_indie_studio'), 'indie_game', 'indie_studio', ['studio_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_indie_game_code_game_id_indie_game'), 'indie_game_code', type_='foreignkey') - op.create_foreign_key(None, 'indie_game_code', 'indie_game', ['game_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_indie_game_code_game_id_indie_game'), 'indie_game_code', 'indie_game', ['game_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_indie_game_image_game_id_indie_game'), 'indie_game_image', type_='foreignkey') - op.create_foreign_key(None, 'indie_game_image', 'indie_game', ['game_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_indie_game_image_game_id_indie_game'), 'indie_game_image', 'indie_game', ['game_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_indie_game_review_game_id_indie_game'), 'indie_game_review', type_='foreignkey') op.drop_constraint(op.f('fk_indie_game_review_judge_id_indie_judge'), 'indie_game_review', type_='foreignkey') - op.create_foreign_key(None, 'indie_game_review', 'indie_game', ['game_id'], ['id'], ondelete='CASCADE') - op.create_foreign_key(None, 'indie_game_review', 'indie_judge', ['judge_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_indie_game_review_game_id_indie_game'), 'indie_game_review', 'indie_game', ['game_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_indie_game_review_judge_id_indie_judge'), 'indie_game_review', 'indie_judge', ['judge_id'], ['id'], ondelete='CASCADE') op.alter_column('indie_judge', 'admin_id', existing_type=sa.UUID(), nullable=True) - op.create_unique_constraint(None, 'indie_judge', ['admin_id']) - op.drop_constraint(op.f('uq_indie_studio_name'), 'indie_studio', type_='unique') - op.create_unique_constraint(None, 'indie_studio', ['group_id']) + op.create_unique_constraint(op.f('uq_indie_judge_admin_id'), 'indie_judge', ['admin_id']) + op.create_unique_constraint(op.f('uq_indie_studio_group_id'), 'indie_studio', ['group_id']) op.drop_constraint(op.f('fk_job_department_id_department'), 'job', type_='foreignkey') - op.create_foreign_key(None, 'job', 'department', ['department_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_job_department_id_department'), 'job', 'department', ['department_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_job_template_department_id_department'), 'job_template', type_='foreignkey') - op.create_foreign_key(None, 'job_template', 'department', ['department_id'], ['id'], ondelete='CASCADE') - op.drop_constraint(op.f('uq_lottery_application_response_id'), 'lottery_application', type_='unique') + op.create_foreign_key(op.f('fk_job_template_department_id_department'), 'job_template', 'department', ['department_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_m_points_for_cash_attendee_id_attendee'), 'm_points_for_cash', type_='foreignkey') - op.create_foreign_key(None, 'm_points_for_cash', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_m_points_for_cash_attendee_id_attendee'), 'm_points_for_cash', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_merch_discount_attendee_id_attendee'), 'merch_discount', type_='foreignkey') - op.create_foreign_key(None, 'merch_discount', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_merch_discount_attendee_id_attendee'), 'merch_discount', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') op.alter_column('merch_pickup', 'picked_up_by_id', existing_type=sa.UUID(), nullable=True) @@ -255,32 +249,29 @@ def upgrade(): existing_type=sa.UUID(), nullable=True) op.drop_constraint(op.f('fk_mits_applicant_team_id_mits_team'), 'mits_applicant', type_='foreignkey') - op.create_foreign_key(None, 'mits_applicant', 'mits_team', ['team_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_mits_applicant_team_id_mits_team'), 'mits_applicant', 'mits_team', ['team_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_mits_document_game_id_mits_game'), 'mits_document', type_='foreignkey') - op.create_foreign_key(None, 'mits_document', 'mits_game', ['game_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_mits_document_game_id_mits_game'), 'mits_document', 'mits_game', ['game_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_mits_game_team_id_mits_team'), 'mits_game', type_='foreignkey') - op.create_foreign_key(None, 'mits_game', 'mits_team', ['team_id'], ['id'], ondelete='CASCADE') - op.create_unique_constraint(None, 'mits_panel_application', ['team_id']) + op.create_foreign_key(op.f('fk_mits_game_team_id_mits_team'), 'mits_game', 'mits_team', ['team_id'], ['id'], ondelete='CASCADE') + op.create_unique_constraint(op.f('uq_mits_panel_application_team_id'), 'mits_panel_application', ['team_id']) op.drop_constraint(op.f('fk_mits_panel_application_team_id_mits_team'), 'mits_panel_application', type_='foreignkey') - op.create_foreign_key(None, 'mits_panel_application', 'mits_team', ['team_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_mits_panel_application_team_id_mits_team'), 'mits_panel_application', 'mits_team', ['team_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_mits_picture_game_id_mits_game'), 'mits_picture', type_='foreignkey') - op.create_foreign_key(None, 'mits_picture', 'mits_game', ['game_id'], ['id'], ondelete='CASCADE') - op.alter_column('mits_team', 'concurrent_attendees', - existing_type=sa.INTEGER(), - nullable=True) - op.create_unique_constraint(None, 'mits_times', ['team_id']) + op.create_foreign_key(op.f('fk_mits_picture_game_id_mits_game'), 'mits_picture', 'mits_game', ['game_id'], ['id'], ondelete='CASCADE') + op.create_unique_constraint(op.f('uq_mits_times_team_id'), 'mits_times', ['team_id']) op.drop_constraint(op.f('fk_mits_times_team_id_mits_team'), 'mits_times', type_='foreignkey') - op.create_foreign_key(None, 'mits_times', 'mits_team', ['team_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_mits_times_team_id_mits_team'), 'mits_times', 'mits_team', ['team_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_no_shirt_attendee_id_attendee'), 'no_shirt', type_='foreignkey') - op.create_foreign_key(None, 'no_shirt', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_no_shirt_attendee_id_attendee'), 'no_shirt', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_old_m_point_exchange_attendee_id_attendee'), 'old_m_point_exchange', type_='foreignkey') - op.create_foreign_key(None, 'old_m_point_exchange', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') - op.drop_constraint(op.f('fk_panel_application_event_id_event'), 'panel_application', type_='foreignkey') - op.drop_constraint(op.f('fk_panel_application_poc_id_attendee'), 'panel_application', type_='foreignkey') + op.create_foreign_key(op.f('fk_old_m_point_exchange_attendee_id_attendee'), 'old_m_point_exchange', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_panel_application_submitter_id_panel_applicant'), 'panel_application', type_='foreignkey') - op.create_foreign_key(None, 'panel_application', 'attendee', ['poc_id'], ['id']) - op.create_foreign_key(None, 'panel_application', 'event', ['event_id'], ['id']) - op.create_foreign_key(None, 'panel_application', 'panel_applicant', ['submitter_id'], ['id']) + op.drop_constraint(op.f('fk_panel_application_poc_id_attendee'), 'panel_application', type_='foreignkey') + op.drop_constraint(op.f('fk_panel_application_event_id_event'), 'panel_application', type_='foreignkey') + op.create_foreign_key(op.f('fk_panel_application_poc_id_attendee'), 'panel_application', 'attendee', ['poc_id'], ['id']) + op.create_foreign_key(op.f('fk_panel_application_event_id_event'), 'panel_application', 'event', ['event_id'], ['id']) + op.create_foreign_key(op.f('fk_panel_application_submitter_id_panel_applicant'), 'panel_application', 'panel_applicant', ['submitter_id'], ['id']) op.alter_column('password_reset', 'admin_id', existing_type=sa.UUID(), nullable=False) @@ -289,89 +280,91 @@ def upgrade(): nullable=False) op.drop_constraint(op.f('fk_password_reset_admin_id_admin_account'), 'password_reset', type_='foreignkey') op.drop_constraint(op.f('fk_password_reset_attendee_id_attendee_account'), 'password_reset', type_='foreignkey') - op.create_foreign_key(None, 'password_reset', 'admin_account', ['admin_id'], ['id'], ondelete='CASCADE') - op.create_foreign_key(None, 'password_reset', 'attendee_account', ['attendee_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_password_reset_admin_id_admin_account'), 'password_reset', 'admin_account', ['admin_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_password_reset_attendee_id_attendee_account'), 'password_reset', 'attendee_account', ['attendee_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_print_queue_attendee_id_attendee'), 'print_job', type_='foreignkey') - op.create_foreign_key(None, 'print_job', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_print_job_attendee_id_attendee'), 'print_job', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_promo_code_group_id_promo_code_group'), 'promo_code', type_='foreignkey') - op.create_foreign_key(None, 'promo_code', 'promo_code_group', ['group_id'], ['id']) + op.create_foreign_key(op.f('fk_promo_code_group_id_promo_code_group'), 'promo_code', 'promo_code_group', ['group_id'], ['id']) op.drop_constraint(op.f('fk_promo_code_group_buyer_id_attendee'), 'promo_code_group', type_='foreignkey') - op.create_foreign_key(None, 'promo_code_group', 'attendee', ['buyer_id'], ['id']) + op.create_foreign_key(op.f('fk_promo_code_group_buyer_id_attendee'), 'promo_code_group', 'attendee', ['buyer_id'], ['id']) op.drop_index(op.f('uq_promo_code_word_normalized_word_part_of_speech'), table_name='promo_code_word') op.create_index('uq_promo_code_word_normalized_word_part_of_speech', 'promo_code_word', [sa.literal_column('lower(trim(word))'), 'part_of_speech'], unique=True) op.alter_column('receipt_item', 'receipt_id', existing_type=sa.UUID(), nullable=False) - op.drop_constraint(op.f('fk_receipt_item_txn_id_receipt_transaction'), 'receipt_item', type_='foreignkey') op.drop_constraint(op.f('fk_receipt_item_receipt_id_model_receipt'), 'receipt_item', type_='foreignkey') - op.create_foreign_key(None, 'receipt_item', 'receipt_transaction', ['txn_id'], ['id']) - op.create_foreign_key(None, 'receipt_item', 'model_receipt', ['receipt_id'], ['id'], ondelete='CASCADE') + op.drop_constraint(op.f('fk_receipt_item_txn_id_receipt_transaction'), 'receipt_item', type_='foreignkey') + op.create_foreign_key(op.f('fk_receipt_item_receipt_id_model_receipt'), 'receipt_item', 'model_receipt', ['receipt_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_receipt_item_txn_id_receipt_transaction'), 'receipt_item', 'receipt_transaction', ['txn_id'], ['id']) op.alter_column('receipt_transaction', 'receipt_id', existing_type=sa.UUID(), nullable=False) op.drop_constraint(op.f('fk_receipt_transaction_refunded_txn_id_receipt_transaction'), 'receipt_transaction', type_='foreignkey') op.drop_constraint(op.f('fk_receipt_transaction_receipt_info_id_receipt_info'), 'receipt_transaction', type_='foreignkey') op.drop_constraint(op.f('fk_receipt_transaction_receipt_id_model_receipt'), 'receipt_transaction', type_='foreignkey') - op.create_foreign_key(None, 'receipt_transaction', 'receipt_transaction', ['refunded_txn_id'], ['id']) - op.create_foreign_key(None, 'receipt_transaction', 'receipt_info', ['receipt_info_id'], ['id']) - op.create_foreign_key(None, 'receipt_transaction', 'model_receipt', ['receipt_id'], ['id'], ondelete='CASCADE') - op.drop_constraint(op.f('fk_room_assignment_attendee_id_attendee'), 'room_assignment', type_='foreignkey') + op.create_foreign_key(op.f('fk_receipt_transaction_refunded_txn_id_receipt_transaction'), 'receipt_transaction', 'receipt_transaction', ['refunded_txn_id'], ['id']) + op.create_foreign_key(op.f('fk_receipt_transaction_receipt_info_id_receipt_info'), 'receipt_transaction', 'receipt_info', ['receipt_info_id'], ['id']) + op.create_foreign_key(op.f('fk_receipt_transaction_receipt_id_model_receipt'), 'receipt_transaction', 'model_receipt', ['receipt_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_room_assignment_room_id_room'), 'room_assignment', type_='foreignkey') - op.create_foreign_key(None, 'room_assignment', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') - op.create_foreign_key(None, 'room_assignment', 'room', ['room_id'], ['id'], ondelete='CASCADE') + op.drop_constraint(op.f('fk_room_assignment_attendee_id_attendee'), 'room_assignment', type_='foreignkey') + op.create_foreign_key(op.f('fk_room_assignment_room_id_room'), 'room_assignment', 'room', ['room_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_room_assignment_attendee_id_attendee'), 'room_assignment', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_sale_attendee_id_attendee'), 'sale', type_='foreignkey') - op.create_foreign_key(None, 'sale', 'attendee', ['attendee_id'], ['id']) + op.create_foreign_key(op.f('fk_sale_attendee_id_attendee'), 'sale', 'attendee', ['attendee_id'], ['id']) op.drop_constraint(op.f('fk_tabletop_checkout_game_id_tabletop_game'), 'tabletop_checkout', type_='foreignkey') op.drop_constraint(op.f('fk_tabletop_checkout_attendee_id_attendee'), 'tabletop_checkout', type_='foreignkey') - op.create_foreign_key(None, 'tabletop_checkout', 'tabletop_game', ['game_id'], ['id'], ondelete='CASCADE') - op.create_foreign_key(None, 'tabletop_checkout', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_tabletop_checkout_game_id_tabletop_game'), 'tabletop_checkout', 'tabletop_game', ['game_id'], ['id'], ondelete='CASCADE') + op.create_foreign_key(op.f('fk_tabletop_checkout_attendee_id_attendee'), 'tabletop_checkout', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('fk_tabletop_game_attendee_id_attendee'), 'tabletop_game', type_='foreignkey') - op.create_foreign_key(None, 'tabletop_game', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') - op.drop_index(op.f('ix_tracking_who'), table_name='tracking') + op.create_foreign_key(op.f('fk_tabletop_game_attendee_id_attendee'), 'tabletop_game', 'attendee', ['attendee_id'], ['id'], ondelete='CASCADE') op.drop_constraint(op.f('txn_request_tracking_incr_id_key'), 'txn_request_tracking', type_='unique') + op.create_unique_constraint(op.f('uq_txn_request_tracking_incr_id'), 'txn_request_tracking', ['incr_id']) + # ### end Alembic commands ### def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_constraint(op.f('uq_txn_request_tracking_incr_id'), 'txn_request_tracking', type_='unique') op.create_unique_constraint(op.f('txn_request_tracking_incr_id_key'), 'txn_request_tracking', ['incr_id'], postgresql_nulls_not_distinct=False) - op.create_index(op.f('ix_tracking_who'), 'tracking', ['who'], unique=False) - op.drop_constraint(None, 'tabletop_game', type_='foreignkey') + op.drop_constraint(op.f('fk_tabletop_game_attendee_id_attendee'), 'tabletop_game', type_='foreignkey') op.create_foreign_key(op.f('fk_tabletop_game_attendee_id_attendee'), 'tabletop_game', 'attendee', ['attendee_id'], ['id']) - op.drop_constraint(None, 'tabletop_checkout', type_='foreignkey') - op.drop_constraint(None, 'tabletop_checkout', type_='foreignkey') + op.drop_constraint(op.f('fk_tabletop_checkout_attendee_id_attendee'), 'tabletop_checkout', type_='foreignkey') + op.drop_constraint(op.f('fk_tabletop_checkout_game_id_tabletop_game'), 'tabletop_checkout', type_='foreignkey') op.create_foreign_key(op.f('fk_tabletop_checkout_attendee_id_attendee'), 'tabletop_checkout', 'attendee', ['attendee_id'], ['id']) op.create_foreign_key(op.f('fk_tabletop_checkout_game_id_tabletop_game'), 'tabletop_checkout', 'tabletop_game', ['game_id'], ['id']) - op.drop_constraint(None, 'sale', type_='foreignkey') + op.drop_constraint(op.f('fk_sale_attendee_id_attendee'), 'sale', type_='foreignkey') op.create_foreign_key(op.f('fk_sale_attendee_id_attendee'), 'sale', 'attendee', ['attendee_id'], ['id'], ondelete='SET NULL') - op.drop_constraint(None, 'room_assignment', type_='foreignkey') - op.drop_constraint(None, 'room_assignment', type_='foreignkey') - op.create_foreign_key(op.f('fk_room_assignment_room_id_room'), 'room_assignment', 'room', ['room_id'], ['id']) + op.drop_constraint(op.f('fk_room_assignment_attendee_id_attendee'), 'room_assignment', type_='foreignkey') + op.drop_constraint(op.f('fk_room_assignment_room_id_room'), 'room_assignment', type_='foreignkey') op.create_foreign_key(op.f('fk_room_assignment_attendee_id_attendee'), 'room_assignment', 'attendee', ['attendee_id'], ['id']) - op.drop_constraint(None, 'receipt_transaction', type_='foreignkey') - op.drop_constraint(None, 'receipt_transaction', type_='foreignkey') - op.drop_constraint(None, 'receipt_transaction', type_='foreignkey') + op.create_foreign_key(op.f('fk_room_assignment_room_id_room'), 'room_assignment', 'room', ['room_id'], ['id']) + op.drop_constraint(op.f('fk_receipt_transaction_receipt_id_model_receipt'), 'receipt_transaction', type_='foreignkey') + op.drop_constraint(op.f('fk_receipt_transaction_receipt_info_id_receipt_info'), 'receipt_transaction', type_='foreignkey') + op.drop_constraint(op.f('fk_receipt_transaction_refunded_txn_id_receipt_transaction'), 'receipt_transaction', type_='foreignkey') op.create_foreign_key(op.f('fk_receipt_transaction_receipt_id_model_receipt'), 'receipt_transaction', 'model_receipt', ['receipt_id'], ['id'], ondelete='SET NULL') op.create_foreign_key(op.f('fk_receipt_transaction_receipt_info_id_receipt_info'), 'receipt_transaction', 'receipt_info', ['receipt_info_id'], ['id'], ondelete='SET NULL') op.create_foreign_key(op.f('fk_receipt_transaction_refunded_txn_id_receipt_transaction'), 'receipt_transaction', 'receipt_transaction', ['refunded_txn_id'], ['id'], ondelete='SET NULL') op.alter_column('receipt_transaction', 'receipt_id', existing_type=sa.UUID(), nullable=True) - op.drop_constraint(None, 'receipt_item', type_='foreignkey') - op.drop_constraint(None, 'receipt_item', type_='foreignkey') - op.create_foreign_key(op.f('fk_receipt_item_receipt_id_model_receipt'), 'receipt_item', 'model_receipt', ['receipt_id'], ['id'], ondelete='SET NULL') + op.drop_constraint(op.f('fk_receipt_item_txn_id_receipt_transaction'), 'receipt_item', type_='foreignkey') + op.drop_constraint(op.f('fk_receipt_item_receipt_id_model_receipt'), 'receipt_item', type_='foreignkey') op.create_foreign_key(op.f('fk_receipt_item_txn_id_receipt_transaction'), 'receipt_item', 'receipt_transaction', ['txn_id'], ['id'], ondelete='SET NULL') + op.create_foreign_key(op.f('fk_receipt_item_receipt_id_model_receipt'), 'receipt_item', 'model_receipt', ['receipt_id'], ['id'], ondelete='SET NULL') op.alter_column('receipt_item', 'receipt_id', existing_type=sa.UUID(), nullable=True) op.drop_index('uq_promo_code_word_normalized_word_part_of_speech', table_name='promo_code_word') op.create_index(op.f('uq_promo_code_word_normalized_word_part_of_speech'), 'promo_code_word', [sa.literal_column('lower(TRIM(BOTH FROM word))'), 'part_of_speech'], unique=True) - op.drop_constraint(None, 'promo_code_group', type_='foreignkey') + op.drop_constraint(op.f('fk_promo_code_group_buyer_id_attendee'), 'promo_code_group', type_='foreignkey') op.create_foreign_key(op.f('fk_promo_code_group_buyer_id_attendee'), 'promo_code_group', 'attendee', ['buyer_id'], ['id'], ondelete='SET NULL') - op.drop_constraint(None, 'promo_code', type_='foreignkey') + op.drop_constraint(op.f('fk_promo_code_group_id_promo_code_group'), 'promo_code', type_='foreignkey') op.create_foreign_key(op.f('fk_promo_code_group_id_promo_code_group'), 'promo_code', 'promo_code_group', ['group_id'], ['id'], ondelete='SET NULL') - op.drop_constraint(None, 'print_job', type_='foreignkey') + op.drop_constraint(op.f('fk_print_job_attendee_id_attendee'), 'print_job', type_='foreignkey') op.create_foreign_key(op.f('fk_print_queue_attendee_id_attendee'), 'print_job', 'attendee', ['attendee_id'], ['id']) - op.drop_constraint(None, 'password_reset', type_='foreignkey') - op.drop_constraint(None, 'password_reset', type_='foreignkey') + op.drop_constraint(op.f('fk_password_reset_attendee_id_attendee_account'), 'password_reset', type_='foreignkey') + op.drop_constraint(op.f('fk_password_reset_admin_id_admin_account'), 'password_reset', type_='foreignkey') op.create_foreign_key(op.f('fk_password_reset_attendee_id_attendee_account'), 'password_reset', 'attendee_account', ['attendee_id'], ['id']) op.create_foreign_key(op.f('fk_password_reset_admin_id_admin_account'), 'password_reset', 'admin_account', ['admin_id'], ['id']) op.alter_column('password_reset', 'attendee_id', @@ -380,32 +373,29 @@ def downgrade(): op.alter_column('password_reset', 'admin_id', existing_type=sa.UUID(), nullable=True) - op.drop_constraint(None, 'panel_application', type_='foreignkey') - op.drop_constraint(None, 'panel_application', type_='foreignkey') - op.drop_constraint(None, 'panel_application', type_='foreignkey') - op.create_foreign_key(op.f('fk_panel_application_submitter_id_panel_applicant'), 'panel_application', 'panel_applicant', ['submitter_id'], ['id'], ondelete='SET NULL') - op.create_foreign_key(op.f('fk_panel_application_poc_id_attendee'), 'panel_application', 'attendee', ['poc_id'], ['id'], ondelete='SET NULL') + op.drop_constraint(op.f('fk_panel_application_submitter_id_panel_applicant'), 'panel_application', type_='foreignkey') + op.drop_constraint(op.f('fk_panel_application_event_id_event'), 'panel_application', type_='foreignkey') + op.drop_constraint(op.f('fk_panel_application_poc_id_attendee'), 'panel_application', type_='foreignkey') op.create_foreign_key(op.f('fk_panel_application_event_id_event'), 'panel_application', 'event', ['event_id'], ['id'], ondelete='SET NULL') - op.drop_constraint(None, 'old_m_point_exchange', type_='foreignkey') + op.create_foreign_key(op.f('fk_panel_application_poc_id_attendee'), 'panel_application', 'attendee', ['poc_id'], ['id'], ondelete='SET NULL') + op.create_foreign_key(op.f('fk_panel_application_submitter_id_panel_applicant'), 'panel_application', 'panel_applicant', ['submitter_id'], ['id'], ondelete='SET NULL') + op.drop_constraint(op.f('fk_old_m_point_exchange_attendee_id_attendee'), 'old_m_point_exchange', type_='foreignkey') op.create_foreign_key(op.f('fk_old_m_point_exchange_attendee_id_attendee'), 'old_m_point_exchange', 'attendee', ['attendee_id'], ['id']) - op.drop_constraint(None, 'no_shirt', type_='foreignkey') + op.drop_constraint(op.f('fk_no_shirt_attendee_id_attendee'), 'no_shirt', type_='foreignkey') op.create_foreign_key(op.f('fk_no_shirt_attendee_id_attendee'), 'no_shirt', 'attendee', ['attendee_id'], ['id']) - op.drop_constraint(None, 'mits_times', type_='foreignkey') + op.drop_constraint(op.f('fk_mits_times_team_id_mits_team'), 'mits_times', type_='foreignkey') op.create_foreign_key(op.f('fk_mits_times_team_id_mits_team'), 'mits_times', 'mits_team', ['team_id'], ['id']) - op.drop_constraint(None, 'mits_times', type_='unique') - op.alter_column('mits_team', 'concurrent_attendees', - existing_type=sa.INTEGER(), - nullable=False) - op.drop_constraint(None, 'mits_picture', type_='foreignkey') + op.drop_constraint(op.f('uq_mits_times_team_id'), 'mits_times', type_='unique') + op.drop_constraint(op.f('fk_mits_picture_game_id_mits_game'), 'mits_picture', type_='foreignkey') op.create_foreign_key(op.f('fk_mits_picture_game_id_mits_game'), 'mits_picture', 'mits_game', ['game_id'], ['id']) - op.drop_constraint(None, 'mits_panel_application', type_='foreignkey') + op.drop_constraint(op.f('fk_mits_panel_application_team_id_mits_team'), 'mits_panel_application', type_='foreignkey') op.create_foreign_key(op.f('fk_mits_panel_application_team_id_mits_team'), 'mits_panel_application', 'mits_team', ['team_id'], ['id']) - op.drop_constraint(None, 'mits_panel_application', type_='unique') - op.drop_constraint(None, 'mits_game', type_='foreignkey') + op.drop_constraint(op.f('uq_mits_panel_application_team_id'), 'mits_panel_application', type_='unique') + op.drop_constraint(op.f('fk_mits_game_team_id_mits_team'), 'mits_game', type_='foreignkey') op.create_foreign_key(op.f('fk_mits_game_team_id_mits_team'), 'mits_game', 'mits_team', ['team_id'], ['id']) - op.drop_constraint(None, 'mits_document', type_='foreignkey') + op.drop_constraint(op.f('fk_mits_document_game_id_mits_game'), 'mits_document', type_='foreignkey') op.create_foreign_key(op.f('fk_mits_document_game_id_mits_game'), 'mits_document', 'mits_game', ['game_id'], ['id']) - op.drop_constraint(None, 'mits_applicant', type_='foreignkey') + op.drop_constraint(op.f('fk_mits_applicant_team_id_mits_team'), 'mits_applicant', type_='foreignkey') op.create_foreign_key(op.f('fk_mits_applicant_team_id_mits_team'), 'mits_applicant', 'mits_team', ['team_id'], ['id']) op.alter_column('merch_pickup', 'picked_up_for_id', existing_type=sa.UUID(), @@ -413,200 +403,193 @@ def downgrade(): op.alter_column('merch_pickup', 'picked_up_by_id', existing_type=sa.UUID(), nullable=False) - op.drop_constraint(None, 'merch_discount', type_='foreignkey') + op.drop_constraint(op.f('fk_merch_discount_attendee_id_attendee'), 'merch_discount', type_='foreignkey') op.create_foreign_key(op.f('fk_merch_discount_attendee_id_attendee'), 'merch_discount', 'attendee', ['attendee_id'], ['id']) - op.drop_constraint(None, 'm_points_for_cash', type_='foreignkey') + op.drop_constraint(op.f('fk_m_points_for_cash_attendee_id_attendee'), 'm_points_for_cash', type_='foreignkey') op.create_foreign_key(op.f('fk_m_points_for_cash_attendee_id_attendee'), 'm_points_for_cash', 'attendee', ['attendee_id'], ['id']) - op.create_unique_constraint(op.f('uq_lottery_application_response_id'), 'lottery_application', ['response_id'], postgresql_nulls_not_distinct=False) - op.drop_constraint(None, 'job_template', type_='foreignkey') + op.drop_constraint(op.f('fk_job_template_department_id_department'), 'job_template', type_='foreignkey') op.create_foreign_key(op.f('fk_job_template_department_id_department'), 'job_template', 'department', ['department_id'], ['id']) - op.drop_constraint(None, 'job', type_='foreignkey') + op.drop_constraint(op.f('fk_job_department_id_department'), 'job', type_='foreignkey') op.create_foreign_key(op.f('fk_job_department_id_department'), 'job', 'department', ['department_id'], ['id']) - op.drop_constraint(None, 'indie_studio', type_='unique') - op.create_unique_constraint(op.f('uq_indie_studio_name'), 'indie_studio', ['name'], postgresql_nulls_not_distinct=False) - op.drop_constraint(None, 'indie_judge', type_='unique') + op.drop_constraint(op.f('uq_indie_studio_group_id'), 'indie_studio', type_='unique') + op.drop_constraint(op.f('uq_indie_judge_admin_id'), 'indie_judge', type_='unique') op.alter_column('indie_judge', 'admin_id', existing_type=sa.UUID(), nullable=False) - op.drop_constraint(None, 'indie_game_review', type_='foreignkey') - op.drop_constraint(None, 'indie_game_review', type_='foreignkey') + op.drop_constraint(op.f('fk_indie_game_review_judge_id_indie_judge'), 'indie_game_review', type_='foreignkey') + op.drop_constraint(op.f('fk_indie_game_review_game_id_indie_game'), 'indie_game_review', type_='foreignkey') op.create_foreign_key(op.f('fk_indie_game_review_judge_id_indie_judge'), 'indie_game_review', 'indie_judge', ['judge_id'], ['id']) op.create_foreign_key(op.f('fk_indie_game_review_game_id_indie_game'), 'indie_game_review', 'indie_game', ['game_id'], ['id']) - op.drop_constraint(None, 'indie_game_image', type_='foreignkey') + op.drop_constraint(op.f('fk_indie_game_image_game_id_indie_game'), 'indie_game_image', type_='foreignkey') op.create_foreign_key(op.f('fk_indie_game_image_game_id_indie_game'), 'indie_game_image', 'indie_game', ['game_id'], ['id']) - op.drop_constraint(None, 'indie_game_code', type_='foreignkey') + op.drop_constraint(op.f('fk_indie_game_code_game_id_indie_game'), 'indie_game_code', type_='foreignkey') op.create_foreign_key(op.f('fk_indie_game_code_game_id_indie_game'), 'indie_game_code', 'indie_game', ['game_id'], ['id']) - op.drop_constraint(None, 'indie_game', type_='foreignkey') - op.drop_constraint(None, 'indie_game', type_='foreignkey') - op.create_foreign_key(op.f('fk_indie_game_studio_id_indie_studio'), 'indie_game', 'indie_studio', ['studio_id'], ['id']) + op.drop_constraint(op.f('fk_indie_game_studio_id_indie_studio'), 'indie_game', type_='foreignkey') + op.drop_constraint(op.f('fk_indie_game_primary_contact_id_indie_developer'), 'indie_game', type_='foreignkey') op.create_foreign_key(op.f('fk_indie_game_primary_contact_id_indie_developer'), 'indie_game', 'indie_developer', ['primary_contact_id'], ['id'], ondelete='SET NULL') - op.alter_column('indie_game', 'multiplayer_game_length', - existing_type=sa.INTEGER(), - nullable=True) - op.drop_constraint(None, 'indie_developer', type_='foreignkey') + op.create_foreign_key(op.f('fk_indie_game_studio_id_indie_studio'), 'indie_game', 'indie_studio', ['studio_id'], ['id']) + op.add_column('indie_developer', sa.Column('gets_emails', sa.BOOLEAN(), server_default=sa.text('false'), autoincrement=False, nullable=False)) + op.drop_constraint(op.f('fk_indie_developer_studio_id_indie_studio'), 'indie_developer', type_='foreignkey') op.create_foreign_key(op.f('fk_indie_developer_studio_id_indie_studio'), 'indie_developer', 'indie_studio', ['studio_id'], ['id']) - op.drop_constraint(None, 'hotel_requests', type_='foreignkey') + op.drop_column('indie_developer', 'receives_emails') + op.drop_constraint(op.f('fk_hotel_requests_attendee_id_attendee'), 'hotel_requests', type_='foreignkey') op.create_foreign_key(op.f('fk_hotel_requests_attendee_id_attendee'), 'hotel_requests', 'attendee', ['attendee_id'], ['id']) - op.drop_constraint(None, 'guest_travel_plans', type_='foreignkey') + op.drop_constraint(op.f('fk_guest_travel_plans_guest_id_guest_group'), 'guest_travel_plans', type_='foreignkey') op.create_foreign_key(op.f('fk_guest_travel_plans_guest_id_guest_group'), 'guest_travel_plans', 'guest_group', ['guest_id'], ['id']) - op.drop_constraint(None, 'guest_track', type_='foreignkey') + op.drop_constraint(op.f('fk_guest_track_guest_id_guest_group'), 'guest_track', type_='foreignkey') op.create_foreign_key(op.f('fk_guest_track_guest_id_guest_group'), 'guest_track', 'guest_group', ['guest_id'], ['id']) - op.drop_constraint(None, 'guest_track', type_='unique') - op.drop_constraint(None, 'guest_taxes', type_='foreignkey') + op.drop_constraint(op.f('uq_guest_track_guest_id'), 'guest_track', type_='unique') + op.drop_constraint(op.f('fk_guest_taxes_guest_id_guest_group'), 'guest_taxes', type_='foreignkey') op.create_foreign_key(op.f('fk_guest_taxes_guest_id_guest_group'), 'guest_taxes', 'guest_group', ['guest_id'], ['id']) - op.drop_constraint(None, 'guest_stage_plot', type_='foreignkey') + op.drop_constraint(op.f('fk_guest_stage_plot_guest_id_guest_group'), 'guest_stage_plot', type_='foreignkey') op.create_foreign_key(op.f('fk_guest_stage_plot_guest_id_guest_group'), 'guest_stage_plot', 'guest_group', ['guest_id'], ['id']) - op.drop_constraint(None, 'guest_panel', type_='foreignkey') + op.drop_constraint(op.f('fk_guest_panel_guest_id_guest_group'), 'guest_panel', type_='foreignkey') op.create_foreign_key(op.f('fk_guest_panel_guest_id_guest_group'), 'guest_panel', 'guest_group', ['guest_id'], ['id']) - op.drop_constraint(None, 'guest_merch', type_='foreignkey') + op.drop_constraint(op.f('fk_guest_merch_guest_id_guest_group'), 'guest_merch', type_='foreignkey') op.create_foreign_key(op.f('fk_guest_merch_guest_id_guest_group'), 'guest_merch', 'guest_group', ['guest_id'], ['id']) - op.drop_constraint(None, 'guest_media_request', type_='foreignkey') + op.drop_constraint(op.f('fk_guest_media_request_guest_id_guest_group'), 'guest_media_request', type_='foreignkey') op.create_foreign_key(op.f('fk_guest_media_request_guest_id_guest_group'), 'guest_media_request', 'guest_group', ['guest_id'], ['id']) - op.drop_constraint(None, 'guest_interview', type_='foreignkey') + op.drop_constraint(op.f('fk_guest_interview_guest_id_guest_group'), 'guest_interview', type_='foreignkey') op.create_foreign_key(op.f('fk_guest_interview_guest_id_guest_group'), 'guest_interview', 'guest_group', ['guest_id'], ['id']) - op.drop_constraint(None, 'guest_info', type_='foreignkey') + op.drop_constraint(op.f('fk_guest_info_guest_id_guest_group'), 'guest_info', type_='foreignkey') op.create_foreign_key(op.f('fk_guest_info_guest_id_guest_group'), 'guest_info', 'guest_group', ['guest_id'], ['id']) - op.drop_constraint(None, 'guest_image', type_='foreignkey') + op.drop_constraint(op.f('fk_guest_image_guest_id_guest_group'), 'guest_image', type_='foreignkey') op.create_foreign_key(op.f('fk_guest_image_guest_id_guest_group'), 'guest_image', 'guest_group', ['guest_id'], ['id']) - op.drop_constraint(None, 'guest_hospitality', type_='foreignkey') + op.drop_constraint(op.f('fk_guest_hospitality_guest_id_guest_group'), 'guest_hospitality', type_='foreignkey') op.create_foreign_key(op.f('fk_guest_hospitality_guest_id_guest_group'), 'guest_hospitality', 'guest_group', ['guest_id'], ['id']) - op.drop_constraint(None, 'guest_group', type_='foreignkey') - op.drop_constraint(None, 'guest_group', type_='foreignkey') + op.drop_constraint(op.f('fk_guest_group_event_id_event'), 'guest_group', type_='foreignkey') + op.drop_constraint(op.f('fk_guest_group_group_id_group'), 'guest_group', type_='foreignkey') op.create_foreign_key(op.f('fk_guest_group_event_id_event'), 'guest_group', 'event', ['event_id'], ['id'], ondelete='SET NULL') op.create_foreign_key(op.f('fk_guest_group_group_id_group'), 'guest_group', 'group', ['group_id'], ['id']) - op.drop_constraint(None, 'guest_group', type_='unique') - op.drop_constraint(None, 'guest_detailed_travel_plan', type_='foreignkey') + op.drop_constraint(op.f('uq_guest_group_group_id'), 'guest_group', type_='unique') + op.drop_constraint(op.f('fk_guest_detailed_travel_plan_travel_plans_id_guest_travel_plans'), 'guest_detailed_travel_plan', type_='foreignkey') op.create_foreign_key(op.f('fk_guest_detailed_travel_plan_travel_plans_id_guest_tra_6ad4'), 'guest_detailed_travel_plan', 'guest_travel_plans', ['travel_plans_id'], ['id']) op.alter_column('guest_detailed_travel_plan', 'travel_plans_id', existing_type=sa.UUID(), nullable=True) - op.drop_constraint(None, 'guest_charity', type_='foreignkey') + op.drop_constraint(op.f('fk_guest_charity_guest_id_guest_group'), 'guest_charity', type_='foreignkey') op.create_foreign_key(op.f('fk_guest_charity_guest_id_guest_group'), 'guest_charity', 'guest_group', ['guest_id'], ['id']) - op.drop_constraint(None, 'guest_bio', type_='foreignkey') + op.drop_constraint(op.f('fk_guest_bio_guest_id_guest_group'), 'guest_bio', type_='foreignkey') op.create_foreign_key(op.f('fk_guest_bio_guest_id_guest_group'), 'guest_bio', 'guest_group', ['guest_id'], ['id']) - op.drop_constraint(None, 'guest_autograph', type_='foreignkey') + op.drop_constraint(op.f('fk_guest_autograph_guest_id_guest_group'), 'guest_autograph', type_='foreignkey') op.create_foreign_key(op.f('fk_guest_autograph_guest_id_guest_group'), 'guest_autograph', 'guest_group', ['guest_id'], ['id']) - op.drop_constraint(None, 'group', type_='foreignkey') - op.drop_constraint(None, 'group', type_='foreignkey') - op.create_foreign_key(op.f('fk_group_shared_with_id_group'), 'group', 'group', ['shared_with_id'], ['id'], ondelete='SET NULL') + op.drop_constraint(op.f('fk_group_shared_with_id_group'), 'group', type_='foreignkey') + op.drop_constraint(op.f('fk_group_leader_id_attendee'), 'group', type_='foreignkey') op.create_foreign_key(op.f('fk_leader'), 'group', 'attendee', ['leader_id'], ['id'], ondelete='SET NULL') - op.drop_constraint(None, 'food_restrictions', type_='foreignkey') + op.create_foreign_key(op.f('fk_group_shared_with_id_group'), 'group', 'group', ['shared_with_id'], ['id'], ondelete='SET NULL') + op.drop_constraint(op.f('fk_food_restrictions_attendee_id_attendee'), 'food_restrictions', type_='foreignkey') op.create_foreign_key(op.f('fk_food_restrictions_attendee_id_attendee'), 'food_restrictions', 'attendee', ['attendee_id'], ['id']) - op.drop_constraint(None, 'event_location', type_='foreignkey') + op.drop_constraint(op.f('fk_event_location_department_id_department'), 'event_location', type_='foreignkey') op.create_foreign_key(op.f('fk_event_location_department_id_department'), 'event_location', 'department', ['department_id'], ['id'], ondelete='SET NULL') - op.drop_constraint(None, 'event_feedback', type_='foreignkey') + op.drop_constraint(op.f('fk_event_feedback_event_id_event'), 'event_feedback', type_='foreignkey') op.create_foreign_key(op.f('fk_event_feedback_event_id_event'), 'event_feedback', 'event', ['event_id'], ['id']) - op.drop_constraint(None, 'event', type_='foreignkey') - op.drop_constraint(None, 'event', type_='foreignkey') - op.drop_constraint(None, 'event', type_='foreignkey') + op.drop_constraint(op.f('fk_event_attraction_event_id_attraction_event'), 'event', type_='foreignkey') + op.drop_constraint(op.f('fk_event_event_location_id_event_location'), 'event', type_='foreignkey') + op.drop_constraint(op.f('fk_event_department_id_department'), 'event', type_='foreignkey') + op.create_foreign_key(op.f('fk_event_attraction_event_id_attraction_event'), 'event', 'attraction_event', ['attraction_event_id'], ['id'], ondelete='SET NULL') op.create_foreign_key(op.f('fk_event_location_id_event_location'), 'event', 'event_location', ['event_location_id'], ['id'], ondelete='SET NULL') op.create_foreign_key(op.f('fk_event_department_id_department'), 'event', 'department', ['department_id'], ['id'], ondelete='SET NULL') - op.create_foreign_key(op.f('fk_event_attraction_event_id_attraction_event'), 'event', 'attraction_event', ['attraction_event_id'], ['id'], ondelete='SET NULL') - op.drop_constraint(None, 'event', type_='unique') - op.drop_constraint(None, 'email', type_='foreignkey') + op.drop_constraint(op.f('uq_event_attraction_event_id'), 'event', type_='unique') + op.drop_constraint(op.f('fk_email_automated_email_id_automated_email'), 'email', type_='foreignkey') op.create_foreign_key(op.f('fk_email_automated_email_id_automated_email'), 'email', 'automated_email', ['automated_email_id'], ['id'], ondelete='SET NULL') - op.drop_constraint(None, 'dept_role', type_='foreignkey') + op.drop_constraint(op.f('fk_dept_role_department_id_department'), 'dept_role', type_='foreignkey') op.create_foreign_key(op.f('fk_dept_role_department_id_department'), 'dept_role', 'department', ['department_id'], ['id']) - op.drop_constraint(None, 'dept_membership_request', type_='foreignkey') - op.drop_constraint(None, 'dept_membership_request', type_='foreignkey') - op.create_foreign_key(op.f('fk_dept_membership_request_department_id_department'), 'dept_membership_request', 'department', ['department_id'], ['id']) + op.drop_constraint(op.f('fk_dept_membership_request_department_id_department'), 'dept_membership_request', type_='foreignkey') + op.drop_constraint(op.f('fk_dept_membership_request_attendee_id_attendee'), 'dept_membership_request', type_='foreignkey') op.create_foreign_key(op.f('fk_dept_membership_request_attendee_id_attendee'), 'dept_membership_request', 'attendee', ['attendee_id'], ['id']) - op.drop_constraint(None, 'dept_membership', type_='foreignkey') - op.drop_constraint(None, 'dept_membership', type_='foreignkey') + op.create_foreign_key(op.f('fk_dept_membership_request_department_id_department'), 'dept_membership_request', 'department', ['department_id'], ['id']) + op.drop_constraint(op.f('fk_dept_membership_attendee_id_attendee'), 'dept_membership', type_='foreignkey') + op.drop_constraint(op.f('fk_dept_membership_department_id_department'), 'dept_membership', type_='foreignkey') op.create_foreign_key(op.f('fk_dept_membership_attendee_id_attendee'), 'dept_membership', 'attendee', ['attendee_id'], ['id']) op.create_foreign_key(op.f('fk_dept_membership_department_id_department'), 'dept_membership', 'department', ['department_id'], ['id']) - op.drop_constraint(None, 'dept_checklist_item', type_='foreignkey') - op.drop_constraint(None, 'dept_checklist_item', type_='foreignkey') + op.drop_constraint(op.f('fk_dept_checklist_item_attendee_id_attendee'), 'dept_checklist_item', type_='foreignkey') + op.drop_constraint(op.f('fk_dept_checklist_item_department_id_department'), 'dept_checklist_item', type_='foreignkey') op.create_foreign_key(op.f('fk_dept_checklist_item_attendee_id_attendee'), 'dept_checklist_item', 'attendee', ['attendee_id'], ['id']) op.create_foreign_key(op.f('fk_dept_checklist_item_department_id_department'), 'dept_checklist_item', 'department', ['department_id'], ['id']) - op.drop_constraint(None, 'department', type_='foreignkey') + op.drop_constraint(op.f('fk_department_parent_id_department'), 'department', type_='foreignkey') op.create_foreign_key(op.f('fk_department_parent_id_department'), 'department', 'department', ['parent_id'], ['id']) - op.drop_constraint(None, 'bulk_printing_request', type_='foreignkey') + op.drop_constraint(op.f('uq_department_name'), 'department', type_='unique') + op.create_unique_constraint(op.f('department_name_key'), 'department', ['name'], postgresql_nulls_not_distinct=False) + op.add_column('bulk_printing_request', sa.Column('required', sa.BOOLEAN(), server_default=sa.text('false'), autoincrement=False, nullable=False)) + op.drop_constraint(op.f('fk_bulk_printing_request_department_id_department'), 'bulk_printing_request', type_='foreignkey') op.create_foreign_key(op.f('fk_bulk_printing_request_department_id_department'), 'bulk_printing_request', 'department', ['department_id'], ['id']) - op.drop_constraint(None, 'badge_info', type_='foreignkey') + op.drop_column('bulk_printing_request', 'important') + op.drop_constraint(op.f('fk_badge_info_attendee_id_attendee'), 'badge_info', type_='foreignkey') op.create_foreign_key(op.f('fk_badge_info_attendee_id_attendee'), 'badge_info', 'attendee', ['attendee_id'], ['id'], ondelete='SET NULL') - op.create_index(op.f('ix_badge_info_ident'), 'badge_info', ['ident'], unique=False) - op.create_unique_constraint(op.f('uq_automated_email_ident'), 'automated_email', ['ident'], postgresql_nulls_not_distinct=False) - op.drop_constraint(None, 'attraction_signup', type_='foreignkey') - op.drop_constraint(None, 'attraction_signup', type_='foreignkey') - op.drop_constraint(None, 'attraction_signup', type_='foreignkey') + op.drop_constraint(op.f('fk_attraction_signup_attraction_event_id_attraction_event'), 'attraction_signup', type_='foreignkey') + op.drop_constraint(op.f('fk_attraction_signup_attendee_id_attendee'), 'attraction_signup', type_='foreignkey') + op.drop_constraint(op.f('fk_attraction_signup_attraction_id_attraction'), 'attraction_signup', type_='foreignkey') op.create_foreign_key(op.f('fk_attraction_signup_attraction_event_id_attraction_event'), 'attraction_signup', 'attraction_event', ['attraction_event_id'], ['id']) op.create_foreign_key(op.f('fk_attraction_signup_attraction_id_attraction'), 'attraction_signup', 'attraction', ['attraction_id'], ['id']) op.create_foreign_key(op.f('fk_attraction_signup_attendee_id_attendee'), 'attraction_signup', 'attendee', ['attendee_id'], ['id']) - op.create_index(op.f('ix_attraction_notification_reply_sid'), 'attraction_notification_reply', ['sid'], unique=False) - op.drop_constraint(None, 'attraction_notification', type_='foreignkey') - op.drop_constraint(None, 'attraction_notification', type_='foreignkey') - op.drop_constraint(None, 'attraction_notification', type_='foreignkey') + op.drop_constraint(op.f('fk_attraction_notification_attendee_id_attendee'), 'attraction_notification', type_='foreignkey') + op.drop_constraint(op.f('fk_attraction_notification_attraction_id_attraction'), 'attraction_notification', type_='foreignkey') + op.drop_constraint(op.f('fk_attraction_notification_attraction_event_id_attraction_event'), 'attraction_notification', type_='foreignkey') + op.create_foreign_key(op.f('fk_attraction_notification_attraction_id_attraction'), 'attraction_notification', 'attraction', ['attraction_id'], ['id']) op.create_foreign_key(op.f('fk_attraction_notification_attendee_id_attendee'), 'attraction_notification', 'attendee', ['attendee_id'], ['id']) op.create_foreign_key(op.f('fk_attraction_notification_attraction_event_id_attraction_event'), 'attraction_notification', 'attraction_event', ['attraction_event_id'], ['id']) - op.create_foreign_key(op.f('fk_attraction_notification_attraction_id_attraction'), 'attraction_notification', 'attraction', ['attraction_id'], ['id']) - op.create_index(op.f('ix_attraction_notification_ident'), 'attraction_notification', ['ident'], unique=False) - op.drop_constraint(None, 'attraction_feature', type_='foreignkey') + op.drop_constraint(op.f('fk_attraction_feature_attraction_id_attraction'), 'attraction_feature', type_='foreignkey') op.create_foreign_key(op.f('fk_attraction_feature_attraction_id_attraction'), 'attraction_feature', 'attraction', ['attraction_id'], ['id']) - op.drop_constraint(None, 'attraction_event', type_='foreignkey') - op.drop_constraint(None, 'attraction_event', type_='foreignkey') - op.drop_constraint(None, 'attraction_event', type_='foreignkey') - op.create_foreign_key(op.f('fk_attraction_event_location_id_event_location'), 'attraction_event', 'event_location', ['event_location_id'], ['id'], ondelete='SET NULL') - op.create_foreign_key(op.f('fk_attraction_event_attraction_id_attraction'), 'attraction_event', 'attraction', ['attraction_id'], ['id']) + op.drop_constraint(op.f('uq_attraction_feature_name'), 'attraction_feature', type_='unique') + op.create_unique_constraint(op.f('attraction_feature_name_attraction_id_key'), 'attraction_feature', ['name', 'attraction_id'], postgresql_nulls_not_distinct=False) + op.drop_constraint(op.f('fk_attraction_event_event_location_id_event_location'), 'attraction_event', type_='foreignkey') + op.drop_constraint(op.f('fk_attraction_event_attraction_feature_id_attraction_feature'), 'attraction_event', type_='foreignkey') + op.drop_constraint(op.f('fk_attraction_event_attraction_id_attraction'), 'attraction_event', type_='foreignkey') op.create_foreign_key(op.f('fk_attraction_event_attraction_feature_id_attraction_feature'), 'attraction_event', 'attraction_feature', ['attraction_feature_id'], ['id']) - op.create_unique_constraint(op.f('uq_attraction_slug'), 'attraction', ['slug'], postgresql_nulls_not_distinct=False) + op.create_foreign_key(op.f('fk_attraction_event_attraction_id_attraction'), 'attraction_event', 'attraction', ['attraction_id'], ['id']) + op.create_foreign_key(op.f('fk_attraction_event_location_id_event_location'), 'attraction_event', 'event_location', ['event_location_id'], ['id'], ondelete='SET NULL') + op.drop_constraint(op.f('uq_attraction_name'), 'attraction', type_='unique') op.create_unique_constraint(op.f('attraction_name_key'), 'attraction', ['name'], postgresql_nulls_not_distinct=False) op.add_column('attendee', sa.Column('affiliate', sa.VARCHAR(), server_default=sa.text("''::character varying"), autoincrement=False, nullable=False)) - op.drop_constraint(None, 'attendee', type_='foreignkey') - op.drop_constraint(None, 'attendee', type_='foreignkey') - op.drop_constraint(None, 'attendee', type_='foreignkey') - op.drop_constraint(None, 'attendee', type_='foreignkey') - op.create_foreign_key(op.f('fk_attendee_badge_pickup_group_id_badge_pickup_group'), 'attendee', 'badge_pickup_group', ['badge_pickup_group_id'], ['id'], ondelete='SET NULL') - op.create_foreign_key(op.f('fk_attendee_group_id_group'), 'attendee', 'group', ['group_id'], ['id'], ondelete='SET NULL') + op.drop_constraint(op.f('fk_attendee_creator_id_attendee'), 'attendee', type_='foreignkey') + op.drop_constraint(op.f('fk_attendee_group_id_group'), 'attendee', type_='foreignkey') + op.drop_constraint(op.f('fk_attendee_badge_pickup_group_id_badge_pickup_group'), 'attendee', type_='foreignkey') + op.drop_constraint(op.f('fk_attendee_watchlist_id_watch_list'), 'attendee', type_='foreignkey') op.create_foreign_key(op.f('fk_attendee_watchlist_id_watch_list'), 'attendee', 'watch_list', ['watchlist_id'], ['id'], ondelete='SET NULL') + op.create_foreign_key(op.f('fk_attendee_badge_pickup_group_id_badge_pickup_group'), 'attendee', 'badge_pickup_group', ['badge_pickup_group_id'], ['id'], ondelete='SET NULL') op.create_foreign_key(op.f('fk_attendee_creator_id_attendee'), 'attendee', 'attendee', ['creator_id'], ['id'], ondelete='SET NULL') - op.drop_constraint(None, 'artist_marketplace_application', type_='foreignkey') + op.create_foreign_key(op.f('fk_attendee_group_id_group'), 'attendee', 'group', ['group_id'], ['id'], ondelete='SET NULL') + op.drop_constraint(op.f('fk_artist_marketplace_application_attendee_id_attendee'), 'artist_marketplace_application', type_='foreignkey') op.create_foreign_key(op.f('fk_artist_marketplace_application_attendee_id_attendee'), 'artist_marketplace_application', 'attendee', ['attendee_id'], ['id']) - op.drop_constraint(None, 'artist_marketplace_application', type_='unique') - op.drop_constraint(None, 'art_show_receipt', type_='foreignkey') + op.drop_constraint(op.f('uq_artist_marketplace_application_attendee_id'), 'artist_marketplace_application', type_='unique') + op.drop_constraint(op.f('fk_art_show_receipt_attendee_id_attendee'), 'art_show_receipt', type_='foreignkey') op.create_foreign_key(op.f('fk_art_show_receipt_attendee_id_attendee'), 'art_show_receipt', 'attendee', ['attendee_id'], ['id'], ondelete='SET NULL') op.alter_column('art_show_receipt', 'attendee_id', existing_type=sa.UUID(), nullable=True) - op.drop_constraint(None, 'art_show_piece', type_='foreignkey') - op.drop_constraint(None, 'art_show_piece', type_='foreignkey') - op.drop_constraint(None, 'art_show_piece', type_='foreignkey') + op.drop_constraint(op.f('fk_art_show_piece_app_id_art_show_application'), 'art_show_piece', type_='foreignkey') + op.drop_constraint(op.f('fk_art_show_piece_winning_bidder_id_art_show_bidder'), 'art_show_piece', type_='foreignkey') + op.drop_constraint(op.f('fk_art_show_piece_receipt_id_art_show_receipt'), 'art_show_piece', type_='foreignkey') op.create_foreign_key(op.f('fk_art_show_pieces_app_id_art_show_application'), 'art_show_piece', 'art_show_application', ['app_id'], ['id'], ondelete='SET NULL') - op.create_foreign_key(op.f('fk_art_show_piece_winning_bidder_id_art_show_bidder'), 'art_show_piece', 'art_show_bidder', ['winning_bidder_id'], ['id'], ondelete='SET NULL') op.create_foreign_key(op.f('fk_art_show_piece_receipt_id_art_show_receipt'), 'art_show_piece', 'art_show_receipt', ['receipt_id'], ['id'], ondelete='SET NULL') + op.create_foreign_key(op.f('fk_art_show_piece_winning_bidder_id_art_show_bidder'), 'art_show_piece', 'art_show_bidder', ['winning_bidder_id'], ['id'], ondelete='SET NULL') op.alter_column('art_show_piece', 'app_id', existing_type=sa.UUID(), nullable=True) - op.drop_constraint(None, 'art_show_payment', type_='foreignkey') + op.drop_constraint(op.f('fk_art_show_payment_receipt_id_art_show_receipt'), 'art_show_payment', type_='foreignkey') op.create_foreign_key(op.f('fk_art_show_payment_receipt_id_art_show_receipt'), 'art_show_payment', 'art_show_receipt', ['receipt_id'], ['id'], ondelete='SET NULL') op.alter_column('art_show_payment', 'receipt_id', existing_type=sa.UUID(), nullable=True) - op.drop_constraint(None, 'art_show_bidder', type_='foreignkey') + op.drop_constraint(op.f('fk_art_show_bidder_attendee_id_attendee'), 'art_show_bidder', type_='foreignkey') op.create_foreign_key(op.f('fk_art_show_bidder_attendee_id_attendee'), 'art_show_bidder', 'attendee', ['attendee_id'], ['id'], ondelete='SET NULL') op.alter_column('art_show_bidder', 'attendee_id', existing_type=sa.UUID(), nullable=True) - op.drop_constraint(None, 'art_show_application', type_='foreignkey') + op.drop_constraint(op.f('fk_art_show_application_attendee_id_attendee'), 'art_show_application', type_='foreignkey') op.create_foreign_key(op.f('fk_art_show_application_attendee_id_attendee'), 'art_show_application', 'attendee', ['attendee_id'], ['id'], ondelete='SET NULL') - op.drop_constraint(None, 'art_show_application', type_='unique') - op.alter_column('art_show_application', 'default_cost', - existing_type=sa.INTEGER(), - nullable=True) - op.alter_column('art_show_application', 'overridden_price', - existing_type=sa.INTEGER(), - nullable=True) - op.drop_constraint(None, 'art_show_agent_code', type_='foreignkey') - op.drop_constraint(None, 'art_show_agent_code', type_='foreignkey') + op.drop_constraint(op.f('uq_art_show_application_attendee_id'), 'art_show_application', type_='unique') + op.drop_constraint(op.f('fk_art_show_agent_code_app_id_art_show_application'), 'art_show_agent_code', type_='foreignkey') + op.drop_constraint(op.f('fk_art_show_agent_code_attendee_id_attendee'), 'art_show_agent_code', type_='foreignkey') op.create_foreign_key(op.f('fk_art_show_agent_code_app_id_art_show_application'), 'art_show_agent_code', 'art_show_application', ['app_id'], ['id']) op.create_foreign_key(op.f('fk_art_show_agent_code_attendee_id_attendee'), 'art_show_agent_code', 'attendee', ['attendee_id'], ['id'], ondelete='SET NULL') - op.drop_constraint(None, 'art_panel_assignment', type_='foreignkey') - op.drop_constraint(None, 'art_panel_assignment', type_='foreignkey') + op.drop_constraint(op.f('fk_art_panel_assignment_panel_id_art_show_panel'), 'art_panel_assignment', type_='foreignkey') + op.drop_constraint(op.f('fk_art_panel_assignment_app_id_art_show_application'), 'art_panel_assignment', type_='foreignkey') op.create_foreign_key(op.f('fk_art_panel_assignment_app_id_art_show_application'), 'art_panel_assignment', 'art_show_application', ['app_id'], ['id']) op.create_foreign_key(op.f('fk_art_panel_assignment_panel_id_art_show_panel'), 'art_panel_assignment', 'art_show_panel', ['panel_id'], ['id']) - op.drop_constraint(None, 'api_token', type_='foreignkey') + op.drop_constraint(op.f('fk_api_token_admin_account_id_admin_account'), 'api_token', type_='foreignkey') op.create_foreign_key(op.f('fk_api_token_admin_account_id_admin_account'), 'api_token', 'admin_account', ['admin_account_id'], ['id']) - op.drop_constraint(None, 'admin_account', type_='foreignkey') + op.drop_constraint(op.f('fk_admin_account_attendee_id_attendee'), 'admin_account', type_='foreignkey') op.create_foreign_key(op.f('fk_admin_account_attendee_id_attendee'), 'admin_account', 'attendee', ['attendee_id'], ['id']) op.create_table('attendee_tournament', sa.Column('id', sa.UUID(), autoincrement=False, nullable=False), @@ -628,3 +611,4 @@ def downgrade(): sa.Column('last_synced', postgresql.JSONB(astext_type=sa.Text()), server_default=sa.text("'{}'::jsonb"), autoincrement=False, nullable=False), sa.PrimaryKeyConstraint('id', name=op.f('pk_attendee_tournament')) ) + # ### end Alembic commands ### diff --git a/uber/forms/department.py b/uber/forms/department.py index 5560d9103..840a6cbe7 100644 --- a/uber/forms/department.py +++ b/uber/forms/department.py @@ -121,7 +121,8 @@ class BulkPrintingRequestInfo(MagForm): description="If you want the same content on the front and back, please make sure your document has each page duplicated.") stapled = BooleanField("Please staple the pages of this document together.") notes = TextAreaField("Additional Information") - required = BooleanField("This document is vital to my department.", - description="We will do our best to print all submitted documents, but this will help us prioritize the most important documents to print.") + important = BooleanField( + "This document is vital to my department.", + description="We will do our best to print all submitted documents, but this will help us prioritize the most important documents to print.") link_is_shared = BooleanField( Markup("I verify that I have checked the permissions of the link provided and made sure it is publicly accessible.")) \ No newline at end of file diff --git a/uber/forms/showcase.py b/uber/forms/showcase.py index 55db359e6..efced3ef4 100644 --- a/uber/forms/showcase.py +++ b/uber/forms/showcase.py @@ -44,7 +44,7 @@ class DeveloperInfo(MagForm): last_name = StringField('Last Name', render_kw={'autocomplete': "lname"}) email = EmailField('Email Address', render_kw={'placeholder': 'test@example.com'}) cellphone = TelField('Phone Number') - gets_emails = BooleanField('I want to receive emails about my studio\'s showcase submissions.') + receives_emails = BooleanField('I want to receive emails about my studio\'s showcase submissions.') agreed_coc = BooleanField() agreed_data_policy = BooleanField() diff --git a/uber/models/__init__.py b/uber/models/__init__.py index ecd535be1..e17e364cc 100644 --- a/uber/models/__init__.py +++ b/uber/models/__init__.py @@ -25,7 +25,7 @@ from sqlalchemy.exc import IntegrityError, NoResultFound from sqlalchemy.ext.hybrid import hybrid_method, hybrid_property from sqlalchemy.ext.mutable import MutableDict -from sqlalchemy.orm import Query, joinedload, selectinload, subqueryload, contains_eager, DeclarativeBase, declared_attr, sessionmaker, scoped_session +from sqlalchemy.orm import Query, joinedload, selectinload, subqueryload, contains_eager, declared_attr, sessionmaker, scoped_session import sqlalchemy.orm from sqlalchemy.orm.attributes import get_history, instance_state from sqlalchemy.schema import MetaData, UniqueConstraint @@ -129,7 +129,13 @@ def uncamel(s, sep='_'): """ return RE_UNCAMEL.sub(r'{0}\1'.format(sep), s).lower() -DeclarativeBase.metadata = MetaData() +SQLModel.metadata.naming_convention = { + "ix": "ix_%(column_0_label)s", + "uq": "uq_%(table_name)s_%(column_0_name)s", + "ck": "ck_%(table_name)s_%(constraint_name)s", + "fk": "fk_%(table_name)s_%(column_0_name)s_%(referred_table_name)s", + "pk": "pk_%(table_name)s", +} class MagModel(SQLModel): model_config: ClassVar = ConfigDict(ignored_types=(hybrid_method, hybrid_property)) diff --git a/uber/models/admin.py b/uber/models/admin.py index 9a729e714..8fb16e922 100644 --- a/uber/models/admin.py +++ b/uber/models/admin.py @@ -41,17 +41,17 @@ class AdminAccount(MagModel, table=True): """ attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE', unique=True) - attendee: 'Attendee' = Relationship( - back_populates="admin_account", sa_relationship_kwargs={'lazy': 'joined', 'cascade': 'save-update,merge,refresh-expire,expunge'}) + attendee: 'Attendee' = Relationship(back_populates="admin_account", sa_relationship_kwargs={'lazy': 'joined'}) - hashed: str = Field(sa_column=Column(String, private=True)) + hashed: str = Field(sa_type=String, private=True) access_groups: list['AccessGroup'] = Relationship( back_populates='admin_accounts', - sa_relationship_kwargs={'lazy': 'selectin', 'cascade': 'save-update,merge,refresh-expire,expunge', 'secondary': 'admin_access_group'}) + sa_relationship_kwargs={'lazy': 'selectin', 'secondary': 'admin_access_group'}) password_reset: "PasswordReset" = Relationship( - back_populates='admin_account', sa_relationship_kwargs={'lazy': 'select', 'passive_deletes': True}) - api_tokens: list['ApiToken'] = Relationship(back_populates="admin_account", sa_relationship_kwargs={'passive_deletes': True}) + back_populates='admin_account', sa_relationship_kwargs={'lazy': 'select', 'cascade': 'all,delete-orphan', 'passive_deletes': True}) + api_tokens: list['ApiToken'] = Relationship(back_populates="admin_account", + sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) active_api_tokens: list['ApiToken'] = Relationship(sa_relationship=relationship( 'ApiToken', lazy='select', primaryjoin='and_(' @@ -59,13 +59,13 @@ class AdminAccount(MagModel, table=True): 'ApiToken.revoked_time == None)', overlaps="admin_account,api_tokens")) api_jobs: list['ApiJob'] = Relationship( - back_populates="admin_account", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) + back_populates="admin_account") attractions: list['Attraction'] = Relationship( - back_populates="owner", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge', 'order_by': 'Attraction.name'}) - judge: 'IndieJudge' = Relationship(back_populates="admin_account", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) + back_populates="owner", sa_relationship_kwargs={'order_by': 'Attraction.name'}) + judge: 'IndieJudge' = Relationship(back_populates="admin_account") print_requests: list['PrintJob'] = Relationship( - back_populates="admin_account", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) + back_populates="admin_account") def __repr__(self): return f"" @@ -270,10 +270,11 @@ def invalid_api_accesses(self): class PasswordReset(MagModel, table=True): admin_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='admin_account.id', ondelete='CASCADE', unique=True) - admin_account: 'AdminAccount' = Relationship(back_populates="password_reset") + admin_account: 'AdminAccount' = Relationship( + back_populates="password_reset", sa_relationship_kwargs={'single_parent': True}) attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee_account.id', ondelete='CASCADE', unique=True) - attendee_account: 'AttendeeAccount' = Relationship(back_populates="password_reset") + attendee_account: 'AttendeeAccount' = Relationship(back_populates="password_reset", sa_relationship_kwargs={'single_parent': True}) generated: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) hashed: str = Column(String, private=True) @@ -307,7 +308,7 @@ class AccessGroup(MagModel, table=True): admin_accounts: list['AdminAccount'] = Relationship( back_populates='access_groups', - sa_relationship_kwargs={'secondary': 'admin_access_group', 'cascade': 'save-update,merge,refresh-expire,expunge'}) + sa_relationship_kwargs={'secondary': 'admin_access_group'}) name: str = '' access: dict[str, int] = Field(sa_type=MutableDict.as_mutable(JSONB), default_factory=dict) @@ -363,14 +364,14 @@ class WatchList(MagModel, table=True): first_names: str = '' last_name: str = '' email: str = '' - birthdate: datetime | None = Field(sa_column=Column(Date, nullable=True, default=None)) + birthdate: datetime | None = Field(sa_type=Date, nullable=True, default=None) reason: str = '' action: str = '' - expiration: datetime | None = Field(sa_column=Column(Date, nullable=True, default=None)) + expiration: datetime | None = Field(sa_type=Date, nullable=True, default=None) active: bool = True attendees: list['Attendee'] = Relationship( back_populates="watch_list", - sa_relationship_kwargs={'lazy': 'selectin', 'cascade': 'save-update,merge,refresh-expire,expunge'}) + sa_relationship_kwargs={'lazy': 'selectin'}) @property def full_name(self): @@ -405,7 +406,7 @@ class EscalationTicket(MagModel, table=True): attendees: list['Attendee'] = Relationship( back_populates="escalation_tickets", sa_relationship_kwargs={'lazy': 'selectin', 'order_by': 'Attendee.full_name', - 'cascade': 'save-update,merge,refresh-expire,expunge', 'secondary': 'attendee_escalation_ticket'}) + 'secondary': 'attendee_escalation_ticket'}) ticket_id_seq: ClassVar = Sequence('escalation_ticket_ticket_id_seq') ticket_id: int = Field(sa_column=Column(Integer, ticket_id_seq, server_default=ticket_id_seq.next_value(), unique=True)) who: str = '' diff --git a/uber/models/api.py b/uber/models/api.py index 8dc8ba270..8b421f092 100644 --- a/uber/models/api.py +++ b/uber/models/api.py @@ -24,7 +24,7 @@ class ApiToken(MagModel, table=True): admin_account: "AdminAccount" = Relationship(back_populates="api_tokens", sa_relationship_kwargs={'lazy': 'joined'}) token: str | None = Field(sa_type=Uuid(as_uuid=False), default_factory=lambda: str(uuid.uuid4()), private=True) - access: str = Field(sa_column=Column(MultiChoice(c.API_ACCESS_OPTS))) + access: str = Field(sa_type=MultiChoice(c.API_ACCESS_OPTS), default='') name: str = '' description: str = '' issued_time: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) diff --git a/uber/models/art_show.py b/uber/models/art_show.py index 31589fb71..b76242489 100644 --- a/uber/models/art_show.py +++ b/uber/models/art_show.py @@ -16,7 +16,7 @@ from uber.utils import RegistrationCode, get_static_file_path from sqlalchemy.ext.hybrid import hybrid_property -from sqlalchemy.types import Integer, Boolean, String, Uuid, DateTime +from sqlalchemy.types import Integer, Uuid, DateTime from sqlalchemy.schema import UniqueConstraint, Index from typing import ClassVar @@ -38,7 +38,7 @@ class ArtShowAgentCode(MagModel, table=True): attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', nullable=True) attendee: 'Attendee' = Relationship(back_populates="agent_codes") - code: str = Column(String) + code: str = '' cancelled: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) @hybrid_property @@ -66,45 +66,44 @@ class ArtShowApplication(MagModel, table=True): checked_in: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) checked_out: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) - locations: str = Column(String) - artist_name: str = Column(String) - artist_id: str = Column(String, admin_only=True) - payout_method: int = Column(Choice(c.ARTIST_PAYOUT_METHOD_OPTS), default=c.CHECK) - banner_name: str = Column(String) - banner_name_ad: str = Column(String) - artist_id_ad: str = Column(String, admin_only=True) - check_payable: str = Column(String) - contact_at_con: str = Column(String) - panels: int = Column(Integer, default=0) - panels_ad: int = Column(Integer, default=0) - tables: int = Column(Integer, default=0) - tables_ad: int = Column(Integer, default=0) - description: str = Column(String) - business_name: str = Column(String) - zip_code: str = Column(String) - address1: str = Column(String) - address2: str = Column(String) - city: str = Column(String) - region: str = Column(String) - country: str = Column(String) - paypal_address: str = Column(String) # TODO: Move to AC plugin - website: str = Column(String) - special_needs: str = Column(String) - status: int = Column(Choice(c.ART_SHOW_STATUS_OPTS), default=c.UNAPPROVED) - decline_reason: str = Column(String) - delivery_method: int = Column(Choice(c.ART_SHOW_DELIVERY_OPTS), default=c.BRINGING_IN) - us_only: bool = Column(Boolean, default=False) - admin_notes: str = Column(String, admin_only=True) - check_in_notes: str = Column(String) - overridden_price: int = Column(Integer, nullable=True, admin_only=True) + locations: str = '' + artist_name: str = '' + artist_id: str = '' + payout_method: int = Field(sa_column=Column(Choice(c.ARTIST_PAYOUT_METHOD_OPTS)), default=c.CHECK) + banner_name: str = '' + banner_name_ad: str = '' + artist_id_ad: str = '' + check_payable: str = '' + contact_at_con: str = '' + panels: int = 0 + panels_ad: int = 0 + tables: int = 0 + tables_ad: int = 0 + description: str = '' + business_name: str = '' + zip_code: str = '' + address1: str = '' + address2: str = '' + city: str = '' + region: str = '' + country: str = '' + paypal_address: str = '' # TODO: Move to AC plugin + website: str = '' + special_needs: str = '' + status: int = Field(sa_column=Column(Choice(c.ART_SHOW_STATUS_OPTS)), default=c.UNAPPROVED) + decline_reason: str = '' + delivery_method: int = Field(sa_column=Column(Choice(c.ART_SHOW_DELIVERY_OPTS)), default=c.BRINGING_IN) + us_only: bool = False + admin_notes: str = '' + check_in_notes: str = '' + overridden_price: int = Field(nullable=True, default=0) active_receipt: 'ModelReceipt' = Relationship(sa_relationship=relationship( 'ModelReceipt', - cascade='save-update,merge,refresh-expire,expunge', primaryjoin='and_(remote(ModelReceipt.owner_id) == foreign(ArtShowApplication.id),' 'ModelReceipt.owner_model == "ArtShowApplication",' 'ModelReceipt.closed == None)', lazy='select')) - default_cost: int = Column(Integer, nullable=True) + default_cost: int | None = Field(nullable=True) agents: list['Attendee'] = Relationship( back_populates="art_agent_apps", @@ -112,9 +111,12 @@ class ArtShowApplication(MagModel, table=True): 'secondaryjoin': 'and_(ArtShowAgentCode.app_id == ArtShowApplication.id, ArtShowAgentCode.cancelled == None)', 'secondary': 'art_show_agent_code', 'viewonly': True }) - art_show_pieces: list['ArtShowPiece'] = Relationship(back_populates="app", sa_relationship_kwargs={'passive_deletes': True}) - agent_codes: list['ArtShowAgentCode'] = Relationship(back_populates="app", sa_relationship_kwargs={'passive_deletes': True}) - assignments: list['ArtPanelAssignment'] = Relationship(back_populates="app", sa_relationship_kwargs={'passive_deletes': True}) + art_show_pieces: list['ArtShowPiece'] = Relationship( + back_populates="app", sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) + agent_codes: list['ArtShowAgentCode'] = Relationship( + back_populates="app", sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) + assignments: list['ArtPanelAssignment'] = Relationship( + back_populates="app", sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) email_model_name: ClassVar = 'app' @@ -463,25 +465,24 @@ class ArtShowPiece(MagModel, table=True): winning_bidder_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='art_show_bidder.id', nullable=True) winning_bidder: 'ArtShowBidder' = Relationship(back_populates="art_show_pieces") - piece_id: int = Column(Integer) - name: str = Column(String) - for_sale: bool = Column(Boolean, default=False) - type: int = Column(Choice(c.ART_PIECE_TYPE_OPTS), default=c.PRINT) - gallery: int = Column(Choice(c.ART_PIECE_GALLERY_OPTS), default=c.GENERAL) - media: str = Column(String) - print_run_num: int | None = Column(Integer, default=0, nullable=True) - print_run_total: int | None = Column(Integer, default=0, nullable=True) - opening_bid: int | None = Column(Integer, default=0, nullable=True) - quick_sale_price: int | None = Column(Integer, default=0, nullable=True) - winning_bid: int | None = Column(Integer, default=0, nullable=True) - no_quick_sale: bool = Column(Boolean, default=False) - voice_auctioned: bool = Column(Boolean, default=False) - status: int = Column(Choice(c.ART_PIECE_STATUS_OPTS), default=c.EXPECTED, - admin_only=True) + piece_id: int = 1 + name: str = '' + for_sale: bool = False + type: int = Field(sa_column=Column(Choice(c.ART_PIECE_TYPE_OPTS)), default=c.PRINT) + gallery: int = Field(sa_column=Column(Choice(c.ART_PIECE_GALLERY_OPTS)), default=c.GENERAL) + media: str = '' + print_run_num: int | None = Field(default=0, nullable=True) + print_run_total: int | None = Field(default=0, nullable=True) + opening_bid: int | None = Field(default=0, nullable=True) + quick_sale_price: int | None = Field(default=0, nullable=True) + winning_bid: int | None = Field(default=0, nullable=True) + no_quick_sale: bool = False + voice_auctioned: bool = False + status: int = Field(sa_column=Column(Choice(c.ART_PIECE_STATUS_OPTS)), default=c.EXPECTED) buyer: 'Attendee' = Relationship( back_populates="art_show_purchases", - sa_relationship_kwargs={'lazy': 'joined', 'secondary': 'art_show_receipt', 'cascade': 'save-update,merge,refresh-expire,expunge'}) + sa_relationship_kwargs={'lazy': 'joined', 'secondary': 'art_show_receipt'}) @presave_adjustment def create_piece_id(self): @@ -599,18 +600,19 @@ class ArtShowPanel(MagModel, table=True): ArtPanelAssignment: selectin """ - gallery: int = Column(Choice(c.ART_PIECE_GALLERY_OPTS), default=c.GENERAL) - surface_type: int = Column(Choice(c.ART_SHOW_PANEL_TYPE_OPTS), default=c.PANEL) - origin_x: int = Column(Integer, default=0) - origin_y: int = Column(Integer, default=0) - terminus_x: int = Column(Integer, default=0) - terminus_y: int = Column(Integer, default=0) - assignable_sides: int = Column(Choice(c.ART_SHOW_PANEL_SIDE_OPTS), default=c.BOTH) - start_label: str = Column(String) - end_label: str = Column(String) + gallery: int = Field(sa_column=Column(Choice(c.ART_PIECE_GALLERY_OPTS)), default=c.GENERAL) + surface_type: int = Field(sa_column=Column(Choice(c.ART_SHOW_PANEL_TYPE_OPTS)), default=c.PANEL) + origin_x: int = 0 + origin_y: int = 0 + terminus_x: int = 0 + terminus_y: int = 0 + assignable_sides: int = Field(sa_column=Column(Choice(c.ART_SHOW_PANEL_SIDE_OPTS)), default=c.BOTH) + start_label: str = '' + end_label: str = '' assignments: list['ArtPanelAssignment'] = Relationship( - back_populates="panel", sa_relationship_kwargs={'lazy': 'selectin', 'passive_deletes': True}) + back_populates="panel", + sa_relationship_kwargs={'lazy': 'selectin', 'cascade': 'all,delete-orphan', 'passive_deletes': True}) __table_args__: ClassVar = ( UniqueConstraint('gallery', 'surface_type', 'origin_x', 'origin_y', 'terminus_x', 'terminus_y'), @@ -652,8 +654,8 @@ class ArtPanelAssignment(MagModel, table=True): panel_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='art_show_panel.id', ondelete='CASCADE') panel: 'ArtShowPanel' = Relationship(back_populates="assignments", sa_relationship_kwargs={'lazy': 'joined'}) - manual: bool = Column(Boolean, default=False) - assigned_side: int = Column(Choice(c.ART_SHOW_PANEL_SIDE_OPTS), default=c.START) + manual: bool = False + assigned_side: int = Field(sa_column=Column(Choice(c.ART_SHOW_PANEL_SIDE_OPTS)), default=c.START) __table_args__: ClassVar = ( UniqueConstraint('panel_id', 'assigned_side'), @@ -689,8 +691,8 @@ class ArtShowPayment(MagModel, table=True): receipt_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='art_show_receipt.id', ondelete='CASCADE') receipt: 'ArtShowReceipt' = Relationship(back_populates="art_show_payments", sa_relationship_kwargs={'lazy': 'joined'}) - amount: int = Column(Integer, default=0) - type: int = Column(Choice(c.ART_SHOW_PAYMENT_OPTS), default=c.STRIPE, admin_only=True) + amount: int = 0 + type: int = Field(sa_column=Column(Choice(c.ART_SHOW_PAYMENT_OPTS)), default=c.STRIPE) when: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) @@ -705,14 +707,14 @@ class ArtShowReceipt(MagModel, table=True): attendee: 'Attendee' = Relationship( back_populates="art_show_receipts", sa_relationship_kwargs={'lazy': 'joined', 'overlaps': 'art_show_purchases,buyer'}) - invoice_num: int = Column(Integer, default=0) + invoice_num: int = 0 closed: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) pieces: list['ArtShowPiece'] = Relationship( back_populates="receipt", - sa_relationship_kwargs={'lazy': 'selectin', 'cascade': 'save-update,merge,refresh-expire,expunge', 'overlaps': 'art_show_purchases,buyer'}) + sa_relationship_kwargs={'lazy': 'selectin', 'overlaps': 'art_show_purchases,buyer'}) art_show_payments: list['ArtShowPayment'] = Relationship( - back_populates="receipt", sa_relationship_kwargs={'lazy': 'selectin', 'passive_deletes': True}) + back_populates="receipt", sa_relationship_kwargs={'lazy': 'selectin', 'cascade': 'all,delete-orphan', 'passive_deletes': True}) @presave_adjustment def add_invoice_num(self): @@ -773,16 +775,16 @@ class ArtShowBidder(MagModel, table=True): attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE') attendee: 'Attendee' = Relationship( - back_populates="art_show_bidder", sa_relationship_kwargs={'lazy': 'joined', 'cascade': 'save-update,merge,refresh-expire,expunge'}) + back_populates="art_show_bidder", sa_relationship_kwargs={'lazy': 'joined'}) - bidder_num: str = Column(String) - admin_notes: str = Column(String) + bidder_num: str = '' + admin_notes: str = '' signed_up: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) - email_won_bids: bool = Column(Boolean, default=False) - contact_type: int = Column(Choice(c.ART_SHOW_CONTACT_TYPE_OPTS), default=c.EMAIL) + email_won_bids: bool = False + contact_type: int = Field(sa_column=Column(Choice(c.ART_SHOW_CONTACT_TYPE_OPTS)), default=c.EMAIL) art_show_pieces: list['ArtShowPiece'] = Relationship( - back_populates="winning_bidder", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) + back_populates="winning_bidder") email_model_name: ClassVar = 'bidder' diff --git a/uber/models/attendee.py b/uber/models/attendee.py index c9b3f2515..222178ad8 100644 --- a/uber/models/attendee.py +++ b/uber/models/attendee.py @@ -10,17 +10,16 @@ from sqlalchemy.ext.hybrid import hybrid_property from sqlalchemy.orm import subqueryload, aliased, selectinload, joinedload from sqlalchemy.schema import ForeignKey, Index, Table, UniqueConstraint -from sqlalchemy.types import Boolean, Integer, Uuid, String, DateTime +from sqlalchemy.types import Boolean, Uuid, String, DateTime from typing import ClassVar import uber from uber.config import c from uber.custom_tags import safe_string, time_day_local, readable_join -from uber.decorators import predelete_adjustment, presave_adjustment, \ - render, cached_property, classproperty +from uber.decorators import presave_adjustment, render, cached_property, classproperty from uber.models import MagModel from uber.models.group import Group -from uber.models.types import default_relationship as relationship, utcnow, Choice, DefaultColumn as Column, \ +from uber.models.types import default_relationship as relationship, Choice, DefaultColumn as Column, \ MultiChoice, TakesPaymentMixin, DefaultField as Field, DefaultRelationship as Relationship from uber.utils import add_opt, get_age_from_birthday, get_age_conf_from_birthday, hour_day_format, \ localized_now, mask_string, normalize_email, normalize_email_legacy, remove_opt, RegistrationCode, listify, groupify @@ -153,10 +152,10 @@ class BadgeInfo(MagModel, table=True): attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', nullable=True) attendee: 'Attendee' = Relationship(back_populates="allocated_badges", sa_relationship_kwargs={'lazy': 'joined'}) - active: bool = Column(Boolean, default=False) + active: bool = False picked_up: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True, default=None) reported_lost: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True, default=None) - ident: int = Column(Integer, default=0, index=True) + ident: int = Field(default=0, index=True) def __repr__(self): return f"" @@ -208,10 +207,12 @@ class Attendee(MagModel, TakesPaymentMixin, table=True): PromoCode: select ModelReceipt: select DeptMembership: select + WatchList: select + PromoCodeGroup: select """ watchlist_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='watch_list.id', nullable=True) - watch_list: "WatchList" = Relationship(back_populates="attendees") + watch_list: "WatchList" = Relationship(back_populates="attendees", sa_relationship_kwargs={'lazy': 'select'}) group_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='group.id', nullable=True) group: 'Group' = Relationship(back_populates="attendees", sa_relationship_kwargs={'foreign_keys': 'Attendee.group_id', 'lazy': 'select'}) @@ -224,8 +225,7 @@ class Attendee(MagModel, TakesPaymentMixin, table=True): back_populates="created_badges", sa_relationship_kwargs={'foreign_keys': 'Attendee.creator_id', 'remote_side': 'Attendee.id'}) created_badges: list['Attendee'] = Relationship( back_populates="creator", - sa_relationship_kwargs={'foreign_keys': 'Attendee.creator_id', 'order_by': 'Attendee.full_name', - 'cascade': 'save-update,merge,refresh-expire,expunge'}) + sa_relationship_kwargs={'foreign_keys': 'Attendee.creator_id', 'order_by': 'Attendee.full_name'}) current_attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', nullable=True) current_attendee: 'Attendee' = Relationship( @@ -233,17 +233,14 @@ class Attendee(MagModel, TakesPaymentMixin, table=True): sa_relationship_kwargs={'foreign_keys': 'Attendee.current_attendee_id', 'remote_side': 'Attendee.id'}) old_badges: list['Attendee'] = Relationship( back_populates="current_attendee", - sa_relationship_kwargs={'foreign_keys': 'Attendee.current_attendee_id', 'order_by': 'Attendee.badge_status', - 'cascade': 'save-update,merge,refresh-expire,expunge'}) + sa_relationship_kwargs={'foreign_keys': 'Attendee.current_attendee_id', 'order_by': 'Attendee.badge_status'}) allocated_badges: list['BadgeInfo'] = Relationship( - back_populates="attendee", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) + back_populates="attendee") active_badge: 'BadgeInfo' = Relationship(sa_relationship=relationship( 'BadgeInfo', - cascade='save-update,merge,refresh-expire,expunge', primaryjoin='and_(BadgeInfo.attendee_id == Attendee.id,' 'BadgeInfo.active == True)', - uselist=False, lazy='joined', overlaps="allocated_badges,attendee")) @@ -268,7 +265,7 @@ class Attendee(MagModel, TakesPaymentMixin, table=True): legal_name: str = '' email: str = '' birthdate: date | None = None - age_group: int | None = Field(sa_column=Column(Choice(c.AGE_GROUPS), default=c.AGE_UNKNOWN, nullable=True)) + age_group: int | None = Field(sa_column=Column(Choice(c.AGE_GROUPS), nullable=True), default=c.AGE_UNKNOWN) international: bool = False zip_code: str = '' @@ -286,22 +283,22 @@ class Attendee(MagModel, TakesPaymentMixin, table=True): requested_accessibility_services: bool = False - interests: str = Field(default='', sa_column=Column(MultiChoice(c.INTEREST_OPTS))) + interests: str = Field(sa_type=MultiChoice(c.INTEREST_OPTS), default='') found_how: str = '' comments: str = '' for_review: str = '' admin_notes: str = '' public_id: str | None = Field(sa_type=Uuid(as_uuid=False), default_factory=lambda: str(uuid4())) - badge_type: int = Field(default=c.ATTENDEE_BADGE, sa_column=Column(Choice(c.BADGE_OPTS))) - badge_status: int = Field(default=c.NEW_STATUS, sa_column=Column(Choice(c.BADGE_STATUS_OPTS), index=True, admin_only=True)) - ribbon: str = Field(default='', sa_column=Column(MultiChoice(c.RIBBON_OPTS), admin_only=True)) + badge_type: int = Field(sa_column=Column(Choice(c.BADGE_OPTS)), default=c.ATTENDEE_BADGE) + badge_status: int = Field(sa_column=Column(Choice(c.BADGE_STATUS_OPTS), index=True, admin_only=True), default=c.NEW_STATUS) + ribbon: str = Field(sa_type=MultiChoice(c.RIBBON_OPTS), default='', admin_only=True) # If [[staff_shirt]] is the same as [[shirt]], we only use the shirt column - shirt: int = Field(default=c.NO_SHIRT, sa_column=Column(Choice(c.SHIRT_OPTS))) - staff_shirt: int = Field(default=c.NO_SHIRT, sa_column=Column(Choice(c.STAFF_SHIRT_OPTS))) - num_event_shirts: int = Field(default=-1, sa_column=Column(Choice(c.STAFF_EVENT_SHIRT_OPTS, allow_unspecified=True))) - shirt_opt_out: int = Field(default=c.OPT_IN, sa_column=Column(Choice(c.SHIRT_OPT_OUT_OPTS))) + shirt: int = Field(sa_column=Column(Choice(c.SHIRT_OPTS)), default=c.NO_SHIRT) + staff_shirt: int = Field(sa_column=Column(Choice(c.STAFF_SHIRT_OPTS)), default=c.NO_SHIRT) + num_event_shirts: int = Field(sa_column=Column(Choice(c.STAFF_EVENT_SHIRT_OPTS, allow_unspecified=True)), default=-1) + shirt_opt_out: int = Field(sa_column=Column(Choice(c.SHIRT_OPT_OUT_OPTS)), default=c.OPT_IN) can_spam: bool = False regdesk_info: str = '' extra_merch: str = '' @@ -315,17 +312,16 @@ class Attendee(MagModel, TakesPaymentMixin, table=True): confirmed: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True, default=None) checked_in: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) - paid: int = Field(default=c.NOT_PAID, sa_column=Column(Choice(c.PAYMENT_OPTS), index=True, admin_only=True)) + paid: int = Field(sa_column=Column(Choice(c.PAYMENT_OPTS), index=True, admin_only=True), default=c.NOT_PAID) badge_cost: int | None overridden_price: int | None - amount_extra: int = Field(default=0, sa_column=Column(Choice(c.DONATION_TIER_OPTS, allow_unspecified=True))) + amount_extra: int = Field(sa_column=Column(Choice(c.DONATION_TIER_OPTS, allow_unspecified=True)), default=0) extra_donation: int = 0 badge_printed_name: str = '' active_receipt: 'ModelReceipt' = Relationship(sa_relationship=relationship( 'ModelReceipt', - cascade='save-update,merge,refresh-expire,expunge', primaryjoin='and_(remote(ModelReceipt.owner_id) == foreign(Attendee.id),' 'ModelReceipt.owner_model == "Attendee",' 'ModelReceipt.closed == None)', @@ -334,18 +330,18 @@ class Attendee(MagModel, TakesPaymentMixin, table=True): created_groups: list['Group'] = Relationship( back_populates="creator", - sa_relationship_kwargs={'foreign_keys': 'Group.creator_id', 'order_by': 'Group.name', - 'cascade': 'save-update,merge,refresh-expire,expunge'}) + sa_relationship_kwargs={'foreign_keys': 'Group.creator_id', 'order_by': 'Group.name'}) dept_memberships: list['DeptMembership'] = Relationship( - back_populates="attendee", sa_relationship_kwargs={'lazy': 'select', 'passive_deletes': True}) + back_populates="attendee", + sa_relationship_kwargs={'lazy': 'select', 'cascade': 'all,delete-orphan', 'passive_deletes': True}) dept_membership_requests: list['DeptMembershipRequest'] = Relationship( - back_populates="attendee", sa_relationship_kwargs={'passive_deletes': True}) + back_populates="attendee", sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) assigned_depts: list['Department'] = Relationship( back_populates='members', sa_relationship_kwargs={ 'order_by': 'Department.name', 'overlaps': 'dept_memberships,attendee', - 'secondary': 'dept_membership', 'cascade': 'save-update,merge,refresh-expire,expunge'}) + 'secondary': 'dept_membership'}) dept_roles: list['DeptRole'] = Relationship( back_populates="attendees", sa_relationship_kwargs={ @@ -353,7 +349,8 @@ class Attendee(MagModel, TakesPaymentMixin, table=True): 'dept_membership_dept_role.c.dept_membership_id == DeptMembership.id)', 'secondary': 'join(DeptMembership, dept_membership_dept_role)', 'order_by': 'DeptRole.name', 'viewonly': True}) - shifts: list['Shift'] = Relationship(back_populates="attendee", sa_relationship_kwargs={'passive_deletes': True}) + shifts: list['Shift'] = Relationship( + back_populates="attendee", sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) jobs: list['Job'] = Relationship( back_populates="attendees_working_shifts", sa_relationship_kwargs={'secondary': 'shift', 'order_by': 'Job.name', 'viewonly': True}) @@ -404,8 +401,8 @@ class Attendee(MagModel, TakesPaymentMixin, table=True): sa_relationship_kwargs={ 'primaryjoin': 'and_(Department.id == DeptMembership.department_id, ' 'DeptMembership.has_inherent_role)', - 'secondary': 'dept_membership', 'cascade': 'save-update,merge,refresh-expire,expunge', - 'order_by': 'Department.name'}) + 'secondary': 'dept_membership', + 'order_by': 'Department.name', 'viewonly': True}) can_admin_checklist_depts: list['Department'] = Relationship( back_populates="members_who_can_admin_checklist", sa_relationship_kwargs={ @@ -422,7 +419,6 @@ class Attendee(MagModel, TakesPaymentMixin, table=True): explicitly_requested_depts: list['Department'] = Relationship( back_populates="explicitly_requesting_attendees", sa_relationship_kwargs={ - 'cascade': 'save-update,merge,refresh-expire,expunge', 'secondary': 'dept_membership_request', 'order_by': 'Department.name', 'overlaps': "attendee,dept_membership_requests,department,membership_requests"}) requested_depts: list['Department'] = Relationship( @@ -443,41 +439,49 @@ class Attendee(MagModel, TakesPaymentMixin, table=True): can_work_setup: bool = False can_work_teardown: bool = False - admin_account: 'AdminAccount' = Relationship(back_populates="attendee", sa_relationship_kwargs={'passive_deletes': True}) + admin_account: 'AdminAccount' = Relationship(back_populates="attendee", + sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) managers: list['AttendeeAccount'] = Relationship( back_populates="attendees", - sa_relationship_kwargs={'secondary': 'attendee_attendee_account', 'cascade': 'save-update,merge,refresh-expire,expunge'}) + sa_relationship_kwargs={'secondary': 'attendee_attendee_account'}) agent_codes: list['ArtShowAgentCode'] = Relationship(back_populates="attendee") art_show_application: 'ArtShowApplication' = Relationship( - back_populates="attendee", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) + back_populates="attendee") art_show_receipts: list['ArtShowReceipt'] = Relationship( - back_populates="attendee", sa_relationship_kwargs={'passive_deletes': True, 'overlaps': 'art_show_purchases,buyer'}) + back_populates="attendee", + sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True, 'overlaps': 'art_show_purchases,buyer'}) marketplace_application: 'ArtistMarketplaceApplication' = Relationship( - back_populates="attendee", sa_relationship_kwargs={'passive_deletes': True}) + back_populates="attendee", sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) escalation_tickets: list['EscalationTicket'] = Relationship( back_populates="attendees", sa_relationship_kwargs={'secondary': "attendee_escalation_ticket"}) - food_restrictions: 'FoodRestrictions' = Relationship(back_populates="attendee", sa_relationship_kwargs={'passive_deletes': True}) + food_restrictions: 'FoodRestrictions' = Relationship(back_populates="attendee", + sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) - promo_code_groups: list['PromoCodeGroup'] = Relationship( - back_populates="buyer", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) + promo_code_groups: list['PromoCodeGroup'] = Relationship(back_populates="buyer", sa_relationship_kwargs={'lazy': 'select'}) - no_shirt: 'NoShirt' = Relationship(back_populates="attendee", sa_relationship_kwargs={'passive_deletes': True}) - sales: list['Sale'] = Relationship(back_populates="attendee", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) - mpoints_for_cash: list['MPointsForCash'] = Relationship(back_populates="attendee", sa_relationship_kwargs={'passive_deletes': True}) - old_mpoint_exchanges: list['OldMPointExchange'] = Relationship(back_populates="attendee", sa_relationship_kwargs={'passive_deletes': True}) - dept_checklist_items: list['DeptChecklistItem'] = Relationship(back_populates="attendee", sa_relationship_kwargs={'passive_deletes': True}) + no_shirt: 'NoShirt' = Relationship(back_populates="attendee", + sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) + sales: list['Sale'] = Relationship(back_populates="attendee") + mpoints_for_cash: list['MPointsForCash'] = Relationship(back_populates="attendee", + sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) + old_mpoint_exchanges: list['OldMPointExchange'] = Relationship( + back_populates="attendee", sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) + dept_checklist_items: list['DeptChecklistItem'] = Relationship( + back_populates="attendee", sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) indie_developer: 'IndieDeveloper' = Relationship( - back_populates="attendee", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) + back_populates="attendee") hotel_eligible: bool = False - hotel_requests: 'HotelRequests' = Relationship(back_populates="attendee", sa_relationship_kwargs={'passive_deletes': True}) - room_assignments: list['RoomAssignment'] = Relationship(back_populates="attendee", sa_relationship_kwargs={'passive_deletes': True}) + hotel_requests: 'HotelRequests' = Relationship(back_populates="attendee", + sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) + room_assignments: list['RoomAssignment'] = Relationship(back_populates="attendee", + sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) lottery_application: 'LotteryApplication' = Relationship( - back_populates="attendee", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) + back_populates="attendee") # The PIN/password used by third party hotel reservation systems hotel_pin: str | None = Field(nullable=True, unique=True) @@ -486,16 +490,17 @@ class Attendee(MagModel, TakesPaymentMixin, table=True): # mits # ========================= mits_applicants: list['MITSApplicant'] = Relationship( - back_populates="attendee", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) + back_populates="attendee") # ========================= # panels # ========================= - assigned_panelists: list['AssignedPanelist'] = Relationship(back_populates="attendee", sa_relationship_kwargs={'passive_deletes': True}) + assigned_panelists: list['AssignedPanelist'] = Relationship(back_populates="attendee", + sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) panel_applicants: list['PanelApplicant'] = Relationship( - back_populates="attendee", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) + back_populates="attendee") panel_applications: list['PanelApplication'] = Relationship( - back_populates="poc", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) + back_populates="poc") submitted_panels: list['PanelApplication'] = Relationship(sa_relationship=relationship( 'PanelApplication', secondary='panel_applicant', @@ -503,7 +508,8 @@ class Attendee(MagModel, TakesPaymentMixin, table=True): primaryjoin='and_(Attendee.id == PanelApplicant.attendee_id, PanelApplicant.submitter == True)', viewonly=True )) - panel_feedback: 'EventFeedback' = Relationship(back_populates="attendee", sa_relationship_kwargs={'passive_deletes': True}) + panel_feedback: 'EventFeedback' = Relationship(back_populates="attendee", + sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) # ========================= # attractions @@ -516,38 +522,44 @@ class Attendee(MagModel, TakesPaymentMixin, table=True): (_NOTIFICATION_TEXT, 'Text'), (_NOTIFICATION_NONE, 'None')] - notification_pref: int = Field(default=_NOTIFICATION_EMAIL, sa_column=Column(Choice(_NOTIFICATION_PREF_OPTS))) + notification_pref: int = Field(sa_column=Column(Choice(_NOTIFICATION_PREF_OPTS)), default=_NOTIFICATION_EMAIL) attractions_opt_out: bool = False attraction_events: list['AttractionEvent'] = Relationship( back_populates="attendees", sa_relationship_kwargs={ - 'cascade': 'save-update,merge,refresh-expire,expunge', 'secondary': 'attraction_signup', + 'secondary': 'attraction_signup', 'overlaps': 'attendee,attraction_signups,event,signups'}) attraction_signups: list['AttractionSignup'] = Relationship( - back_populates="attendee", sa_relationship_kwargs={'order_by': 'AttractionSignup.signup_time', 'passive_deletes': True}) + back_populates="attendee", + sa_relationship_kwargs={'order_by': 'AttractionSignup.signup_time', 'cascade': 'all,delete-orphan', 'passive_deletes': True}) attraction_notifications: list['AttractionNotification'] = Relationship( - back_populates="attendee", sa_relationship_kwargs={'order_by': 'AttractionNotification.sent_time', 'passive_deletes': True}) + back_populates="attendee", + sa_relationship_kwargs={'order_by': 'AttractionNotification.sent_time', 'cascade': 'all,delete-orphan', 'passive_deletes': True}) # ========================= # tabletop # ========================= - games: list['TabletopGame'] = Relationship(back_populates="attendee", sa_relationship_kwargs={'passive_deletes': True}) - checkouts: list['TabletopCheckout'] = Relationship(back_populates="attendee", sa_relationship_kwargs={'passive_deletes': True}) + games: list['TabletopGame'] = Relationship(back_populates="attendee", + sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) + checkouts: list['TabletopCheckout'] = Relationship(back_populates="attendee", + sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) # ========================= # badge printing # ========================= print_requests: list['PrintJob'] = Relationship( - back_populates="attendee", sa_relationship_kwargs={'order_by': 'desc(PrintJob.last_updated)', 'passive_deletes': True}) + back_populates="attendee", + sa_relationship_kwargs={'order_by': 'desc(PrintJob.last_updated)', 'cascade': 'all,delete-orphan', 'passive_deletes': True}) # ========================= # art show # ========================= - art_show_bidder: 'ArtShowBidder' = Relationship(back_populates="attendee", sa_relationship_kwargs={'passive_deletes': True}) + art_show_bidder: 'ArtShowBidder' = Relationship(back_populates="attendee", + sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) art_show_purchases: list['ArtShowPiece'] = Relationship( back_populates="buyer", - sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge', 'secondary': 'art_show_receipt'}) + sa_relationship_kwargs={'secondary': 'art_show_receipt'}) art_agent_apps: list['ArtShowApplication'] = Relationship( back_populates="agents", sa_relationship_kwargs={ @@ -2583,17 +2595,18 @@ class AttendeeAccount(MagModel, table=True): """ public_id: str | None = Field(sa_type=Uuid(as_uuid=False), default_factory=lambda: str(uuid4()), nullable=True) - email: str = Column(String) - hashed: str = Column(String, private=True) + email: str = '' + hashed: str = Field(default='', private=True) password_reset: 'PasswordReset' = Relationship( - back_populates="attendee_account", sa_relationship_kwargs={'lazy': 'select', 'passive_deletes': True}) + back_populates="attendee_account", + sa_relationship_kwargs={'lazy': 'select', 'cascade': 'all,delete-orphan', 'passive_deletes': True}) attendees: list['Attendee'] = Relationship( back_populates="managers", sa_relationship_kwargs={ - 'order_by': 'Attendee.registered', 'cascade': 'save-update,merge,refresh-expire,expunge', + 'order_by': 'Attendee.registered', 'secondary': 'attendee_attendee_account'}) - imported: bool = Column(Boolean, default=False) - unused_years: int = Column(Integer, default=0) + imported: bool = False + unused_years: int = 0 email_model_name: ClassVar = 'account' @@ -2715,11 +2728,11 @@ class BadgePickupGroup(MagModel, table=True): """ public_id: str | None = Field(sa_type=Uuid(as_uuid=False), default_factory=lambda: str(uuid4()), nullable=True) - account_id: str = Column(String) + account_id: str = '' attendees: list['Attendee'] = Relationship( back_populates="badge_pickup_group", - sa_relationship_kwargs={'lazy': 'selectin', 'order_by': 'Attendee.full_name', 'cascade': 'save-update,merge,refresh-expire,expunge'}) + sa_relationship_kwargs={'lazy': 'selectin', 'order_by': 'Attendee.full_name'}) def build_from_account(self, account): for attendee in account.attendees: @@ -2802,9 +2815,9 @@ class FoodRestrictions(MagModel, table=True): attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE', unique=True) attendee: 'Attendee' = Relationship(back_populates="food_restrictions", sa_relationship_kwargs={'lazy': 'joined'}) - standard: str = Column(MultiChoice(c.FOOD_RESTRICTION_OPTS)) - sandwich_pref: str = Column(MultiChoice(c.SANDWICH_OPTS)) - freeform: str = Column(String) + standard: str = Field(sa_type=MultiChoice(c.FOOD_RESTRICTION_OPTS), default='') + sandwich_pref: str = Field(sa_type=MultiChoice(c.SANDWICH_OPTS), default='') + freeform: str = '' def __getattr__(self, name): try: diff --git a/uber/models/attraction.py b/uber/models/attraction.py index 0d76d4363..85b850b70 100644 --- a/uber/models/attraction.py +++ b/uber/models/attraction.py @@ -8,14 +8,14 @@ from sqlalchemy.schema import UniqueConstraint from sqlalchemy.sql import text from sqlalchemy.sql.expression import bindparam -from sqlalchemy.types import Boolean, Integer, Uuid, String, DateTime +from sqlalchemy.types import Uuid, String, DateTime from typing import ClassVar from uber.config import c from uber.custom_tags import humanize_timedelta, location_event_name, location_room_name from uber.decorators import presave_adjustment, render, classproperty from uber.models import MagModel, Attendee -from uber.models.types import (default_relationship as relationship, Choice, DefaultColumn as Column, utcmin, +from uber.models.types import (DefaultColumn as Column, default_relationship as relationship, Choice, utcmin, DefaultField as Field, DefaultRelationship as Relationship) from uber.utils import evening_datetime, noon_datetime, localized_now, slugify, listify, groupify @@ -26,13 +26,13 @@ class AttractionMixin(): - populate_schedule: bool = Column(Boolean, default=True) - no_notifications: bool = Column(Boolean, default=False) - waitlist_available: bool = Column(Boolean, default=True) - waitlist_slots: int = Column(Integer, default=10) - signups_open_relative: int = Column(Integer, default=c.DEFAULT_ATTRACTIONS_SIGNUPS_MINUTES) + populate_schedule: bool = True + no_notifications: bool = False + waitlist_available: bool = True + waitlist_slots: int = 10 + signups_open_relative: int = c.DEFAULT_ATTRACTIONS_SIGNUPS_MINUTES signups_open_time: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) - slots: int = Column(Integer, default=1) + slots: int = 1 @classproperty def inherited_cols(cls): @@ -147,19 +147,20 @@ class Attraction(MagModel, AttractionMixin, table=True): secondary='admin_account', viewonly=True)) - name: str = Column(String, unique=True) - slug: str = Column(String, unique=True) - description: str = Column(String) - full_description: str = Column(String) - is_public: bool = Column(Boolean, default=False) - checkin_reminder: int | None = Column(Integer, default=None, nullable=True) - advance_checkin: int = Column(Integer, default=0) - restriction: int = Column(Choice(_RESTRICTION_OPTS), default=_NONE) - badge_num_required: bool = Column(Boolean, default=False) + name: str = Field(default='', unique=True) + slug: str = Field(default='', unique=True) + description: str = '' + full_description: str = '' + is_public: bool = False + checkin_reminder: int | None = Field(default=None, nullable=True) + advance_checkin: int = 0 + restriction: int = Field(sa_column=Column(Choice(_RESTRICTION_OPTS)), default=_NONE) + badge_num_required: bool = False features: list['AttractionFeature'] = Relationship( back_populates="attraction", - sa_relationship_kwargs={'lazy': 'selectin', 'order_by': '[AttractionFeature.name, AttractionFeature.id]', 'passive_deletes': True}) + sa_relationship_kwargs={'lazy': 'selectin', 'order_by': '[AttractionFeature.name, AttractionFeature.id]', + 'cascade': 'all,delete-orphan', 'passive_deletes': True}) public_features: list['AttractionFeature'] = Relationship(sa_relationship=relationship( 'AttractionFeature', primaryjoin='and_(' @@ -169,7 +170,8 @@ class Attraction(MagModel, AttractionMixin, table=True): order_by='[AttractionFeature.name, AttractionFeature.id]')) events: list['AttractionEvent'] = Relationship( back_populates="attraction", - sa_relationship_kwargs={'order_by': '[AttractionEvent.start_time, AttractionEvent.id]', 'passive_deletes': True}) + sa_relationship_kwargs={'order_by': '[AttractionEvent.start_time, AttractionEvent.id]', + 'cascade': 'all,delete-orphan', 'passive_deletes': True}) signups: list['AttractionSignup'] = Relationship( back_populates="attraction", sa_relationship_kwargs={'viewonly': True, 'order_by': '[AttractionSignup.checkin_time, AttractionSignup.id]'}) @@ -339,15 +341,16 @@ class AttractionFeature(MagModel, AttractionMixin, table=True): attraction_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attraction.id', ondelete='CASCADE') attraction: 'Attraction' = Relationship(back_populates="features", sa_relationship_kwargs={'lazy': 'joined'}) - name: str = Column(String) - slug: str = Column(String) - description: str = Column(String) - is_public: bool = Column(Boolean, default=False) - badge_num_required: bool = Column(Boolean, default=False) + name: str = '' + slug: str = '' + description: str = '' + is_public: bool = False + badge_num_required: bool = False events: list['AttractionEvent'] = Relationship( back_populates="feature", - sa_relationship_kwargs={'lazy': 'selectin', 'order_by': '[AttractionEvent.start_time, AttractionEvent.id]', 'passive_deletes': True}) + sa_relationship_kwargs={'lazy': 'selectin', 'order_by': '[AttractionEvent.start_time, AttractionEvent.id]', + 'cascade': 'all,delete-orphan', 'passive_deletes': True}) __table_args__: ClassVar = ( UniqueConstraint('name', 'attraction_id'), @@ -479,25 +482,27 @@ class AttractionEvent(MagModel, AttractionMixin, table=True): event_location_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='event_location.id', nullable=True) location: 'EventLocation' = Relationship( - back_populates="attractions", sa_relationship_kwargs={'lazy': 'joined', 'cascade': 'save-update,merge,refresh-expire,expunge'}) + back_populates="attractions", sa_relationship_kwargs={'lazy': 'joined'}) start_time: datetime = Field(sa_type=DateTime(timezone=True), default=c.EPOCH) - duration: int = Column(Integer, default=60) + duration: int = 60 schedule_item: 'Event' = Relationship( - back_populates="attraction", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) + back_populates="attraction") signups: list['AttractionSignup'] = Relationship( - back_populates="event", sa_relationship_kwargs={'order_by': 'AttractionSignup.checkin_time', 'passive_deletes': True}) + back_populates="event", + sa_relationship_kwargs={'order_by': 'AttractionSignup.checkin_time', 'cascade': 'all,delete-orphan', 'passive_deletes': True}) attendee_signups: ClassVar = association_proxy('signups', 'attendee') notifications: list['AttractionNotification'] = Relationship( - back_populates="event", sa_relationship_kwargs={'order_by': 'AttractionNotification.sent_time', 'passive_deletes': True}) + back_populates="event", + sa_relationship_kwargs={'order_by': 'AttractionNotification.sent_time', 'cascade': 'all,delete-orphan', 'passive_deletes': True}) notification_replies: list['AttractionNotificationReply'] = Relationship( back_populates="event", - sa_relationship_kwargs={'order_by': 'AttractionNotificationReply.sid', 'cascade': 'save-update,merge,refresh-expire,expunge'}) + sa_relationship_kwargs={'order_by': 'AttractionNotificationReply.sid'}) attendees: list['Attendee'] = Relationship( back_populates="attraction_events", sa_relationship_kwargs={ - 'cascade': 'save-update,merge,refresh-expire,expunge', 'secondary': 'attraction_signup', + 'secondary': 'attraction_signup', 'order_by': 'attraction_signup.c.signup_time', 'overlaps': 'signups,event,attraction_signups,attendee'}) @presave_adjustment @@ -762,7 +767,7 @@ class AttractionSignup(MagModel, table=True): attraction_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attraction.id', ondelete='CASCADE') attraction: 'Attraction' = Relationship( - back_populates="signups", sa_relationship_kwargs={'lazy': 'joined', 'cascade': 'save-update,merge,refresh-expire,expunge'}) + back_populates="signups", sa_relationship_kwargs={'lazy': 'joined'}) attraction_event_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attraction_event.id', ondelete='CASCADE') event: 'AttractionEvent' = Relationship(back_populates="signups", sa_relationship_kwargs={'lazy': 'joined'}) @@ -772,7 +777,7 @@ class AttractionSignup(MagModel, table=True): signup_time: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(pytz.UTC)) checkin_time: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: utcmin.datetime, index=True) - on_waitlist: bool = Column(Boolean, default=False) + on_waitlist: bool = False notifications: list['AttractionNotification'] = Relationship( back_populates="signup", @@ -873,12 +878,12 @@ class AttractionNotification(MagModel, table=True): attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE') attendee: 'Attendee' = Relationship(back_populates="attraction_notifications", sa_relationship_kwargs={'lazy': 'joined'}) - notification_type: int = Column(Choice(Attendee._NOTIFICATION_PREF_OPTS)) - ident: str = Column(String, index=True) - sid: str = Column(String) + notification_type: int = Field(sa_column=Column(Choice(Attendee._NOTIFICATION_PREF_OPTS)), default=0) + ident: str = Field(default='', index=True) + sid: str = '' sent_time: datetime = Field(sa_type=DateTime(timezone=True), default=lambda: datetime.now(pytz.UTC)) - subject: str = Column(String) - body: str = Column(String) + subject: str = '' + body: str = '' signup: 'AttractionSignup' = Relationship( back_populates="notifications", @@ -904,13 +909,13 @@ class AttractionNotificationReply(MagModel, table=True): attraction_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attraction.id', nullable=True) attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', nullable=True) - notification_type: int = Column(Choice(Attendee._NOTIFICATION_PREF_OPTS)) - from_phonenumber: str = Column(String) - to_phonenumber: str = Column(String) - sid: str = Column(String, index=True) + notification_type: int = Field(sa_column=Column(Choice(Attendee._NOTIFICATION_PREF_OPTS)), default=0) + from_phonenumber: str = '' + to_phonenumber: str = '' + sid: str = Field(default='', index=True) received_time: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(pytz.UTC)) sent_time: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(pytz.UTC)) - body: str = Column(String) + body: str = '' @presave_adjustment def _fix_attraction_id(self): diff --git a/uber/models/badge_printing.py b/uber/models/badge_printing.py index 25b910ead..f2a43b912 100644 --- a/uber/models/badge_printing.py +++ b/uber/models/badge_printing.py @@ -5,8 +5,7 @@ from typing import Any from uber.models import MagModel -from uber.models.types import (DefaultColumn as Column, default_relationship as relationship, - DefaultField as Field, DefaultRelationship as Relationship) +from uber.models.types import default_relationship as relationship, DefaultField as Field, DefaultRelationship as Relationship __all__ = ['PrintJob'] @@ -23,15 +22,15 @@ class PrintJob(MagModel, table=True): admin_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='admin_account.id', nullable=True) admin_account: "AdminAccount" = Relationship(back_populates="print_requests") - admin_name: str = Column(String) # Preserve admin's name in case their account is removed - printer_id: str = Column(String) - reg_station: int | None = Column(Integer, nullable=True) - print_fee: int = Column(Integer, default=0) + admin_name: str = '' # Preserve admin's name in case their account is removed + printer_id: str = '' + reg_station: int | None = Field(nullable=True) + print_fee: int = 0 queued: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True, default=None) printed: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True, default=None) - ready: bool = Column(Boolean, default=True) - errors: str = Column(String) - is_minor: bool = Column(Boolean) + ready: bool = True + errors: str = '' + is_minor: bool = False json_data: dict[str, Any] = Field(sa_type=MutableDict.as_mutable(JSONB), default_factory=dict) receipt_item: 'ReceiptItem' = Relationship(sa_relationship=relationship('ReceiptItem', primaryjoin='and_(' diff --git a/uber/models/commerce.py b/uber/models/commerce.py index e53ef5143..313dd2605 100644 --- a/uber/models/commerce.py +++ b/uber/models/commerce.py @@ -6,7 +6,7 @@ from sqlalchemy import func, or_ from sqlalchemy.sql.functions import coalesce -from sqlalchemy.types import Boolean, Integer, String, DateTime, Uuid, JSON +from sqlalchemy.types import DateTime, Uuid, JSON from sqlalchemy.dialects.postgresql.json import JSONB from sqlalchemy.ext.mutable import MutableDict from typing import Any, ClassVar @@ -16,7 +16,7 @@ from uber.decorators import presave_adjustment, classproperty from uber.models import MagModel from uber.models.attendee import Attendee -from uber.models.types import (default_relationship as relationship, Choice, DefaultColumn as Column, +from uber.models.types import (DefaultColumn as Column, default_relationship as relationship, Choice, DefaultField as Field, DefaultRelationship as Relationship) from uber.payments import ReceiptManager @@ -29,10 +29,10 @@ class ArbitraryCharge(MagModel, table=True): - amount: int = Column(Integer) - what: str = Column(String) + amount: int = 0 + what: str = '' when: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) - reg_station: int | None = Column(Integer, nullable=True) + reg_station: int | None = Field(default=0, nullable=True) _repr_attr_names: ClassVar = ['what'] @@ -40,7 +40,7 @@ class ArbitraryCharge(MagModel, table=True): class MerchDiscount(MagModel, table=True): """Staffers can apply a single-use discount to any merch purchases.""" attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE', unique=True) - uses: int = Column(Integer) + uses: int = 0 class MerchPickup(MagModel, table=True): @@ -48,19 +48,17 @@ class MerchPickup(MagModel, table=True): picked_up_for_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', unique=True, nullable=True) picked_up_by: 'Attendee' = Relationship(sa_relationship=relationship( Attendee, - primaryjoin='MerchPickup.picked_up_by_id == Attendee.id', - cascade='save-update,merge,refresh-expire,expunge')) + primaryjoin='MerchPickup.picked_up_by_id == Attendee.id')) picked_up_for: 'Attendee' = Relationship(sa_relationship=relationship( Attendee, - primaryjoin='MerchPickup.picked_up_for_id == Attendee.id', - cascade='save-update,merge,refresh-expire,expunge')) + primaryjoin='MerchPickup.picked_up_for_id == Attendee.id')) class MPointsForCash(MagModel, table=True): attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE') attendee: 'Attendee' = Relationship(back_populates="mpoints_for_cash") - amount: int = Column(Integer) + amount: int = 0 when: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) @@ -78,7 +76,7 @@ class OldMPointExchange(MagModel, table=True): attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE') attendee: 'Attendee' = Relationship(back_populates="old_mpoint_exchanges") - amount: int = Column(Integer) + amount: int = 0 when: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) @@ -86,12 +84,12 @@ class Sale(MagModel, table=True): attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', nullable=True) attendee: 'Attendee' = Relationship(back_populates="sales") - what: str = Column(String) - cash: int = Column(Integer, default=0) - mpoints: int = Column(Integer, default=0) + what: str = '' + cash: int = 0 + mpoints: int = 0 when: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) - reg_station: int | None = Column(Integer, nullable=True) - payment_method: int = Column(Choice(c.SALE_OPTS), default=c.MERCH) + reg_station: int | None = Field(nullable=True) + payment_method: int = Field(sa_column=Column(Choice(c.SALE_OPTS)), default=c.MERCH) class ModelReceipt(MagModel, table=True): @@ -108,15 +106,15 @@ class ModelReceipt(MagModel, table=True): as during prereg, there may be multiple receipt transactions created with the same reference ID across multiple receipts. """ - invoice_num: int = Column(Integer, default=0) + invoice_num: int = 0 owner_id: str = Field(sa_type=Uuid(as_uuid=False), index=True) - owner_model: str = Column(String) + owner_model: str = '' closed: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) receipt_txns: list['ReceiptTransaction'] = Relationship( - back_populates="receipt", sa_relationship_kwargs={'lazy': 'selectin', 'passive_deletes': True}) + back_populates="receipt", sa_relationship_kwargs={'lazy': 'selectin', 'cascade': 'all,delete-orphan', 'passive_deletes': True}) receipt_items: list['ReceiptItem'] = Relationship( - back_populates="receipt", sa_relationship_kwargs={'lazy': 'selectin', 'passive_deletes': True}) + back_populates="receipt", sa_relationship_kwargs={'lazy': 'selectin', 'cascade': 'all,delete-orphan', 'passive_deletes': True}) def close_all_items(self, session): for item in self.open_receipt_items: @@ -360,25 +358,25 @@ class ReceiptTransaction(MagModel, table=True): sa_relationship_kwargs={'foreign_keys': 'ReceiptTransaction.refunded_txn_id', 'remote_side': 'ReceiptTransaction.id'}) refund_txns: list['ReceiptTransaction'] = Relationship( back_populates="refunded_txn", - sa_relationship_kwargs={'order_by': 'ReceiptTransaction.added', 'cascade': 'save-update,merge,refresh-expire,expunge'}) + sa_relationship_kwargs={'order_by': 'ReceiptTransaction.added'}) - refunded: int = Column(Integer, default=0) - intent_id: str = Column(String) - charge_id: str = Column(String) - refund_id: str = Column(String) - method: int = Column(Choice(c.PAYMENT_METHOD_OPTS), default=c.STRIPE) - department: int = Column(Choice(c.RECEIPT_ITEM_DEPT_OPTS), default=c.OTHER_RECEIPT_ITEM) - amount: int = Column(Integer) - txn_total: int = Column(Integer, default=0) - processing_fee: int = Column(Integer, default=0) + refunded: int = 0 + intent_id: str = '' + charge_id: str = '' + refund_id: str = '' + method: int = Field(sa_column=Column(Choice(c.PAYMENT_METHOD_OPTS)), default=c.STRIPE) + department: int = Field(sa_column=Column(Choice(c.RECEIPT_ITEM_DEPT_OPTS)), default=c.OTHER_RECEIPT_ITEM) + amount: int = 0 + txn_total: int = 0 + processing_fee: int = 0 added: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) - on_hold: bool = Column(Boolean, default=False) + on_hold: bool = False cancelled: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) - who: str = Column(String) - desc: str = Column(String) + who: str = '' + desc: str = '' receipt_items: list['ReceiptItem'] = Relationship( - back_populates="receipt_txn", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) + back_populates="receipt_txn") @property def available_actions(self): @@ -571,18 +569,18 @@ class ReceiptItem(MagModel, table=True): purchaser_id: str | None = Field(sa_type=Uuid(as_uuid=False), index=True, nullable=True) fk_id: str | None = Field(sa_type=Uuid(as_uuid=False), index=True, nullable=True) - fk_model: str = Column(String) - department: int = Column(Choice(c.RECEIPT_ITEM_DEPT_OPTS), default=c.OTHER_RECEIPT_ITEM) - category: int = Column(Choice(c.RECEIPT_CATEGORY_OPTS), default=c.OTHER) - amount: int = Column(Integer) - comped: bool = Column(Boolean, default=False) - reverted: bool = Column(Boolean, default=False) - count: int = Column(Integer, default=1) + fk_model: str = '' + department: int = Field(sa_column=Column(Choice(c.RECEIPT_ITEM_DEPT_OPTS)), default=c.OTHER_RECEIPT_ITEM) + category: int = Field(sa_column=Column(Choice(c.RECEIPT_CATEGORY_OPTS)), default=c.OTHER) + amount: int = 0 + comped: bool = False + reverted: bool = False + count: int = 1 added: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) closed: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) - who: str = Column(String) - desc: str = Column(String) - admin_notes: str = Column(String) + who: str = '' + desc: str = '' + admin_notes: str = '' revert_change: dict[str, Any] = Field(sa_type=JSON, default_factory=dict) @presave_adjustment @@ -648,20 +646,20 @@ class ReceiptInfo(MagModel, table=True): ReceiptTransaction: selectin """ - fk_email_model: str = Column(String) - fk_email_id: str = Column(String) - terminal_id: str = Column(String) - reference_id: str = Column(String) + fk_email_model: str = '' + fk_email_id: str = '' + terminal_id: str = '' + reference_id: str = '' charged: datetime = Field(sa_type=DateTime(timezone=True)) voided: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) card_data: dict[str, Any] = Field(sa_type=MutableDict.as_mutable(JSONB), default_factory=dict) emv_data: dict[str, Any] = Field(sa_type=MutableDict.as_mutable(JSONB), default_factory=dict) txn_info: dict[str, Any] = Field(sa_type=MutableDict.as_mutable(JSONB), default_factory=dict) - signature: str = Column(String) - receipt_html: str = Column(String) + signature: str = '' + receipt_html: str = '' receipt_txns: list['ReceiptTransaction'] = Relationship( - back_populates="receipt_info", sa_relationship_kwargs={'lazy': 'selectin', 'cascade': 'save-update,merge,refresh-expire,expunge'}) + back_populates="receipt_info", sa_relationship_kwargs={'lazy': 'selectin'}) @property def response_code_str(self): @@ -774,10 +772,10 @@ def cavv_str(self): class TerminalSettlement(MagModel, table=True): - batch_timestamp: str = Column(String) - batch_who: str = Column(String) + batch_timestamp: str = '' + batch_who: str = '' requested: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) - workstation_num: int = Column(Integer, default=0) - terminal_id: str = Column(String) + workstation_num: int = 0 + terminal_id: str = '' response: dict[str, Any] = Field(sa_type=MutableDict.as_mutable(JSONB), default_factory=dict) - error: str = Column(String) + error: str = '' diff --git a/uber/models/department.py b/uber/models/department.py index 32cf5cdb5..862a22c39 100644 --- a/uber/models/department.py +++ b/uber/models/department.py @@ -5,7 +5,7 @@ from sqlalchemy.ext.hybrid import hybrid_property from sqlalchemy.schema import ForeignKey, Table, UniqueConstraint, Index from sqlalchemy.sql import text -from sqlalchemy.types import Integer, Time, Uuid, String, DateTime +from sqlalchemy.types import Uuid, DateTime from typing import ClassVar from uber.config import c @@ -87,17 +87,17 @@ class BulkPrintingRequest(MagModel, table=True): link: str = '' copies: int = 0 - print_orientation: int = Field(sa_column=Column(Choice(c.PRINT_ORIENTATION_OPTS), default=c.PORTRAIT)) - cut_orientation: int = Field(sa_column=Column(Choice(c.CUT_ORIENTATION_OPTS), default=c.NONE)) - color: int = Field(sa_column=Column(Choice(c.PRINT_REQUEST_COLOR_OPTS), default=c.BW)) - paper_type: int = Field(sa_column=Column(Choice(c.PRINT_REQUEST_PAPER_TYPE_OPTS), default=c.STANDARD)) + print_orientation: int = Field(sa_column=Column(Choice(c.PRINT_ORIENTATION_OPTS)), default=c.PORTRAIT) + cut_orientation: int = Field(sa_column=Column(Choice(c.CUT_ORIENTATION_OPTS)), default=c.NONE) + color: int = Field(sa_column=Column(Choice(c.PRINT_REQUEST_COLOR_OPTS)), default=c.BW) + paper_type: int = Field(sa_column=Column(Choice(c.PRINT_REQUEST_PAPER_TYPE_OPTS)), default=c.STANDARD) paper_type_text: str = '' - size: int = Field(sa_column=Column(Choice(c.PRINT_REQUEST_SIZE_OPTS), default=c.STANDARD)) + size: int = Field(sa_column=Column(Choice(c.PRINT_REQUEST_SIZE_OPTS)), default=c.STANDARD) size_text: str = '' double_sided: bool = False stapled: bool = False notes: str = '' - required: bool = False + important: bool = False link_is_shared: bool = False @@ -122,7 +122,7 @@ class DeptMembership(MagModel, table=True): dept_roles: list['DeptRole'] = Relationship( back_populates="dept_memberships", sa_relationship_kwargs={ - 'lazy': 'selectin', 'cascade': 'save-update,merge,refresh-expire,expunge', 'secondary': 'dept_membership_dept_role'}) + 'lazy': 'selectin', 'secondary': 'dept_membership_dept_role'}) __mapper_args__: ClassVar = {'confirm_deleted_rows': False} __table_args__: ClassVar = ( @@ -197,13 +197,13 @@ class DeptRole(MagModel, table=True): jobs: list['Job'] = Relationship( back_populates="required_roles", - sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge', 'secondary': 'job_required_role'}) + sa_relationship_kwargs={'secondary': 'job_required_role'}) job_templates: list['JobTemplate'] = Relationship( back_populates="required_roles", - sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge', 'secondary': 'job_template_required_role'}) + sa_relationship_kwargs={'secondary': 'job_template_required_role'}) dept_memberships: list['DeptMembership'] = Relationship( back_populates="dept_roles", - sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge', 'secondary': 'dept_membership_dept_role'}) + sa_relationship_kwargs={'secondary': 'dept_membership_dept_role'}) attendees: list['Attendee'] = Relationship( back_populates="dept_roles", sa_relationship_kwargs={ @@ -256,7 +256,7 @@ class Department(MagModel, table=True): parent: 'Department' = Relationship(back_populates="sub_depts", sa_relationship_kwargs={'remote_side': 'Department.id'}) sub_depts: list['Department'] = Relationship(back_populates="parent", sa_relationship_kwargs={'order_by': 'Department.name'}) - name: str = Field(sa_column=Column(String, unique=True, default='')) + name: str = Field(unique=True, default='') description: str = '' solicits_volunteers: bool = True max_consecutive_minutes: int = 0 @@ -266,20 +266,24 @@ class Department(MagModel, table=True): panels_desc: str = '' locations: list['EventLocation'] = Relationship( - back_populates="department", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) + back_populates="department") events: list['Event'] = Relationship( - back_populates="department", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) + back_populates="department") attractions: list['Attraction'] = Relationship( - back_populates="department", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) + back_populates="department") - jobs: list['Job'] = Relationship(back_populates="department", sa_relationship_kwargs={'passive_deletes': True}) - job_templates: list['JobTemplate'] = Relationship(back_populates="department", sa_relationship_kwargs={'passive_deletes': True}) + jobs: list['Job'] = Relationship(back_populates="department", + sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) + job_templates: list['JobTemplate'] = Relationship(back_populates="department", + sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) attendees_working_shifts: list['Attendee'] = Relationship( back_populates="depts_where_working", sa_relationship_kwargs={'secondary': 'join(Shift, Job)', 'viewonly': True}) - dept_checklist_items: list['DeptChecklistItem'] = Relationship(back_populates="department", sa_relationship_kwargs={'passive_deletes': True}) - dept_roles: list['DeptRole'] = Relationship(back_populates="department", sa_relationship_kwargs={'passive_deletes': True}) + dept_checklist_items: list['DeptChecklistItem'] = Relationship( + back_populates="department", sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) + dept_roles: list['DeptRole'] = Relationship(back_populates="department", + sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) dept_heads: list['Attendee'] = Relationship(sa_relationship=relationship( 'Attendee', primaryjoin='and_(' @@ -314,16 +318,17 @@ class Department(MagModel, table=True): 'secondary': 'dept_membership', 'viewonly': True, 'order_by': 'Attendee.full_name'}) members: list['Attendee'] = Relationship( back_populates='assigned_depts', - sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge', 'secondary': 'dept_membership', + sa_relationship_kwargs={'secondary': 'dept_membership', 'order_by': 'Attendee.full_name', 'overlaps': 'attendee,dept_memberships'}) memberships: list['DeptMembership'] = Relationship( - back_populates="department", sa_relationship_kwargs={'overlaps': 'assigned_depts,members', 'passive_deletes': True}) + back_populates="department", + sa_relationship_kwargs={'overlaps': 'assigned_depts,members', 'cascade': 'all,delete-orphan', 'passive_deletes': True}) membership_requests: list['DeptMembershipRequest'] = Relationship( - back_populates="department", sa_relationship_kwargs={'cascade': 'all', 'passive_deletes': True}) + back_populates="department", + sa_relationship_kwargs={'cascade': 'all', 'cascade': 'all,delete-orphan', 'passive_deletes': True}) explicitly_requesting_attendees: list['Attendee'] = Relationship( back_populates="explicitly_requested_depts", sa_relationship_kwargs={ - 'cascade': 'save-update,merge,refresh-expire,expunge', 'secondary': 'dept_membership_request', 'order_by': 'Attendee.full_name', 'overlaps': 'membership_requests,department,attendee,dept_membership_requests'}) requesting_attendees: list['Attendee'] = Relationship( @@ -464,15 +469,16 @@ class Job(MagModel, table=True): weight: float = 1 slots: int = 1 extra15: bool = False - visibility: int = Field(sa_column=Column(Choice(_VISIBILITY_OPTS), default=_ONLY_MEMBERS)) + visibility: int = Field(sa_column=Column(Choice(_VISIBILITY_OPTS)), default=_ONLY_MEMBERS) all_roles_required: bool = True attendees_working_shifts: list['Attendee'] = Relationship( back_populates="jobs", sa_relationship_kwargs={'secondary': 'shift', 'viewonly': True}) required_roles: list['DeptRole'] = Relationship( back_populates="jobs", - sa_relationship_kwargs={'lazy': 'selectin', 'cascade': 'save-update,merge,refresh-expire,expunge', 'secondary': 'job_required_role'}) - shifts: list['Shift'] = Relationship(back_populates="job", sa_relationship_kwargs={'lazy': 'selectin', 'passive_deletes': True}) + sa_relationship_kwargs={'lazy': 'selectin', 'secondary': 'job_required_role'}) + shifts: list['Shift'] = Relationship(back_populates="job", + sa_relationship_kwargs={'lazy': 'selectin', 'cascade': 'all,delete-orphan', 'passive_deletes': True}) __table_args__: ClassVar = ( Index('ix_job_department_id', 'department_id'), @@ -739,26 +745,26 @@ class JobTemplate(MagModel, table=True): department: 'Department' = Relationship(back_populates="job_templates", sa_relationship_kwargs={'lazy': 'joined'}) template_name: str = '' - type: int = Field(sa_column=Column(Choice(c.JOB_TEMPLATE_TYPE_OPTS), default=c.FILL_GAPS)) + type: int = Field(sa_column=Column(Choice(c.JOB_TEMPLATE_TYPE_OPTS)), default=c.FILL_GAPS) name: str = '' description: str = '' duration: int = 0 weight: float = 1 extra15: bool = False - visibility: int = Field(sa_column=Column(Choice(Job._VISIBILITY_OPTS), default=Job._ONLY_MEMBERS)) + visibility: int = Field(sa_column=Column(Choice(Job._VISIBILITY_OPTS)), default=Job._ONLY_MEMBERS) all_roles_required: bool = True min_slots: int = 1 # Future improvement: a bulk-edit for slots in jobs by time of day - days: str = Field(sa_column=Column(MultiChoice(c.JOB_DAY_OPTS))) - open_time: time | None = Field(sa_column=Column(Time, nullable=True)) - close_time: time | None = Field(sa_column=Column(Time, nullable=True)) - interval: int = Field(sa_column=Column(Integer, nullable=True)) + days: str = Field(sa_type=MultiChoice(c.JOB_DAY_OPTS), default='') + open_time: time | None = Field(nullable=True) + close_time: time | None = Field(nullable=True) + interval: int = Field(nullable=True) - jobs: list['Job'] = Relationship(back_populates="template", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) + jobs: list['Job'] = Relationship(back_populates="template") required_roles: list['DeptRole'] = Relationship( back_populates="job_templates", sa_relationship_kwargs={ - 'lazy': 'selectin', 'cascade': 'save-update,merge,refresh-expire,expunge', 'secondary': 'job_template_required_role'}) + 'lazy': 'selectin', 'secondary': 'job_template_required_role'}) @presave_adjustment def zero_slots(self): @@ -980,8 +986,8 @@ class Shift(MagModel, table=True): attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE') attendee: 'Attendee' = Relationship(back_populates="shifts", sa_relationship_kwargs={'lazy': 'joined'}) - worked: int = Field(sa_column=Column(Choice(c.WORKED_STATUS_OPTS), default=c.SHIFT_UNMARKED)) - rating: int = Field(sa_column=Column(Choice(c.RATING_OPTS), default=c.UNRATED)) + worked: int = Field(sa_column=Column(Choice(c.WORKED_STATUS_OPTS)), default=c.SHIFT_UNMARKED) + rating: int = Field(sa_column=Column(Choice(c.RATING_OPTS)), default=c.UNRATED) comment: str = '' __table_args__: ClassVar = ( diff --git a/uber/models/email.py b/uber/models/email.py index 5e4b81b3b..29ee50203 100644 --- a/uber/models/email.py +++ b/uber/models/email.py @@ -10,7 +10,7 @@ from sqlalchemy.dialects.postgresql.json import JSONB from sqlalchemy.ext.hybrid import hybrid_property from sqlalchemy.ext.mutable import MutableDict -from sqlalchemy.types import Boolean, Integer, String, Uuid, DateTime +from sqlalchemy.types import Uuid, DateTime from typing import Any, ClassVar from uber import utils @@ -18,8 +18,7 @@ from uber.decorators import presave_adjustment, renderable_data, cached_property, classproperty from uber.jinja import JinjaEnv from uber.models import MagModel -from uber.models.types import (DefaultColumn as Column, default_relationship as relationship, - DefaultField as Field, DefaultRelationship as Relationship) +from uber.models.types import DefaultField as Field, DefaultRelationship as Relationship from uber.utils import normalize_newlines, request_cached_context, groupify log = logging.getLogger(__name__) @@ -29,15 +28,15 @@ class BaseEmailMixin(object): - model: str = Column(String) + model: str = '' - subject: str = Column(String) - body: str = Column(String) + subject: str = '' + body: str = '' - sender: str = Column(String) - cc: str = Column(String) - bcc: str = Column(String) - replyto: str = Column(String) + sender: str = '' + cc: str = '' + bcc: str = '' + replyto: str = '' _repr_attr_names: ClassVar = ['subject'] @@ -70,17 +69,17 @@ class AutomatedEmail(MagModel, BaseEmailMixin, table=True): _fixtures: ClassVar = OrderedDict() email_overrides: ClassVar = [] # Used in plugins, list of (ident, key, val) tuples - format: str = Column(String, default='text') - ident: str = Column(String, unique=True) + format: str = 'text' + ident: str = Field(default='', unique=True) - approved: bool = Column(Boolean, default=False) - needs_approval: bool = Column(Boolean, default=True) - unapproved_count: int = Column(Integer, default=0) - currently_sending: bool = Column(Boolean, default=False) + approved: bool = False + needs_approval: bool = True + unapproved_count: int = 0 + currently_sending: bool = False last_send_time: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True, default=None) - allow_at_the_con: bool = Column(Boolean, default=False) - allow_post_con: bool = Column(Boolean, default=False) + allow_at_the_con: bool = False + allow_post_con: bool = False active_after: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True, default=None) active_before: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True, default=None) @@ -88,7 +87,7 @@ class AutomatedEmail(MagModel, BaseEmailMixin, table=True): emails: list['Email'] = Relationship( back_populates="automated_email", - sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge', 'order_by': 'Email.id'}) + sa_relationship_kwargs={'order_by': 'Email.id'}) @presave_adjustment def date_adjustments(self): @@ -357,8 +356,8 @@ class Email(MagModel, BaseEmailMixin, table=True): automated_email: 'AutomatedEmail' = Relationship(back_populates="emails", sa_relationship_kwargs={'lazy': 'joined'}) fk_id: str | None = Field(sa_type=Uuid(as_uuid=False), nullable=True) - ident: str = Column(String) - to: str = Column(String) + ident: str = '' + to: str = '' when: str = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) @cached_property diff --git a/uber/models/group.py b/uber/models/group.py index b552d3bdb..58977a7b4 100644 --- a/uber/models/group.py +++ b/uber/models/group.py @@ -6,15 +6,15 @@ from pytz import UTC from sqlalchemy import and_, exists, or_, func, select, not_ from sqlalchemy.ext.hybrid import hybrid_property -from sqlalchemy.types import Boolean, Integer, Numeric, String, DateTime, Uuid +from sqlalchemy.types import DateTime, Uuid from typing import ClassVar from uber.config import c from uber.custom_tags import format_currency from uber.decorators import presave_adjustment from uber.models import MagModel -from uber.models.types import default_relationship as relationship, utcnow, Choice, DefaultColumn as Column, \ - MultiChoice, TakesPaymentMixin, DefaultField as Field, DefaultRelationship as Relationship +from uber.models.types import (Choice, default_relationship as relationship, DefaultColumn as Column, MultiChoice, TakesPaymentMixin, + DefaultField as Field, DefaultRelationship as Relationship) from uber.utils import add_opt @@ -28,7 +28,7 @@ class Group(MagModel, TakesPaymentMixin, table=True): """ leader_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', nullable=True) - leader: 'Attendee' = Relationship(sa_relationship=relationship('Attendee', foreign_keys='Group.leader_id', post_update=True, cascade='all')) + leader: 'Attendee' = Relationship(sa_relationship=relationship('Attendee', foreign_keys='Group.leader_id', post_update=True)) creator_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', nullable=True) creator: 'Attendee' = Relationship( @@ -40,50 +40,48 @@ class Group(MagModel, TakesPaymentMixin, table=True): table_shares: list['Group'] = Relationship(back_populates="shared_with", sa_relationship_kwargs={'viewonly': True}) public_id: str | None = Field(sa_type=Uuid(as_uuid=False), default_factory=lambda: str(uuid4())) - name: str = Column(String) - tables: Decimal = Column(Numeric, default=0) - zip_code: str = Column(String) - address1: str = Column(String) - address2: str = Column(String) - city: str = Column(String) - region: str = Column(String) - country:str = Column(String) - email_address: str = Column(String) - phone: str = Column(String) - website: str = Column(String) - wares: str = Column(String) - categories: str = Column(MultiChoice(c.DEALER_WARES_OPTS)) - categories_text: str = Column(String) - description: str = Column(String) - special_needs: str = Column(String) - - cost: int = Column(Integer, default=0, admin_only=True) - auto_recalc: bool = Column(Boolean, default=True, admin_only=True) - - can_add: bool = Column(Boolean, default=False, admin_only=True) - is_dealer: bool = Column(Boolean, default=False, admin_only=True) - convert_badges: bool = Column(Boolean, default=False, admin_only=True) - admin_notes: str = Column(String, admin_only=True) - status: int = Column(Choice(c.DEALER_STATUS_OPTS), default=c.UNAPPROVED, admin_only=True) + name: str = '' + tables: Decimal = 0 + zip_code: str = '' + address1: str = '' + address2: str = '' + city: str = '' + region: str = '' + country:str = '' + email_address: str = '' + phone: str = '' + website: str = '' + wares: str = '' + categories: str = Field(sa_type=MultiChoice(c.DEALER_WARES_OPTS), default='') + categories_text: str = '' + description: str = '' + special_needs: str = '' + + cost: int = 0 + auto_recalc: bool = True + + can_add: bool = False + is_dealer: bool = False + convert_badges: bool = False + admin_notes: str = '' + status: int = Field(sa_column=Column(Choice(c.DEALER_STATUS_OPTS)), default=c.UNAPPROVED) registered: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) approved: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) attendees: list['Attendee'] = Relationship( back_populates="group", - sa_relationship_kwargs={'foreign_keys': 'Attendee.group_id', 'lazy': 'selectin', 'cascade': 'save-update,merge,refresh-expire,expunge'}) - studio: 'IndieStudio' = Relationship(back_populates="group", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) - guest: 'GuestGroup' = Relationship(back_populates="group", sa_relationship_kwargs={'passive_deletes': True}) + sa_relationship_kwargs={'foreign_keys': 'Attendee.group_id', 'lazy': 'selectin'}) + studio: 'IndieStudio' = Relationship(back_populates="group") + guest: 'GuestGroup' = Relationship(back_populates="group", sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) active_receipt: 'ModelReceipt' = Relationship(sa_relationship=relationship( 'ModelReceipt', - cascade='save-update,merge,refresh-expire,expunge', primaryjoin='and_(remote(ModelReceipt.owner_id) == foreign(Group.id),' 'ModelReceipt.owner_model == "Group",' 'ModelReceipt.closed == None)', lazy='select')) terms_conditions_doc: 'SignedDocument' = Relationship(sa_relationship=relationship( 'SignedDocument', - cascade='save-update,merge,refresh-expire,expunge', primaryjoin='and_(SignedDocument.fk_id == foreign(Group.id),' 'SignedDocument.model == "Group")', overlaps="active_receipt")) diff --git a/uber/models/guests.py b/uber/models/guests.py index 73ab1336f..da260476f 100644 --- a/uber/models/guests.py +++ b/uber/models/guests.py @@ -7,14 +7,14 @@ from datetime import datetime, timedelta from markupsafe import Markup -from sqlalchemy.types import Boolean, Integer, String, DateTime, Uuid, JSON +from sqlalchemy.types import Boolean, DateTime, Uuid, JSON from typing import Any, ClassVar from uber.config import c from uber.custom_tags import yesno from uber.decorators import presave_adjustment, classproperty from uber.models import MagModel -from uber.models.types import (Choice, DefaultColumn as Column, MultiChoice, GuidebookImageMixin, +from uber.models.types import (Choice, MultiChoice, GuidebookImageMixin, DefaultColumn as Column, DefaultField as Field, DefaultRelationship as Relationship) from uber.utils import filename_extension, slugify @@ -38,31 +38,44 @@ class GuestGroup(MagModel, table=True): event_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='event.id', nullable=True) event: 'Event' = Relationship(back_populates="guest") - group_type: int = Column(Choice(c.GROUP_TYPE_OPTS), default=c.BAND) - num_hotel_rooms: int = Column(Integer, default=1, admin_only=True) - payment: int = Column(Integer, default=0, admin_only=True) - vehicles: int = Column(Integer, default=1, admin_only=True) - estimated_loadin_minutes: int = Column(Integer, default=c.DEFAULT_LOADIN_MINUTES, admin_only=True) - estimated_performance_minutes: int = Column(Integer, default=c.DEFAULT_PERFORMANCE_MINUTES, admin_only=True) - wants_mc: bool | None = Column(Boolean, nullable=True) - needs_rehearsal: int | None = Column(Choice(c.GUEST_REHEARSAL_OPTS), nullable=True) - badges_assigned: bool = Column(Boolean, default=False) - - info: 'GuestInfo' = Relationship(back_populates="guest", sa_relationship_kwargs={'passive_deletes': True}) + group_type: int = Field(sa_column=Column(Choice(c.GROUP_TYPE_OPTS)), default=c.BAND) + num_hotel_rooms: int = Field(default=1, admin_only=True) + payment: int = Field(default=0, admin_only=True) + vehicles: int = Field(default=1, admin_only=True) + estimated_loadin_minutes: int = Field(default=c.DEFAULT_LOADIN_MINUTES, admin_only=True) + estimated_performance_minutes: int = Field(default=c.DEFAULT_PERFORMANCE_MINUTES, admin_only=True) + wants_mc: bool | None = Field(nullable=True) + needs_rehearsal: int | None = Field(sa_column=Column(Choice(c.GUEST_REHEARSAL_OPTS), nullable=True)) + badges_assigned: bool = False + + info: 'GuestInfo' = Relationship( + back_populates="guest", sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) images: list['GuestImage'] = Relationship( - back_populates="guest", sa_relationship_kwargs={'order_by': 'GuestImage.id', 'passive_deletes': True}) - bio: 'GuestBio' = Relationship(back_populates="guest", sa_relationship_kwargs={'passive_deletes': True}) - taxes: 'GuestTaxes' = Relationship(back_populates="guest", sa_relationship_kwargs={'passive_deletes': True}) - stage_plot: 'GuestStagePlot' = Relationship(back_populates="guest", sa_relationship_kwargs={'passive_deletes': True}) - panel: 'GuestPanel' = Relationship(back_populates="guest", sa_relationship_kwargs={'passive_deletes': True}) - merch: 'GuestMerch' = Relationship(back_populates="guest", sa_relationship_kwargs={'passive_deletes': True}) - tracks: list['GuestTrack'] = Relationship(back_populates="guest", sa_relationship_kwargs={'passive_deletes': True}) - charity: 'GuestCharity' = Relationship(back_populates="guest", sa_relationship_kwargs={'passive_deletes': True}) - autograph: 'GuestAutograph' = Relationship(back_populates="guest", sa_relationship_kwargs={'passive_deletes': True}) - interview: 'GuestInterview' = Relationship(back_populates="guest", sa_relationship_kwargs={'passive_deletes': True}) - travel_plans: 'GuestTravelPlans' = Relationship(back_populates="guest", sa_relationship_kwargs={'passive_deletes': True}) - hospitality: 'GuestHospitality' = Relationship(back_populates="guest", sa_relationship_kwargs={'passive_deletes': True}) - media_request: 'GuestMediaRequest' = Relationship(back_populates="guest", sa_relationship_kwargs={'passive_deletes': True}) + back_populates="guest", sa_relationship_kwargs={'order_by': 'GuestImage.id', 'cascade': 'all,delete-orphan', 'passive_deletes': True}) + bio: 'GuestBio' = Relationship( + back_populates="guest", sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) + taxes: 'GuestTaxes' = Relationship( + back_populates="guest", sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) + stage_plot: 'GuestStagePlot' = Relationship( + back_populates="guest", sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) + panel: 'GuestPanel' = Relationship( + back_populates="guest", sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) + merch: 'GuestMerch' = Relationship( + back_populates="guest", sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) + tracks: list['GuestTrack'] = Relationship( + back_populates="guest", sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) + charity: 'GuestCharity' = Relationship( + back_populates="guest", sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) + autograph: 'GuestAutograph' = Relationship( + back_populates="guest", sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) + interview: 'GuestInterview' = Relationship( + back_populates="guest", sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) + travel_plans: 'GuestTravelPlans' = Relationship( + back_populates="guest", sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) + hospitality: 'GuestHospitality' = Relationship( + back_populates="guest", sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) + media_request: 'GuestMediaRequest' = Relationship( + back_populates="guest", sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) email_model_name: ClassVar = 'guest' @@ -305,11 +318,11 @@ class GuestInfo(MagModel, table=True): guest_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='guest_group.id', ondelete='CASCADE', unique=True) guest: 'GuestGroup' = Relationship(back_populates="info", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) - poc_phone: str = Column(String) - performer_count: int = Column(Integer, default=0) - bringing_vehicle: bool = Column(Boolean, default=False) - vehicle_info: str = Column(String) - arrival_time: str = Column(String) + poc_phone: str = '' + performer_count: int = 0 + bringing_vehicle: bool = False + vehicle_info: str = '' + arrival_time: str = '' @property def status(self): @@ -342,18 +355,18 @@ class GuestBio(MagModel, table=True): guest_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='guest_group.id', ondelete='CASCADE', unique=True) guest: 'GuestGroup' = Relationship(back_populates="bio", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) - desc: str = Column(String) - member_info: str = Column(String) - website: str = Column(String) - facebook: str = Column(String) - twitter: str = Column(String) - instagram: str = Column(String) - twitch: str = Column(String) - bandcamp: str = Column(String) - discord: str = Column(String) - spotify: str = Column(String) - other_social_media: str = Column(String) - teaser_song_url: str = Column(String) + desc: str = '' + member_info: str = '' + website: str = '' + facebook: str = '' + twitter: str = '' + instagram: str = '' + twitch: str = '' + bandcamp: str = '' + discord: str = '' + spotify: str = '' + other_social_media: str = '' + teaser_song_url: str = '' @property def status(self): @@ -368,7 +381,7 @@ class GuestTaxes(MagModel, table=True): guest_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='guest_group.id', ondelete='CASCADE', unique=True) guest: 'GuestGroup' = Relationship(back_populates="taxes", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) - w9_sent: bool = Column(Boolean, default=False) + w9_sent: bool = False @property def status(self): @@ -383,9 +396,9 @@ class GuestStagePlot(MagModel, table=True): guest_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='guest_group.id', ondelete='CASCADE', unique=True) guest: 'GuestGroup' = Relationship(back_populates="stage_plot", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) - filename: str = Column(String) - content_type: str = Column(String) - notes: str = Column(String) + filename: str = '' + content_type: str = '' + notes: str = '' @property def url(self): @@ -425,12 +438,12 @@ class GuestPanel(MagModel, table=True): guest_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='guest_group.id', ondelete='CASCADE', unique=True) guest: 'GuestGroup' = Relationship(back_populates="panel", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) - wants_panel: int | None = Column(Choice(c.GUEST_PANEL_OPTS), nullable=True) - name: str = Column(String) - length: str = Column(String) - desc: str = Column(String) - tech_needs: str = Column(MultiChoice(c.TECH_NEED_OPTS)) - other_tech_needs: str = Column(String) + wants_panel: int | None = Field(sa_column=Column(Choice(c.GUEST_PANEL_OPTS), nullable=True)) + name: str = '' + length: str = '' + desc: str = '' + tech_needs: str = Field(sa_type=MultiChoice(c.TECH_NEED_OPTS), default='') + other_tech_needs: str = '' @property def status(self): @@ -445,9 +458,9 @@ class GuestTrack(MagModel, table=True): guest_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='guest_group.id', ondelete='CASCADE', unique=True) guest: 'GuestGroup' = Relationship(back_populates="tracks", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) - filename: str = Column(String) - content_type: str = Column(String) - extension: str = Column(String) + filename: str = '' + content_type: str = '' + extension: str = '' @property def file(self): @@ -492,38 +505,38 @@ class GuestMerch(MagModel, table=True): guest_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='guest_group.id', ondelete='CASCADE', unique=True) guest: 'GuestGroup' = Relationship(back_populates="merch", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) - selling_merch: int | None = Column(Choice(c.GUEST_MERCH_OPTS), nullable=True) - delivery_method: int | None = Column(Choice(c.GUEST_MERCH_DELIVERY_OPTS), nullable=True) - payout_method: int | None = Column(Choice(c.GUEST_MERCH_PAYOUT_METHOD_OPTS), nullable=True) - paypal_email: str = Column(String) - check_payable: str = Column(String) - check_zip_code: str = Column(String) - check_address1: str = Column(String) - check_address2: str = Column(String) - check_city: str = Column(String) - check_region: str = Column(String) - check_country: str = Column(String) - - arrival_plans: str = Column(String) - checkin_time: int | None = Column(Choice(c.GUEST_MERCH_CHECKIN_TIMES), nullable=True) - checkout_time: int | None = Column(Choice(c.GUEST_MERCH_CHECKOUT_TIMES), nullable=True) - merch_events: str = Column(String) + selling_merch: int | None = Field(sa_column=Column(Choice(c.GUEST_MERCH_OPTS), nullable=True)) + delivery_method: int | None = Field(sa_column=Column(Choice(c.GUEST_MERCH_DELIVERY_OPTS), nullable=True)) + payout_method: int | None = Field(sa_column=Column(Choice(c.GUEST_MERCH_PAYOUT_METHOD_OPTS), nullable=True)) + paypal_email: str = '' + check_payable: str = '' + check_zip_code: str = '' + check_address1: str = '' + check_address2: str = '' + check_city: str = '' + check_region: str = '' + check_country: str = '' + + arrival_plans: str = '' + checkin_time: int | None = Field(sa_column=Column(Choice(c.GUEST_MERCH_CHECKIN_TIMES), nullable=True)) + checkout_time: int | None = Field(sa_column=Column(Choice(c.GUEST_MERCH_CHECKOUT_TIMES), nullable=True)) + merch_events: str = '' inventory: dict[Any, Any] = Field(sa_type=JSON, default_factory=dict) inventory_updated: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) - extra_info: str = Column(String) - tax_phone: str = Column(String) - - poc_is_group_leader: bool = Column(Boolean, default=False) - poc_first_name: str = Column(String) - poc_last_name: str = Column(String) - poc_phone: str = Column(String) - poc_email: str = Column(String) - poc_zip_code: str = Column(String) - poc_address1: str = Column(String) - poc_address2: str = Column(String) - poc_city: str = Column(String) - poc_region: str = Column(String) - poc_country: str = Column(String) + extra_info: str = '' + tax_phone: str = '' + + poc_is_group_leader: bool = Field(sa_type=Boolean, default=False) + poc_first_name: str = '' + poc_last_name: str = '' + poc_phone: str = '' + poc_email: str = '' + poc_zip_code: str = '' + poc_address1: str = '' + poc_address2: str = '' + poc_city: str = '' + poc_region: str = '' + poc_country: str = '' handlers: dict[str, Any] = Field(sa_type=JSON, default_factory=dict) @@ -793,8 +806,8 @@ class GuestCharity(MagModel, table=True): guest_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='guest_group.id', ondelete='CASCADE', unique=True) guest: 'GuestGroup' = Relationship(back_populates="charity", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) - donating: int | None = Column(Choice(c.GUEST_CHARITY_OPTS), nullable=True) - desc: str = Column(String) + donating: int | None = Field(sa_column=Column(Choice(c.GUEST_CHARITY_OPTS), nullable=True)) + desc: str = '' @property def status(self): @@ -814,10 +827,10 @@ class GuestAutograph(MagModel, table=True): guest_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='guest_group.id', ondelete='CASCADE', unique=True) guest: 'GuestGroup' = Relationship(back_populates="autograph", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) - num: int = Column(Integer, default=0) - length: int = Column(Integer, default=60) # session length in minutes - rock_island_autographs: bool | None = Column(Boolean, nullable=True) - rock_island_length: int = Column(Integer, default=60) # session length in minutes + num: int = 0 + length: int = 60 # session length in minutes + rock_island_autographs: bool | None = Field(nullable=True) + rock_island_length: int = 60 # session length in minutes @presave_adjustment def no_length_if_zero_autographs(self): @@ -833,9 +846,9 @@ class GuestInterview(MagModel, table=True): guest_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='guest_group.id', ondelete='CASCADE', unique=True) guest: 'GuestGroup' = Relationship(back_populates="interview", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) - will_interview: bool = Column(Boolean, default=False) - email: str = Column(String) - direct_contact: bool = Column(Boolean, default=False) + will_interview: bool = False + email: str = '' + direct_contact: bool = False @presave_adjustment def no_details_if_no_interview(self): @@ -853,13 +866,14 @@ class GuestTravelPlans(MagModel, table=True): guest_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='guest_group.id', ondelete='CASCADE', unique=True) guest: 'GuestGroup' = Relationship(back_populates="travel_plans", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) - modes: str = Column(MultiChoice(c.GUEST_TRAVEL_OPTS), default=c.OTHER) - modes_text: str = Column(String) - details: str = Column(String) - completed: bool = Column(Boolean, default=False) + modes: str = Field(sa_type=MultiChoice(c.GUEST_TRAVEL_OPTS), default=c.OTHER) + modes_text: str = '' + details: str = '' + completed: bool = False detailed_travel_plans: list['GuestDetailedTravelPlan'] = Relationship( - back_populates="travel_plans", sa_relationship_kwargs={'lazy': 'selectin', 'passive_deletes': True}) + back_populates="travel_plans", + sa_relationship_kwargs={'lazy': 'selectin', 'cascade': 'all,delete-orphan', 'passive_deletes': True}) @property def num_detailed_travel_plans(self): @@ -874,7 +888,7 @@ class GuestHospitality(MagModel, table=True): guest_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='guest_group.id', ondelete='CASCADE', unique=True) guest: 'GuestGroup' = Relationship(back_populates="hospitality", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) - completed: bool = Column(Boolean, default=False) + completed: bool = False class GuestMediaRequest(MagModel, table=True): @@ -885,7 +899,7 @@ class GuestMediaRequest(MagModel, table=True): guest_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='guest_group.id', ondelete='CASCADE', unique=True) guest: 'GuestGroup' = Relationship(back_populates="media_request", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) - completed: bool = Column(Boolean, default=False) + completed: bool = False class GuestDetailedTravelPlan(MagModel, table=True): @@ -896,18 +910,18 @@ class GuestDetailedTravelPlan(MagModel, table=True): travel_plans_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='guest_travel_plans.id', ondelete='CASCADE') travel_plans: 'GuestTravelPlans' = Relationship(back_populates="detailed_travel_plans", sa_relationship_kwargs={'lazy': 'joined'}) - mode: int = Column(Choice(c.GUEST_TRAVEL_OPTS)) - mode_text: str = Column(String) - traveller: str = Column(String) - companions: str = Column(String) - luggage_needs: str = Column(String) - contact_email: str = Column(String) - contact_phone: str = Column(String) + mode: int = Field(sa_column=Column(Choice(c.GUEST_TRAVEL_OPTS)), default=0) + mode_text: str = '' + traveller: str = '' + companions: str = '' + luggage_needs: str = '' + contact_email: str = '' + contact_phone: str = '' arrival_time: datetime = Field(sa_type=DateTime(timezone=True)) - arrival_details: str = Column(String) + arrival_details: str = '' departure_time: datetime = Field(sa_type=DateTime(timezone=True)) - departure_details: str = Column(String) - extra_details: str = Column(String) + departure_details: str = '' + extra_details: str = '' @classproperty def min_arrival_time(self): diff --git a/uber/models/hotel.py b/uber/models/hotel.py index 581ef0e17..cef212d94 100644 --- a/uber/models/hotel.py +++ b/uber/models/hotel.py @@ -9,14 +9,14 @@ from sqlalchemy.dialects.postgresql.json import JSONB from sqlalchemy.ext.hybrid import hybrid_property from sqlalchemy.ext.mutable import MutableDict -from sqlalchemy.types import Boolean, Date, Integer, String, DateTime, Uuid +from sqlalchemy.types import Date, Integer, DateTime, Uuid from typing import Any, ClassVar from uber.config import c from uber.custom_tags import readable_join, datetime_local_filter from uber.decorators import presave_adjustment from uber.models import MagModel -from uber.models.types import Choice, utcnow, DefaultColumn as Column, MultiChoice, DefaultField as Field, DefaultRelationship as Relationship +from uber.models.types import Choice, DefaultColumn as Column, MultiChoice, DefaultField as Field, DefaultRelationship as Relationship from uber.utils import RegistrationCode log = logging.getLogger(__name__) @@ -72,11 +72,11 @@ class HotelRequests(MagModel, NightsMixin, table=True): attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE', unique=True) attendee: 'Attendee' = Relationship(back_populates="hotel_requests", sa_relationship_kwargs={'lazy': 'joined'}) - nights: str = Column(MultiChoice(c.NIGHT_OPTS)) - wanted_roommates: str = Column(String) - unwanted_roommates: str = Column(String) - special_needs: str = Column(String) - approved: bool = Column(Boolean, default=False, admin_only=True) + nights: str = Field(sa_type=MultiChoice(c.NIGHT_OPTS), default='') + wanted_roommates: str = '' + unwanted_roommates: str = '' + special_needs: str = '' + approved: bool = Field(default=False, admin_only=True) def decline(self): nights = [n for n in self.nights.split(',') if int(n) in c.CORE_NIGHTS] @@ -91,13 +91,14 @@ def __repr__(self): class Room(MagModel, NightsMixin, table=True): - notes: str = Column(String) - message: str = Column(String) - locked_in: bool = Column(Boolean, default=False) - nights: str = Column(MultiChoice(c.NIGHT_OPTS)) + notes: str = '' + message: str = '' + locked_in: bool = False + nights: str = Field(sa_type=MultiChoice(c.NIGHT_OPTS), default='') created: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) - assignments: list['RoomAssignment'] = Relationship(back_populates="room", sa_relationship_kwargs={'passive_deletes': True}) + assignments: list['RoomAssignment'] = Relationship(back_populates="room", + sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) @property def email(self): @@ -143,43 +144,43 @@ class LotteryApplication(MagModel, table=True): attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', nullable=True, unique=True) attendee: 'Attendee' = Relationship(back_populates="lottery_application", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) - invite_code: str = Column(String) # Not used for now but we're keeping it for later - confirmation_num: str = Column(String) + invite_code: str = '' # Not used for now but we're keeping it for later + confirmation_num: str = '' response_id_seq: ClassVar = Sequence('lottery_application_response_id_seq') - response_id: int = Column(Integer, response_id_seq, server_default=response_id_seq.next_value(), unique=True) - status: int = Column(Choice(c.HOTEL_LOTTERY_STATUS_OPTS), default=c.PARTIAL, admin_only=True) + response_id: int = Field(sa_column=Column(Integer, response_id_seq, server_default=response_id_seq.next_value(), unique=True)) + status: int = Field(sa_column=Column(Choice(c.HOTEL_LOTTERY_STATUS_OPTS), admin_only=True), default=c.PARTIAL) entry_started: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) entry_metadata: dict[str, Any] = Field(sa_type=MutableDict.as_mutable(JSONB), default_factory=dict) - entry_type: int | None = Column(Choice(c.HOTEL_LOTTERY_ENTRY_TYPE_OPTS), nullable=True) - current_step: int = Column(Integer, default=0) + entry_type: int | None = Field(sa_column=Column(Choice(c.HOTEL_LOTTERY_ENTRY_TYPE_OPTS), nullable=True)) + current_step: int = 0 last_submitted: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) - admin_notes: str = Column(String) - is_staff_entry: bool = Column(Boolean, default=False) - - legal_first_name: str = Column(String) - legal_last_name: str = Column(String) - cellphone: str = Column(String) - earliest_checkin_date: date | None = Column(Date, nullable=True) - latest_checkin_date: date | None = Column(Date, nullable=True) - earliest_checkout_date: date | None = Column(Date, nullable=True) - latest_checkout_date: date | None = Column(Date, nullable=True) - selection_priorities: str = Column(MultiChoice(c.HOTEL_LOTTERY_PRIORITIES_OPTS)) - - hotel_preference: str = Column(MultiChoice(c.HOTEL_LOTTERY_HOTELS_OPTS)) - room_type_preference: str = Column(MultiChoice(c.HOTEL_LOTTERY_ROOM_TYPES_OPTS)) - wants_ada: bool = Column(Boolean, default=False) - ada_requests: str = Column(String) - - room_opt_out: bool = Column(Boolean, default=False) - suite_type_preference: str = Column(MultiChoice(c.HOTEL_LOTTERY_SUITE_ROOM_TYPES_OPTS)) - - terms_accepted: bool = Column(Boolean, default=False) - data_policy_accepted: bool = Column(Boolean, default=False) - suite_terms_accepted: bool = Column(Boolean, default=False) - guarantee_policy_accepted: bool = Column(Boolean, default=False) - can_edit: bool = Column(Boolean, default=False) - final_status_hidden: bool = Column(Boolean, default=True) - booking_url_hidden: bool = Column(Boolean, default=True) + admin_notes: str = '' + is_staff_entry: bool = False + + legal_first_name: str = '' + legal_last_name: str = '' + cellphone: str = '' + earliest_checkin_date: date | None = Field(sa_type=Date, nullable=True) + latest_checkin_date: date | None = Field(sa_type=Date, nullable=True) + earliest_checkout_date: date | None = Field(sa_type=Date, nullable=True) + latest_checkout_date: date | None = Field(sa_type=Date, nullable=True) + selection_priorities: str = Field(sa_type=MultiChoice(c.HOTEL_LOTTERY_PRIORITIES_OPTS), default='') + + hotel_preference: str = Field(sa_type=MultiChoice(c.HOTEL_LOTTERY_HOTELS_OPTS), default='') + room_type_preference: str = Field(sa_type=MultiChoice(c.HOTEL_LOTTERY_ROOM_TYPES_OPTS), default='') + wants_ada: bool = False + ada_requests: str = '' + + room_opt_out: bool = False + suite_type_preference: str = Field(sa_type=MultiChoice(c.HOTEL_LOTTERY_SUITE_ROOM_TYPES_OPTS), default='') + + terms_accepted: bool = False + data_policy_accepted: bool = False + 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) @@ -188,20 +189,20 @@ class LotteryApplication(MagModel, table=True): sa_relationship_kwargs={'lazy': 'joined', 'foreign_keys': 'LotteryApplication.parent_application_id', 'remote_side': 'LotteryApplication.id'}) group_members: list['LotteryApplication'] = Relationship( - back_populates="parent_application", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) + back_populates="parent_application") former_parent_id: str | None = Field(sa_type=Uuid(as_uuid=False), nullable=True) - room_group_name: str = Column(String) + room_group_name: str = '' email_model_name: ClassVar = 'app' - assigned_hotel: int | None = Column(Choice(c.HOTEL_LOTTERY_HOTELS_OPTS), nullable=True) - assigned_room_type: int | None = Column(Choice(c.HOTEL_LOTTERY_ROOM_TYPES_OPTS), nullable=True) - assigned_suite_type: int | None = Column(Choice(c.HOTEL_LOTTERY_SUITE_ROOM_TYPES_OPTS), nullable=True) - assigned_check_in_date: date | None = Column(Date, nullable=True) - assigned_check_out_date: date | None = Column(Date, nullable=True) - deposit_cutoff_date: date | None = Column(Date, nullable=True) - lottery_name: str = Column(String) - booking_url: str = Column(String) + assigned_hotel: int | None = Field(sa_column=Column(Choice(c.HOTEL_LOTTERY_HOTELS_OPTS), nullable=True)) + assigned_room_type: int | None = Field(sa_column=Column(Choice(c.HOTEL_LOTTERY_ROOM_TYPES_OPTS), nullable=True)) + assigned_suite_type: int | None = Field(sa_column=Column(Choice(c.HOTEL_LOTTERY_SUITE_ROOM_TYPES_OPTS), nullable=True)) + assigned_check_in_date: date | None = Field(sa_type=Date, nullable=True) + assigned_check_out_date: date | None = Field(sa_type=Date, nullable=True) + deposit_cutoff_date: date | None = Field(sa_type=Date, nullable=True) + lottery_name: str = '' + booking_url: str = '' @presave_adjustment def unset_entry_type(self): diff --git a/uber/models/legal.py b/uber/models/legal.py index dba3b2ea9..701698f84 100644 --- a/uber/models/legal.py +++ b/uber/models/legal.py @@ -3,18 +3,18 @@ from uber.decorators import presave_adjustment from uber.models import MagModel -from uber.models.types import DefaultColumn as Column, DefaultField as Field, DefaultRelationship as Relationship +from uber.models.types import DefaultField as Field __all__ = ['SignedDocument'] class SignedDocument(MagModel, table=True): fk_id: str = Field(sa_type=Uuid(as_uuid=False), index=True) - model: str = Column(String) - document_id: str = Column(String) + model: str = '' + document_id: str = '' last_emailed: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True, default=None) - link: str = Column(String) - ident: str = Column(String) + link: str = '' + ident: str = '' signed: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True, default=None) declined: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True, default=None) diff --git a/uber/models/marketplace.py b/uber/models/marketplace.py index 55ad4199e..6a8132ce2 100644 --- a/uber/models/marketplace.py +++ b/uber/models/marketplace.py @@ -2,14 +2,14 @@ from uber.custom_tags import email_only, email_to_link from uber.models import MagModel from uber.decorators import presave_adjustment -from uber.models.types import (Choice, DefaultColumn as Column, default_relationship as relationship, utcnow, +from uber.models.types import (Choice, default_relationship as relationship, DefaultColumn as Column, DefaultField as Field, DefaultRelationship as Relationship) from datetime import datetime from markupsafe import Markup from pytz import UTC from sqlalchemy.orm import backref -from sqlalchemy.types import Boolean, Integer, Uuid, String, DateTime +from sqlalchemy.types import Uuid, DateTime from typing import ClassVar @@ -25,20 +25,20 @@ class ArtistMarketplaceApplication(MagModel, table=True): attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE', unique=True) attendee: 'Attendee' = Relationship(back_populates="marketplace_application", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) - name: str = Column(String) - display_name: str = Column(String) - email_address: str = Column(String) - website: str = Column(String) - tax_number: str = Column(String) - terms_accepted: bool = Column(Boolean, default=False) - seating_requests: str = Column(String) - accessibility_requests: str = Column(String) - - status: int = Column(Choice(c.MARKETPLACE_STATUS_OPTS), default=c.PENDING, admin_only=True) + name: str = '' + display_name: str = '' + email_address: str = '' + website: str = '' + tax_number: str = '' + terms_accepted: bool = False + seating_requests: str = '' + accessibility_requests: str = '' + + status: int = Field(sa_column=Column(Choice(c.MARKETPLACE_STATUS_OPTS)), default=c.PENDING) registered: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) accepted: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) - admin_notes: str = Column(String, admin_only=True) - overridden_price: int | None = Column(Integer, nullable=True, admin_only=True) + admin_notes: str = '' + overridden_price: int | None = Field(default=0, nullable=True) receipt_items: list['ReceiptItem'] = Relationship(sa_relationship=relationship('ReceiptItem', primaryjoin='and_(' diff --git a/uber/models/mits.py b/uber/models/mits.py index 885363bc1..b6ad4c42c 100644 --- a/uber/models/mits.py +++ b/uber/models/mits.py @@ -5,13 +5,13 @@ from pytz import UTC from sqlalchemy import and_ -from sqlalchemy.types import Boolean, Integer, Uuid, DateTime, String +from sqlalchemy.types import Uuid, DateTime from sqlalchemy.ext.hybrid import hybrid_property from typing import ClassVar from uber.config import c from uber.models import MagModel -from uber.models.types import (utcnow, Choice, DefaultColumn as Column, MultiChoice, GuidebookImageMixin, +from uber.models.types import (Choice, MultiChoice, GuidebookImageMixin, DefaultColumn as Column, DefaultField as Field, DefaultRelationship as Relationship) from uber.utils import slugify @@ -24,28 +24,32 @@ class MITSTeam(MagModel, table=True): MITSGame: selectin """ - name: str = Column(String) - days_available: int | None = Column(Integer, nullable=True) - hours_available: int | None = Column(Integer, nullable=True) - concurrent_attendees: int | None = Column(Integer, default=0) - panel_interest: bool | None = Column(Boolean, nullable=True, admin_only=True) - showcase_interest: bool | None = Column(Boolean, nullable=True, admin_only=True) - want_to_sell: bool = Column(Boolean, default=False) - address: str = Column(String) + name: str = '' + days_available: int | None = Field(nullable=True) + hours_available: int | None = Field(nullable=True) + concurrent_attendees: int = 0 + panel_interest: bool | None = Field(nullable=True, admin_only=True) + showcase_interest: bool | None = Field(nullable=True, admin_only=True) + want_to_sell: bool = False + address: str = '' submitted: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) - waiver_signature: str = Column(String) + waiver_signature: str = '' waiver_signed: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) applied: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) - status: int = Column(Choice(c.MITS_APP_STATUS), default=c.PENDING, admin_only=True) + status: int = Field(sa_column=Column(Choice(c.MITS_APP_STATUS), admin_only=True), default=c.PENDING) - applicants: list['MITSApplicant'] = Relationship(back_populates="team", sa_relationship_kwargs={'passive_deletes': True}) - games: list['MITSGame'] = Relationship(back_populates="team", sa_relationship_kwargs={'passive_deletes': True}) - schedule: 'MITSTimes' = Relationship(back_populates="team", sa_relationship_kwargs={'passive_deletes': True}) - panel_app: 'MITSPanelApplication' = Relationship(back_populates="team", sa_relationship_kwargs={'passive_deletes': True}) + applicants: list['MITSApplicant'] = Relationship( + back_populates="team", sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) + games: list['MITSGame'] = Relationship( + back_populates="team", sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) + schedule: 'MITSTimes' = Relationship( + back_populates="team", sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) + panel_app: 'MITSPanelApplication' = Relationship( + back_populates="team", sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) duplicate_of: str | None = Field(sa_type=Uuid(as_uuid=False), nullable=True) - deleted: bool = Column(Boolean, default=False) + deleted: bool = False # We've found that a lot of people start filling out an application and # then instead of continuing their application just start over fresh and # fill out a new one. In these cases we mark the application as @@ -145,15 +149,15 @@ class MITSApplicant(MagModel, table=True): attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', nullable=True) attendee: 'Attendee' = Relationship(back_populates="mits_applicants") - primary_contact: bool = Column(Boolean, default=False) - first_name: str = Column(String) - last_name: str = Column(String) - email: str = Column(String) - cellphone: str = Column(String) - contact_method: int = Column(Choice(c.MITS_CONTACT_OPTS), default=c.TEXTING) + primary_contact: bool = False + first_name: str = '' + last_name: str = '' + email: str = '' + cellphone: str = '' + contact_method: int = Field(sa_column=Column(Choice(c.MITS_CONTACT_OPTS)), default=c.TEXTING) - declined_hotel_space: bool = Column(Boolean, default=False) - requested_room_nights: str = Column(MultiChoice(c.MITS_ROOM_NIGHT_OPTS), default='') + declined_hotel_space: bool = False + requested_room_nights: str = Field(sa_type=MultiChoice(c.MITS_ROOM_NIGHT_OPTS), default='') email_model_name: ClassVar = 'applicant' @@ -181,23 +185,25 @@ class MITSGame(MagModel, table=True): team_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='mits_team.id', ondelete='CASCADE') team: 'MITSTeam' = Relationship(back_populates="games", sa_relationship_kwargs={'lazy': 'joined'}) - name: str = Column(String) - promo_blurb: str = Column(String) - description: str = Column(String) - genre: str = Column(String) - phase: int = Column(Choice(c.MITS_PHASE_OPTS), default=c.DEVELOPMENT) - min_age: int = Column(Choice(c.MITS_AGE_OPTS), default=c.CHILD) - age_explanation: str = Column(String) - min_players: int = Column(Integer, default=2) - max_players: int = Column(Integer, default=4) - copyrighted: int | None = Column(Choice(c.MITS_COPYRIGHT_OPTS), nullable=True) - personally_own: bool = Column(Boolean, default=False) - unlicensed: bool = Column(Boolean, default=False) - professional: bool = Column(Boolean, default=False) - tournament: bool = Column(Boolean, default=False) - - pictures: list['MITSPicture'] = Relationship(back_populates="game", sa_relationship_kwargs={'passive_deletes': True}) - documents: list['MITSDocument'] = Relationship(back_populates="game", sa_relationship_kwargs={'passive_deletes': True}) + name: str = '' + promo_blurb: str = '' + description: str = '' + genre: str = '' + phase: int = Field(sa_column=Column(Choice(c.MITS_PHASE_OPTS)), default=c.DEVELOPMENT) + min_age: int = Field(sa_column=Column(Choice(c.MITS_AGE_OPTS)), default=c.CHILD) + age_explanation: str = '' + min_players: int = 2 + max_players: int = 4 + copyrighted: int | None = Field(sa_column=Column(Choice(c.MITS_COPYRIGHT_OPTS), nullable=True)) + personally_own: bool = False + unlicensed: bool = False + professional: bool = False + tournament: bool = False + + pictures: list['MITSPicture'] = Relationship( + back_populates="game", sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) + documents: list['MITSDocument'] = Relationship( + back_populates="game", sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) @hybrid_property def has_been_accepted(self): @@ -259,7 +265,7 @@ class MITSPicture(MagModel, GuidebookImageMixin, table=True): game_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='mits_game.id', ondelete='CASCADE') game: 'MITSGame' = Relationship(back_populates="pictures", sa_relationship_kwargs={'lazy': 'joined'}) - description: str = Column(String) + description: str = '' @property def url(self): @@ -278,8 +284,8 @@ class MITSDocument(MagModel, table=True): game_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='mits_game.id', ondelete='CASCADE') game: 'MITSGame' = Relationship(back_populates="documents", sa_relationship_kwargs={'lazy': 'joined'}) - filename: str = Column(String) - description: str = Column(String) + filename: str = '' + description: str = '' @property def url(self): @@ -298,8 +304,8 @@ class MITSTimes(MagModel, table=True): team_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='mits_team.id', ondelete='CASCADE', unique=True) team: 'MITSTeam' = Relationship(back_populates="schedule", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) - showcase_availability: str = Column(MultiChoice(c.MITS_SHOWCASE_SCHEDULE_OPTS)) - availability: str = Column(MultiChoice(c.MITS_SCHEDULE_OPTS)) + showcase_availability: str = Field(sa_type=MultiChoice(c.MITS_SHOWCASE_SCHEDULE_OPTS), default='') + availability: str = Field(sa_type=MultiChoice(c.MITS_SCHEDULE_OPTS), default='') class MITSPanelApplication(MagModel, table=True): @@ -310,10 +316,10 @@ class MITSPanelApplication(MagModel, table=True): team_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='mits_team.id', ondelete='CASCADE', unique=True) team: 'MITSTeam' = Relationship(back_populates="panel_app", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) - name: str = Column(String) - description: str = Column(String) - length: int = Column(Choice(c.PANEL_STRICT_LENGTH_OPTS), default=c.SIXTY_MIN) - participation_interest: bool = Column(Boolean, default=False) + name: str = '' + description: str = '' + length: int = Field(sa_column=Column(Choice(c.PANEL_STRICT_LENGTH_OPTS)), default=c.SIXTY_MIN) + participation_interest: bool = False def add_applicant_restriction(): diff --git a/uber/models/panels.py b/uber/models/panels.py index f6011281a..4edd41898 100644 --- a/uber/models/panels.py +++ b/uber/models/panels.py @@ -33,14 +33,14 @@ class EventLocation(MagModel, table=True): department_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='department.id', nullable=True) department: 'Department' = Relationship(back_populates="locations") - name: str = Column(String) - room: str = Column(String) - tracks: str = Column(MultiChoice(c.EVENT_TRACK_OPTS)) + name: str = '' + room: str = '' + tracks: str = Field(sa_column=Column(MultiChoice(c.EVENT_TRACK_OPTS)), default='') events: list['Event'] = Relationship( - back_populates="location", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) + back_populates="location") attractions: list['AttractionEvent'] = Relationship( - back_populates="location", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) + back_populates="location") @property def schedule_name(self): @@ -95,17 +95,19 @@ class Event(MagModel, table=True): attraction: 'AttractionEvent' = Relationship(back_populates="schedule_item", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) start_time: datetime = Field(sa_type=DateTime(timezone=True)) - duration: int = Column(Integer, default=60) - name: str = Column(String, nullable=False) - description: str = Column(String) - public_description: str = Column(String) - tracks: str = Column(MultiChoice(c.EVENT_TRACK_OPTS)) - - assigned_panelists: list['AssignedPanelist'] = Relationship(back_populates="event", sa_relationship_kwargs={'passive_deletes': True}) + duration: int = 60 + name: str = False + description: str = '' + public_description: str = '' + tracks: str = Field(sa_column=Column(MultiChoice(c.EVENT_TRACK_OPTS)), default='') + + assigned_panelists: list['AssignedPanelist'] = Relationship( + back_populates="event", sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) applications: list['PanelApplication'] = Relationship( - back_populates="event", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) - panel_feedback: list['EventFeedback'] = Relationship(back_populates="event", sa_relationship_kwargs={'passive_deletes': True}) - guest: 'GuestGroup' = Relationship(back_populates="event", sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) + back_populates="event") + panel_feedback: list['EventFeedback'] = Relationship( + back_populates="event", sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) + guest: 'GuestGroup' = Relationship(back_populates="event") @property def minutes(self): @@ -195,45 +197,45 @@ class PanelApplication(MagModel, table=True): submitter_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='panel_applicant.id', nullable=True) - name: str = Column(String) - length: int = Column(Choice(c.PANEL_LENGTH_OPTS), default=c.SIXTY_MIN) - length_text: str = Column(String) - length_reason: str = Column(String) - description: str = Column(String) - public_description: str = Column(String) - unavailable: str = Column(String) - available: str = Column(String) - affiliations: str = Column(String) - past_attendance: str = Column(String) - department: str = Column(UniqueList) - department_name: str = Column(String) - rating: int = Column(Choice(c.PANEL_RATING_OPTS), default=c.UNRATED) - granular_rating: str = Column(MultiChoice(c.PANEL_CONTENT_OPTS)) - presentation: int = Column(Choice(c.PRESENTATION_OPTS)) - other_presentation: str = Column(String) - noise_level: int = Column(Choice(c.NOISE_LEVEL_OPTS)) - tech_needs: str = Column(MultiChoice(c.TECH_NEED_OPTS)) - other_tech_needs: str = Column(String) - need_tables: bool = Column(Boolean, default=False) - tables_desc: str = Column(String) - has_cost: bool = Column(Boolean, default=False) - is_loud: bool = Column(Boolean, default=False) - tabletop: bool = Column(Boolean, default=False) - cost_desc: str = Column(String) - livestream: int = Column(Choice(c.LIVESTREAM_OPTS), default=c.OPT_IN) - record: int = Column(Choice(c.LIVESTREAM_OPTS), default=c.OPT_IN) - panelist_bringing: str = Column(String) - extra_info: str = Column(String) + name: str = '' + length: int = Field(sa_column=Column(Choice(c.PANEL_LENGTH_OPTS)), default=c.SIXTY_MIN) + length_text: str = '' + length_reason: str = '' + description: str = '' + public_description: str = '' + unavailable: str = '' + available: str = '' + affiliations: str = '' + past_attendance: str = '' + department: str = Field(sa_type=UniqueList, default='') + department_name: str = '' + rating: int = Field(sa_column=Column(Choice(c.PANEL_RATING_OPTS)), default=c.UNRATED) + granular_rating: str = Field(sa_column=Column(MultiChoice(c.PANEL_CONTENT_OPTS)), default='') + presentation: int = Field(sa_column=Column(Choice(c.PRESENTATION_OPTS))) + other_presentation: str = '' + noise_level: int = Field(sa_column=Column(Choice(c.NOISE_LEVEL_OPTS))) + tech_needs: str = Field(sa_column=Column(MultiChoice(c.TECH_NEED_OPTS)), default='') + other_tech_needs: str = '' + need_tables: bool = False + tables_desc: str = '' + has_cost: bool = False + is_loud: bool = False + tabletop: bool = False + cost_desc: str = '' + livestream: int = Field(sa_column=Column(Choice(c.LIVESTREAM_OPTS)), default=c.OPT_IN) + record: int = Field(sa_column=Column(Choice(c.LIVESTREAM_OPTS)), default=c.OPT_IN) + panelist_bringing: str = '' + extra_info: str = '' applied: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) accepted: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) confirmed: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) - status: int = Column(Choice(c.PANEL_APP_STATUS_OPTS), default=c.PENDING, admin_only=True) - comments: str = Column(String, admin_only=True) - tags: str = Column(UniqueList, admin_only=True) + status: int = Field(sa_column=Column(Choice(c.PANEL_APP_STATUS_OPTS)), default=c.PENDING, admin_only=True) + comments: str = '' + tags: str = Field(sa_type=UniqueList, default='') applicants: list['PanelApplicant'] = Relationship( back_populates="applications", - sa_relationship_kwargs={'lazy': 'selectin', 'cascade': 'save-update,merge,refresh-expire,expunge', 'secondary': 'panel_applicant_application'}) + sa_relationship_kwargs={'lazy': 'selectin', 'secondary': 'panel_applicant_application'}) email_model_name: ClassVar = 'app' @@ -352,26 +354,26 @@ class PanelApplicant(MagModel, table=True): attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='SET NULL', nullable=True) attendee: 'Attendee' = Relationship(back_populates="panel_applicants", sa_relationship_kwargs={'lazy': 'joined'}) - submitter: bool = Column(Boolean, default=False) - first_name: str = Column(String) - last_name: str = Column(String) - email: str = Column(String) - cellphone: str = Column(String) - communication_pref: str = Column(MultiChoice(c.COMMUNICATION_PREF_OPTS)) - other_communication_pref: str = Column(String) - requested_accessibility_services: bool = Column(Boolean, default=False) - pronouns: str = Column(MultiChoice(c.PRONOUN_OPTS)) - other_pronouns: str = Column(String) - occupation: str = Column(String) - website: str = Column(String) - other_credentials: str = Column(String) - guidebook_bio: str = Column(String) - display_name: str = Column(String) - social_media_info: str = Column(String) + submitter: bool = False + first_name: str = '' + last_name: str = '' + email: str = '' + cellphone: str = '' + communication_pref: str = Field(sa_column=Column(MultiChoice(c.COMMUNICATION_PREF_OPTS)), default='') + other_communication_pref: str = '' + requested_accessibility_services: bool = False + pronouns: str = Field(sa_column=Column(MultiChoice(c.PRONOUN_OPTS)), default='') + other_pronouns: str = '' + occupation: str = '' + website: str = '' + other_credentials: str = '' + guidebook_bio: str = '' + display_name: str = '' + social_media_info: str = '' applications: list['PanelApplication'] = Relationship( back_populates="applicants", - sa_relationship_kwargs={'lazy': 'selectin', 'cascade': 'save-update,merge,refresh-expire,expunge', 'secondary': 'panel_applicant_application'}) + sa_relationship_kwargs={'lazy': 'selectin', 'secondary': 'panel_applicant_application'}) @property def has_credentials(self): @@ -403,7 +405,7 @@ class EventFeedback(MagModel, table=True): attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE') attendee: 'Attendee' = Relationship(back_populates="panel_feedback") - headcount_starting: int = Column(Integer, default=0) - headcount_during: int = Column(Integer, default=0) - comments: str = Column(String) - rating: int = Column(Choice(c.PANEL_FEEDBACK_OPTS), default=c.UNRATED) + headcount_starting: int = 0 + headcount_during: int = 0 + comments: str = '' + rating: int = Field(sa_column=Column(Choice(c.PANEL_FEEDBACK_OPTS)), default=c.UNRATED) diff --git a/uber/models/promo_code.py b/uber/models/promo_code.py index 44459ca02..3e7192c88 100644 --- a/uber/models/promo_code.py +++ b/uber/models/promo_code.py @@ -57,8 +57,8 @@ class PromoCodeWord(MagModel, table=True): (_ADVERB, 'adverb')] _PARTS_OF_SPEECH: ClassVar = dict(_PART_OF_SPEECH_OPTS) - word: str = Column(String) - part_of_speech: int = Column(Choice(_PART_OF_SPEECH_OPTS), default=_ADJECTIVE) + word: str = '' + part_of_speech: int = Field(sa_column=Column(Choice(_PART_OF_SPEECH_OPTS)), default=_ADJECTIVE) _repr_attr_names: ClassVar = ('word',) @@ -137,12 +137,12 @@ class PromoCodeGroup(MagModel, table=True): buyer_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', nullable=True) buyer: 'Attendee' = Relationship(back_populates="promo_code_groups", sa_relationship_kwargs={'lazy': 'joined'}) - name: str = Column(String) - code: str = Column(String, admin_only=True) + name: str = '' + code: str = '' registered: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) promo_codes: list['PromoCode'] = Relationship( - back_populates="group", sa_relationship_kwargs={'lazy': 'selectin', 'cascade': 'save-update,merge,refresh-expire,expunge'}) + back_populates="group", sa_relationship_kwargs={'lazy': 'selectin'}) email_model_name: ClassVar = 'group' @@ -316,13 +316,13 @@ class PromoCode(MagModel, table=True): group_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='promo_code_group.id', nullable=True) group: 'PromoCodeGroup' = Relationship(back_populates="promo_codes", sa_relationship_kwargs={'lazy': 'joined'}) - code: str = Column(String) - discount: int | None = Column(Integer, nullable=True, default=None) - discount_type: int = Column(Choice(_DISCOUNT_TYPE_OPTS), default=_FIXED_DISCOUNT) + code: str = '' + discount: int | None = Field(nullable=True, default=None) + discount_type: int = Field(sa_column=Column(Choice(_DISCOUNT_TYPE_OPTS)), default=_FIXED_DISCOUNT) expiration_date: datetime = Field(sa_type=DateTime(timezone=True), default=c.ESCHATON) - uses_allowed: int | None = Column(Integer, nullable=True, default=None) - cost: int | None = Column(Integer, nullable=True, default=None) - admin_notes: str = Column(String) + uses_allowed: int | None = Field(nullable=True, default=None) + cost: int | None = Field(nullable=True, default=None) + admin_notes: str = '' used_by: list['Attendee'] = Relationship( back_populates="promo_code", sa_relationship_kwargs={'lazy': 'selectin', 'cascade': 'merge,refresh-expire,expunge'} diff --git a/uber/models/showcase.py b/uber/models/showcase.py index 25633490f..b7e1088d3 100644 --- a/uber/models/showcase.py +++ b/uber/models/showcase.py @@ -44,19 +44,20 @@ class IndieJudge(MagModel, ReviewMixin, table=True): admin_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='admin_account.id', nullable=True, unique=True) admin_account: "AdminAccount" = Relationship(back_populates="judge", sa_relationship_kwargs={'single_parent': True}) - status: int = Column(Choice(c.MIVS_JUDGE_STATUS_OPTS), default=c.UNCONFIRMED) - assignable_showcases: str = Column(MultiChoice(c.SHOWCASE_GAME_TYPE_OPTS)) - all_games_showcases: str = Column(MultiChoice(c.SHOWCASE_GAME_TYPE_OPTS)) - no_game_submission: bool | None = Column(Boolean, nullable=True) - genres: str = Column(MultiChoice(c.MIVS_JUDGE_GENRE_OPTS)) - platforms: str = Column(MultiChoice(c.MIVS_PLATFORM_OPTS)) - platforms_text: str = Column(String) - vr_text: str = Column(String) - staff_notes: str = Column(String) + status: int = Field(sa_column=Column(Choice(c.MIVS_JUDGE_STATUS_OPTS)), default=c.UNCONFIRMED) + assignable_showcases: str = Field(sa_column=Column(MultiChoice(c.SHOWCASE_GAME_TYPE_OPTS)), default='') + all_games_showcases: str = Field(sa_column=Column(MultiChoice(c.SHOWCASE_GAME_TYPE_OPTS)), default='') + no_game_submission: bool | None = True + genres: str = Field(sa_column=Column(MultiChoice(c.MIVS_JUDGE_GENRE_OPTS)), default='') + platforms: str = Field(sa_column=Column(MultiChoice(c.MIVS_PLATFORM_OPTS)), default='') + platforms_text: str = '' + vr_text: str = '' + staff_notes: str = '' codes: list['IndieGameCode'] = Relationship( - back_populates="judge", sa_relationship_kwargs={'lazy': 'selectin', 'cascade': 'save-update,merge,refresh-expire,expunge'}) - reviews: list['IndieGameReview'] = Relationship(back_populates="judge", sa_relationship_kwargs={'lazy': 'selectin', 'passive_deletes': True}) + back_populates="judge", sa_relationship_kwargs={'lazy': 'selectin'}) + reviews: list['IndieGameReview'] = Relationship( + back_populates="judge", sa_relationship_kwargs={'lazy': 'selectin', 'cascade': 'all,delete-orphan', 'passive_deletes': True}) email_model_name: ClassVar = 'judge' @@ -144,32 +145,33 @@ class IndieStudio(MagModel, table=True): group_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='group.id', nullable=True, unique=True) group: 'Group' = Relationship(back_populates="studio", sa_relationship_kwargs={'single_parent': True}) - name: str = Column(String, unique=True) - website: str = Column(String) - other_links: str = Column(UniqueList) + name: str = Field(default='', unique=True) + website: str = '' + other_links: str = Field(sa_type=UniqueList, default='') - status: int = Column( - Choice(c.MIVS_STUDIO_STATUS_OPTS), default=c.NEW, admin_only=True) - staff_notes: str = Column(String, admin_only=True) + status: int = Field(sa_column=Choice(c.MIVS_STUDIO_STATUS_OPTS), default=c.NEW) + staff_notes: str = '' registered: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) - accepted_core_hours: bool = Column(Boolean, default=False) - discussion_emails: str = Column(String) - completed_discussion: bool = Column(Boolean, default=False) - read_handbook: bool = Column(Boolean, default=False) - training_password: str = Column(String) - selling_merch: int | None = Column(Choice(c.MIVS_MERCH_OPTS), nullable=True) - needs_hotel_space: bool | None = Column(Boolean, nullable=True, admin_only=True) # "Admin only" preserves null default - name_for_hotel: str = Column(String) - email_for_hotel: str = Column(String) - contact_phone: str = Column(String) - show_info_updated: bool = Column(Boolean, default=False) - logistics_updated: bool = Column(Boolean, default=False) + accepted_core_hours: bool = False + discussion_emails: str = '' + completed_discussion: bool = False + read_handbook: bool = False + training_password: str = '' + selling_merch: int | None = Field(sa_column=Column(Choice(c.MIVS_MERCH_OPTS), nullable=True)) + needs_hotel_space: bool | None = Field(nullable=True) + name_for_hotel: str = '' + email_for_hotel: str = '' + contact_phone: str = '' + show_info_updated: bool = False + logistics_updated: bool = False games: list['IndieGame'] = Relationship( - back_populates="studio", sa_relationship_kwargs={'lazy': 'selectin', 'order_by': 'IndieGame.title', 'passive_deletes': True}) + back_populates="studio", + sa_relationship_kwargs={'lazy': 'selectin', 'order_by': 'IndieGame.title', 'cascade': 'all,delete-orphan', 'passive_deletes': True}) developers: list['IndieDeveloper'] = Relationship( - back_populates="studio", sa_relationship_kwargs={'order_by': 'IndieDeveloper.last_name', 'passive_deletes': True}) + back_populates="studio", + sa_relationship_kwargs={'order_by': 'IndieDeveloper.last_name', 'cascade': 'all,delete-orphan', 'passive_deletes': True}) email_model_name: ClassVar = 'studio' @@ -294,11 +296,11 @@ def website_href(self): @property def email(self): - return [dev.email_to_address for dev in self.developers if dev.gets_emails] + return [dev.email_to_address for dev in self.developers if dev.receives_emails] @property def primary_contacts(self): - return [dev for dev in self.developers if dev.gets_emails] + return [dev for dev in self.developers if dev.receives_emails] @property def submitted_games(self): @@ -335,16 +337,15 @@ class IndieDeveloper(MagModel, table=True): attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', nullable=True) attendee: 'Attendee' = Relationship(back_populates="indie_developer") - gets_emails: bool = Column(Boolean, default=False) - first_name: str = Column(String) - last_name: str = Column(String) - email: str = Column(String) - cellphone: str = Column(String) - agreed_coc: bool = Column(Boolean, default=False) - agreed_data_policy: bool = Column(Boolean, default=False) + receives_emails: bool = False + first_name: str = '' + last_name: str = '' + email: str = '' + cellphone: str = '' + agreed_coc: bool = False + agreed_data_policy: bool = False - arcade_games: list['IndieGame'] = Relationship(back_populates="primary_contact", - sa_relationship_kwargs={'cascade': 'save-update,merge,refresh-expire,expunge'}) + arcade_games: list['IndieGame'] = Relationship(back_populates="primary_contact") @property def email_to_address(self): @@ -381,77 +382,78 @@ class IndieGame(MagModel, ReviewMixin, table=True): primary_contact_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='indie_developer.id', nullable=True) primary_contact: 'IndieDeveloper' = Relationship(back_populates="arcade_games", sa_relationship_kwargs={'lazy': 'joined'}) - title: str = Column(String) - brief_description: str = Column(String) - description: str = Column(String) - genres: str = Column(MultiChoice(c.MIVS_GENRE_OPTS)) - genres_text: str = Column(String) - platforms: str = Column(MultiChoice(c.MIVS_PLATFORM_OPTS + c.INDIE_RETRO_PLATFORM_OPTS)) - platforms_text: str = Column(String) - player_count: str = Column(String) - how_to_play: str = Column(String) - link_to_video: str = Column(String) - link_to_game: str = Column(String) - - requires_gamepad: bool = Column(Boolean, default=False) - is_alumni: bool = Column(Boolean, default=False) - content_warning: bool = Column(Boolean, default=False) - warning_desc: str = Column(String) - photosensitive_warning: bool = Column(Boolean, default=False) - has_multiplayer: bool = Column(Boolean, default=False) - password_to_game: str = Column(String) - code_type: int = Column(Choice(c.MIVS_CODE_TYPE_OPTS), default=c.NO_CODE) - code_instructions: str = Column(String) - build_status: int = Column( - Choice(c.MIVS_BUILD_STATUS_OPTS), default=c.PRE_ALPHA) - build_notes: str = Column(String) - - game_hours: str = Column(String) - game_hours_text: str = Column(String) - game_end_time: bool = Column(Boolean, default=False) - floorspace: int | None = Column(Choice(c.INDIE_ARCADE_FLOORSPACE_OPTS), nullable=True) - floorspace_text: str = Column(String) - cabinet_type: int | None = Column(Choice(c.INDIE_ARCADE_CABINET_OPTS), nullable=True) - cabinet_type_text: str = Column(String) - sanitation_requests: str = Column(String) - transit_needs: str = Column(String) - found_how: str = Column(String) - read_faq: str = Column(String) - mailing_list: bool = Column(Boolean, default=False) - - publisher_name: str = Column(String) - release_date: str = Column(String) - other_assets: str = Column(String) - in_person: bool = Column(Boolean, default=False) - delivery_method: int | None = Column(Choice(c.INDIE_RETRO_DELIVERY_OPTS), nullable=True) - - agreed_liability: bool = Column(Boolean, default=False) - agreed_showtimes: bool = Column(Boolean, default=False) - agreed_equipment: bool = Column(Boolean, default=False) - - link_to_promo_video: str = Column(String) - link_to_webpage: str = Column(String) - link_to_store: str = Column(String) - other_social_media: str = Column(String) - - tournament_at_event: bool = Column(Boolean, default=False) - tournament_prizes: str = Column(String) - multiplayer_game_length: int = Column(Integer, nullable=True) # Length in minutes - leaderboard_challenge: bool = Column(Boolean, default=False) - - showcase_type: int = Column(Choice(c.SHOWCASE_GAME_TYPE_OPTS), default=c.MIVS) - submitted: bool = Column(Boolean, default=False) - status: int = Column( - Choice(c.MIVS_GAME_STATUS_OPTS), default=c.NEW, admin_only=True) - judge_notes: str = Column(String, admin_only=True) + title: str = '' + brief_description: str = '' + description: str = '' + genres: str = Field(sa_column=Column(MultiChoice(c.MIVS_GENRE_OPTS)), default='') + genres_text: str = '' + platforms: str = Field(sa_column=Column(MultiChoice(c.MIVS_PLATFORM_OPTS + c.INDIE_RETRO_PLATFORM_OPTS)), default='') + platforms_text: str = '' + player_count: str = '' + how_to_play: str = '' + link_to_video: str = '' + link_to_game: str = '' + + requires_gamepad: bool = False + is_alumni: bool = False + content_warning: bool = False + warning_desc: str = '' + photosensitive_warning: bool = False + has_multiplayer: bool = False + password_to_game: str = '' + code_type: int = Field(sa_column=Column(Choice(c.MIVS_CODE_TYPE_OPTS)), default=c.NO_CODE) + code_instructions: str = '' + build_status: int = Field(sa_column=Column(Choice(c.MIVS_BUILD_STATUS_OPTS)), default=c.PRE_ALPHA) + build_notes: str = '' + + game_hours: str = '' + game_hours_text: str = '' + game_end_time: bool = False + floorspace: int | None = Field(sa_column=Column(Choice(c.INDIE_ARCADE_FLOORSPACE_OPTS), nullable=True)) + floorspace_text: str = '' + cabinet_type: int | None = Field(sa_column=Column(Choice(c.INDIE_ARCADE_CABINET_OPTS), nullable=True)) + cabinet_type_text: str = '' + sanitation_requests: str = '' + transit_needs: str = '' + found_how: str = '' + read_faq: str = '' + mailing_list: bool = False + + publisher_name: str = '' + release_date: str = '' + other_assets: str = '' + in_person: bool = False + delivery_method: int | None = Field(sa_column=Column(Choice(c.INDIE_RETRO_DELIVERY_OPTS), nullable=True)) + + agreed_liability: bool = False + agreed_showtimes: bool = False + agreed_equipment: bool = False + + link_to_promo_video: str = '' + link_to_webpage: str = '' + link_to_store: str = '' + other_social_media: str = '' + + tournament_at_event: bool = False + tournament_prizes: str = '' + multiplayer_game_length: int = Field(nullable=True) # Length in minutes + leaderboard_challenge: bool = False + + showcase_type: int = Field(sa_column=Column(Choice(c.SHOWCASE_GAME_TYPE_OPTS), default=c.MIVS)) + submitted: bool = False + status: int = Field(sa_column=Column(Choice(c.MIVS_GAME_STATUS_OPTS), default=c.NEW)) + judge_notes: str = '' registered: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) waitlisted: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) accepted: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) - codes: list['IndieGameCode'] = Relationship(back_populates="game", sa_relationship_kwargs={'lazy': 'selectin', 'passive_deletes': True}) - reviews: list['IndieGameReview'] = Relationship(back_populates="game", sa_relationship_kwargs={'passive_deletes': True}) + codes: list['IndieGameCode'] = Relationship( + back_populates="game", sa_relationship_kwargs={'lazy': 'selectin', 'cascade': 'all,delete-orphan', 'passive_deletes': True}) + reviews: list['IndieGameReview'] = Relationship( + back_populates="game", sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) images: list['IndieGameImage'] = Relationship( - back_populates="game", sa_relationship_kwargs={'lazy': 'selectin', 'order_by': 'IndieGameImage.id', 'passive_deletes': True}) + back_populates="game", sa_relationship_kwargs={'lazy': 'selectin', 'order_by': 'IndieGameImage.id', + 'cascade': 'all,delete-orphan', 'passive_deletes': True}) email_model_name: ClassVar = 'game' @@ -694,9 +696,9 @@ class IndieGameImage(MagModel, GuidebookImageMixin, table=True): game_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='indie_game.id', ondelete='CASCADE') game: 'IndieGame' = Relationship(back_populates="images", sa_relationship_kwargs={'lazy': 'joined'}) - description: str = Column(String) - use_in_promo: bool = Column(Boolean, default=False) - is_screenshot: bool = Column(Boolean, default=True) + description: str = '' + use_in_promo: bool = False + is_screenshot: bool = True @property def image(self): @@ -744,9 +746,9 @@ class IndieGameCode(MagModel, table=True): judge_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='indie_judge.id', nullable=True) judge: 'IndieJudge' = Relationship(back_populates="codes", sa_relationship_kwargs={'lazy': 'joined'}) - code: str = Column(String) - unlimited_use: bool = Column(Boolean, default=False) - judge_notes: str = Column(String, admin_only=True) # TODO: Remove? + code: str = '' + unlimited_use: bool = False + judge_notes: str = '' @property def type_label(self): @@ -765,22 +767,20 @@ class IndieGameReview(MagModel, table=True): judge_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='indie_judge.id', ondelete='CASCADE') judge: 'IndieJudge' = Relationship(back_populates="reviews", sa_relationship_kwargs={'lazy': 'joined'}) - video_status: int = Column( - Choice(c.MIVS_VIDEO_REVIEW_STATUS_OPTS), default=c.PENDING) - game_status: int = Column( - Choice(c.MIVS_GAME_REVIEW_STATUS_OPTS), default=c.PENDING) - game_status_text: str = Column(String) - game_content_bad: bool = Column(Boolean, default=False) - read_how_to_play: bool = Column(Boolean, default=False) + video_status: int = Field(sa_column=Column(Choice(c.MIVS_VIDEO_REVIEW_STATUS_OPTS), default=c.PENDING)) + game_status: int = Field(sa_column=Column(Choice(c.MIVS_GAME_REVIEW_STATUS_OPTS), default=c.PENDING)) + game_status_text: str = '' + game_content_bad: bool = False + read_how_to_play: bool = False # 0 = not reviewed, 1-10 score (10 is best) - readiness_score: int = Column(Integer, default=0) - design_score: int = Column(Integer, default=0) - enjoyment_score: int = Column(Integer, default=0) - game_review: str = Column(String) - developer_response: str = Column(String) - staff_notes: str = Column(String) - send_to_studio: bool = Column(Boolean, default=False) + readiness_score: int = 0 + design_score: int = 0 + enjoyment_score: int = 0 + game_review: str = '' + developer_response: str = '' + staff_notes: str = '' + send_to_studio: bool = False __table_args__: ClassVar = ( UniqueConstraint('game_id', 'judge_id', name='review_game_judge_uniq'), diff --git a/uber/models/tabletop.py b/uber/models/tabletop.py index 85652df49..73550ed95 100644 --- a/uber/models/tabletop.py +++ b/uber/models/tabletop.py @@ -5,7 +5,7 @@ from typing import ClassVar from uber.models import MagModel -from uber.models.types import DefaultColumn as Column, DefaultField as Field, DefaultRelationship as Relationship +from uber.models.types import DefaultField as Field, DefaultRelationship as Relationship __all__ = ['TabletopGame', 'TabletopCheckout'] @@ -15,12 +15,13 @@ class TabletopGame(MagModel, table=True): attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE') attendee: 'Attendee' = Relationship(back_populates="games") - code: str = Column(String) - name: str = Column(String) - returned: bool = Column(Boolean, default=False) + code: str = '' + name: str = '' + returned: bool = False checkouts: list['TabletopCheckout'] = Relationship( - back_populates="game", sa_relationship_kwargs={'order_by': 'TabletopCheckout.checked_out', 'passive_deletes': True}) + back_populates="game", sa_relationship_kwargs={'order_by': 'TabletopCheckout.checked_out', + 'cascade': 'all,delete-orphan', 'passive_deletes': True}) _repr_attr_names: ClassVar = ['name'] diff --git a/uber/models/tracking.py b/uber/models/tracking.py index a6047607a..5decb82fc 100644 --- a/uber/models/tracking.py +++ b/uber/models/tracking.py @@ -34,9 +34,9 @@ class ReportTracking(MagModel, table=True): when: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) - who: str = Column(String) - supervisor: str = Column(String) - page: str = Column(String) + who: str = '' + supervisor: str = '' + page: str = '' params: dict[str, Any] = Field(sa_type=MutableDict.as_mutable(JSONB), default_factory=dict) @property @@ -111,16 +111,16 @@ def track_pageview(cls): class Tracking(MagModel, table=True): fk_id: str = Field(sa_type=Uuid(as_uuid=False), index=True) - model: str = Column(String) - when: datetime = Field(sa_type=DateTime(timezone=True), default=lambda: datetime.now(UTC), index=True) - who: str = Column(String, index=True) - supervisor: str = Column(String) - page: str = Column(String) - which: str = Column(String) - links: str = Column(String) - action: int = Column(Choice(c.TRACKING_OPTS)) - data: str = Column(String) - snapshot: str = Column(String) + model: str = '' + when: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC), index=True) + who: str = Field(default='', index=True) + supervisor: str = '' + page: str = '' + which: str = '' + links: str = '' + action: int = Field(sa_column=Column(Choice(c.TRACKING_OPTS))) + data: str = '' + snapshot: str = '' @property def who_repr(self): @@ -286,16 +286,16 @@ def _insert(session): class TxnRequestTracking(MagModel, table=True): incr_id_seq: ClassVar = Sequence('txn_request_tracking_incr_id_seq') - incr_id: int = Column(Integer, incr_id_seq, server_default=incr_id_seq.next_value(), unique=True) + incr_id: int = Field(sa_column=Column(Integer, incr_id_seq, server_default=incr_id_seq.next_value(), unique=True)) fk_id: str | None = Field(sa_type=Uuid(as_uuid=False), nullable=True) - workstation_num: int = Column(Integer, default=0) - terminal_id: str = Column(String) - who: str = Column(String) + workstation_num: int = 0 + terminal_id: str = '' + who: str = '' requested: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) resolved: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) - success: bool = Column(Boolean, default=False) + success: bool = False response: dict[Any, Any] = Field(sa_type=MutableDict.as_mutable(JSONB), default_factory=dict) - internal_error: str = Column(String) + internal_error: str = '' @presave_adjustment def log_internal_error(self): diff --git a/uber/models/types.py b/uber/models/types.py index 5acdd5d5f..07dfa03c9 100644 --- a/uber/models/types.py +++ b/uber/models/types.py @@ -53,7 +53,7 @@ def DefaultColumn(*args, admin_only=False, private=False, **kwargs): return col -def DefaultField(*args, private=False, **kwargs): +def DefaultField(*args, admin_only=False, private=False, **kwargs): """ Returns a SQLModel Field with the given parameters, except that instead of the regular defaults, we've overridden the following defaults if no @@ -64,6 +64,12 @@ def DefaultField(*args, private=False, **kwargs): nullable True False default None '' (only for String fields) server_default None + + We also have an "admin_only" parameter, which is set as an attribute on + the column instance, indicating whether the column should be settable by + regular attendees filling out one of the registration forms or if only a + logged-in admin user should be able to set it. This is deprecated but + kept for compatibility with older forms. """ sa_column = kwargs.get('sa_column', None) if sa_column is not None: @@ -82,8 +88,9 @@ def DefaultField(*args, private=False, **kwargs): default = kwargs.get('default') if isinstance(default, (int, str)): sa_kwargs.setdefault('server_default', str(default)) - + col = SQLModelField(*args, **kwargs) + col.admin_only = admin_only col.private = private return col @@ -94,7 +101,7 @@ def default_relationship(*args, **kwargs): instead of the regular defaults, we've overridden the following defaults if no value is provided for the following parameters: load_on_pending now defaults to True - cascade now defaults to 'all,delete-orphan' + cascade now defaults to 'save-update,merge,refresh-expire,expunge' """ kwargs.setdefault('load_on_pending', True) if kwargs.get("viewonly", False): @@ -102,7 +109,7 @@ def default_relationship(*args, **kwargs): # on viewonly relationships. kwargs.setdefault('cascade', 'expunge,refresh-expire,merge') else: - kwargs.setdefault('cascade', 'all,delete-orphan') + kwargs.setdefault('cascade', 'save-update,merge,refresh-expire,expunge') kwargs.setdefault('lazy', 'raise') return SQLAlchemy_relationship(*args, **kwargs) @@ -112,7 +119,7 @@ def DefaultRelationship(*args, **kwargs): Returns a SQLModel Relationship with the given parameters, except that instead of the regular defaults, we've overridden the following defaults if no value is provided for the following parameters: - cascade now defaults to 'all,delete-orphan' + cascade now defaults to 'save-update,merge,refresh-expire,expunge' lazy now default to raise """ sa_relationship = kwargs.get('sa_relationship', None) @@ -126,7 +133,7 @@ def DefaultRelationship(*args, **kwargs): # on viewonly relationships. sa_kwargs.setdefault('cascade', 'expunge,refresh-expire,merge') else: - sa_kwargs.setdefault('cascade', 'all,delete-orphan') + sa_kwargs.setdefault('cascade', 'save-update,merge,refresh-expire,expunge') sa_kwargs.setdefault('lazy', 'raise') return SQLModelRelationship(*args, **kwargs, sa_relationship_kwargs=sa_kwargs) diff --git a/uber/site_sections/dept_admin.py b/uber/site_sections/dept_admin.py index d00c3531a..f6692c757 100644 --- a/uber/site_sections/dept_admin.py +++ b/uber/site_sections/dept_admin.py @@ -42,7 +42,8 @@ def form(self, session, message='', **params): if not department_id or department_id == 'None': raise HTTPRedirect('index') - department = session.department(department_id) + department = session.query(Department).filter( + Department.id == department_id).options(selectinload(Department.attendees_working_shifts)).first() forms = load_forms(params, department, ['DepartmentInfo']) if cherrypy.request.method == 'POST': diff --git a/uber/site_sections/dept_checklist.py b/uber/site_sections/dept_checklist.py index ade562913..a51a7ffe1 100644 --- a/uber/site_sections/dept_checklist.py +++ b/uber/site_sections/dept_checklist.py @@ -343,7 +343,7 @@ def bulk_print_jobs_csv(self, out, session): print_size = f"Custom: {request.size_text}" if request.size == c.CUSTOM else request.size_label out.writerow([ dept_name, request.link, request.copies, request.print_orientation_label, request.cut_orientation_label, - request.color_label, paper_type, print_size, request.double_sided, request.stapled, request.required, + request.color_label, paper_type, print_size, request.double_sided, request.stapled, request.important, request.notes, short_datetime_local(request.last_updated) ]) diff --git a/uber/site_sections/preregistration.py b/uber/site_sections/preregistration.py index 2cf7b57ff..a63b50827 100644 --- a/uber/site_sections/preregistration.py +++ b/uber/site_sections/preregistration.py @@ -10,7 +10,7 @@ import cherrypy from collections import defaultdict from sqlalchemy import func, or_ -from sqlalchemy.orm import selectinload +from sqlalchemy.orm import selectinload, joinedload from sqlalchemy.orm.exc import NoResultFound from uber.config import c @@ -2179,7 +2179,11 @@ def confirm(self, session, message='', return_to='confirm', undoing_extra='', ** if params.get('id') not in [None, '', 'None']: attendee = session.query(Attendee).filter(Attendee.id == params.get('id')).options( selectinload(Attendee.dept_membership_requests), - selectinload(Attendee.art_agent_apps) + selectinload(Attendee.art_agent_apps), + selectinload(Attendee.promo_code_groups), + joinedload(Attendee.lottery_application), + joinedload(Attendee.art_show_application), + joinedload(Attendee.marketplace_application), ).first() receipt = session.get_receipt_by_model(attendee) if cherrypy.request.method == 'POST': @@ -2288,7 +2292,8 @@ def validate_attendee(self, session, form_list=[], is_prereg=False, **params): attendee = Attendee() else: try: - attendee = session.attendee(id) + attendee = session.query(Attendee).filter(Attendee.id == id).options( + selectinload(Attendee.promo_code_groups)).first() except NoResultFound: if is_prereg: attendee = self._get_unsaved( diff --git a/uber/site_sections/registration.py b/uber/site_sections/registration.py index 59dc3d080..b79118f7e 100644 --- a/uber/site_sections/registration.py +++ b/uber/site_sections/registration.py @@ -49,10 +49,15 @@ def load_attendee(session, params): attendee = Attendee() else: attendee = session.query(Attendee).filter(Attendee.id == id).options( + selectinload(Attendee.promo_code_groups), + selectinload(Attendee.allocated_badges), + selectinload(Attendee.escalation_tickets), selectinload(Attendee.assigned_depts), selectinload(Attendee.dept_membership_requests), selectinload(Attendee.dept_memberships_with_role), selectinload(Attendee.dept_memberships_with_inherent_role), + joinedload(Attendee.lottery_application), + joinedload(Attendee.watch_list), joinedload(Attendee.shifts), joinedload(Attendee.panel_applicants), joinedload(Attendee.admin_account)).one() @@ -141,6 +146,8 @@ def index(self, session, message='', page='0', search_text='', uploaded_id='', o 'This attendee was the only{} search result'.format('' if invalid else ' valid')) pages = range(1, int(math.ceil(count / 100)) + 1) + attendees = attendees.options( + selectinload(Attendee.promo_code_groups), selectinload(Attendee.allocated_badges)) attendees = attendees[-100 + 100*page: 100*page] if page else [] return { diff --git a/uber/site_sections/showcase.py b/uber/site_sections/showcase.py index 0a46075d9..7af0a28a3 100644 --- a/uber/site_sections/showcase.py +++ b/uber/site_sections/showcase.py @@ -191,7 +191,7 @@ def validate_developer(self, session, form_list=[], **params): def delete_developer(self, session, id, **params): developer = session.indie_developer(id) studio = developer.studio - if developer.gets_emails and len(studio.primary_contacts) == 1: + if developer.receives_emails and len(studio.primary_contacts) == 1: raise HTTPRedirect('index?id={}&message={}', studio.id, 'You cannot delete the only presenter who receives email updates.') @@ -223,7 +223,7 @@ def confirm(self, session, id, decision=None, **params): has_leader = False badges_remaining = studio.comped_badges - developers = sorted(studio.developers, key=lambda d: (not d.gets_emails, d.full_name)) + developers = sorted(studio.developers, key=lambda d: (not d.receives_emails, d.full_name)) for dev in developers: if not dev.matching_attendee and badges_remaining: dev.comped = True diff --git a/uber/templates/forms/showcase/developer.html b/uber/templates/forms/showcase/developer.html index 359af9835..51a7d5dc0 100644 --- a/uber/templates/forms/showcase/developer.html +++ b/uber/templates/forms/showcase/developer.html @@ -12,8 +12,8 @@ #}
    @@ -36,10 +36,10 @@
    - {{ form_macros.input(developer_info.gets_emails, alpine_model="gets_emails") }} + {{ form_macros.input(developer_info.receives_emails, alpine_model="receives_emails") }}
    {% else %} - + {% endif %} {% endblock %}
    diff --git a/uber/templates/showcase/index.html b/uber/templates/showcase/index.html index d79c0b56b..907426202 100644 --- a/uber/templates/showcase/index.html +++ b/uber/templates/showcase/index.html @@ -55,7 +55,7 @@

    Team Members

    {{ dev.full_name }} {{ dev.email }} {{ dev.cellphone }} - {{ dev.gets_emails|yesno|title }} + {{ dev.receives_emails|yesno|title }}
    diff --git a/uber/templates/showcase_judging/studio.html b/uber/templates/showcase_judging/studio.html index 14b35a162..086e3468c 100644 --- a/uber/templates/showcase_judging/studio.html +++ b/uber/templates/showcase_judging/studio.html @@ -70,7 +70,7 @@

    {{ studio.name }}

    {{ dev.email }} {{ dev.cellphone_num }} - {% if dev.gets_emails %} + {% if dev.receives_emails %} Primary Contact {% endif %} From 62ad27c43de496a73122b985681ef0bbbec150f1 Mon Sep 17 00:00:00 2001 From: Victoria Earl Date: Wed, 25 Feb 2026 14:27:24 +0100 Subject: [PATCH 12/20] Fix prereg and stop relationship raising A bit of a clumsy wrap-up, but this rolls back the raise relationship loading strategy while also fixing bugs introduced by the SQLAlchemy upgrade/SQLModel implementation. --- requirements.txt | 2 + uber/api.py | 57 ++++++++++++------- uber/models/__init__.py | 30 ++++++++-- uber/models/admin.py | 18 ++---- uber/models/api.py | 4 -- uber/models/art_show.py | 37 ------------- uber/models/attendee.py | 56 ++++--------------- uber/models/attraction.py | 34 +----------- uber/models/badge_printing.py | 4 -- uber/models/commerce.py | 15 ----- uber/models/department.py | 37 ------------- uber/models/email.py | 4 -- uber/models/group.py | 13 ++--- uber/models/guests.py | 61 --------------------- uber/models/hotel.py | 14 ----- uber/models/marketplace.py | 4 -- uber/models/mits.py | 30 ---------- uber/models/panels.py | 19 ------- uber/models/promo_code.py | 7 --- uber/models/showcase.py | 34 ------------ uber/models/tabletop.py | 5 -- uber/models/types.py | 5 +- uber/payments.py | 14 +++-- uber/redis_session.py | 4 ++ uber/site_sections/accounts.py | 2 +- uber/site_sections/attractions_admin.py | 17 +++--- uber/site_sections/preregistration.py | 14 +++-- uber/site_sections/registration.py | 3 +- uber/site_sections/schedule.py | 2 +- uber/site_sections/staffing_admin.py | 1 + uber/templates/attractions_admin/form.html | 2 +- uber/templates/registration/index_base.html | 4 +- uber/utils.py | 39 ++++++++++++- 33 files changed, 163 insertions(+), 429 deletions(-) diff --git a/requirements.txt b/requirements.txt index e8dcc6c8e..509b4dfe7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,6 +11,7 @@ configobj==5.0.9 email_validator==2.2.0 fpdf2==2.8.3 geopy==2.4.1 +TatSu==5.7.4 ics==0.7.2 Jinja2==3.1.6 ortools==9.14.6206 @@ -31,6 +32,7 @@ rpctools @ git+https://github.com/appliedsec/rpctools.git@4e4108c3b7b4b6c482e515 sentry-sdk==2.32.0 signnow_python_sdk==2.0.1 SQLAlchemy==2.0.46 +sqlmodel==0.0.37 stripe==9.1.0 twilio==9.6.5 uszipcode==1.0.1 diff --git a/uber/api.py b/uber/api.py index 69acd557b..c834ad38e 100644 --- a/uber/api.py +++ b/uber/api.py @@ -1,7 +1,6 @@ import re import uuid from collections import defaultdict -from collections.abc import Iterable from datetime import datetime from functools import wraps @@ -16,7 +15,7 @@ from dateutil import parser as dateparser from time import mktime from sqlalchemy import and_, func, or_, not_ -from sqlalchemy.orm import subqueryload +from sqlalchemy.orm import subqueryload, joinedload, selectinload from sqlalchemy.orm.exc import MultipleResultsFound, NoResultFound from sqlalchemy.types import Boolean, Date, DateTime @@ -29,7 +28,7 @@ GuestGroup, Room, HotelRequests, RoomAssignment) from uber.models.badge_printing import PrintJob from uber.serializer import serializer -from uber.utils import check, check_csrf, normalize_email_legacy, normalize_newlines +from uber.utils import check, check_csrf, normalize_email_legacy, normalize_newlines, is_listy log = logging.getLogger(__name__) @@ -77,7 +76,7 @@ def error(status, code, message): def success(result): response = {'jsonrpc': '2.0', 'id': id, 'result': result} log.debug('Returning success message: {}', { - 'jsonrpc': '2.0', 'id': id, 'result': len(result) if isinstance(result, Iterable) and not isinstance(result, str) else str(result).encode('utf-8')}) + 'jsonrpc': '2.0', 'id': id, 'result': len(result) if is_listy(result) else str(result).encode('utf-8')}) cherrypy.response.status = 200 return response @@ -161,13 +160,15 @@ def _attendee_fields_and_query(full, query, only_valid=True): if full: fields = AttendeeLookup.fields_full query = query.options( - subqueryload(Attendee.dept_memberships), - subqueryload(Attendee.assigned_depts), - subqueryload(Attendee.food_restrictions), - subqueryload(Attendee.shifts).subqueryload(Shift.job)) + selectinload(Attendee.dept_memberships).joinedload(DeptMembership.department), + selectinload(Attendee.assigned_depts), + selectinload(Attendee.dept_roles).joinedload(DeptRole.department), + selectinload(Attendee.shifts).joinedload(Shift.job), + selectinload(Attendee.food_restrictions), + selectinload(Attendee.managers), joinedload(Attendee.group)) else: fields = AttendeeLookup.fields - query = query.options(subqueryload(Attendee.dept_memberships)) + query = query.options(selectinload(Attendee.dept_memberships), selectinload(Attendee.shifts).joinedload(Shift.job),) return (fields, query) @@ -310,7 +311,7 @@ def _parse_datetime(d): def _parse_if_datetime(key, val): # This should be in the DateTime and Date classes, but they're not defined in this app if hasattr(getattr(Attendee, key), 'type') and ( - isinstance(getattr(Attendee, key).type, DateTime) or isinstance(getattr(Attendee, key).type, sa.types.time) or isinstance(getattr(Attendee, key).type, Date)): + isinstance(getattr(Attendee, key).type, DateTime) or isinstance(getattr(Attendee, key).type, Date) or isinstance(getattr(Attendee, key).type, Date)): return _parse_datetime(val) return val @@ -508,7 +509,6 @@ def export_judges(self): with Session() as session: judges = session.query(IndieJudge).filter(not_(IndieJudge.status.in_([c.CANCELLED, c.DISQUALIFIED]))) - for judge in judges: fields = AttendeeLookup.attendee_import_fields + Attendee.import_fields judges_list.append((judge.to_dict(), judge.attendee.to_dict(fields))) @@ -693,10 +693,16 @@ def export(self, query, full=False): with Session() as session: if full: options = [ - subqueryload(Attendee.dept_memberships).subqueryload(DeptMembership.department), - subqueryload(Attendee.dept_roles).subqueryload(DeptRole.department)] + selectinload(Attendee.dept_memberships).joinedload(DeptMembership.department), + selectinload(Attendee.dept_roles).joinedload(DeptRole.department), + selectinload(Attendee.shifts).joinedload(Shift.job), + selectinload(Attendee.food_restrictions), + selectinload(Attendee.managers), joinedload(Attendee.group) + ] else: - options = [] + options = [ + selectinload(Attendee.shifts).joinedload(Shift.job), + ] email_attendees = [] if emails: @@ -867,9 +873,22 @@ def export_attendees(self, id, full=False, include_group=False): if not account: raise HTTPError(404, 'No attendee account found with this ID') - - attendees_to_export = account.valid_attendees if include_group \ - else [a for a in account.valid_attendees if not a.group] + + filters = [Attendee.is_valid == True] + if not include_group: + filters.append(Attendee.group_id == None) + + attendees_to_export = session.query(Attendee).join(Attendee.managers).filter( + AttendeeAccount.id == id).filter(*filters).options( + selectinload(Attendee.dept_memberships).joinedload(DeptMembership.department), + selectinload(Attendee.dept_roles).joinedload(DeptRole.department), + selectinload(Attendee.shifts).joinedload(Shift.job), + selectinload(Attendee.food_restrictions), + selectinload(Attendee.managers), + joinedload(Attendee.group), + joinedload(Attendee.art_show_application), + joinedload(Attendee.marketplace_application) + ) attendees = _prepare_attendees_export(attendees_to_export, include_apps=full) return { @@ -900,7 +919,7 @@ def export(self, query, all=False): if emails: email_accounts = session.query(AttendeeAccount).filter( AttendeeAccount.email.in_(list(emails.keys())) - ).options(subqueryload(AttendeeAccount.attendees) + ).options(selectinload(AttendeeAccount.attendees) ).order_by(AttendeeAccount.email, AttendeeAccount.id).all() known_emails = set(a.normalized_email for a in email_accounts) @@ -909,7 +928,7 @@ def export(self, query, all=False): id_accounts = [] if ids: id_accounts = session.query(AttendeeAccount).filter( - AttendeeAccount.id.in_(ids)).options(subqueryload(AttendeeAccount.attendees) + AttendeeAccount.id.in_(ids)).options(selectinload(AttendeeAccount.attendees) ).order_by(AttendeeAccount.email, AttendeeAccount.id).all() diff --git a/uber/models/__init__.py b/uber/models/__init__.py index e17e364cc..f710f33f5 100644 --- a/uber/models/__init__.py +++ b/uber/models/__init__.py @@ -28,6 +28,7 @@ from sqlalchemy.orm import Query, joinedload, selectinload, subqueryload, contains_eager, declared_attr, sessionmaker, scoped_session import sqlalchemy.orm from sqlalchemy.orm.attributes import get_history, instance_state +from sqlalchemy.orm.collections import InstrumentedList from sqlalchemy.schema import MetaData, UniqueConstraint from sqlalchemy.types import Boolean, Integer, Float, Date, Numeric, DateTime, Uuid, JSON from sqlmodel import SQLModel @@ -137,7 +138,9 @@ def uncamel(s, sep='_'): "pk": "pk_%(table_name)s", } class MagModel(SQLModel): - model_config: ClassVar = ConfigDict(ignored_types=(hybrid_method, hybrid_property)) + model_config: ClassVar = ConfigDict( + extra='allow', + ignored_types=(hybrid_method, hybrid_property)) @declared_attr.directive def __tablename__(cls) -> str: @@ -161,10 +164,19 @@ def to_dict(self, fields=None): val = val.isoformat() elif isinstance(val, uuid.UUID): val = str(val) - - data[field] = val + + if isinstance(val, InstrumentedList): + data[field] = [] + for model in val: + obj_fields = fields[field] if isinstance(fields, dict) else None + data[field].append(model.to_dict(obj_fields)) + if data[field] == []: + del data[field] # Empty instrumented lists are not pickleable + else: + data[field] = val + data['_model'] = self.__class__.__name__ return data - + id: str | None = Field(sa_type=Uuid(as_uuid=False), default_factory=lambda: str(uuid4()), primary_key=True) created: datetime = Field(sa_type=DateTime(timezone=True), sa_column_kwargs={'server_default': utcnow()}, default_factory=lambda: datetime.now(UTC)) last_updated: datetime = Field(sa_type=DateTime(timezone=True), sa_column_kwargs={'server_default': utcnow()}, default_factory=lambda: datetime.now(UTC)) @@ -546,6 +558,8 @@ def _label(self, name, val): @suffix_property def _local(self, name, val): + if isinstance(val, six.string_types): + val = dateparser.parse(val) return val.astimezone(c.EVENT_TIMEZONE) @suffix_property @@ -556,6 +570,12 @@ def _labels(self, name, val): return [labels[i].get('name', '') for i in ints] else: return sorted(labels[i] for i in ints) + + def __setattr__(self, name, value): + # Work around an issue in Pydantic where you can't assign extra properties after init + if self.__pydantic_extra__ is None: + super().__setattr__('__pydantic_extra__', {}) + return super().__setattr__(name, value) def __getattr__(self, name): suffixed = suffix_property.check(self, name) @@ -593,7 +613,7 @@ def __getattr__(self, name): except Exception: pass - raise AttributeError(self.__class__.__name__ + '.' + name) + return super().__getattr__(name) def get_tracking_by_instance(self, instance, action, last_only=True): from uber.models.tracking import Tracking diff --git a/uber/models/admin.py b/uber/models/admin.py index 8fb16e922..82082073c 100644 --- a/uber/models/admin.py +++ b/uber/models/admin.py @@ -33,13 +33,6 @@ class AdminAccount(MagModel, table=True): - """ - Attendee: joined - AccessGroup: selectin - ApiToken: select - PasswordReset: select - """ - attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE', unique=True) attendee: 'Attendee' = Relationship(back_populates="admin_account", sa_relationship_kwargs={'lazy': 'joined'}) @@ -198,6 +191,10 @@ def is_mivs_judge_or_admin(self, id=None): except Exception: return None + def can_admin_attraction(self, attraction): + return self.id == attraction.owner_id or ( + self.full_dept_admin or self.attendee.has_inherent_role_in(attraction.department_id)) + @property def api_read(self): return any([group.has_any_access('api', read_only=True) for group in self.access_groups]) @@ -357,10 +354,6 @@ def has_access_level(self, access_to, access_level, read_only=False, max_level=F class WatchList(MagModel, table=True): - """ - Attendee: selectin - """ - first_names: str = '' last_name: str = '' email: str = '' @@ -400,9 +393,6 @@ def fix_birthdate(self): class EscalationTicket(MagModel, table=True): - """ - Attendee: selectin - """ attendees: list['Attendee'] = Relationship( back_populates="escalation_tickets", sa_relationship_kwargs={'lazy': 'selectin', 'order_by': 'Attendee.full_name', diff --git a/uber/models/api.py b/uber/models/api.py index 8b421f092..1801031a4 100644 --- a/uber/models/api.py +++ b/uber/models/api.py @@ -16,10 +16,6 @@ class ApiToken(MagModel, table=True): - """ - AdminAccount: joined - """ - admin_account_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='admin_account.id', ondelete='CASCADE') admin_account: "AdminAccount" = Relationship(back_populates="api_tokens", sa_relationship_kwargs={'lazy': 'joined'}) diff --git a/uber/models/art_show.py b/uber/models/art_show.py index b76242489..ddcf5a767 100644 --- a/uber/models/art_show.py +++ b/uber/models/art_show.py @@ -28,10 +28,6 @@ class ArtShowAgentCode(MagModel, table=True): - """ - ArtShowApplication: joined - """ - app_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='art_show_application.id', ondelete='CASCADE') app: 'ArtShowApplication' = Relationship(back_populates="agent_codes", sa_relationship_kwargs={'lazy': 'joined'}) @@ -55,11 +51,6 @@ def attendee_first_name(self): class ArtShowApplication(MagModel, table=True): - """ - Attendee: joined - ModelReceipt: select - """ - attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', nullable=True, unique=True) attendee: 'Attendee' = Relationship( back_populates="art_show_application", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) @@ -451,11 +442,6 @@ def check_total(self): class ArtShowPiece(MagModel, table=True): - """ - ArtShowApplication: joined - Attendee (buyer): joined - """ - app_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='art_show_application.id', ondelete='CASCADE') app: 'ArtShowApplication' = Relationship(back_populates="art_show_pieces", sa_relationship_kwargs={'lazy': 'joined'}) @@ -596,10 +582,6 @@ def print_bidsheet(self, pdf, sheet_num, normal_font_name, bold_font_name, set_f class ArtShowPanel(MagModel, table=True): - """ - ArtPanelAssignment: selectin - """ - gallery: int = Field(sa_column=Column(Choice(c.ART_PIECE_GALLERY_OPTS)), default=c.GENERAL) surface_type: int = Field(sa_column=Column(Choice(c.ART_SHOW_PANEL_TYPE_OPTS)), default=c.PANEL) origin_x: int = 0 @@ -643,11 +625,6 @@ def directional_usability(self): class ArtPanelAssignment(MagModel, table=True): - """ - ArtShowApplication: joined - ArtShowPanel: joined - """ - app_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='art_show_application.id', ondelete='CASCADE') app: 'ArtShowApplication' = Relationship(back_populates="assignments", sa_relationship_kwargs={'lazy': 'joined'}) @@ -684,10 +661,6 @@ def assignment_str(self): class ArtShowPayment(MagModel, table=True): - """ - ArtShowReceipt: joined - """ - receipt_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='art_show_receipt.id', ondelete='CASCADE') receipt: 'ArtShowReceipt' = Relationship(back_populates="art_show_payments", sa_relationship_kwargs={'lazy': 'joined'}) @@ -697,12 +670,6 @@ class ArtShowPayment(MagModel, table=True): class ArtShowReceipt(MagModel, table=True): - """ - Attendee: joined - ArtShowPiece: selectin - ArtShowPayment: selectin - """ - attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE') attendee: 'Attendee' = Relationship( back_populates="art_show_receipts", sa_relationship_kwargs={'lazy': 'joined', 'overlaps': 'art_show_purchases,buyer'}) @@ -769,10 +736,6 @@ def cash_total(self): class ArtShowBidder(MagModel, table=True): - """ - Attendee: joined - """ - attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE') attendee: 'Attendee' = Relationship( back_populates="art_show_bidder", sa_relationship_kwargs={'lazy': 'joined'}) diff --git a/uber/models/attendee.py b/uber/models/attendee.py index 222178ad8..b68e11a6b 100644 --- a/uber/models/attendee.py +++ b/uber/models/attendee.py @@ -201,16 +201,6 @@ def check_in(self): class Attendee(MagModel, TakesPaymentMixin, table=True): - """ - Group: select - AdminAccount: select - PromoCode: select - ModelReceipt: select - DeptMembership: select - WatchList: select - PromoCodeGroup: select - """ - watchlist_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='watch_list.id', nullable=True) watch_list: "WatchList" = Relationship(back_populates="attendees", sa_relationship_kwargs={'lazy': 'select'}) @@ -218,11 +208,12 @@ class Attendee(MagModel, TakesPaymentMixin, table=True): group: 'Group' = Relationship(back_populates="attendees", sa_relationship_kwargs={'foreign_keys': 'Attendee.group_id', 'lazy': 'select'}) badge_pickup_group_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='badge_pickup_group.id', nullable=True) - badge_pickup_group: 'BadgePickupGroup' = Relationship(back_populates="attendees") + badge_pickup_group: 'BadgePickupGroup' = Relationship(back_populates="attendees", sa_relationship_kwargs={'lazy': 'select'}) creator_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', nullable=True) creator: 'Attendee' = Relationship( - back_populates="created_badges", sa_relationship_kwargs={'foreign_keys': 'Attendee.creator_id', 'remote_side': 'Attendee.id'}) + back_populates="created_badges", + sa_relationship_kwargs={'foreign_keys': 'Attendee.creator_id', 'lazy': 'select', 'remote_side': 'Attendee.id'}) created_badges: list['Attendee'] = Relationship( back_populates="creator", sa_relationship_kwargs={'foreign_keys': 'Attendee.creator_id', 'order_by': 'Attendee.full_name'}) @@ -230,13 +221,12 @@ class Attendee(MagModel, TakesPaymentMixin, table=True): current_attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', nullable=True) current_attendee: 'Attendee' = Relationship( back_populates="old_badges", - sa_relationship_kwargs={'foreign_keys': 'Attendee.current_attendee_id', 'remote_side': 'Attendee.id'}) + sa_relationship_kwargs={'foreign_keys': 'Attendee.current_attendee_id', 'lazy': 'select', 'remote_side': 'Attendee.id'}) old_badges: list['Attendee'] = Relationship( back_populates="current_attendee", sa_relationship_kwargs={'foreign_keys': 'Attendee.current_attendee_id', 'order_by': 'Attendee.badge_status'}) - allocated_badges: list['BadgeInfo'] = Relationship( - back_populates="attendee") + allocated_badges: list['BadgeInfo'] = Relationship(back_populates="attendee") active_badge: 'BadgeInfo' = Relationship(sa_relationship=relationship( 'BadgeInfo', primaryjoin='and_(BadgeInfo.attendee_id == Attendee.id,' @@ -336,12 +326,12 @@ class Attendee(MagModel, TakesPaymentMixin, table=True): back_populates="attendee", sa_relationship_kwargs={'lazy': 'select', 'cascade': 'all,delete-orphan', 'passive_deletes': True}) dept_membership_requests: list['DeptMembershipRequest'] = Relationship( - back_populates="attendee", sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) + back_populates="attendee", sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'lazy': 'select', 'passive_deletes': True}) assigned_depts: list['Department'] = Relationship( back_populates='members', sa_relationship_kwargs={ 'order_by': 'Department.name', 'overlaps': 'dept_memberships,attendee', - 'secondary': 'dept_membership'}) + 'lazy': 'select', 'secondary': 'dept_membership'}) dept_roles: list['DeptRole'] = Relationship( back_populates="attendees", sa_relationship_kwargs={ @@ -362,6 +352,7 @@ class Attendee(MagModel, TakesPaymentMixin, table=True): primaryjoin='and_(' 'Attendee.id == DeptMembership.attendee_id, ' 'DeptMembership.has_inherent_role)', + lazy='select', viewonly=True)) dept_memberships_with_dept_role: list['DeptMembership'] = Relationship(sa_relationship=relationship( 'DeptMembership', @@ -439,8 +430,9 @@ class Attendee(MagModel, TakesPaymentMixin, table=True): can_work_setup: bool = False can_work_teardown: bool = False - admin_account: 'AdminAccount' = Relationship(back_populates="attendee", - sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) + admin_account: 'AdminAccount' = Relationship( + back_populates="attendee", + sa_relationship_kwargs={'lazy': 'select', 'cascade': 'all,delete-orphan', 'passive_deletes': True}) managers: list['AttendeeAccount'] = Relationship( back_populates="attendees", sa_relationship_kwargs={'secondary': 'attendee_attendee_account'}) @@ -456,7 +448,7 @@ class Attendee(MagModel, TakesPaymentMixin, table=True): back_populates="attendee", sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) escalation_tickets: list['EscalationTicket'] = Relationship( - back_populates="attendees", sa_relationship_kwargs={'secondary': "attendee_escalation_ticket"}) + back_populates="attendees", sa_relationship_kwargs={'lazy': 'select', 'secondary': "attendee_escalation_ticket"}) food_restrictions: 'FoodRestrictions' = Relationship(back_populates="attendee", sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) @@ -828,13 +820,6 @@ def badge_num(self, value): self.session.add(badge) self.active_badge = badge - @property - def last_badge_num(self): - if self.active_badge: - return self.badge_num - if self.lost_badges: - return self.lost_badges[0].ident - @property def lost_badges(self): return [badge for badge in self.allocated_badges if badge.active == False and badge.reported_lost != None] @@ -2559,11 +2544,6 @@ def is_signed_up_for_attraction(self, attraction): def is_signed_up_for_attraction_feature(self, feature): return feature in self.attraction_features - def can_admin_attraction(self, attraction): - if not self.admin_account: - return False - return self.admin_account.id == attraction.owner_id or self.can_admin_dept_for(attraction.department_id) - # ========================= # guests # ========================= @@ -2590,10 +2570,6 @@ def guest_group(self): class AttendeeAccount(MagModel, table=True): - """ - PasswordReset: select - """ - public_id: str | None = Field(sa_type=Uuid(as_uuid=False), default_factory=lambda: str(uuid4()), nullable=True) email: str = '' hashed: str = Field(default='', private=True) @@ -2723,10 +2699,6 @@ def refunded_deferred_attendees(self): class BadgePickupGroup(MagModel, table=True): - """ - Attendee: selectin - """ - public_id: str | None = Field(sa_type=Uuid(as_uuid=False), default_factory=lambda: str(uuid4()), nullable=True) account_id: str = '' @@ -2808,10 +2780,6 @@ def under_18_badges(self): class FoodRestrictions(MagModel, table=True): - """ - Attendee: joined - """ - attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE', unique=True) attendee: 'Attendee' = Relationship(back_populates="food_restrictions", sa_relationship_kwargs={'lazy': 'joined'}) diff --git a/uber/models/attraction.py b/uber/models/attraction.py index 85b850b70..ebb52af20 100644 --- a/uber/models/attraction.py +++ b/uber/models/attraction.py @@ -94,10 +94,6 @@ def get_updated_signup_vals(self): return same_time_settings, update_attrs class Attraction(MagModel, AttractionMixin, table=True): - """ - AttractionFeature: selectin - """ - _NONE: ClassVar = 0 _PER_FEATURE: ClassVar = 1 _PER_ATTRACTION: ClassVar = 2 @@ -333,11 +329,6 @@ def signups_requiring_notification(self, session, from_time, to_time, options=No class AttractionFeature(MagModel, AttractionMixin, table=True): - """ - Attraction: joined - AttractionEvent: selectin - """ - attraction_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attraction.id', ondelete='CASCADE') attraction: 'Attraction' = Relationship(back_populates="features", sa_relationship_kwargs={'lazy': 'joined'}) @@ -467,13 +458,6 @@ def available_events_by_day(self): class AttractionEvent(MagModel, AttractionMixin, table=True): - """ - Attraction: joined - AttractionFeature: joined - EventLocation: joined - Event: joined - """ - attraction_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attraction.id', ondelete='CASCADE', index=True) attraction: 'Attraction' = Relationship(back_populates="events", sa_relationship_kwargs={'lazy': 'joined'}) @@ -488,7 +472,7 @@ class AttractionEvent(MagModel, AttractionMixin, table=True): duration: int = 60 schedule_item: 'Event' = Relationship( - back_populates="attraction") + back_populates="attraction", sa_relationship_kwargs={'lazy': 'joined'}) signups: list['AttractionSignup'] = Relationship( back_populates="event", sa_relationship_kwargs={'order_by': 'AttractionSignup.checkin_time', 'cascade': 'all,delete-orphan', 'passive_deletes': True}) @@ -759,12 +743,6 @@ def overlap(self, event): class AttractionSignup(MagModel, table=True): - """ - Attendee: joined - Attraction: joined - AttractionEvent: joined - """ - attraction_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attraction.id', ondelete='CASCADE') attraction: 'Attraction' = Relationship( back_populates="signups", sa_relationship_kwargs={'lazy': 'joined'}) @@ -864,12 +842,6 @@ def notify_waitlist(self): class AttractionNotification(MagModel, table=True): - """ - Attendee: joined - AttractionEvent: joined - AttractionSignup: joined - """ - attraction_event_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attraction_event.id', ondelete='CASCADE') event: 'AttractionEvent' = Relationship(back_populates="notifications", sa_relationship_kwargs={'lazy': 'joined'}) @@ -899,10 +871,6 @@ def _fix_attraction_id(self): class AttractionNotificationReply(MagModel, table=True): - """ - AttractionEvent: joined - """ - attraction_event_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attraction_event.id', nullable=True) event: 'AttractionEvent' = Relationship(back_populates="notification_replies", sa_relationship_kwargs={'lazy': 'joined'}) diff --git a/uber/models/badge_printing.py b/uber/models/badge_printing.py index f2a43b912..3950a15d5 100644 --- a/uber/models/badge_printing.py +++ b/uber/models/badge_printing.py @@ -12,10 +12,6 @@ class PrintJob(MagModel, table=True): - """ - Attendee: joined - """ - attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE') attendee: 'Attendee' = Relationship(back_populates="print_requests", sa_relationship_kwargs={'lazy': 'joined'}) diff --git a/uber/models/commerce.py b/uber/models/commerce.py index 313dd2605..8b5988692 100644 --- a/uber/models/commerce.py +++ b/uber/models/commerce.py @@ -94,9 +94,6 @@ class Sale(MagModel, table=True): class ModelReceipt(MagModel, table=True): """ - ReceiptTransaction: selectin - ReceiptItem: selectin - Attendees, groups, and art show apps have a running receipt that has items and transactions added to it dynamically. Receipt items can be purchases or credits added to the receipt. They do not involve money changing hands. @@ -328,9 +325,6 @@ def process_full_refund(self, session, model, who='non-admin', exclude_fees=Fals class ReceiptTransaction(MagModel, table=True): """ - ModelReceipt: joined - ReceiptInfo: select - Transactions have two key properties: whether or not they were done through Stripe, and whether they represent a payment or a refund. @@ -556,11 +550,6 @@ def cannot_delete_reason(self): class ReceiptItem(MagModel, table=True): - """ - ModelReceipt: joined - ReceiptTransaction: joined - """ - receipt_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='model_receipt.id', ondelete='CASCADE') receipt: 'ModelReceipt' = Relationship(back_populates="receipt_items", sa_relationship_kwargs={'lazy': 'joined'}) @@ -642,10 +631,6 @@ def cannot_delete_reason(self): class ReceiptInfo(MagModel, table=True): - """ - ReceiptTransaction: selectin - """ - fk_email_model: str = '' fk_email_id: str = '' terminal_id: str = '' diff --git a/uber/models/department.py b/uber/models/department.py index 862a22c39..7255ef0ba 100644 --- a/uber/models/department.py +++ b/uber/models/department.py @@ -63,11 +63,6 @@ class DeptChecklistItem(MagModel, table=True): - """ - Attendee: joined - Department: joined - """ - department_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='department.id', ondelete='CASCADE') department: 'Department' = Relationship(back_populates="dept_checklist_items", sa_relationship_kwargs={'lazy': 'joined'}) @@ -102,12 +97,6 @@ class BulkPrintingRequest(MagModel, table=True): class DeptMembership(MagModel, table=True): - """ - Attendee: joined - Department: joined - DeptRole: selectin - """ - attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE') attendee: 'Attendee' = Relationship(back_populates="dept_memberships", sa_relationship_kwargs={'lazy': 'joined'}) @@ -162,11 +151,6 @@ def dept_roles_names(self): class DeptMembershipRequest(MagModel, table=True): - """ - Attendee: joined - Department: joined - """ - attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE') attendee: 'Attendee' = Relationship(back_populates="dept_membership_requests", sa_relationship_kwargs={'lazy': 'joined'}) @@ -185,10 +169,6 @@ class DeptMembershipRequest(MagModel, table=True): class DeptRole(MagModel, table=True): - """ - Department: joined - """ - department_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='department.id', ondelete='CASCADE') department: 'Department' = Relationship(back_populates="dept_roles", sa_relationship_kwargs={'lazy': 'joined'}) @@ -443,13 +423,6 @@ def job_templates_by_name(self): class Job(MagModel, table=True): - """ - Department: joined - DeptRole: selectin - Shift: selectin - JobTemplate: select - """ - _ONLY_MEMBERS: ClassVar = 0 _ALL_VOLUNTEERS: ClassVar = 2 _VISIBILITY_OPTS: ClassVar = [ @@ -736,11 +709,6 @@ def available_volunteers(self): class JobTemplate(MagModel, table=True): - """ - Department: joined - DeptRole: selectin - """ - department_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='department.id', ondelete='CASCADE') department: 'Department' = Relationship(back_populates="job_templates", sa_relationship_kwargs={'lazy': 'joined'}) @@ -975,11 +943,6 @@ def real_cutoff_time(self, day_int): class Shift(MagModel, table=True): - """ - Attendee: joined - Job: joined - """ - job_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='job.id', ondelete='CASCADE') job: 'Job' = Relationship(back_populates="shifts", sa_relationship_kwargs={'lazy': 'joined'}) diff --git a/uber/models/email.py b/uber/models/email.py index 29ee50203..960097c33 100644 --- a/uber/models/email.py +++ b/uber/models/email.py @@ -348,10 +348,6 @@ def would_send_if_approved(self, model_instance): class Email(MagModel, BaseEmailMixin, table=True): - """ - AutomatedEmail: joined - """ - automated_email_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='automated_email.id', nullable=True, index=True) automated_email: 'AutomatedEmail' = Relationship(back_populates="emails", sa_relationship_kwargs={'lazy': 'joined'}) diff --git a/uber/models/group.py b/uber/models/group.py index 58977a7b4..c5416138f 100644 --- a/uber/models/group.py +++ b/uber/models/group.py @@ -22,13 +22,9 @@ class Group(MagModel, TakesPaymentMixin, table=True): - """ - Attendee: selectin - ModelReceipt: select - """ - leader_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', nullable=True) - leader: 'Attendee' = Relationship(sa_relationship=relationship('Attendee', foreign_keys='Group.leader_id', post_update=True)) + leader: 'Attendee' = Relationship(sa_relationship=relationship('Attendee', foreign_keys='Group.leader_id', + lazy='select', post_update=True)) creator_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', nullable=True) creator: 'Attendee' = Relationship( @@ -68,9 +64,8 @@ class Group(MagModel, TakesPaymentMixin, table=True): registered: datetime = Field(sa_type=DateTime(timezone=True), default_factory=lambda: datetime.now(UTC)) approved: datetime | None = Field(sa_type=DateTime(timezone=True), nullable=True) - attendees: list['Attendee'] = Relationship( - back_populates="group", - sa_relationship_kwargs={'foreign_keys': 'Attendee.group_id', 'lazy': 'selectin'}) + attendees: list['Attendee'] = Relationship(back_populates="group", + sa_relationship_kwargs={'foreign_keys': 'Attendee.group_id', 'lazy': 'selectin'}) studio: 'IndieStudio' = Relationship(back_populates="group") guest: 'GuestGroup' = Relationship(back_populates="group", sa_relationship_kwargs={'cascade': 'all,delete-orphan', 'passive_deletes': True}) diff --git a/uber/models/guests.py b/uber/models/guests.py index da260476f..8267a2ed8 100644 --- a/uber/models/guests.py +++ b/uber/models/guests.py @@ -28,10 +28,6 @@ class GuestGroup(MagModel, table=True): - """ - Group: joined - """ - group_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='group.id', ondelete='CASCADE', unique=True) group: 'Group' = Relationship(back_populates="guest", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) @@ -311,10 +307,6 @@ def guidebook_images(self): class GuestInfo(MagModel, table=True): - """ - GuestGroup: joined - """ - guest_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='guest_group.id', ondelete='CASCADE', unique=True) guest: 'GuestGroup' = Relationship(back_populates="info", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) @@ -348,10 +340,6 @@ def download_filename(self): class GuestBio(MagModel, table=True): - """ - GuestGroup: joined - """ - guest_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='guest_group.id', ondelete='CASCADE', unique=True) guest: 'GuestGroup' = Relationship(back_populates="bio", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) @@ -374,10 +362,6 @@ def status(self): class GuestTaxes(MagModel, table=True): - """ - GuestGroup: joined - """ - guest_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='guest_group.id', ondelete='CASCADE', unique=True) guest: 'GuestGroup' = Relationship(back_populates="taxes", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) @@ -389,10 +373,6 @@ def status(self): class GuestStagePlot(MagModel, table=True): - """ - GuestGroup: joined - """ - guest_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='guest_group.id', ondelete='CASCADE', unique=True) guest: 'GuestGroup' = Relationship(back_populates="stage_plot", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) @@ -431,10 +411,6 @@ def status(self): class GuestPanel(MagModel, table=True): - """ - GuestGroup: joined - """ - guest_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='guest_group.id', ondelete='CASCADE', unique=True) guest: 'GuestGroup' = Relationship(back_populates="panel", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) @@ -451,10 +427,6 @@ def status(self): class GuestTrack(MagModel, table=True): - """ - GuestGroup: joined - """ - guest_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='guest_group.id', ondelete='CASCADE', unique=True) guest: 'GuestGroup' = Relationship(back_populates="tracks", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) @@ -495,10 +467,6 @@ def filepath(self): class GuestMerch(MagModel, table=True): - """ - GuestGroup: joined - """ - _inventory_file_regex: ClassVar = re.compile(r'^(audio|image)(|\-\d+)$') _inventory_filename_regex: ClassVar = re.compile(r'^(audio|image)(|\-\d+)_filename$') @@ -799,10 +767,6 @@ def update_inventory(self, inventory, *, persist_files=True): class GuestCharity(MagModel, table=True): - """ - GuestGroup: joined - """ - guest_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='guest_group.id', ondelete='CASCADE', unique=True) guest: 'GuestGroup' = Relationship(back_populates="charity", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) @@ -820,10 +784,6 @@ def no_desc_if_not_donating(self): class GuestAutograph(MagModel, table=True): - """ - GuestGroup: joined - """ - guest_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='guest_group.id', ondelete='CASCADE', unique=True) guest: 'GuestGroup' = Relationship(back_populates="autograph", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) @@ -839,10 +799,6 @@ def no_length_if_zero_autographs(self): class GuestInterview(MagModel, table=True): - """ - GuestGroup: joined - """ - guest_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='guest_group.id', ondelete='CASCADE', unique=True) guest: 'GuestGroup' = Relationship(back_populates="interview", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) @@ -858,11 +814,6 @@ def no_details_if_no_interview(self): class GuestTravelPlans(MagModel, table=True): - """ - GuestGroup: joined - GuestDetailedTravelPlan: selectin - """ - guest_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='guest_group.id', ondelete='CASCADE', unique=True) guest: 'GuestGroup' = Relationship(back_populates="travel_plans", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) @@ -881,10 +832,6 @@ def num_detailed_travel_plans(self): class GuestHospitality(MagModel, table=True): - """ - GuestGroup: joined - """ - guest_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='guest_group.id', ondelete='CASCADE', unique=True) guest: 'GuestGroup' = Relationship(back_populates="hospitality", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) @@ -892,10 +839,6 @@ class GuestHospitality(MagModel, table=True): class GuestMediaRequest(MagModel, table=True): - """ - GuestGroup: joined - """ - guest_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='guest_group.id', ondelete='CASCADE', unique=True) guest: 'GuestGroup' = Relationship(back_populates="media_request", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) @@ -903,10 +846,6 @@ class GuestMediaRequest(MagModel, table=True): class GuestDetailedTravelPlan(MagModel, table=True): - """ - GuestTravelPlans: joined - """ - travel_plans_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='guest_travel_plans.id', ondelete='CASCADE') travel_plans: 'GuestTravelPlans' = Relationship(back_populates="detailed_travel_plans", sa_relationship_kwargs={'lazy': 'joined'}) diff --git a/uber/models/hotel.py b/uber/models/hotel.py index cef212d94..135154ef6 100644 --- a/uber/models/hotel.py +++ b/uber/models/hotel.py @@ -65,10 +65,6 @@ def setup_teardown(self): class HotelRequests(MagModel, NightsMixin, table=True): - """ - Attendee: joined - """ - attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE', unique=True) attendee: 'Attendee' = Relationship(back_populates="hotel_requests", sa_relationship_kwargs={'lazy': 'joined'}) @@ -123,11 +119,6 @@ def check_out_date(self): class RoomAssignment(MagModel, table=True): - """ - Attendee: joined - Room: joined - """ - room_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='room.id', ondelete='CASCADE') room: 'Room' = Relationship(back_populates="assignments", sa_relationship_kwargs={'lazy': 'joined'}) @@ -136,11 +127,6 @@ class RoomAssignment(MagModel, table=True): class LotteryApplication(MagModel, table=True): - """ - Attendee: joined - LotteryApplication (parent_application): joined - """ - attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', nullable=True, unique=True) attendee: 'Attendee' = Relationship(back_populates="lottery_application", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) diff --git a/uber/models/marketplace.py b/uber/models/marketplace.py index 6a8132ce2..a1e2088bb 100644 --- a/uber/models/marketplace.py +++ b/uber/models/marketplace.py @@ -17,10 +17,6 @@ class ArtistMarketplaceApplication(MagModel, table=True): - """ - Attendee: joined - """ - MATCHING_DEALER_FIELDS: ClassVar = ['email_address', 'website', 'name'] attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE', unique=True) diff --git a/uber/models/mits.py b/uber/models/mits.py index b6ad4c42c..d5cab5a3e 100644 --- a/uber/models/mits.py +++ b/uber/models/mits.py @@ -20,10 +20,6 @@ class MITSTeam(MagModel, table=True): - """ - MITSGame: selectin - """ - name: str = '' days_available: int | None = Field(nullable=True) hours_available: int | None = Field(nullable=True) @@ -139,10 +135,6 @@ def completion_percentage(self): class MITSApplicant(MagModel, table=True): - """ - MITSTeam: joined - """ - team_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='mits_team.id', ondelete='CASCADE') team: 'MITSTeam' = Relationship(back_populates="applicants", sa_relationship_kwargs={'lazy': 'joined'}) @@ -176,12 +168,6 @@ def has_requested(self, night): class MITSGame(MagModel, table=True): - """ - MITSTeam: joined - MITSPicture: selectin - MITSDocument: selectin - """ - team_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='mits_team.id', ondelete='CASCADE') team: 'MITSTeam' = Relationship(back_populates="games", sa_relationship_kwargs={'lazy': 'joined'}) @@ -258,10 +244,6 @@ def guidebook_images(self): class MITSPicture(MagModel, GuidebookImageMixin, table=True): - """ - MITSGame: joined - """ - game_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='mits_game.id', ondelete='CASCADE') game: 'MITSGame' = Relationship(back_populates="pictures", sa_relationship_kwargs={'lazy': 'joined'}) @@ -277,10 +259,6 @@ def filepath(self): class MITSDocument(MagModel, table=True): - """ - MITSGame: joined - """ - game_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='mits_game.id', ondelete='CASCADE') game: 'MITSGame' = Relationship(back_populates="documents", sa_relationship_kwargs={'lazy': 'joined'}) @@ -297,10 +275,6 @@ def filepath(self): class MITSTimes(MagModel, table=True): - """ - MITSTeam: joined - """ - team_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='mits_team.id', ondelete='CASCADE', unique=True) team: 'MITSTeam' = Relationship(back_populates="schedule", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) @@ -309,10 +283,6 @@ class MITSTimes(MagModel, table=True): class MITSPanelApplication(MagModel, table=True): - """ - MITSTeam: joined - """ - team_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='mits_team.id', ondelete='CASCADE', unique=True) team: 'MITSTeam' = Relationship(back_populates="panel_app", sa_relationship_kwargs={'lazy': 'joined', 'single_parent': True}) diff --git a/uber/models/panels.py b/uber/models/panels.py index 4edd41898..5930b5ad2 100644 --- a/uber/models/panels.py +++ b/uber/models/panels.py @@ -81,10 +81,6 @@ def update_events(self, session): class Event(MagModel, table=True): - """ - EventLocation: joined - """ - event_location_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='event_location.id', nullable=True) location: 'EventLocation' = Relationship(back_populates="events", sa_relationship_kwargs={'lazy': 'joined'}) @@ -164,11 +160,6 @@ def guidebook_desc(self): class AssignedPanelist(MagModel, table=True): - """ - Attendee: joined - Event: joined - """ - attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='CASCADE') attendee: 'Attendee' = Relationship(back_populates="assigned_panelists", sa_relationship_kwargs={'lazy': 'joined'}) @@ -184,11 +175,6 @@ def __repr__(self): class PanelApplication(MagModel, table=True): - """ - Event: joined - PanelApplicant: selectin - """ - event_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='event.id', nullable=True) event: 'Event' = Relationship(back_populates="applications", sa_relationship_kwargs={'lazy': 'joined'}) @@ -346,11 +332,6 @@ def has_been_accepted(self): class PanelApplicant(MagModel, table=True): - """ - Attendee: joined - PanelApplicant: selectin - """ - attendee_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', ondelete='SET NULL', nullable=True) attendee: 'Attendee' = Relationship(back_populates="panel_applicants", sa_relationship_kwargs={'lazy': 'joined'}) diff --git a/uber/models/promo_code.py b/uber/models/promo_code.py index 3e7192c88..929e7cbee 100644 --- a/uber/models/promo_code.py +++ b/uber/models/promo_code.py @@ -129,11 +129,6 @@ def normalize_word(cls, word): class PromoCodeGroup(MagModel, table=True): - """ - Attendee: joined - PromoCode: selectin - """ - buyer_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='attendee.id', nullable=True) buyer: 'Attendee' = Relationship(back_populates="promo_code_groups", sa_relationship_kwargs={'lazy': 'joined'}) @@ -229,8 +224,6 @@ def min_badges_addable(self): class PromoCode(MagModel, table=True): """ Promo codes used by attendees to purchase badges at discounted prices. - Attendee: selectin - PromoCodeGroup: joined Attributes: code (str): The actual textual representation of the promo code. This diff --git a/uber/models/showcase.py b/uber/models/showcase.py index b7e1088d3..2bc5f02a6 100644 --- a/uber/models/showcase.py +++ b/uber/models/showcase.py @@ -36,11 +36,6 @@ def game_reviews(self): class IndieJudge(MagModel, ReviewMixin, table=True): - """ - IndieGameCode: selectin - IndieGameReview: selectin - """ - admin_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='admin_account.id', nullable=True, unique=True) admin_account: "AdminAccount" = Relationship(back_populates="judge", sa_relationship_kwargs={'single_parent': True}) @@ -138,10 +133,6 @@ def get_code_for(self, game_id): class IndieStudio(MagModel, table=True): - """ - IndieGame: selectin - """ - group_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='group.id', nullable=True, unique=True) group: 'Group' = Relationship(back_populates="studio", sa_relationship_kwargs={'single_parent': True}) @@ -327,10 +318,6 @@ def unclaimed_badges(self): class IndieDeveloper(MagModel, table=True): - """ - IndieStudio: joined - """ - studio_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='indie_studio.id', ondelete='CASCADE') studio: 'IndieStudio' = Relationship(back_populates="developers", sa_relationship_kwargs={'lazy': 'joined'}) @@ -369,13 +356,6 @@ def matching_attendee(self): class IndieGame(MagModel, ReviewMixin, table=True): - """ - IndieStudio: joined - IndieDeveloper: joined - IndieGameCode: selectin - IndieGameImage: selectin - """ - studio_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='indie_studio.id', ondelete='CASCADE') studio: 'IndieStudio' = Relationship(back_populates="games", sa_relationship_kwargs={'lazy': 'joined'}) @@ -689,10 +669,6 @@ def guidebook_images(self): class IndieGameImage(MagModel, GuidebookImageMixin, table=True): - """ - IndieGame: joined - """ - game_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='indie_game.id', ondelete='CASCADE') game: 'IndieGame' = Relationship(back_populates="images", sa_relationship_kwargs={'lazy': 'joined'}) @@ -735,11 +711,6 @@ def filepath(self): class IndieGameCode(MagModel, table=True): - """ - IndieGame: joined - IndieJudge: joined - """ - game_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='indie_game.id', ondelete='CASCADE') game: 'IndieGame' = Relationship(back_populates="codes", sa_relationship_kwargs={'lazy': 'joined'}) @@ -756,11 +727,6 @@ def type_label(self): class IndieGameReview(MagModel, table=True): - """ - IndieGame: joined - IndieJudge: joined - """ - game_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='indie_game.id', ondelete='CASCADE') game: 'IndieGame' = Relationship(back_populates="reviews", sa_relationship_kwargs={'lazy': 'joined'}) diff --git a/uber/models/tabletop.py b/uber/models/tabletop.py index 73550ed95..3928f48ca 100644 --- a/uber/models/tabletop.py +++ b/uber/models/tabletop.py @@ -34,11 +34,6 @@ def checked_out(self): class TabletopCheckout(MagModel, table=True): - """ - Attendee: joined - TabletopGame: joined - """ - game_id: str | None = Field(sa_type=Uuid(as_uuid=False), foreign_key='tabletop_game.id', ondelete='CASCADE') game: 'TabletopGame' = Relationship(back_populates="checkouts", sa_relationship_kwargs={'lazy': 'joined'}) diff --git a/uber/models/types.py b/uber/models/types.py index 07dfa03c9..00cee6e45 100644 --- a/uber/models/types.py +++ b/uber/models/types.py @@ -110,7 +110,7 @@ def default_relationship(*args, **kwargs): kwargs.setdefault('cascade', 'expunge,refresh-expire,merge') else: kwargs.setdefault('cascade', 'save-update,merge,refresh-expire,expunge') - kwargs.setdefault('lazy', 'raise') + #kwargs.setdefault('lazy', 'raise') return SQLAlchemy_relationship(*args, **kwargs) @@ -120,7 +120,6 @@ def DefaultRelationship(*args, **kwargs): instead of the regular defaults, we've overridden the following defaults if no value is provided for the following parameters: cascade now defaults to 'save-update,merge,refresh-expire,expunge' - lazy now default to raise """ sa_relationship = kwargs.get('sa_relationship', None) if sa_relationship is not None: @@ -134,7 +133,7 @@ def DefaultRelationship(*args, **kwargs): sa_kwargs.setdefault('cascade', 'expunge,refresh-expire,merge') else: sa_kwargs.setdefault('cascade', 'save-update,merge,refresh-expire,expunge') - sa_kwargs.setdefault('lazy', 'raise') + #sa_kwargs.setdefault('lazy', 'raise') return SQLModelRelationship(*args, **kwargs, sa_relationship_kwargs=sa_kwargs) diff --git a/uber/payments.py b/uber/payments.py index d761dbe3e..f171eca90 100644 --- a/uber/payments.py +++ b/uber/payments.py @@ -5,6 +5,7 @@ from datetime import datetime, timedelta from dateutil.parser import parse from uuid import uuid4 +from sqlalchemy.orm import selectinload import logging import cherrypy @@ -14,7 +15,7 @@ import uber from uber.config import c from uber.custom_tags import format_currency, email_only -from uber.utils import report_critical_exception, listify +from uber.utils import report_critical_exception, listify, is_listy import uber.spin_rest_utils as spin_rest_utils from uber.decorators import cached_property, classproperty @@ -53,6 +54,7 @@ class PreregCart: the payment process is started. This class helps manage them in the session instead. """ def __init__(self, targets=()): + log.error(targets) self._targets = listify(targets) self._current_cost = 0 @@ -119,7 +121,7 @@ def get_unpaid_promo_code_uses_count(cls, id, already_counted_attendee_ids=None) @classmethod def to_sessionized(cls, m, **params): from uber.models import Attendee, Group - if isinstance(m, Iterable): + if is_listy(m): return [cls.to_sessionized(t) for t in m] elif isinstance(m, dict): return m @@ -147,7 +149,7 @@ def to_sessionized(cls, m, **params): @classmethod def from_sessionized(cls, d): - if isinstance(d, Iterable): + if is_listy(d): return [cls.from_sessionized(t) for t in d] elif isinstance(d, dict): assert d['_model'] in {'Attendee', 'Group'} @@ -1809,8 +1811,10 @@ def mark_paid_from_ids(intent_id, charge_id, put_on_hold=False): from uber.decorators import render session = Session() - matching_txns = session.query(ReceiptTransaction).filter_by(intent_id=intent_id).filter( - ReceiptTransaction.charge_id == '').all() + matching_txns = session.query(ReceiptTransaction).filter( + ReceiptTransaction.intent_id == intent_id, + ReceiptTransaction.charge_id == '').options( + selectinload(ReceiptTransaction.receipt_items)).all() if not matching_txns: log.debug(f"Tried to mark payments with intent ID {intent_id} as paid but we couldn't find any!") diff --git a/uber/redis_session.py b/uber/redis_session.py index 58956db65..1d85eb009 100644 --- a/uber/redis_session.py +++ b/uber/redis_session.py @@ -59,6 +59,10 @@ def _load(self): except TypeError: # if id not defined pickle can't load None and raise TypeError return None + except Exception as e: + # Keep the entire thread from getting stuck + self._delete() + raise e def _save(self, expiration_time): pickled_data = pickle.dumps( diff --git a/uber/site_sections/accounts.py b/uber/site_sections/accounts.py index 9e9089860..0485e8bf5 100644 --- a/uber/site_sections/accounts.py +++ b/uber/site_sections/accounts.py @@ -113,7 +113,7 @@ def bulk(self, session, department_id=None, **params): department_id = None if department_id == 'All' else department_id attendee_filters = [Attendee.dept_memberships.any(department_id=department_id)] if department_id else [] attendees = session.staffers().filter(*attendee_filters).options( - selectinload(Attendee.dept_memberships_with_role) + selectinload(Attendee.dept_memberships_with_role), joinedload(Attendee.admin_account) ).all() for attendee in attendees: attendee.trusted_here = attendee.trusted_in(department_id) if department_id else attendee.has_role_somewhere diff --git a/uber/site_sections/attractions_admin.py b/uber/site_sections/attractions_admin.py index 184788b6c..69f6ef5fa 100644 --- a/uber/site_sections/attractions_admin.py +++ b/uber/site_sections/attractions_admin.py @@ -324,8 +324,7 @@ def new(self, session, message='', **params): def delete(self, session, id, message=''): if cherrypy.request.method == 'POST': attraction = session.query(Attraction).get(id) - attendee = session.admin_attendee() - if not attendee.can_admin_attraction(attraction): + if not session.current_admin_account().can_admin_attraction(attraction): raise HTTPRedirect( 'form?id={}&message={}', id, @@ -567,7 +566,7 @@ def update_locations(self, session, feature_id, old_location, new_location): message = '' if cherrypy.request.method == 'POST': feature = session.query(AttractionFeature).get(feature_id) - if not session.admin_attendee().can_admin_attraction(feature.attraction): + if not session.current_admin_account().can_admin_attraction(feature.attraction): message = "You cannot update rooms for an attraction you don't own" else: for event in feature.events: @@ -584,7 +583,7 @@ def delete_event(self, session, id): event = session.query(AttractionEvent).get(id) attraction_id = event.feature.attraction_id attraction = session.query(Attraction).get(attraction_id) - if not session.admin_attendee().can_admin_attraction(attraction): + if not session.current_admin_account().can_admin_attraction(attraction): message = "You cannot delete a event from an attraction you don't own." else: session.delete(event) @@ -593,13 +592,13 @@ def delete_event(self, session, id): return {'error': message} @ajax - def delete_event(self, session, id): + def delete_event_cascade(self, session, id): message = '' if cherrypy.request.method == 'POST': event = session.query(AttractionEvent).get(id) attraction_id = event.feature.attraction_id attraction = session.query(Attraction).get(attraction_id) - if not session.admin_attendee().can_admin_attraction(attraction): + if not session.current_admin_account().can_admin_attraction(attraction): message = "You cannot delete a event from an attraction you don't own." else: if event.schedule_item: @@ -616,7 +615,7 @@ def delete_feature(self, session, id): message = '' if cherrypy.request.method == 'POST': attraction = session.query(Attraction).get(attraction_id) - if not session.admin_attendee().can_admin_attraction(attraction): + if not session.current_admin_account().can_admin_attraction(attraction): message = "You cannot delete a feature from an attraction you don't own." else: session.delete(feature) @@ -632,7 +631,7 @@ def delete_feature_cascade(self, session, id): message = '' if cherrypy.request.method == 'POST': attraction = session.query(Attraction).get(attraction_id) - if not session.admin_attendee().can_admin_attraction(attraction): + if not session.current_admin_account().can_admin_attraction(attraction): message = "You cannot delete a feature from an attraction you don't own." else: for event in feature.events: @@ -653,7 +652,7 @@ def cancel_signup(self, session, id): signup = session.query(AttractionSignup).get(id) attraction_id = signup.event.feature.attraction_id attraction = session.query(Attraction).get(attraction_id) - if not session.admin_attendee().can_admin_attraction(attraction): + if not session.current_admin_account().can_admin_attraction(attraction): message = "You cannot cancel a signup for an attraction you don't own." elif signup.is_checked_in: message = "You cannot cancel a signup that has already checked in." diff --git a/uber/site_sections/preregistration.py b/uber/site_sections/preregistration.py index a63b50827..515898953 100644 --- a/uber/site_sections/preregistration.py +++ b/uber/site_sections/preregistration.py @@ -217,7 +217,7 @@ def index(self, session, message='', account_email='', account_password='', **pa if not PreregCart.unpaid_preregs: raise HTTPRedirect('form?message={}', message) if message else HTTPRedirect('form') else: - cart = PreregCart(listify(PreregCart.unpaid_preregs.values())) + cart = PreregCart(list(PreregCart.unpaid_preregs.values())) cart.set_total_cost() for attendee in cart.attendees: if attendee.promo_code: @@ -736,13 +736,13 @@ def banned(self, **params): } def at_door_confirmation(self, session, message='', qr_code_id='', **params): - cart = PreregCart(listify(PreregCart.unpaid_preregs.values())) + cart = PreregCart(list(PreregCart.unpaid_preregs.values())) registrations_list = [] account = session.current_attendee_account() if c.ATTENDEE_ACCOUNTS_ENABLED else None account_pickup_group = session.query(BadgePickupGroup).filter_by(account_id=account.id).first() if account else None pickup_group = None - if not listify(PreregCart.unpaid_preregs.values()): + if not list(PreregCart.unpaid_preregs.values()): if qr_code_id: current_pickup_group = session.query(BadgePickupGroup).filter_by(public_id=qr_code_id).first() for attendee in current_pickup_group.attendees: @@ -815,7 +815,7 @@ def at_door_confirmation(self, session, message='', qr_code_id='', **params): } def process_free_prereg(self, session, message='', **params): - cart = PreregCart(listify(PreregCart.unpaid_preregs.values())) + cart = PreregCart(list(PreregCart.unpaid_preregs.values())) cart.set_total_cost() if cart.total_cost <= 0: prereg_cart_error = cart.prereg_cart_checks(session) @@ -860,7 +860,7 @@ def prereg_payment(self, session, message='', **params): if errors: return errors update_prereg_cart(session) - cart = PreregCart(listify(PreregCart.unpaid_preregs.values())) + cart = PreregCart(list(PreregCart.unpaid_preregs.values())) cart.set_total_cost() pickup_group_id = None @@ -2181,6 +2181,7 @@ def confirm(self, session, message='', return_to='confirm', undoing_extra='', ** selectinload(Attendee.dept_membership_requests), selectinload(Attendee.art_agent_apps), selectinload(Attendee.promo_code_groups), + selectinload(Attendee.shifts), joinedload(Attendee.lottery_application), joinedload(Attendee.art_show_application), joinedload(Attendee.marketplace_application), @@ -2293,13 +2294,14 @@ def validate_attendee(self, session, form_list=[], is_prereg=False, **params): else: try: attendee = session.query(Attendee).filter(Attendee.id == id).options( - selectinload(Attendee.promo_code_groups)).first() + selectinload(Attendee.promo_code_groups)).one() except NoResultFound: if is_prereg: attendee = self._get_unsaved( id, if_not_found=HTTPRedirect('form?message={}', 'That preregistration expired or has already been finalized.')) + log.error(attendee) else: return {"error": {'': ["We could not find the badge you're trying to update."]}} diff --git a/uber/site_sections/registration.py b/uber/site_sections/registration.py index b79118f7e..4a8544c95 100644 --- a/uber/site_sections/registration.py +++ b/uber/site_sections/registration.py @@ -147,7 +147,8 @@ def index(self, session, message='', page='0', search_text='', uploaded_id='', o pages = range(1, int(math.ceil(count / 100)) + 1) attendees = attendees.options( - selectinload(Attendee.promo_code_groups), selectinload(Attendee.allocated_badges)) + selectinload(Attendee.promo_code_groups), + selectinload(Attendee.allocated_badges)) attendees = attendees[-100 + 100*page: 100*page] if page else [] return { diff --git a/uber/site_sections/schedule.py b/uber/site_sections/schedule.py index 56c5c5bbd..75a1163c3 100644 --- a/uber/site_sections/schedule.py +++ b/uber/site_sections/schedule.py @@ -326,7 +326,7 @@ def edit(self, session, message='', view_date=c.PANELS_EPOCH.date(), view_event= locations = [] event_locations = session.query(EventLocation).options( - selectinload(EventLocation.events) + selectinload(EventLocation.events), joinedload(EventLocation.department) ) if not event_locations.first(): diff --git a/uber/site_sections/staffing_admin.py b/uber/site_sections/staffing_admin.py index 9c9b2b524..5ea11bbb8 100644 --- a/uber/site_sections/staffing_admin.py +++ b/uber/site_sections/staffing_admin.py @@ -209,6 +209,7 @@ def bulk_dept_import( from_department = service.dept.jobs(department_id=id) to_department = session.query(Department).filter_by(name=from_department['name']).options( selectinload(Department.dept_roles), selectinload(Department.job_templates), + selectinload(Department.attractions), ).first() if not to_department: to_department = _create_copy_department(from_department) diff --git a/uber/templates/attractions_admin/form.html b/uber/templates/attractions_admin/form.html index 1737ca5b9..4a6a7ddf4 100644 --- a/uber/templates/attractions_admin/form.html +++ b/uber/templates/attractions_admin/form.html @@ -660,7 +660,7 @@ } -{%- set can_admin_attraction = admin_account.attendee.can_admin_attraction(attraction) -%} +{%- set can_admin_attraction = admin_account.can_admin_attraction(attraction) -%} {% if can_admin_attraction -%}