Harden bot against runtime stalls

2026-07-01 20:35:50 +09:00
parent 6fbe4c4f43
commit 26c65b7caa
18 changed files with 645 additions and 337 deletions
--- a/migrations/versions/20260217_0032_55_12efff9b8e0c_.py
+++ b/migrations/versions/20260217_0032_55_12efff9b8e0c_.py
@@ -17,72 +17,10 @@ depends_on = None


 def upgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table('blocked_users',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('telegram_id', sa.BigInteger(), nullable=False),
-    sa.Column('error_type', sa.String(length=100), nullable=False),
-    sa.Column('error_message', sa.Text(), nullable=True),
-    sa.Column('first_blocked_at', sa.DateTime(timezone=True), nullable=True),
-    sa.Column('last_attempt_at', sa.DateTime(timezone=True), nullable=True),
-    sa.Column('attempt_count', sa.Integer(), nullable=True),
-    sa.Column('is_active', sa.Boolean(), nullable=True),
-    sa.PrimaryKeyConstraint('id')
-    )
-    op.create_index(op.f('ix_blocked_users_is_active'), 'blocked_users', ['is_active'], unique=False)
-    op.create_index(op.f('ix_blocked_users_telegram_id'), 'blocked_users', ['telegram_id'], unique=True)
-    op.create_table('broadcast_channels',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('chat_id', sa.BigInteger(), nullable=False),
-    sa.Column('chat_type', sa.String(length=20), nullable=False),
-    sa.Column('title', sa.String(length=255), nullable=False),
-    sa.Column('username', sa.String(length=255), nullable=True),
-    sa.Column('description', sa.Text(), nullable=True),
-    sa.Column('is_active', sa.Boolean(), nullable=True),
-    sa.Column('added_by', sa.Integer(), nullable=False),
-    sa.Column('created_at', sa.DateTime(timezone=True), nullable=True),
-    sa.Column('updated_at', sa.DateTime(timezone=True), nullable=True),
-    sa.ForeignKeyConstraint(['added_by'], ['users.id'], ),
-    sa.PrimaryKeyConstraint('id')
-    )
-    op.create_index(op.f('ix_broadcast_channels_chat_id'), 'broadcast_channels', ['chat_id'], unique=True)
-    op.create_index(op.f('ix_broadcast_channels_is_active'), 'broadcast_channels', ['is_active'], unique=False)
-    op.create_table('broadcast_logs',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('broadcast_type', sa.String(length=20), nullable=False),
-    sa.Column('target_id', sa.BigInteger(), nullable=True),
-    sa.Column('message_type', sa.String(length=20), nullable=False),
-    sa.Column('message_text', sa.Text(), nullable=True),
-    sa.Column('file_id', sa.String(length=255), nullable=True),
-    sa.Column('total_recipients', sa.Integer(), nullable=True),
-    sa.Column('success_count', sa.Integer(), nullable=True),
-    sa.Column('failed_count', sa.Integer(), nullable=True),
-    sa.Column('blocked_count', sa.Integer(), nullable=True),
-    sa.Column('created_by', sa.Integer(), nullable=False),
-    sa.Column('started_at', sa.DateTime(timezone=True), nullable=True),
-    sa.Column('completed_at', sa.DateTime(timezone=True), nullable=True),
-    sa.Column('status', sa.String(length=20), nullable=True),
-    sa.ForeignKeyConstraint(['created_by'], ['users.id'], ),
-    sa.PrimaryKeyConstraint('id')
-    )
-    op.create_index(op.f('ix_broadcast_logs_broadcast_type'), 'broadcast_logs', ['broadcast_type'], unique=False)
-    op.create_index(op.f('ix_broadcast_logs_status'), 'broadcast_logs', ['status'], unique=False)
-    op.add_column('users', sa.Column('is_chat_banned', sa.Boolean(), nullable=True))
-    op.add_column('users', sa.Column('last_activity', sa.DateTime(timezone=True), nullable=True))
-    # ### end Alembic commands ###
+    # Duplicate autogenerated migration. The real changes are applied by
+    # 71376bb89294, 1f1631301809 and b4c435a7dc5f.
+    pass


 def downgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_column('users', 'last_activity')
