From 148fc78014dbc16252264367566bf64057b2906a Mon Sep 17 00:00:00 2001 From: DengDai <29502593+zzhhxx@users.noreply.github.com> Date: Mon, 24 Nov 2025 13:40:58 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/forms.py | 2 +- app/models.py | 71 +++++--- app/routes.py | 16 +- app/templates/admin/report_detail.html | 4 +- app/templates/appeal_detail.html | 20 +-- app/templates/create_report.html | 6 +- .../054c116946ac_initial_migration.py | 169 ------------------ ...dd_partnersite_model_for_official_sites.py | 42 ----- 8 files changed, 69 insertions(+), 261 deletions(-) delete mode 100644 migrations/versions/054c116946ac_initial_migration.py delete mode 100644 migrations/versions/ee88f6dd173c_add_partnersite_model_for_official_sites.py diff --git a/app/forms.py b/app/forms.py index 6c76665..663c3de 100644 --- a/app/forms.py +++ b/app/forms.py @@ -44,7 +44,7 @@ class ReportForm(FlaskForm): # render_kw={"placeholder": "例如：some.site.com"} # ) reported_pt_site = SelectField('违规站点', validators=[DataRequired()]) - reported_uid = StringField( + reported_username = StringField( '被举报的用户名', validators=[Optional(), Length(max=50)], render_kw={"placeholder": "可选"} diff --git a/app/models.py b/app/models.py index 08c84a5..eb8c4d6 100644 --- a/app/models.py +++ b/app/models.py @@ -2,12 +2,16 @@ from datetime import datetime from flask_login import UserMixin from werkzeug.security import generate_password_hash, check_password_hash from app import db, login_manager + class PartnerSite(db.Model): __tablename__ = 'partner_sites' id = db.Column(db.Integer, primary_key=True) - name = db.Column(db.String(100), unique=True, nullable=False, index=True) + name = db.Column(db.String(100), unique=True, nullable=False, index=True) url = db.Column(db.String(255), nullable=True) is_active = db.Column(db.Boolean, default=True, nullable=False, index=True) + created_at = db.Column(db.DateTime, default=datetime.utcnow) + updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow) + def __repr__(self): return f'' class User(UserMixin, db.Model): @@ -16,13 +20,13 @@ class User(UserMixin, db.Model): username = db.Column(db.String(64), unique=True, index=True, nullable=False) email = db.Column(db.String(120), unique=True, index=True, nullable=False) password_hash = db.Column(db.String(256)) - role = db.Column(db.String(20), default='user', index=True) # 'user', 'admin', 'trusted_user' - status = db.Column(db.String(20), default='pending', index=True) # 'pending', 'active' + role = db.Column(db.String(16), default='user', index=True) # 'user', 'admin', 'trust_user' + status = db.Column(db.String(16), default='pending', index=True) # 'pending', 'active', 'disabled' created_at = db.Column(db.DateTime, default=datetime.utcnow) + updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow) pt_site = db.Column(db.String(100)) # 注册时填写的站点 uid = db.Column(db.String(50)) # 注册时填写的 UID reports = db.relationship('Report', backref='reporter', lazy='dynamic') - # comments = db.relationship('Comment', backref='author', lazy='dynamic') comments = db.relationship('Comment', back_populates='author', lazy='dynamic') def set_password(self, password): self.password_hash = generate_password_hash(password) @@ -39,19 +43,23 @@ def load_user(user_id): class Report(db.Model): __tablename__ = 'reports' + __table_args__ = ( + db.Index('idx_report_status_created', 'status', 'created_at'), + ) + id = db.Column(db.Integer, primary_key=True) - reporter_id = db.Column(db.Integer, db.ForeignKey('users.id'), nullable=False) + reporter_id = db.Column(db.Integer, db.ForeignKey('users.id', ondelete='CASCADE'), nullable=False) reported_pt_site = db.Column(db.String(100), nullable=False) - reported_uid = db.Column(db.String(50)) + reported_username = db.Column(db.String(50)) reported_email = db.Column(db.String(120), index=True, nullable=False) - reason_category = db.Column(db.String(50), nullable=False) # e.g., 'cheating', 'trading', 'spam' + reason_category = db.Column(db.String(16), nullable=False) # 'cheating', 'trading', 'spam', 'abusive', 'radio', 'other' description = db.Column(db.Text, nullable=False) - status = db.Column(db.String(20), index=True, default='pending') # 'pending', 'in_review', 'approved', 'rejected' + status = db.Column(db.String(16), index=True, default='pending') # 'pending', 'approved', 'rejected', 'revoked', 'overturned' created_at = db.Column(db.DateTime, index=True, default=datetime.utcnow) + updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow) comments = db.relationship('Comment', backref='report', lazy='dynamic', cascade='all, delete-orphan') - - evidences = db.relationship('Evidence', backref='report', lazy='dynamic', cascade="all, delete-orphan") - blacklist_entry = db.relationship('Blacklist', backref='report', uselist=False) # one-to-one + evidences = db.relationship('Evidence', backref='report', lazy='dynamic', cascade='all, delete-orphan') + blacklist_entry = db.relationship('Blacklist', backref='report', uselist=False) def __repr__(self): return f'' @@ -59,16 +67,22 @@ class Report(db.Model): class Evidence(db.Model): __tablename__ = 'evidences' id = db.Column(db.Integer, primary_key=True) - report_id = db.Column(db.Integer, db.ForeignKey('reports.id'), nullable=False) - file_url = db.Column(db.String(512), nullable=False) # 存储OSS或本地路径 - file_type = db.Column(db.String(20)) # 'image', 'zip', 'text' + report_id = db.Column(db.Integer, db.ForeignKey('reports.id', ondelete='CASCADE'), nullable=False) + file_url = db.Column(db.String(1024), nullable=False) # 存储OSS或本地路径 + file_type = db.Column(db.String(16)) # 'image', 'zip', 'text', 'image_url' created_at = db.Column(db.DateTime, default=datetime.utcnow) + updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow) def __repr__(self): return f'' class Blacklist(db.Model): __tablename__ = 'blacklist' + __table_args__ = ( + db.Index('idx_blacklist_email_status', 'normalized_email', 'status'), + db.Index('idx_blacklist_username_status', 'username', 'status'), + ) + id = db.Column(db.Integer, primary_key=True) username = db.Column(db.String(64), index=True) email = db.Column(db.String(120), index=True) @@ -76,42 +90,43 @@ class Blacklist(db.Model): pt_site = db.Column(db.String(100), index=True) uid = db.Column(db.String(50)) report_id = db.Column(db.Integer, db.ForeignKey('reports.id'), unique=True) # 确保一个举报只对应一个黑名单条目 - status = db.Column(db.String(20), default='active', index=True) # 'active', 'appealed_ok', 'expired' + status = db.Column(db.String(16), default='active', index=True) # 'active', 'revoked', 'expired' created_at = db.Column(db.DateTime, index=True, default=datetime.utcnow) + updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow) appeals = db.relationship('Appeal', backref='blacklist_entry', lazy='dynamic') + def __repr__(self): return f'' class Comment(db.Model): __tablename__ = 'comments' id = db.Column(db.Integer, primary_key=True) body = db.Column(db.Text) - timestamp = db.Column(db.DateTime, index=True, default=datetime.utcnow) - author_id = db.Column(db.Integer, db.ForeignKey('users.id')) - report_id = db.Column(db.Integer, db.ForeignKey('reports.id')) - # author = db.relationship('User') # 方便地通过 comment.author 访问用户 + created_at = db.Column(db.DateTime, index=True, default=datetime.utcnow) + author_id = db.Column(db.Integer, db.ForeignKey('users.id', ondelete='CASCADE')) + report_id = db.Column(db.Integer, db.ForeignKey('reports.id', ondelete='CASCADE')) author = db.relationship('User', back_populates='comments') class Appeal(db.Model): __tablename__ = 'appeals' id = db.Column(db.Integer, primary_key=True) reason = db.Column(db.Text, nullable=False) # 用户最初的申诉理由 - status = db.Column(db.String(64), nullable=False, default='awaiting_admin_reply') # 状态: awaiting_admin_reply, awaiting_user_reply, closed_approved, closed_rejected + status = db.Column(db.String(32), nullable=False, default='awaiting_admin_reply', index=True) # 'awaiting_admin_reply', 'awaiting_user_reply', 'approved', 'rejected' created_at = db.Column(db.DateTime, index=True, default=datetime.utcnow) updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow) - # 关系 - appealer_id = db.Column(db.Integer, db.ForeignKey('users.id')) # 申诉人 - blacklist_entry_id = db.Column(db.Integer, db.ForeignKey('blacklist.id')) # 关联的黑名单条目 + appealer_id = db.Column(db.Integer, db.ForeignKey('users.id', ondelete='CASCADE')) # 申诉人 + blacklist_entry_id = db.Column(db.Integer, db.ForeignKey('blacklist.id', ondelete='SET NULL')) # 关联的黑名单条目 messages = db.relationship('AppealMessage', backref='appeal', lazy='dynamic', cascade='all, delete-orphan') appealer = db.relationship('User', backref='appeals') + def __repr__(self): return f'' class AppealMessage(db.Model): __tablename__ = 'appeal_messages' id = db.Column(db.Integer, primary_key=True) body = db.Column(db.Text, nullable=False) - timestamp = db.Column(db.DateTime, index=True, default=datetime.utcnow) - - # 关系 - author_id = db.Column(db.Integer, db.ForeignKey('users.id')) # 消息发送者 - appeal_id = db.Column(db.Integer, db.ForeignKey('appeals.id')) + created_at = db.Column(db.DateTime, index=True, default=datetime.utcnow) + author_id = db.Column(db.Integer, db.ForeignKey('users.id', ondelete='CASCADE')) # 消息发送者 + appeal_id = db.Column(db.Integer, db.ForeignKey('appeals.id', ondelete='CASCADE')) + author = db.relationship('User', backref='appeal_messages') + def __repr__(self): return f'' diff --git a/app/routes.py b/app/routes.py index 8690856..836897c 100644 --- a/app/routes.py +++ b/app/routes.py @@ -53,7 +53,7 @@ def create_report(): new_report = Report( reporter_id=current_user.id, reported_pt_site=form.reported_pt_site.data, - reported_uid=form.reported_uid.data, + reported_username=form.reported_username.data, reported_email=form.reported_email.data, reason_category=form.reason_category.data, description=form.description.data, @@ -133,7 +133,7 @@ def report_detail(report_id): flash('你的审核建议已成功提交。', 'success') return redirect(url_for('main.report_detail', report_id=report.id)) - comments = report.comments.order_by(Comment.timestamp.desc()).all() + comments = report.comments.order_by(Comment.created_at.desc()).all() return render_template( 'admin/report_detail.html', @@ -160,9 +160,9 @@ def process_report(report_id, action): email=report.reported_email, normalized_email=normalize_email(report.reported_email), pt_site=report.reported_pt_site, - uid=report.reported_uid, + uid=report.reported_username, report_id=report.id, - username=report.reported_uid or None + username=report.reported_username or None ) db.session.add(new_blacklist_entry) flash('举报已批准，并已将相关信息添加到黑名单。', 'success') @@ -324,7 +324,7 @@ def appeal_detail(appeal_id): db.session.commit() flash('消息已发送。', 'success') return redirect(url_for('main.appeal_detail', appeal_id=appeal.id)) - messages = appeal.messages.order_by(AppealMessage.timestamp.asc()).all() + messages = appeal.messages.order_by(AppealMessage.created_at.asc()).all() return render_template('appeal_detail.html', appeal=appeal, messages=messages, form=form) @main.route('/admin/appeals') @login_required @@ -351,7 +351,7 @@ def decide_appeal(appeal_id): if action == 'approve': # 批准申诉：删除黑名单记录，更新申诉状态 blacklist_entry = appeal.blacklist_entry - blacklist_entry.status = 'revoked' # 将黑名单条目状态改为“已撤销” + blacklist_entry.status = 'revoked' # 将黑名单条目状态改为"已撤销" appeal.status = 'approved' # 同时更新申诉本身的状态 if blacklist_entry.report: # 使用 'overturned' (已推翻) 可能比 'revoked' 更能描述 Report 的状态 @@ -367,9 +367,13 @@ def decide_appeal(appeal_id): elif action == 'reject': # 驳回申诉：仅更新申诉状态 appeal.status = 'rejected' + db.session.add(appeal) flash(f'已驳回申诉 #{appeal.id}。', 'info') else: flash('无效操作。', 'danger') + return redirect(url_for('main.appeal_list')) + + db.session.commit() return redirect(url_for('main.appeal_list')) @main.route('/admin/sites', methods=['GET', 'POST']) diff --git a/app/templates/admin/report_detail.html b/app/templates/admin/report_detail.html index b6ffc6a..bd93fb0 100644 --- a/app/templates/admin/report_detail.html +++ b/app/templates/admin/report_detail.html @@ -11,7 +11,7 @@
  • 被举报邮箱: {{ report.reported_email }}
    • -
  • 被举报用户名: {{ report.reported_uid or 'N/A' }}
    • +
  • 被举报用户名: {{ report.reported_username or 'N/A' }}
  • 所属站点: {{ report.reported_pt_site }}
  • 举报理由: {{ report.reason_category }}
  • 举报人: {{ report.reporter.username }}
    • @@ -69,7 +69,7 @@

    {{ comment.body | safe }}

    - {{ comment.timestamp.strftime('%Y-%m-%d %H:%M') }} + {{ comment.created_at.strftime('%Y-%m-%d %H:%M') }}
{% else %} diff --git a/app/templates/appeal_detail.html b/app/templates/appeal_detail.html index c9ecd1b..9cab1c0 100644 --- a/app/templates/appeal_detail.html +++ b/app/templates/appeal_detail.html @@ -11,9 +11,9 @@

