trevor/new_lottery_bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
Andrey K. Choi
2025-11-16 12:36:02 +09:00
parent 3a25e6a4cb
commit eb3f3807fd
61 changed files with 1438 additions and 1139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
migrations/versions/001_initial_migration.py
View File

@@ -1,82 +0,0 @@
"""Initial migration - Create lottery bot tables
Revision ID: 001
Revises:
Create Date: 2024-12-11 12:00:00.000000
"""
from alembic import op
import sqlalchemy as sa
from sqlalchemy.dialects import sqlite
# revision identifiers, used by Alembic.
revision = '001'
down_revision = None
branch_labels = None
depends_on = None
def upgrade() -> None:
# ### commands auto generated by Alembic - please adjust! ###
op.create_table('users',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('telegram_id', sa.Integer(), nullable=False),
sa.Column('username', sa.String(length=255), nullable=True),
sa.Column('first_name', sa.String(length=255), nullable=True),
sa.Column('last_name', sa.String(length=255), nullable=True),
sa.Column('created_at', sa.DateTime(), nullable=True),
sa.Column('is_admin', sa.Boolean(), nullable=True),
sa.PrimaryKeyConstraint('id')
)
op.create_index(op.f('ix_users_telegram_id'), 'users', ['telegram_id'], unique=True)
op.create_table('lotteries',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('title', sa.String(length=500), nullable=False),
sa.Column('description', sa.Text(), nullable=True),
sa.Column('created_at', sa.DateTime(), nullable=True),
sa.Column('start_date', sa.DateTime(), nullable=True),
sa.Column('end_date', sa.DateTime(), nullable=True),
sa.Column('is_active', sa.Boolean(), nullable=True),
sa.Column('is_completed', sa.Boolean(), nullable=True),
sa.Column('prizes', sa.JSON(), nullable=True),
sa.Column('creator_id', sa.Integer(), nullable=False),
sa.Column('manual_winners', sa.JSON(), nullable=True),
sa.Column('draw_results', sa.JSON(), nullable=True),
sa.ForeignKeyConstraint(['creator_id'], ['users.id'], ),
sa.PrimaryKeyConstraint('id')
)
op.create_table('participations',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('user_id', sa.Integer(), nullable=False),
sa.Column('lottery_id', sa.Integer(), nullable=False),
sa.Column('created_at', sa.DateTime(), nullable=True),
sa.ForeignKeyConstraint(['lottery_id'], ['lotteries.id'], ),
sa.ForeignKeyConstraint(['user_id'], ['users.id'], ),
sa.PrimaryKeyConstraint('id')
)
op.create_table('winners',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('lottery_id', sa.Integer(), nullable=False),
sa.Column('user_id', sa.Integer(), nullable=False),
sa.Column('place', sa.Integer(), nullable=False),
sa.Column('prize', sa.String(length=500), nullable=True),
sa.Column('is_manual', sa.Boolean(), nullable=True),
sa.Column('created_at', sa.DateTime(), nullable=True),
sa.ForeignKeyConstraint(['lottery_id'], ['lotteries.id'], ),
sa.ForeignKeyConstraint(['user_id'], ['users.id'], ),
sa.PrimaryKeyConstraint('id')
)
# ### end Alembic commands ###
def downgrade() -> None:
# ### commands auto generated by Alembic - please adjust! ###
op.drop_table('winners')
op.drop_table('participations')
op.drop_table('lotteries')
op.drop_index(op.f('ix_users_telegram_id'), table_name='users')
op.drop_table('users')
# ### end Alembic commands ###

45
migrations/versions/002_add_account_numbers_and_display_type.py
View File

@@ -1,45 +0,0 @@
"""Add account numbers and winner display type
Revision ID: 002_add_account_numbers_and_display_type
Revises: 001_initial_migration
Create Date: 2025-11-12 06:57:40.000000
"""
from alembic import op
import sqlalchemy as sa
# revision identifiers, used by Alembic.
revision = '002_add_account_numbers_and_display_type'
down_revision = '001'
branch_labels = None
depends_on = None
def upgrade():
"""Добавить поля для клиентских счетов и типа отображения победителей"""
# Добавить поле account_number в таблицу users
op.add_column('users', sa.Column('account_number', sa.String(length=23), nullable=True))
# Создать индекс для account_number для быстрого поиска
op.create_index(op.f('ix_users_account_number'), 'users', ['account_number'], unique=True)
# Добавить поле winner_display_type в таблицу lotteries
op.add_column('lotteries', sa.Column('winner_display_type', sa.String(length=20), nullable=True))
# Установить значения по умолчанию для существующих записей
op.execute("UPDATE lotteries SET winner_display_type = 'username' WHERE winner_display_type IS NULL")
def downgrade():
"""Удалить добавленные поля"""
# Удалить поле winner_display_type из таблицы lotteries
op.drop_column('lotteries', 'winner_display_type')
# Удалить индекс для account_number
op.drop_index(op.f('ix_users_account_number'), table_name='users')
# Удалить поле account_number из таблицы users
op.drop_column('users', 'account_number')

46
migrations/versions/20251115_1911_53_0e35616a69df_add_account_number_to_participations_.py
View File