-    op.drop_column('users', 'is_chat_banned')
-    op.drop_index(op.f('ix_broadcast_logs_status'), table_name='broadcast_logs')
-    op.drop_index(op.f('ix_broadcast_logs_broadcast_type'), table_name='broadcast_logs')
-    op.drop_table('broadcast_logs')
-    op.drop_index(op.f('ix_broadcast_channels_is_active'), table_name='broadcast_channels')
-    op.drop_index(op.f('ix_broadcast_channels_chat_id'), table_name='broadcast_channels')
-    op.drop_table('broadcast_channels')
-    op.drop_index(op.f('ix_blocked_users_telegram_id'), table_name='blocked_users')
-    op.drop_index(op.f('ix_blocked_users_is_active'), table_name='blocked_users')
-    op.drop_table('blocked_users')
-    # ### end Alembic commands ###
+    pass
--- a/migrations/versions/20260218_0402_12_merge_migration.py
+++ b/migrations/versions/20260218_0402_12_merge_migration.py
@@ -1,7 +1,7 @@
 """merge branches

 Revision ID: merge_migration
-Revises: cd31303a681c
+Revises: cd31303a681c, 41aae82e631b
 Create Date: 2026-02-18 04:02:12.000000

 """
@@ -11,7 +11,7 @@ import sqlalchemy as sa

 # revision identifiers, used by Alembic.
 revision = 'merge_migration'
-down_revision = 'cd31303a681c'
+down_revision = ('cd31303a681c', '41aae82e631b')
 branch_labels = None
 depends_on = None

--- a/migrations/versions/20260701_0001_add_performance_indexes.py
+++ b/migrations/versions/20260701_0001_add_performance_indexes.py
@@ -0,0 +1,72 @@
+"""add performance indexes
+
+Revision ID: 20260701_0001_add_performance_indexes
+Revises: 20260307_0100_add_emoji_mappings
+Create Date: 2026-07-01 00:01:00.000000
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+revision = '20260701_0001_add_performance_indexes'
+down_revision = '20260307_0100_add_emoji_mappings'
+branch_labels = None
+depends_on = None
+
+
+def _index_exists(table_name: str, index_name: str) -> bool:
+    inspector = sa.inspect(op.get_bind())
+    return any(index["name"] == index_name for index in inspector.get_indexes(table_name))
+
+
+def _create_index_if_missing(index_name: str, table_name: str, columns: list[str], unique: bool = False) -> None:
+    if not _index_exists(table_name, index_name):
+        op.create_index(index_name, table_name, columns, unique=unique)
+
+
+def _drop_index_if_exists(index_name: str, table_name: str) -> None:
+    if _index_exists(table_name, index_name):
+        op.drop_index(index_name, table_name=table_name)
+
+
+def upgrade() -> None:
+    _create_index_if_missing(
+        "ix_users_registered_activity",
+        "users",
+        ["is_registered", "last_activity"],
+    )
+    _create_index_if_missing(
+        "ix_participations_lottery_account",
+        "participations",
+        ["lottery_id", "account_number"],
+    )
+    _create_index_if_missing(
+        "ix_participations_user_created",
+        "participations",
+        ["user_id", "created_at"],
+    )
+    _create_index_if_missing(
+        "ix_winners_lottery_place",
+        "winners",
+        ["lottery_id", "place"],
+    )
+    _create_index_if_missing(
+        "ix_winners_user_id",
+        "winners",
+        ["user_id"],
+    )
+    _create_index_if_missing(
+        "ix_blocked_users_lookup",
+        "blocked_users",
+        ["telegram_id", "error_type", "is_active"],
+    )
+
+
+def downgrade() -> None:
+    _drop_index_if_exists("ix_blocked_users_lookup", "blocked_users")
+    _drop_index_if_exists("ix_winners_user_id", "winners")
+    _drop_index_if_exists("ix_winners_lottery_place", "winners")
+    _drop_index_if_exists("ix_participations_user_created", "participations")
+    _drop_index_if_exists("ix_participations_lottery_account", "participations")
+    _drop_index_if_exists("ix_users_registered_activity", "users")