申诉ID: #{{ appeal.id }}

申诉人: {{ appeal.appealer.username }}

-

状态: - {{ appeal.status }} @@ -26,7 +26,7 @@

- {% if current_user.role=='admin' and appeal.status not in ['closed_approved', 'closed_rejected'] %} + {% if current_user.role=='admin' and appeal.status not in ['approved', 'rejected'] %}
管理员操作
@@ -64,12 +64,12 @@ {% for message in messages %}
- {% if message.author_id.role == 'admin' %} - {{ message.author_id.username }} (管理员) - {{ message.timestamp.strftime('%Y-%m-%d %H:%M') }} + {% if message.author.role == 'admin' %} + {{ message.author.username }} (管理员) + {{ message.created_at.strftime('%Y-%m-%d %H:%M') }} {% else %} - {{ message.author_id.username }} - {{ message.timestamp.strftime('%Y-%m-%d %H:%M') }} + {{ message.author.username }} + {{ message.created_at.strftime('%Y-%m-%d %H:%M') }} {% endif %}
@@ -79,7 +79,7 @@ {% endfor %}
- {% if appeal.status not in ['closed_approved', 'closed_rejected'] %} + {% if appeal.status not in ['approved', 'rejected'] %}
{{ form.hidden_tag() }} diff --git a/app/templates/create_report.html b/app/templates/create_report.html index 464331f..f641318 100644 --- a/app/templates/create_report.html +++ b/app/templates/create_report.html @@ -21,9 +21,9 @@ {% for error in form.reported_pt_site.errors %}
{{ error }}
{% endfor %}
- {{ form.reported_uid.label(class="form-label") }} - {{ form.reported_uid(class="form-control") }} - {% for error in form.reported_uid.errors %}
{{ error }}
{% endfor %} + {{ form.reported_username.label(class="form-label") }} + {{ form.reported_username(class="form-control") }} + {% for error in form.reported_username.errors %}
{{ error }}
{% endfor %}
diff --git a/migrations/versions/054c116946ac_initial_migration.py b/migrations/versions/054c116946ac_initial_migration.py deleted file mode 100644 index 7dc1a3b..0000000 --- a/migrations/versions/054c116946ac_initial_migration.py +++ /dev/null @@ -1,169 +0,0 @@ -"""Initial migration - -Revision ID: 054c116946ac -Revises: -Create Date: 2025-11-22 00:37:30.417108 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = '054c116946ac' -down_revision = None -branch_labels = None -depends_on = None - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.create_table('users', - sa.Column('id', sa.Integer(), nullable=False), - sa.Column('username', sa.String(length=64), nullable=False), - sa.Column('email', sa.String(length=120), nullable=False), - sa.Column('password_hash', sa.String(length=256), nullable=True), - sa.Column('role', sa.String(length=20), nullable=True), - sa.Column('status', sa.String(length=20), nullable=True), - sa.Column('created_at', sa.DateTime(), nullable=True), - sa.Column('pt_site', sa.String(length=100), nullable=True), - sa.Column('uid', sa.String(length=50), nullable=True), - sa.PrimaryKeyConstraint('id') - ) - with op.batch_alter_table('users', schema=None) as batch_op: - batch_op.create_index(batch_op.f('ix_users_email'), ['email'], unique=True) - batch_op.create_index(batch_op.f('ix_users_role'), ['role'], unique=False) - batch_op.create_index(batch_op.f('ix_users_status'), ['status'], unique=False) - batch_op.create_index(batch_op.f('ix_users_username'), ['username'], unique=True) - - op.create_table('reports', - sa.Column('id', sa.Integer(), nullable=False), - sa.Column('reporter_id', sa.Integer(), nullable=False), - sa.Column('reported_pt_site', sa.String(length=100), nullable=False), - sa.Column('reported_uid', sa.String(length=50), nullable=True), - sa.Column('reported_email', sa.String(length=120), nullable=False), - sa.Column('reason_category', sa.String(length=50), nullable=False), - sa.Column('description', sa.Text(), nullable=False), - sa.Column('status', sa.String(length=20), nullable=True), - sa.Column('created_at', sa.DateTime(), nullable=True), - sa.ForeignKeyConstraint(['reporter_id'], ['users.id'], ), - sa.PrimaryKeyConstraint('id') - ) - with op.batch_alter_table('reports', schema=None) as batch_op: - batch_op.create_index(batch_op.f('ix_reports_created_at'), ['created_at'], unique=False) - batch_op.create_index(batch_op.f('ix_reports_reported_email'), ['reported_email'], unique=False) - batch_op.create_index(batch_op.f('ix_reports_status'), ['status'], unique=False) - - op.create_table('blacklist', - sa.Column('id', sa.Integer(), nullable=False), - sa.Column('username', sa.String(length=64), nullable=True), - sa.Column('email', sa.String(length=120), nullable=True), - sa.Column('normalized_email', sa.String(length=120), nullable=True), - sa.Column('pt_site', sa.String(length=100), nullable=True), - sa.Column('uid', sa.String(length=50), nullable=True), - sa.Column('report_id', sa.Integer(), nullable=True), - sa.Column('status', sa.String(length=20), nullable=True), - sa.Column('created_at', sa.DateTime(), nullable=True), - sa.ForeignKeyConstraint(['report_id'], ['reports.id'], ), - sa.PrimaryKeyConstraint('id'), - sa.UniqueConstraint('report_id') - ) - with op.batch_alter_table('blacklist', schema=None) as batch_op: - batch_op.create_index(batch_op.f('ix_blacklist_created_at'), ['created_at'], unique=False) - batch_op.create_index(batch_op.f('ix_blacklist_email'), ['email'], unique=False) - batch_op.create_index(batch_op.f('ix_blacklist_normalized_email'), ['normalized_email'], unique=False) - batch_op.create_index(batch_op.f('ix_blacklist_pt_site'), ['pt_site'], unique=False) - batch_op.create_index(batch_op.f('ix_blacklist_status'), ['status'], unique=False) - batch_op.create_index(batch_op.f('ix_blacklist_username'), ['username'], unique=False) - - op.create_table('comments', - sa.Column('id', sa.Integer(), nullable=False), - sa.Column('body', sa.Text(), nullable=True), - sa.Column('timestamp', sa.DateTime(), nullable=True), - sa.Column('author_id', sa.Integer(), nullable=True), - sa.Column('report_id', sa.Integer(), nullable=True), - sa.ForeignKeyConstraint(['author_id'], ['users.id'], ), - sa.ForeignKeyConstraint(['report_id'], ['reports.id'], ), - sa.PrimaryKeyConstraint('id') - ) - with op.batch_alter_table('comments', schema=None) as batch_op: - batch_op.create_index(batch_op.f('ix_comments_timestamp'), ['timestamp'], unique=False) - - op.create_table('evidences', - sa.Column('id', sa.Integer(), nullable=False), - sa.Column('report_id', sa.Integer(), nullable=False), - sa.Column('file_url', sa.String(length=512), nullable=False), - sa.Column('file_type', sa.String(length=20), nullable=True), - sa.Column('created_at', sa.DateTime(), nullable=True), - sa.ForeignKeyConstraint(['report_id'], ['reports.id'], ), - sa.PrimaryKeyConstraint('id') - ) - op.create_table('appeals', - sa.Column('id', sa.Integer(), nullable=False), - sa.Column('reason', sa.Text(), nullable=False), - sa.Column('status', sa.String(length=64), nullable=False), - sa.Column('created_at', sa.DateTime(), nullable=True), - sa.Column('updated_at', sa.DateTime(), nullable=True), - sa.Column('appealer_id', sa.Integer(), nullable=True), - sa.Column('blacklist_entry_id', sa.Integer(), nullable=True), - sa.ForeignKeyConstraint(['appealer_id'], ['users.id'], ), - sa.ForeignKeyConstraint(['blacklist_entry_id'], ['blacklist.id'], ), - sa.PrimaryKeyConstraint('id') - ) - with op.batch_alter_table('appeals', schema=None) as batch_op: - batch_op.create_index(batch_op.f('ix_appeals_created_at'), ['created_at'], unique=False) - - op.create_table('appeal_messages', - sa.Column('id', sa.Integer(), nullable=False), - sa.Column('body', sa.Text(), nullable=False), - sa.Column('timestamp', sa.DateTime(), nullable=True), - sa.Column('author_id', sa.Integer(), nullable=True), - sa.Column('appeal_id', sa.Integer(), nullable=True), - sa.ForeignKeyConstraint(['appeal_id'], ['appeals.id'], ), - sa.ForeignKeyConstraint(['author_id'], ['users.id'], ), - sa.PrimaryKeyConstraint('id') - ) - with op.batch_alter_table('appeal_messages', schema=None) as batch_op: - batch_op.create_index(batch_op.f('ix_appeal_messages_timestamp'), ['timestamp'], unique=False) - - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - with op.batch_alter_table('appeal_messages', schema=None) as batch_op: - batch_op.drop_index(batch_op.f('ix_appeal_messages_timestamp')) - - op.drop_table('appeal_messages') - with op.batch_alter_table('appeals', schema=None) as batch_op: - batch_op.drop_index(batch_op.f('ix_appeals_created_at')) - - op.drop_table('appeals') - op.drop_table('evidences') - with op.batch_alter_table('comments', schema=None) as batch_op: - batch_op.drop_index(batch_op.f('ix_comments_timestamp')) - - op.drop_table('comments') - with op.batch_alter_table('blacklist', schema=None) as batch_op: - batch_op.drop_index(batch_op.f('ix_blacklist_username')) - batch_op.drop_index(batch_op.f('ix_blacklist_status')) - batch_op.drop_index(batch_op.f('ix_blacklist_pt_site')) - batch_op.drop_index(batch_op.f('ix_blacklist_normalized_email')) - batch_op.drop_index(batch_op.f('ix_blacklist_email')) - batch_op.drop_index(batch_op.f('ix_blacklist_created_at')) - - op.drop_table('blacklist') - with op.batch_alter_table('reports', schema=None) as batch_op: - batch_op.drop_index(batch_op.f('ix_reports_status')) - batch_op.drop_index(batch_op.f('ix_reports_reported_email')) - batch_op.drop_index(batch_op.f('ix_reports_created_at')) - - op.drop_table('reports') - with op.batch_alter_table('users', schema=None) as batch_op: - batch_op.drop_index(batch_op.f('ix_users_username')) - batch_op.drop_index(batch_op.f('ix_users_status')) - batch_op.drop_index(batch_op.f('ix_users_role')) - batch_op.drop_index(batch_op.f('ix_users_email')) - - op.drop_table('users') - # ### end Alembic commands ### diff --git a/migrations/versions/ee88f6dd173c_add_partnersite_model_for_official_sites.py b/migrations/versions/ee88f6dd173c_add_partnersite_model_for_official_sites.py deleted file mode 100644 index 8d69142..0000000 --- a/migrations/versions/ee88f6dd173c_add_partnersite_model_for_official_sites.py +++ /dev/null @@ -1,42 +0,0 @@ -"""Add PartnerSite model for official sites - -Revision ID: ee88f6dd173c -Revises: 054c116946ac -Create Date: 2025-11-23 22:14:57.981853 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = 'ee88f6dd173c' -down_revision = '054c116946ac' -branch_labels = None -depends_on = None - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.create_table('partner_sites', - sa.Column('id', sa.Integer(), nullable=False), - sa.Column('name', sa.String(length=100), nullable=False), - sa.Column('url', sa.String(length=255), nullable=True), - sa.Column('is_active', sa.Boolean(), nullable=False), - sa.PrimaryKeyConstraint('id') - ) - with op.batch_alter_table('partner_sites', schema=None) as batch_op: - batch_op.create_index(batch_op.f('ix_partner_sites_is_active'), ['is_active'], unique=False) - batch_op.create_index(batch_op.f('ix_partner_sites_name'), ['name'], unique=True) - - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - with op.batch_alter_table('partner_sites', schema=None) as batch_op: - batch_op.drop_index(batch_op.f('ix_partner_sites_name')) - batch_op.drop_index(batch_op.f('ix_partner_sites_is_active')) - - op.drop_table('partner_sites') - # ### end Alembic commands ###