@@ -1,46 +0,0 @@
"""Add account_number to participations and winners
Revision ID: 0e35616a69df
Revises: 002_add_account_numbers_and_display_type
Create Date: 2025-11-15 19:11:53.075216
"""
from alembic import op
import sqlalchemy as sa
# revision identifiers, used by Alembic.
revision = '0e35616a69df'
down_revision = '002_add_account_numbers_and_display_type'
branch_labels = None
depends_on = None
def upgrade() -> None:
# ### commands auto generated by Alembic - please adjust! ###
op.add_column('participations', sa.Column('account_number', sa.String(length=23), nullable=True))
op.alter_column('participations', 'user_id',
existing_type=sa.INTEGER(),
nullable=True)
op.create_index(op.f('ix_participations_account_number'), 'participations', ['account_number'], unique=False)
op.add_column('winners', sa.Column('account_number', sa.String(length=23), nullable=True))
op.alter_column('winners', 'user_id',
existing_type=sa.INTEGER(),
nullable=True)
op.create_index(op.f('ix_winners_account_number'), 'winners', ['account_number'], unique=False)
# ### end Alembic commands ###
def downgrade() -> None:
# ### commands auto generated by Alembic - please adjust! ###
op.drop_index(op.f('ix_winners_account_number'), table_name='winners')
op.alter_column('winners', 'user_id',
existing_type=sa.INTEGER(),
nullable=False)
op.drop_column('winners', 'account_number')
op.drop_index(op.f('ix_participations_account_number'), table_name='participations')
op.alter_column('participations', 'user_id',
existing_type=sa.INTEGER(),
nullable=False)
op.drop_column('participations', 'account_number')
# ### end Alembic commands ###

97
migrations/versions/init_tables.py Normal file
View File

@@ -0,0 +1,97 @@
"""Init tables
Revision ID: init
Revises:
Create Date: 2025-11-16 12:15:00.000000
"""
from alembic import op
import sqlalchemy as sa
from datetime import datetime, timezone
# revision identifiers, used by Alembic.
revision = 'init'
down_revision = None
branch_labels = None
depends_on = None
def upgrade() -> None:
# Users table
op.create_table('users',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('telegram_id', sa.Integer(), nullable=False),
sa.Column('username', sa.String(length=255), nullable=True),
sa.Column('first_name', sa.String(length=255), nullable=True),
sa.Column('last_name', sa.String(length=255), nullable=True),
sa.Column('created_at', sa.DateTime(timezone=True),
nullable=True, default=lambda: datetime.now(timezone.utc)),
sa.Column('is_admin', sa.Boolean(), nullable=True, default=False),
sa.Column('account_number', sa.String(length=20), nullable=True),
sa.PrimaryKeyConstraint('id')
)
op.create_index('ix_users_telegram_id', 'users', ['telegram_id'], unique=True)
op.create_index('ix_users_account_number', 'users', ['account_number'], unique=False)
# Lotteries table
op.create_table('lotteries',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('title', sa.String(length=500), nullable=False),
sa.Column('description', sa.Text(), nullable=True),
sa.Column('created_at', sa.DateTime(timezone=True),
nullable=True, default=lambda: datetime.now(timezone.utc)),
sa.Column('start_date', sa.DateTime(timezone=True), nullable=True),
sa.Column('end_date', sa.DateTime(timezone=True), nullable=True),
sa.Column('is_active', sa.Boolean(), nullable=True, default=True),
sa.Column('is_completed', sa.Boolean(), nullable=True, default=False),
sa.Column('prizes', sa.JSON(), nullable=True),
sa.Column('creator_id', sa.Integer(), nullable=False),
sa.Column('manual_winners', sa.JSON(), nullable=True, default=dict),
sa.Column('draw_results', sa.JSON(), nullable=True),
sa.Column('winner_display_type', sa.String(length=20), nullable=True, default='username'),
sa.ForeignKeyConstraint(['creator_id'], ['users.id']),
sa.PrimaryKeyConstraint('id')
)
# Participations table
op.create_table('participations',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('user_id', sa.Integer(), nullable=True),
sa.Column('lottery_id', sa.Integer(), nullable=False),
sa.Column('account_number', sa.String(length=20), nullable=True),
sa.Column('created_at', sa.DateTime(timezone=True),
nullable=True, default=lambda: datetime.now(timezone.utc)),
sa.ForeignKeyConstraint(['lottery_id'], ['lotteries.id']),
sa.ForeignKeyConstraint(['user_id'], ['users.id']),
sa.PrimaryKeyConstraint('id')
)
op.create_index('ix_participations_account_number', 'participations', ['account_number'], unique=False)
# Winners table
op.create_table('winners',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('lottery_id', sa.Integer(), nullable=False),
sa.Column('user_id', sa.Integer(), nullable=True),
sa.Column('account_number', sa.String(length=20), nullable=True),
sa.Column('place', sa.Integer(), nullable=False),
sa.Column('prize', sa.String(length=500), nullable=True),
sa.Column('is_manual', sa.Boolean(), nullable=True, default=False),
sa.Column('created_at', sa.DateTime(timezone=True),
nullable=True, default=lambda: datetime.now(timezone.utc)),
sa.ForeignKeyConstraint(['lottery_id'], ['lotteries.id']),
sa.ForeignKeyConstraint(['user_id'], ['users.id']),
sa.PrimaryKeyConstraint('id')
)
op.create_index('ix_winners_account_number', 'winners', ['account_number'], unique=False)
def downgrade() -> None:
op.drop_index('ix_winners_account_number', table_name='winners')
op.drop_table('winners')
op.drop_index('ix_participations_account_number', table_name='participations')
op.drop_table('participations')
op.drop_table('lotteries')
op.drop_index('ix_users_account_number', table_name='users')
op.drop_index('ix_users_telegram_id', table_name='users')
op.drop_table('users')