feat: handle unsubscribe

This commit is contained in:
Artem Tsyrulnikov
2025-12-01 10:30:31 +03:00
parent c32635839a
commit ca3805eec3
14 changed files with 447 additions and 164 deletions

View File

@@ -0,0 +1,42 @@
"""add subscription status and unsubscribed_at
Revision ID: 3b8259700b61
Revises: f05f85d10837
Create Date: 2025-11-25 18:45:04.642105
"""
from collections.abc import Sequence
import sqlalchemy as sa
from alembic import op
# revision identifiers, used by Alembic.
revision: str = '3b8259700b61'
down_revision: str | None = 'f05f85d10837'
branch_labels: str | Sequence[str] | None = None
depends_on: str | Sequence[str] | None = None
def upgrade() -> None:
# ### commands auto generated by Alembic - please adjust! ###
# Создаём enum тип явно
subscription_status = sa.Enum('ACTIVE', 'UNSUBSCRIBED', name='subscriptionstatus')
subscription_status.create(op.get_bind(), checkfirst=True)
op.add_column(
'subscription',
sa.Column('status', subscription_status, nullable=False, server_default='ACTIVE'),
)
op.add_column('subscription', sa.Column('unsubscribed_at', sa.DateTime(timezone=True), nullable=True))
# ### end Alembic commands ###
def downgrade() -> None:
# ### commands auto generated by Alembic - please adjust! ###
op.drop_column('subscription', 'unsubscribed_at')
op.drop_column('subscription', 'status')
# Удаляем enum тип
sa.Enum(name='subscriptionstatus').drop(op.get_bind(), checkfirst=True)
# ### end Alembic commands ###

View File

@@ -0,0 +1,63 @@
"""add unique constraint for active subscriptions
Revision ID: 52ad7cc9bf1e
Revises: 3b8259700b61
Create Date: 2025-11-26 14:14:57.814576
"""
from collections.abc import Sequence
import sqlalchemy as sa
from alembic import op
# revision identifiers, used by Alembic.
revision: str = '52ad7cc9bf1e'
down_revision: str | None = '3b8259700b61'
branch_labels: str | Sequence[str] | None = None
depends_on: str | Sequence[str] | None = None
def upgrade() -> None:
# Добавляем поле target_channel_id (сначала nullable)
op.add_column('subscription', sa.Column('target_channel_id', sa.Uuid(), nullable=True))
# Заполняем target_channel_id из placement
op.execute("""
UPDATE subscription
SET target_channel_id = placement.target_channel_id
FROM placement
WHERE subscription.placement_id = placement.id
""")
# Делаем поле NOT NULL после заполнения
op.alter_column('subscription', 'target_channel_id', nullable=False)
# Добавляем FK constraint
op.create_foreign_key(
'subscription_target_channel_id_fkey', 'subscription', 'target_channel', ['target_channel_id'], ['id']
)
# Создаем индекс на target_channel_id
op.create_index(op.f('ix_subscription_target_channel_id'), 'subscription', ['target_channel_id'])
# Создаём UNIQUE constraint для активных подписок
op.create_index(
'unique_active_subscription_per_channel',
'subscription',
['subscriber_id', 'target_channel_id'],
unique=True,
postgresql_where=sa.text("status = 'ACTIVE'::subscriptionstatus"),
)
def downgrade() -> None:
# Удаляем UNIQUE constraint
op.drop_index('unique_active_subscription_per_channel', table_name='subscription')
# Удаляем индекс и FK constraint
op.drop_index(op.f('ix_subscription_target_channel_id'), table_name='subscription')
op.drop_constraint('subscription_target_channel_id_fkey', 'subscription', type_='foreignkey')
# Удаляем колонку
op.drop_column('subscription', 'target_channel_id')

View File

