admin/mtgonline
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Phase 2: Add missing migrations, fix FK dependencies, align schemas with models

Browse Source
This commit is contained in:
akadmin
2026-08-09 17:17:47 +00:00
parent 2d52e2dc89
commit 0167c83b11
5 changed files with 385 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/alembic/versions/000_base_tables.py
+90 -44
View File
@@ -19,75 +19,121 @@ depends_on: Union[str, Sequence[str], None] = None
def upgrade() -> None:
"""Create base tables: users, decklist files, and rooms."""
# 1. Users Table
"""Create base tables: users, decklists, rooms, and supporting tables."""
# 1. Users Table (matches User model)
op.create_table(
'mtgonline_users',
sa.Column('id', sa.Integer(), primary_key=True, autoincrement=True),
sa.Column('username', sa.String(50), unique=True, nullable=False, index=True),
sa.Column('email', sa.String(255), unique=True, nullable=False, index=True),
sa.Column('password_hash', sa.String(255), nullable=False),
sa.Column('salt', sa.String(32), nullable=True),
sa.Column('display_name', sa.String(100), nullable=True),
sa.Column('avatar_url', sa.String(500), nullable=True),
sa.Column('country', sa.String(100), nullable=True),
sa.Column('real_name', sa.String(255), nullable=True),
sa.Column('avatar_bmp', sa.LargeBinary(), nullable=True),
sa.Column('privlevel', sa.Integer(), default=0),
sa.Column('username', sa.String(64), unique=True, nullable=False, index=True),
sa.Column('password_hash', sa.String(128), nullable=False),
sa.Column('salt', sa.String(128), nullable=False),
sa.Column('email', sa.String(255), nullable=True, index=True),
sa.Column('country', sa.String(2), nullable=True),
sa.Column('real_name', sa.String(128), nullable=True),
sa.Column('avatar_bmp', sa.Text(), nullable=True),
sa.Column('privlevel', sa.String(50), nullable=True, server_default='User'),
sa.Column('is_active', sa.Boolean(), default=True),
sa.Column('is_banned', sa.Boolean(), default=False),
sa.Column('ban_reason', sa.Text(), nullable=True),
sa.Column('ban_ends', sa.DateTime(), nullable=True),
sa.Column('vip_status', sa.Boolean(), default=False),
sa.Column('vip_status', sa.Integer(), default=0),
sa.Column('vip_expiry', sa.DateTime(), nullable=True),
sa.Column('creation_date', sa.DateTime(), server_default=sa.func.now()),
sa.Column('last_login', sa.DateTime(), nullable=True),
sa.Column('created_at', sa.DateTime(), server_default=sa.func.now()),
sa.Column('updated_at', sa.DateTime(), server_default=sa.func.now(), onupdate=sa.func.now()),
)
# 2. Decklist Files Table
# 2. Decklist Folders Table (matches DecklistFolder model)
op.create_table(
'mtgonline_decklist_folders',
sa.Column('id', sa.Integer(), primary_key=True, autoincrement=True),
sa.Column('owner_id', sa.Integer(), sa.ForeignKey('mtgonline_users.id'), nullable=False),
sa.Column('name', sa.String(255), nullable=False),
sa.Column('parent_id', sa.Integer(), sa.ForeignKey('mtgonline_decklist_folders.id'), nullable=True),
sa.Column('creation_date', sa.DateTime(), server_default=sa.func.now()),
)
# 3. Decklist Files Table (matches DecklistFile model)
op.create_table(
'mtgonline_decklist_files',
sa.Column('id', sa.Integer(), primary_key=True, autoincrement=True),
sa.Column('user_id', sa.Integer(), sa.ForeignKey('mtgonline_users.id', ondelete='CASCADE'), nullable=False, index=True),
sa.Column('folder_id', sa.Integer(), sa.ForeignKey('mtgonline_decklist_folders.id'), nullable=True),
sa.Column('owner_id', sa.Integer(), sa.ForeignKey('mtgonline_users.id'), nullable=False),
sa.Column('name', sa.String(255), nullable=False),
sa.Column('content', sa.Text(), nullable=True),
sa.Column('description', sa.Text(), nullable=True),
sa.Column('format', sa.String(50), server_default='standard'),
sa.Column('is_favorite', sa.Boolean(), default=False),
sa.Column('import_source', sa.String(50), nullable=True),
sa.Column('import_confidence', sa.Float(), nullable=True),
sa.Column('last_played', sa.DateTime(), nullable=True),
sa.Column('created_at', sa.DateTime(), server_default=sa.func.now()),
sa.Column('updated_at', sa.DateTime(), server_default=sa.func.now(), onupdate=sa.func.now()),
sa.Column('content', sa.Text(), nullable=False),
sa.Column('format', sa.String(50), nullable=True, server_default='native'),
sa.Column('status', sa.String(20), nullable=True, server_default='DRAUGHT'),
sa.Column('creation_date', sa.DateTime(), server_default=sa.func.now()),
)
op.create_index('idx_decklist_files_user', 'mtgonline_decklist_files', ['user_id'])
op.create_index('idx_decklist_files_name', 'mtgonline_decklist_files', ['name'])
# 3. Rooms Table
op.create_index('idx_decks_owner', 'mtgonline_decklist_files', ['owner_id'])
op.create_index('idx_decks_folder', 'mtgonline_decklist_files', ['folder_id'])
# 4. Rooms Table (matches Room model)
op.create_table(
'mtgonline_rooms',
sa.Column('id', sa.Integer(), primary_key=True, autoincrement=True),
sa.Column('name', sa.String(100), unique=True, nullable=False),
sa.Column('description', sa.Text(), nullable=True),
sa.Column('is_password_protected', sa.Boolean(), default=False),
sa.Column('password_hash', sa.String(128), nullable=True),
sa.Column('creation_date', sa.DateTime(), server_default=sa.func.now()),
)
# 5. Room Game Types Table (matches RoomGameType model)
op.create_table(
'mtgonline_rooms_gametypes',
sa.Column('id', sa.Integer(), primary_key=True, autoincrement=True),
sa.Column('room_id', sa.Integer(), sa.ForeignKey('mtgonline_rooms.id'), nullable=False),
sa.Column('name', sa.String(100), nullable=False),
sa.Column('description', sa.Text(), nullable=True),
sa.Column('max_players', sa.Integer(), default=8),
sa.Column('is_public', sa.Boolean(), default=True),
sa.Column('is_password_protected', sa.Boolean(), default=False),
sa.Column('password_hash', sa.String(255), nullable=True),
sa.Column('game_type', sa.String(50), nullable=True),
sa.Column('format', sa.String(50), nullable=True),
sa.Column('created_by', sa.Integer(), sa.ForeignKey('mtgonline_users.id'), nullable=False),
sa.Column('created_at', sa.DateTime(), server_default=sa.func.now()),
sa.Column('updated_at', sa.DateTime(), server_default=sa.func.now(), onupdate=sa.func.now()),
)
op.create_index('idx_rooms_created_by', 'mtgonline_rooms', ['created_by'])
op.create_index('idx_rooms_name', 'mtgonline_rooms', ['name'])
# 6. Bans Table (matches Ban model)
op.create_table(
'mtgonline_bans',
sa.Column('id', sa.Integer(), primary_key=True, autoincrement=True),
sa.Column('user_id', sa.Integer(), sa.ForeignKey('mtgonline_users.id'), nullable=False),
sa.Column('server_id', sa.Integer(), nullable=True),
sa.Column('reason', sa.Text(), nullable=False),
sa.Column('moderators', sa.String(255), nullable=True),
sa.Column('ip_address', sa.String(45), nullable=True),
sa.Column('expiration_time', sa.DateTime(), nullable=True),
sa.Column('active', sa.Boolean(), default=True),
sa.Column('creation_date', sa.DateTime(), server_default=sa.func.now()),
)
op.create_index('idx_bans_active', 'mtgonline_bans', ['active'])
# 7. Game Log Table (matches GameLog model)
op.create_table(
'mtgonline_log',
sa.Column('id', sa.Integer(), primary_key=True, autoincrement=True),
sa.Column('room_id', sa.Integer(), sa.ForeignKey('mtgonline_rooms.id'), nullable=True),
sa.Column('player_id', sa.Integer(), sa.ForeignKey('mtgonline_users.id'), nullable=True),
sa.Column('message', sa.Text(), nullable=False),
sa.Column('timestamp', sa.DateTime(), server_default=sa.func.now()),
)
op.create_index('idx_log_timestamp', 'mtgonline_log', ['timestamp'])
# 8. Audit Log Table (matches AuditLog model)
op.create_table(
'mtgonline_audit',
sa.Column('id', sa.Integer(), primary_key=True, autoincrement=True),
sa.Column('admin_id', sa.Integer(), sa.ForeignKey('mtgonline_users.id'), nullable=False),
sa.Column('action_type', sa.String(50), nullable=False),
sa.Column('target_user_id', sa.Integer(), sa.ForeignKey('mtgonline_users.id'), nullable=True),
sa.Column('details', sa.Text(), nullable=True),
sa.Column('ip_address', sa.String(45), nullable=True),
sa.Column('timestamp', sa.DateTime(), server_default=sa.func.now()),
)
def downgrade() -> None:
"""Drop base tables."""
"""Drop base tables in reverse dependency order."""
op.drop_table('mtgonline_audit')
op.drop_table('mtgonline_log')
op.drop_table('mtgonline_bans')
op.drop_table('mtgonline_rooms_gametypes')
op.drop_table('mtgonline_rooms')
op.drop_table('mtgonline_decklist_files')
op.drop_table('mtgonline_decklist_folders')
op.drop_table('mtgonline_users')
backend/alembic/versions/001_initial_user_schema.py
-68
View File
@@ -21,69 +21,6 @@ depends_on: Union[str, Sequence[str], None] = None
def upgrade() -> None:
"""Create all user data tables."""
# 0. Base Tables (Users and Decklist Files)
op.create_table(
'mtgonline_users',
sa.Column('id', sa.Integer(), primary_key=True, autoincrement=True),
sa.Column('username', sa.String(50), unique=True, nullable=False, index=True),
sa.Column('email', sa.String(255), unique=True, nullable=False, index=True),
sa.Column('password_hash', sa.String(255), nullable=False),
sa.Column('salt', sa.String(32), nullable=True),
sa.Column('display_name', sa.String(100), nullable=True),
sa.Column('avatar_url', sa.String(500), nullable=True),
sa.Column('country', sa.String(100), nullable=True),
sa.Column('real_name', sa.String(255), nullable=True),
sa.Column('avatar_bmp', sa.LargeBinary(), nullable=True),
sa.Column('privlevel', sa.Integer(), default=0),
sa.Column('is_active', sa.Boolean(), default=True),
sa.Column('is_banned', sa.Boolean(), default=False),
sa.Column('ban_reason', sa.Text(), nullable=True),
sa.Column('ban_ends', sa.DateTime(), nullable=True),
sa.Column('vip_status', sa.Boolean(), default=False),
sa.Column('vip_expiry', sa.DateTime(), nullable=True),
sa.Column('creation_date', sa.DateTime(), server_default=sa.func.now()),
sa.Column('last_login', sa.DateTime(), nullable=True),
sa.Column('created_at', sa.DateTime(), server_default=sa.func.now()),
sa.Column('updated_at', sa.DateTime(), server_default=sa.func.now(), onupdate=sa.func.now()),
)
op.create_table(
'mtgonline_decklist_files',
sa.Column('id', sa.Integer(), primary_key=True, autoincrement=True),
sa.Column('user_id', sa.Integer(), sa.ForeignKey('mtgonline_users.id', ondelete='CASCADE'), nullable=False, index=True),
sa.Column('name', sa.String(255), nullable=False),
sa.Column('content', sa.Text(), nullable=True),
sa.Column('description', sa.Text(), nullable=True),
sa.Column('format', sa.String(50), server_default='standard'),
sa.Column('is_favorite', sa.Boolean(), default=False),
sa.Column('import_source', sa.String(50), nullable=True),
sa.Column('import_confidence', sa.Float(), nullable=True),
sa.Column('last_played', sa.DateTime(), nullable=True),
sa.Column('created_at', sa.DateTime(), server_default=sa.func.now()),
sa.Column('updated_at', sa.DateTime(), server_default=sa.func.now(), onupdate=sa.func.now()),
)
op.create_index('idx_decklist_files_user', 'mtgonline_decklist_files', ['user_id'])
op.create_index('idx_decklist_files_name', 'mtgonline_decklist_files', ['name'])
# 0.1. Rooms Table
op.create_table(
'mtgonline_rooms',
sa.Column('id', sa.Integer(), primary_key=True, autoincrement=True),
sa.Column('name', sa.String(100), nullable=False),
sa.Column('description', sa.Text(), nullable=True),
sa.Column('max_players', sa.Integer(), default=8),
sa.Column('is_public', sa.Boolean(), default=True),
sa.Column('is_password_protected', sa.Boolean(), default=False),
sa.Column('password_hash', sa.String(255), nullable=True),
sa.Column('game_type', sa.String(50), nullable=True),
sa.Column('format', sa.String(50), nullable=True),
sa.Column('created_by', sa.Integer(), sa.ForeignKey('mtgonline_users.id'), nullable=False),
sa.Column('created_at', sa.DateTime(), server_default=sa.func.now()),
sa.Column('updated_at', sa.DateTime(), server_default=sa.func.now(), onupdate=sa.func.now()),
)
op.create_index('idx_rooms_created_by', 'mtgonline_rooms', ['created_by'])
op.create_index('idx_rooms_name', 'mtgonline_rooms', ['name'])
# 1. User Sessions Table
op.create_table(
'user_sessions',
@@ -326,8 +263,3 @@ def downgrade() -> None:
op.drop_table('game_replays')
op.drop_table('deck_versions')
op.drop_table('user_sessions')
# Drop base tables (must be dropped after tables that reference them)
op.drop_table('mtgonline_rooms')
op.drop_table('mtgonline_decklist_files')
op.drop_table('mtgonline_users')
backend/alembic/versions/002_user_deck_building_tables.py
+4 -4
View File
@@ -42,7 +42,7 @@ def upgrade() -> None:
'user_deck_cards',
sa.Column('id', sa.BigInteger().with_variant(sa.Integer, "sqlite"), primary_key=True, autoincrement=True),
sa.Column('deck_id', sa.BigInteger(), sa.ForeignKey('user_decks.id', ondelete='CASCADE'), nullable=False, index=True),
sa.Column('card_id', sa.Integer(), nullable=False, index=True),
sa.Column('card_id', sa.Integer(), sa.ForeignKey('mtgonline_cards.id'), nullable=False, index=True),
sa.Column('quantity', sa.Integer(), nullable=False, default=1),
sa.Column('zone', sa.String(20), nullable=False, default='main'),
sa.Column('position', sa.Integer(), nullable=True),
@@ -73,7 +73,7 @@ def upgrade() -> None:
'deck_precedent_cards',
sa.Column('id', sa.BigInteger().with_variant(sa.Integer, "sqlite"), primary_key=True, autoincrement=True),
sa.Column('precedent_id', sa.BigInteger(), sa.ForeignKey('deck_precedents.id', ondelete='CASCADE'), nullable=False, index=True),
sa.Column('card_id', sa.Integer(), nullable=False, index=True),
sa.Column('card_id', sa.Integer(), sa.ForeignKey('mtgonline_cards.id'), nullable=False, index=True),
sa.Column('quantity', sa.Integer(), nullable=False, default=1),
sa.Column('zone', sa.String(20), nullable=False, default='main'),
)
@@ -88,8 +88,8 @@ def upgrade() -> None:
'card_suggestions',
sa.Column('id', sa.BigInteger().with_variant(sa.Integer, "sqlite"), primary_key=True, autoincrement=True),
sa.Column('deck_id', sa.BigInteger(), sa.ForeignKey('user_decks.id', ondelete='CASCADE'), nullable=False, index=True),
sa.Column('card_id', sa.Integer(), nullable=False, index=True),
sa.Column('source_card_id', sa.Integer(), nullable=True),
sa.Column('card_id', sa.Integer(), sa.ForeignKey('mtgonline_cards.id'), nullable=False, index=True),
sa.Column('source_card_id', sa.Integer(), sa.ForeignKey('mtgonline_cards.id'), nullable=True),
sa.Column('suggestion_type', sa.String(50), nullable=False, default='SIMILAR'),
sa.Column('confidence', sa.Float(), nullable=True),
sa.Column('notes', sa.Text(), nullable=True),