@@ -1,10 +1,11 @@
"""init
Revision ID: f05f85d10837
Revises:
Revises:
Create Date: 2025-11-13 01:06:51.623272
"""
from collections.abc import Sequence
import sqlalchemy as sa
@@ -19,152 +20,206 @@ depends_on: str | Sequence[str] | None = None
def upgrade() -> None:
# ### commands auto generated by Alembic - please adjust! ###
op.create_table('subscriber',
sa.Column('telegram_id', sa.BigInteger(), nullable=False),
sa.Column('username', sa.String(), nullable=True),
sa.Column('first_name', sa.String(), nullable=True),
sa.Column('last_name', sa.String(), nullable=True),
sa.Column('id', sa.Uuid(), nullable=False),
sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('updated_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('deleted_at', sa.DateTime(timezone=True), nullable=True),
sa.PrimaryKeyConstraint('id')
op.create_table(
'subscriber',
sa.Column('telegram_id', sa.BigInteger(), nullable=False),
sa.Column('username', sa.String(), nullable=True),
sa.Column('first_name', sa.String(), nullable=True),
sa.Column('last_name', sa.String(), nullable=True),
sa.Column('id', sa.Uuid(), nullable=False),
sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('updated_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('deleted_at', sa.DateTime(timezone=True), nullable=True),
sa.PrimaryKeyConstraint('id'),
)
op.create_index(op.f('ix_subscriber_telegram_id'), 'subscriber', ['telegram_id'], unique=True)
op.create_table('user',
sa.Column('telegram_id', sa.Integer(), nullable=False),
sa.Column('username', sa.String(), nullable=True),
sa.Column('id', sa.Uuid(), nullable=False),
sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('updated_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('deleted_at', sa.DateTime(timezone=True), nullable=True),
sa.PrimaryKeyConstraint('id')
op.create_table(
'user',
sa.Column('telegram_id', sa.Integer(), nullable=False),
sa.Column('username', sa.String(), nullable=True),
sa.Column('id', sa.Uuid(), nullable=False),
sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('updated_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('deleted_at', sa.DateTime(timezone=True), nullable=True),
sa.PrimaryKeyConstraint('id'),
)
op.create_index(op.f('ix_user_telegram_id'), 'user', ['telegram_id'], unique=True)
op.create_table('external_channel',
sa.Column('telegram_id', sa.BigInteger(), nullable=False),
sa.Column('title', sa.String(), nullable=False),
sa.Column('username', sa.String(), nullable=True),
sa.Column('description', sa.String(), nullable=True),
sa.Column('subscribers_count', sa.Integer(), nullable=True),
sa.Column('user_id', sa.Uuid(), nullable=False),
sa.Column('id', sa.Uuid(), nullable=False),
sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('updated_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('deleted_at', sa.DateTime(timezone=True), nullable=True),
sa.ForeignKeyConstraint(['user_id'], ['user.id'], ),
sa.PrimaryKeyConstraint('id')
op.create_table(
'external_channel',
sa.Column('telegram_id', sa.BigInteger(), nullable=False),
sa.Column('title', sa.String(), nullable=False),
sa.Column('username', sa.String(), nullable=True),
sa.Column('description', sa.String(), nullable=True),
sa.Column('subscribers_count', sa.Integer(), nullable=True),
sa.Column('user_id', sa.Uuid(), nullable=False),
sa.Column('id', sa.Uuid(), nullable=False),
sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('updated_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('deleted_at', sa.DateTime(timezone=True), nullable=True),
sa.ForeignKeyConstraint(
['user_id'],
['user.id'],
),
sa.PrimaryKeyConstraint('id'),
)
op.create_index(op.f('ix_external_channel_telegram_id'), 'external_channel', ['telegram_id'], unique=True)
op.create_index(op.f('ix_external_channel_user_id'), 'external_channel', ['user_id'], unique=False)
op.create_index(op.f('ix_external_channel_username'), 'external_channel', ['username'], unique=False)
op.create_table('login_token',
sa.Column('token', sa.String(), nullable=False),
sa.Column('user_id', sa.Uuid(), nullable=False),
sa.Column('expires_at', sa.DateTime(timezone=True), nullable=False),
sa.Column('used_at', sa.DateTime(timezone=True), nullable=True),
sa.Column('id', sa.Uuid(), nullable=False),
sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('updated_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('deleted_at', sa.DateTime(timezone=True), nullable=True),
sa.ForeignKeyConstraint(['user_id'], ['user.id'], ),
sa.PrimaryKeyConstraint('id')
op.create_table(
'login_token',
sa.Column('token', sa.String(), nullable=False),
sa.Column('user_id', sa.Uuid(), nullable=False),
sa.Column('expires_at', sa.DateTime(timezone=True), nullable=False),
sa.Column('used_at', sa.DateTime(timezone=True), nullable=True),
sa.Column('id', sa.Uuid(), nullable=False),
sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('updated_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('deleted_at', sa.DateTime(timezone=True), nullable=True),
sa.ForeignKeyConstraint(
['user_id'],
['user.id'],
),
sa.PrimaryKeyConstraint('id'),
)
op.create_index(op.f('ix_login_token_token'), 'login_token', ['token'], unique=True)
op.create_table('target_channel',
sa.Column('telegram_id', sa.BigInteger(), nullable=False),
sa.Column('title', sa.String(), nullable=False),
sa.Column('username', sa.String(), nullable=True),
sa.Column('status', sa.Enum('ACTIVE', 'INACTIVE', 'ARCHIVED', name='targetchannelstatus'), nullable=False),
sa.Column('user_id', sa.Uuid(), nullable=False),
sa.Column('id', sa.Uuid(), nullable=False),
sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('updated_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('deleted_at', sa.DateTime(timezone=True), nullable=True),
sa.ForeignKeyConstraint(['user_id'], ['user.id'], ),
sa.PrimaryKeyConstraint('id')
op.create_table(
'target_channel',
sa.Column('telegram_id', sa.BigInteger(), nullable=False),
sa.Column('title', sa.String(), nullable=False),
sa.Column('username', sa.String(), nullable=True),
sa.Column('status', sa.Enum('ACTIVE', 'INACTIVE', 'ARCHIVED', name='targetchannelstatus'), nullable=False),
sa.Column('user_id', sa.Uuid(), nullable=False),
sa.Column('id', sa.Uuid(), nullable=False),
sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('updated_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('deleted_at', sa.DateTime(timezone=True), nullable=True),
sa.ForeignKeyConstraint(
['user_id'],
['user.id'],
),
sa.PrimaryKeyConstraint('id'),
)
op.create_index(op.f('ix_target_channel_telegram_id'), 'target_channel', ['telegram_id'], unique=True)
op.create_index(op.f('ix_target_channel_user_id'), 'target_channel', ['user_id'], unique=False)
op.create_index(op.f('ix_target_channel_username'), 'target_channel', ['username'], unique=False)
op.create_table('creative',
sa.Column('name', sa.String(), nullable=False),
sa.Column('text', sa.String(), nullable=False),
sa.Column('status', sa.Enum('ACTIVE', 'ARCHIVED', name='creativestatus'), nullable=False),
sa.Column('placements_count', sa.Integer(), server_default='0', nullable=False),
sa.Column('user_id', sa.Uuid(), nullable=False),
sa.Column('target_channel_id', sa.Uuid(), nullable=False),
sa.Column('id', sa.Uuid(), nullable=False),
sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('updated_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('deleted_at', sa.DateTime(timezone=True), nullable=True),
sa.ForeignKeyConstraint(['target_channel_id'], ['target_channel.id'], ),
sa.ForeignKeyConstraint(['user_id'], ['user.id'], ),
sa.PrimaryKeyConstraint('id')
op.create_table(
'creative',
sa.Column('name', sa.String(), nullable=False),
sa.Column('text', sa.String(), nullable=False),
sa.Column('status', sa.Enum('ACTIVE', 'ARCHIVED', name='creativestatus'), nullable=False),
sa.Column('placements_count', sa.Integer(), server_default='0', nullable=False),
sa.Column('user_id', sa.Uuid(), nullable=False),
sa.Column('target_channel_id', sa.Uuid(), nullable=False),
sa.Column('id', sa.Uuid(), nullable=False),
sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('updated_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('deleted_at', sa.DateTime(timezone=True), nullable=True),
sa.ForeignKeyConstraint(
['target_channel_id'],
['target_channel.id'],
),
sa.ForeignKeyConstraint(
['user_id'],
['user.id'],
),
sa.PrimaryKeyConstraint('id'),
)
op.create_index(op.f('ix_creative_target_channel_id'), 'creative', ['target_channel_id'], unique=False)
op.create_index(op.f('ix_creative_user_id'), 'creative', ['user_id'], unique=False)
op.create_table('target_external_channel',
sa.Column('target_channel_id', sa.Uuid(), nullable=False),
sa.Column('external_channel_id', sa.Uuid(), nullable=False),
sa.ForeignKeyConstraint(['external_channel_id'], ['external_channel.id'], ondelete='CASCADE'),
sa.ForeignKeyConstraint(['target_channel_id'], ['target_channel.id'], ondelete='CASCADE'),
sa.PrimaryKeyConstraint('target_channel_id', 'external_channel_id')
op.create_table(
'target_external_channel',
sa.Column('target_channel_id', sa.Uuid(), nullable=False),
sa.Column('external_channel_id', sa.Uuid(), nullable=False),
sa.ForeignKeyConstraint(['external_channel_id'], ['external_channel.id'], ondelete='CASCADE'),
sa.ForeignKeyConstraint(['target_channel_id'], ['target_channel.id'], ondelete='CASCADE'),
sa.PrimaryKeyConstraint('target_channel_id', 'external_channel_id'),
)
op.create_table('placement',
sa.Column('target_channel_id', sa.Uuid(), nullable=False),
sa.Column('external_channel_id', sa.Uuid(), nullable=False),
sa.Column('creative_id', sa.Uuid(), nullable=False),
sa.Column('user_id', sa.Uuid(), nullable=False),
sa.Column('placement_date', sa.DateTime(timezone=True), nullable=False),
sa.Column('cost', sa.Float(), nullable=True),
sa.Column('comment', sa.String(), nullable=True),
sa.Column('ad_post_url', sa.String(), nullable=True),
sa.Column('invite_link_type', sa.Enum('PUBLIC', 'APPROVAL', name='invitelinktype'), nullable=False),
sa.Column('invite_link', sa.String(), nullable=False),
sa.Column('status', sa.Enum('ACTIVE', 'ARCHIVED', name='placementstatus'), nullable=False),
sa.Column('subscriptions_count', sa.Integer(), server_default='0', nullable=False),
sa.Column('views_count', sa.Integer(), nullable=True),
sa.Column('views_availability', sa.Enum('UNKNOWN', 'AVAILABLE', 'UNAVAILABLE', 'MANUAL', name='postviewsavailability'), nullable=False),
sa.Column('last_views_fetch_at', sa.DateTime(timezone=True), nullable=True),
sa.Column('id', sa.Uuid(), nullable=False),
sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('updated_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('deleted_at', sa.DateTime(timezone=True), nullable=True),
sa.ForeignKeyConstraint(['creative_id'], ['creative.id'], ),
sa.ForeignKeyConstraint(['external_channel_id'], ['external_channel.id'], ),
sa.ForeignKeyConstraint(['target_channel_id'], ['target_channel.id'], ),
sa.ForeignKeyConstraint(['user_id'], ['user.id'], ),
sa.PrimaryKeyConstraint('id')
op.create_table(
'placement',
sa.Column('target_channel_id', sa.Uuid(), nullable=False),
sa.Column('external_channel_id', sa.Uuid(), nullable=False),
sa.Column('creative_id', sa.Uuid(), nullable=False),
sa.Column('user_id', sa.Uuid(), nullable=False),
sa.Column('placement_date', sa.DateTime(timezone=True), nullable=False),
sa.Column('cost', sa.Float(), nullable=True),
sa.Column('comment', sa.String(), nullable=True),
sa.Column('ad_post_url', sa.String(), nullable=True),
sa.Column('invite_link_type', sa.Enum('PUBLIC', 'APPROVAL', name='invitelinktype'), nullable=False),
sa.Column('invite_link', sa.String(), nullable=False),
sa.Column('status', sa.Enum('ACTIVE', 'ARCHIVED', name='placementstatus'), nullable=False),
sa.Column('subscriptions_count', sa.Integer(), server_default='0', nullable=False),
sa.Column('views_count', sa.Integer(), nullable=True),
sa.Column(
'views_availability',
sa.Enum('UNKNOWN', 'AVAILABLE', 'UNAVAILABLE', 'MANUAL', name='postviewsavailability'),
nullable=False,
),
sa.Column('last_views_fetch_at', sa.DateTime(timezone=True), nullable=True),
sa.Column('id', sa.Uuid(), nullable=False),
sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('updated_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('deleted_at', sa.DateTime(timezone=True), nullable=True),
sa.ForeignKeyConstraint(
['creative_id'],
['creative.id'],
),
sa.ForeignKeyConstraint(
['external_channel_id'],
['external_channel.id'],
),
sa.ForeignKeyConstraint(
['target_channel_id'],
['target_channel.id'],
),
sa.ForeignKeyConstraint(
['user_id'],
['user.id'],
),
sa.PrimaryKeyConstraint('id'),
)
op.create_index(op.f('ix_placement_creative_id'), 'placement', ['creative_id'], unique=False)
op.create_index(op.f('ix_placement_external_channel_id'), 'placement', ['external_channel_id'], unique=False)
op.create_index(op.f('ix_placement_target_channel_id'), 'placement', ['target_channel_id'], unique=False)
op.create_index(op.f('ix_placement_user_id'), 'placement', ['user_id'], unique=False)
op.create_table('placement_views_history',
sa.Column('placement_id', sa.Uuid(), nullable=False),
sa.Column('views_count', sa.Integer(), nullable=False),
sa.Column('fetched_at', sa.DateTime(timezone=True), nullable=False),
sa.Column('id', sa.Uuid(), nullable=False),
sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('updated_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('deleted_at', sa.DateTime(timezone=True), nullable=True),
sa.ForeignKeyConstraint(['placement_id'], ['placement.id'], ),
sa.PrimaryKeyConstraint('id')
op.create_table(
'placement_views_history',
sa.Column('placement_id', sa.Uuid(), nullable=False),
sa.Column('views_count', sa.Integer(), nullable=False),
sa.Column('fetched_at', sa.DateTime(timezone=True), nullable=False),
sa.Column('id', sa.Uuid(), nullable=False),
sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('updated_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('deleted_at', sa.DateTime(timezone=True), nullable=True),
sa.ForeignKeyConstraint(
['placement_id'],
['placement.id'],
),
sa.PrimaryKeyConstraint('id'),
)
op.create_index(op.f('ix_placement_views_history_fetched_at'), 'placement_views_history', ['fetched_at'], unique=False)
op.create_index(op.f('ix_placement_views_history_placement_id'), 'placement_views_history', ['placement_id'], unique=False)
op.create_table('subscription',
sa.Column('placement_id', sa.Uuid(), nullable=False),
sa.Column('subscriber_id', sa.Uuid(), nullable=False),
sa.Column('invite_link', sa.String(), nullable=False),
sa.Column('id', sa.Uuid(), nullable=False),
sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('updated_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('deleted_at', sa.DateTime(timezone=True), nullable=True),
sa.ForeignKeyConstraint(['placement_id'], ['placement.id'], ),
sa.ForeignKeyConstraint(['subscriber_id'], ['subscriber.id'], ),
sa.PrimaryKeyConstraint('id')
op.create_index(
op.f('ix_placement_views_history_fetched_at'), 'placement_views_history', ['fetched_at'], unique=False
)
op.create_index(
op.f('ix_placement_views_history_placement_id'), 'placement_views_history', ['placement_id'], unique=False
)
op.create_table(
'subscription',
sa.Column('placement_id', sa.Uuid(), nullable=False),
sa.Column('subscriber_id', sa.Uuid(), nullable=False),
sa.Column('invite_link', sa.String(), nullable=False),
sa.Column('id', sa.Uuid(), nullable=False),
sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('updated_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('deleted_at', sa.DateTime(timezone=True), nullable=True),
sa.ForeignKeyConstraint(
['placement_id'],
['placement.id'],
),
sa.ForeignKeyConstraint(
['subscriber_id'],
['subscriber.id'],
),
sa.PrimaryKeyConstraint('id'),
)
op.create_index(op.f('ix_subscription_invite_link'), 'subscription', ['invite_link'], unique=False)
op.create_index(op.f('ix_subscription_placement_id'), 'subscription', ['placement_id'], unique=False)