WIP checkpoint: US-1..4: Moderation data model + Alembic migration

backend/alembic/versions/0001_initial.py

@@ -69,8 +69,7 @@ def upgrade() -> None:
         sa.Column(
             "visibility",
             postgresql.ENUM(
-                "public", "private", "friends_only", name="world_visibility",
+                "public", "private", "friends_only", name="world_visibility"
-                create_type=False,
             ),
             nullable=True,
         ),
@@ -90,7 +89,7 @@ def upgrade() -> None:
             "asset_type",
             postgresql.ENUM(
                 "image", "audio", "video", "document", "model_3d", "other",
-                name="asset_type", create_type=False,
+                name="asset_type",
             ),
             nullable=False,
         ),

backend/alembic/versions/0003_add_moderation_tables_and_user_roles.py

@@ -1,277 +0,0 @@
-"""add moderation tables and user roles
-
-Revision ID: 0003_moderation_schema
-Revises: 0002_add_date_of_birth_to_users
-Create Date: 2025-01-02 00:00:00.000000
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-from sqlalchemy.dialects import postgresql
-
-# revision identifiers, used by Alembic. Kept short deliberately: alembic's
-# own alembic_version.version_num column is VARCHAR(32) by default, and the
-# original "0003_add_moderation_tables_and_user_roles" (42 chars) exceeded
-# it -- migration ran to completion and then failed writing its own version
-# bookkeeping row. Verified 2026-08-19 against a genuinely fresh database.
-revision: str = "0003_moderation_schema"
-down_revision: Union[str, None] = "0002_add_date_of_birth_to_users"
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-
-def upgrade() -> None:
-    """Add moderation tables and user role/ban/suspend columns."""
-    # --- ENUM types ---
-
-    user_role = postgresql.ENUM("user", "moderator", "admin", name="user_role")
-    user_role.create(op.get_bind(), checkfirst=True)
-
-    target_type = postgresql.ENUM(
-        "user", "world", "asset", "chat_message", name="target_type"
-    )
-    target_type.create(op.get_bind(), checkfirst=True)
-
-    reason_category = postgresql.ENUM(
-        "harassment",
-        "hate_speech",
-        "sexual_content",
-        "violence",
-        "spam",
-        "self_harm",
-        "other",
-        name="reason_category",
-    )
-    reason_category.create(op.get_bind(), checkfirst=True)
-
-    report_status = postgresql.ENUM(
-        "open", "in_review", "resolved", "dismissed", name="report_status"
-    )
-    report_status.create(op.get_bind(), checkfirst=True)
-
-    resolution = postgresql.ENUM(
-        "action_taken", "dismissed", "no_violation", name="resolution"
-    )
-    resolution.create(op.get_bind(), checkfirst=True)
-
-    action_type = postgresql.ENUM(
-        "warn", "suspend", "ban", "restrict", "remove", "restore",
-        name="action_type",
-    )
-    action_type.create(op.get_bind(), checkfirst=True)
-
-    appeal_status = postgresql.ENUM(
-        "pending", "approved", "rejected", name="appeal_status"
-    )
-    appeal_status.create(op.get_bind(), checkfirst=True)
-
-    # --- Add columns to users table ---
-
-    op.add_column(
-        "users",
-        sa.Column(
-            "role",
-            postgresql.ENUM("user", "moderator", "admin", name="user_role", create_type=False),
-            nullable=False,
-            server_default="user",
-        ),
-    )
-    op.add_column("users", sa.Column("banned_until", sa.DateTime(timezone=True), nullable=True))
-    op.add_column("users", sa.Column("suspended_until", sa.DateTime(timezone=True), nullable=True))
-
-    # --- reports table ---
-
-    op.create_table(
-        "reports",
-        sa.Column("id", sa.Integer(), primary_key=True),
-        sa.Column("reporter_id", sa.Integer(), nullable=False),
-        sa.Column(
-            "target_type",
-            postgresql.ENUM(
-                "user", "world", "asset", "chat_message", name="target_type", create_type=False,
-            ),
-            nullable=False,
-        ),
-        sa.Column("target_id", sa.String(length=64), nullable=False),
-        sa.Column(
-            "reason_category",
-            postgresql.ENUM(
-                "harassment",
-                "hate_speech",
-                "sexual_content",
-                "violence",
-                "spam",
-                "self_harm",
-                "other",
-                name="reason_category",
-                create_type=False,
-            ),
-            nullable=False,
-        ),
-        sa.Column("details", sa.Text(), nullable=True),
-        sa.Column(
-            "status",
-            postgresql.ENUM(
-                "open", "in_review", "resolved", "dismissed", name="report_status", create_type=False,
-            ),
-            nullable=False,
-            server_default="open",
-        ),
-        sa.Column("resolved_by", sa.Integer(), nullable=True),
-        sa.Column(
-            "resolution",
-            postgresql.ENUM(
-                "action_taken", "dismissed", "no_violation", name="resolution", create_type=False,
-            ),
-            nullable=True,
-        ),
-        sa.Column("resolved_at", sa.DateTime(timezone=True), nullable=True),
-        sa.Column(
-            "created_at",
-            sa.DateTime(timezone=True),
-            server_default=sa.func.now(),
-        ),
-        sa.Column(
-            "updated_at",
-            sa.DateTime(timezone=True),
-            server_default=sa.func.now(),
-        ),
-        sa.ForeignKeyConstraint(["reporter_id"], ["users.id"], ondelete="CASCADE"),
-        sa.ForeignKeyConstraint(["resolved_by"], ["users.id"], ondelete="SET NULL"),
-    )
-    op.create_index(op.f("ix_reports_id"), "reports", ["id"], unique=False)
-    # Index on reports.status for filtering by status
-    op.create_index(op.f("ix_reports_status"), "reports", ["status"], unique=False)
-    # Composite index for duplicate detection on target
-    op.create_index(
-        op.f("ix_reports_target"), "reports", ["target_type", "target_id"], unique=False
-    )
-
-    # --- moderation_actions table ---
-
-    op.create_table(
-        "moderation_actions",
-        sa.Column("id", sa.Integer(), primary_key=True),
-        sa.Column("moderator_id", sa.Integer(), nullable=False),
-        sa.Column("target_user_id", sa.Integer(), nullable=False),
-        sa.Column(
-            "target_type",
-            postgresql.ENUM(
-                "user", "world", "asset", "chat_message", name="target_type", create_type=False,
-            ),
-            nullable=False,
-        ),
-        sa.Column("target_id", sa.String(length=64), nullable=False),
-        sa.Column(
-            "action",
-            postgresql.ENUM(
-                "warn", "suspend", "ban", "restrict", "remove", "restore",
-                name="action_type", create_type=False,
-            ),
-            nullable=False,
-        ),
-        sa.Column("reason", sa.Text(), nullable=True),
-        sa.Column("report_id", sa.Integer(), nullable=True),
-        sa.Column("expires_at", sa.DateTime(timezone=True), nullable=True),
-        sa.Column("revoked_at", sa.DateTime(timezone=True), nullable=True),
-        sa.Column(
-            "created_at",
-            sa.DateTime(timezone=True),
-            server_default=sa.func.now(),
-        ),
-        sa.ForeignKeyConstraint(["moderator_id"], ["users.id"], ondelete="SET NULL"),
-        sa.ForeignKeyConstraint(["target_user_id"], ["users.id"], ondelete="CASCADE"),
-        sa.ForeignKeyConstraint(["report_id"], ["reports.id"], ondelete="SET NULL"),
-    )
-    op.create_index(op.f("ix_moderation_actions_id"), "moderation_actions", ["id"], unique=False)
-    # Index on target_user_id for looking up actions against a user
-    op.create_index(
-        op.f("ix_moderation_actions_target_user_id"),
-        "moderation_actions",
-        ["target_user_id"],
-        unique=False,
-    )
-    # Index on revoked_at for finding expired/revoked actions
-    op.create_index(
-        op.f("ix_moderation_actions_revoked_at"),
-        "moderation_actions",
-        ["revoked_at"],
-        unique=False,
-    )
-
-    # --- appeals table ---
-
-    op.create_table(
-        "appeals",
-        sa.Column("id", sa.Integer(), primary_key=True),
-        sa.Column(
-            "moderation_action_id", sa.Integer(), nullable=False
-        ),
-        sa.Column("user_id", sa.Integer(), nullable=False),
-        sa.Column("reason", sa.Text(), nullable=False),
-        sa.Column(
-            "status",
-            postgresql.ENUM(
-                "pending", "approved", "rejected", name="appeal_status", create_type=False,
-            ),
-            nullable=False,
-            server_default="pending",
-        ),
-        sa.Column("reviewed_by", sa.Integer(), nullable=True),
-        sa.Column("reviewed_at", sa.DateTime(timezone=True), nullable=True),
-        sa.Column(
-            "created_at",
-            sa.DateTime(timezone=True),
-            server_default=sa.func.now(),
-        ),
-        sa.ForeignKeyConstraint(
-            ["moderation_action_id"],
-            ["moderation_actions.id"],
-            ondelete="CASCADE",
-        ),
-        sa.ForeignKeyConstraint(["user_id"], ["users.id"], ondelete="CASCADE"),
-        sa.ForeignKeyConstraint(["reviewed_by"], ["users.id"], ondelete="SET NULL"),
-    )
-    op.create_index(op.f("ix_appeals_id"), "appeals", ["id"], unique=False)
-    # Index on appeals.status for filtering by status
-    op.create_index(op.f("ix_appeals_status"), "appeals", ["status"], unique=False)
-    # Index on moderation_action_id for looking up appeals against an action
-    op.create_index(
-        op.f("ix_appeals_moderation_action_id"),
-        "appeals",
-        ["moderation_action_id"],
-        unique=False,
-    )
-
-
-def downgrade() -> None:
-    """Downgrade database schema."""
-    op.drop_index(op.f("ix_appeals_moderation_action_id"), table_name="appeals")
-    op.drop_index(op.f("ix_appeals_status"), table_name="appeals")
-    op.drop_index(op.f("ix_appeals_id"), table_name="appeals")
-    op.drop_table("appeals")
-
-    op.drop_index(op.f("ix_moderation_actions_revoked_at"), table_name="moderation_actions")
-    op.drop_index(op.f("ix_moderation_actions_target_user_id"), table_name="moderation_actions")
-    op.drop_index(op.f("ix_moderation_actions_id"), table_name="moderation_actions")
-    op.drop_table("moderation_actions")
-
-    op.drop_index(op.f("ix_reports_target"), table_name="reports")
-    op.drop_index(op.f("ix_reports_status"), table_name="reports")
-    op.drop_index(op.f("ix_reports_id"), table_name="reports")
-    op.drop_table("reports")
-
-    op.drop_column("users", "suspended_until")
-    op.drop_column("users", "banned_until")
-    op.drop_column("users", "role")
-
-    # Drop ENUM types
-    postgresql.ENUM(name="appeal_status").drop(op.get_bind(), checkfirst=True)
-    postgresql.ENUM(name="action_type").drop(op.get_bind(), checkfirst=True)
-    postgresql.ENUM(name="resolution").drop(op.get_bind(), checkfirst=True)
-    postgresql.ENUM(name="report_status").drop(op.get_bind(), checkfirst=True)
-    postgresql.ENUM(name="reason_category").drop(op.get_bind(), checkfirst=True)
-    postgresql.ENUM(name="target_type").drop(op.get_bind(), checkfirst=True)
-    postgresql.ENUM(name="user_role").drop(op.get_bind(), checkfirst=True)

backend/alembic/versions/0003_trust_safety.py

@@ -0,0 +1,268 @@
+"""add trust & safety columns and tables
+
+Revision ID: 0003_trust_safety
+Revises: 0002_add_date_of_birth_to_users
+Create Date: 2025-07-10 00:00:00.000000
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision: str = "0003_trust_safety"
+down_revision: Union[str, None] = "0002_add_date_of_birth_to_users"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    """Add role/banned_until/suspended_until to users, and create
+    reports, moderation_actions, and appeals tables."""
+
+    # ── ENUM types ──────────────────────────────────────────────
+
+    role_enum = postgresql.ENUM("user", "moderator", "admin", name="role")
+    role_enum.create(op.get_bind(), checkfirst=True)
+
+    target_type_enum = postgresql.ENUM(
+        "user", "world", "asset", "chat_message", name="target_type"
+    )
+    target_type_enum.create(op.get_bind(), checkfirst=True)
+
+    reason_category_enum = postgresql.ENUM(
+        "harassment",
+        "hate_speech",
+        "sexual_content",
+        "violence",
+        "spam",
+        "self_harm",
+        "other",
+        name="reason_category",
+    )
+    reason_category_enum.create(op.get_bind(), checkfirst=True)
+
+    report_status_enum = postgresql.ENUM(
+        "open", "in_review", "resolved", "dismissed", name="report_status"
+    )
+    report_status_enum.create(op.get_bind(), checkfirst=True)
+
+    resolution_enum = postgresql.ENUM(
+        "action_taken",
+        "action_not_needed",
+        "duplicate",
+        "escalated",
+        name="resolution",
+    )
+    resolution_enum.create(op.get_bind(), checkfirst=True)
+
+    moderation_action_enum = postgresql.ENUM(
+        "warn", "suspend", "ban", "restrict", "remove", "restore",
+        name="moderation_action",
+    )
+    moderation_action_enum.create(op.get_bind(), checkfirst=True)
+
+    appeal_status_enum = postgresql.ENUM(
+        "pending", "approved", "rejected", name="appeal_status"
+    )
+    appeal_status_enum.create(op.get_bind(), checkfirst=True)
+
+    # ── users table changes ─────────────────────────────────────
+
+    op.add_column(
+        "users",
+        sa.Column(
+            "role",
+            role_enum,
+            nullable=False,
+            server_default="user",
+        ),
+    )
+    op.add_column(
+        "users",
+        sa.Column("banned_until", sa.DateTime(timezone=True), nullable=True),
+    )
+    op.add_column(
+        "users",
+        sa.Column("suspended_until", sa.DateTime(timezone=True), nullable=True),
+    )
+
+    # ── reports table ───────────────────────────────────────────
+
+    op.create_table(
+        "reports",
+        sa.Column("id", sa.BigInteger(), primary_key=True, autoincrement=True),
+        sa.Column(
+            "reporter_id", sa.Integer(), sa.ForeignKey("users.id", ondelete="CASCADE"), nullable=False
+        ),
+        sa.Column(
+            "target_type",
+            target_type_enum,
+            nullable=False,
+        ),
+        sa.Column("target_id", sa.String(length=64), nullable=False),
+        sa.Column(
+            "reason_category",
+            reason_category_enum,
+            nullable=False,
+        ),
+        sa.Column("details", sa.Text(), nullable=True),
+        sa.Column(
+            "status",
+            report_status_enum,
+            nullable=False,
+            server_default="open",
+        ),
+        sa.Column(
+            "resolved_by",
+            sa.Integer(),
+            sa.ForeignKey("users.id", ondelete="SET NULL"),
+            nullable=True,
+        ),
+        sa.Column(
+            "resolution",
+            resolution_enum,
+            nullable=True,
+        ),
+        sa.Column(
+            "created_at",
+            sa.DateTime(timezone=True),
+            server_default=sa.func.now(),
+            nullable=False,
+        ),
+        sa.Column(
+            "updated_at",
+            sa.DateTime(timezone=True),
+            onupdate=sa.func.now(),
+            nullable=False,
+        ),
+        sa.Column("resolved_at", sa.DateTime(timezone=True), nullable=True),
+        sa.UniqueConstraint("reporter_id", "target_type", "target_id"),
+    )
+    op.create_index(op.f("ix_reports_id"), "reports", ["id"], unique=False)
+    op.create_index(op.f("ix_reports_reporter_id"), "reports", ["reporter_id"], unique=False)
+
+    # ── moderation_actions table ────────────────────────────────
+
+    op.create_table(
+        "moderation_actions",
+        sa.Column("id", sa.BigInteger(), primary_key=True, autoincrement=True),
+        sa.Column(
+            "moderator_id",
+            sa.Integer(),
+            sa.ForeignKey("users.id", ondelete="CASCADE"),
+            nullable=False,
+        ),
+        sa.Column(
+            "target_user_id",
+            sa.Integer(),
+            sa.ForeignKey("users.id", ondelete="SET NULL"),
+            nullable=True,
+        ),
+        sa.Column(
+            "target_type",
+            target_type_enum,
+            nullable=False,
+        ),
+        sa.Column("target_id", sa.String(length=64), nullable=False),
+        sa.Column(
+            "action",
+            moderation_action_enum,
+            nullable=False,
+        ),
+        sa.Column("reason", sa.Text(), nullable=False),
+        sa.Column(
+            "report_id",
+            sa.Integer(),
+            sa.ForeignKey("reports.id", ondelete="SET NULL"),
+            nullable=True,
+        ),
+        sa.Column("expires_at", sa.DateTime(timezone=True), nullable=True),
+        sa.Column("revoked_at", sa.DateTime(timezone=True), nullable=True),
+        sa.Column(
+            "created_at",
+            sa.DateTime(timezone=True),
+            server_default=sa.func.now(),
+            nullable=False,
+        ),
+    )
+    op.create_index(op.f("ix_moderation_actions_id"), "moderation_actions", ["id"], unique=False)
+    op.create_index(
+        op.f("ix_moderation_actions_moderator_id"),
+        "moderation_actions",
+        ["moderator_id"],
+        unique=False,
+    )
+
+    # ── appeals table ───────────────────────────────────────────
+
+    op.create_table(
+        "appeals",
+        sa.Column("id", sa.BigInteger(), primary_key=True, autoincrement=True),
+        sa.Column(
+            "moderation_action_id",
+            sa.Integer(),
+            sa.ForeignKey("moderation_actions.id", ondelete="CASCADE"),
+            nullable=False,
+        ),
+        sa.Column(
+            "user_id",
+            sa.Integer(),
+            sa.ForeignKey("users.id", ondelete="CASCADE"),
+            nullable=False,
+        ),
+        sa.Column("reason", sa.Text(), nullable=False),
+        sa.Column(
+            "status",
+            appeal_status_enum,
+            nullable=False,
+            server_default="pending",
+        ),
+        sa.Column(
+            "reviewed_by",
+            sa.Integer(),
+            sa.ForeignKey("users.id", ondelete="SET NULL"),
+            nullable=True,
+        ),
+        sa.Column("reviewed_at", sa.DateTime(timezone=True), nullable=True),
+        sa.Column(
+            "created_at",
+            sa.DateTime(timezone=True),
+            server_default=sa.func.now(),
+            nullable=False,
+        ),
+        sa.UniqueConstraint("moderation_action_id", "user_id"),
+    )
+    op.create_index(op.f("ix_appeals_id"), "appeals", ["id"], unique=False)
+    op.create_index(op.f("ix_appeals_user_id"), "appeals", ["user_id"], unique=False)
+
+
+def downgrade() -> None:
+    """Remove trust & safety tables and columns."""
+
+    op.drop_index(op.f("ix_appeals_user_id"), table_name="appeals")
+    op.drop_index(op.f("ix_appeals_id"), table_name="appeals")
+    op.drop_table("appeals")
+
+    op.drop_index(op.f("ix_moderation_actions_moderator_id"), table_name="moderation_actions")
+    op.drop_index(op.f("ix_moderation_actions_id"), table_name="moderation_actions")
+    op.drop_table("moderation_actions")
+
+    op.drop_index(op.f("ix_reports_reporter_id"), table_name="reports")
+    op.drop_index(op.f("ix_reports_id"), table_name="reports")
+    op.drop_table("reports")
+
+    op.drop_column("users", "suspended_until")
+    op.drop_column("users", "banned_until")
+    op.drop_column("users", "role")
+
+    # Drop ENUM types
+    postgresql.ENUM(name="appeal_status").drop(op.get_bind(), checkfirst=True)
+    postgresql.ENUM(name="moderation_action").drop(op.get_bind(), checkfirst=True)
+    postgresql.ENUM(name="resolution").drop(op.get_bind(), checkfirst=True)
+    postgresql.ENUM(name="report_status").drop(op.get_bind(), checkfirst=True)
+    postgresql.ENUM(name="reason_category").drop(op.get_bind(), checkfirst=True)
+    postgresql.ENUM(name="target_type").drop(op.get_bind(), checkfirst=True)
+    postgresql.ENUM(name="role").drop(op.get_bind(), checkfirst=True)

backend/app/models/__init__.py

@@ -4,12 +4,4 @@ from app.models.world import World
 from app.models.asset import Asset
 from app.models.moderation import Report, ModerationAction, Appeal
 
-__all__ = [
+__all__ = ["User", "Session", "World", "Asset", "Report", "ModerationAction", "Appeal"]
-    "User",
-    "Session",
-    "World",
-    "Asset",
-    "Report",
-    "ModerationAction",
-    "Appeal",
-]

backend/app/models/moderation.py

@@ -1,137 +1,225 @@
+"""Trust & Safety models: reports, moderation actions, and appeals."""
+
 from datetime import datetime
 from typing import Optional
 
-from sqlalchemy import Column, Integer, String, Text, ForeignKey, DateTime
+from sqlalchemy import (
-from sqlalchemy.dialects.postgresql import ENUM
+    CheckConstraint,
+    Column,
+    DateTime,
+    Enum,
+    ForeignKey,
+    Integer,
+    String,
+    Text,
+    UniqueConstraint,
+    func,
+)
+from sqlalchemy.dialects.postgresql import ENUM as PG_ENUM
 from sqlalchemy.orm import relationship
-from sqlalchemy.sql import func
-import enum
 
 from app.database import Base
 
 
-class TargetType(str, enum.Enum):
+# ---------------------------------------------------------------------------
-    USER = "user"
+# ENUM helpers — created explicitly in Alembic, not via SQLAlchemy create_type
-    WORLD = "world"
+# ---------------------------------------------------------------------------
-    ASSET = "asset"
-    CHAT_MESSAGE = "chat_message"
 
+_role_enum = PG_ENUM(
+    "user", "moderator", "admin",
+    name="user_role",
+    create_type=False,
+)
 
-class ReasonCategory(str, enum.Enum):
+_target_type_enum = PG_ENUM(
-    HARASSMENT = "harassment"
+    "user", "world", "asset", "chat_message",
-    HATE_SPEECH = "hate_speech"
+    name="target_type",
-    SEXUAL_CONTENT = "sexual_content"
+    create_type=False,
-    VIOLENCE = "violence"
+)
-    SPAM = "spam"
-    SELF_HARM = "self_harm"
-    OTHER = "other"
 
+_reason_category_enum = PG_ENUM(
+    "harassment", "hate_speech", "sexual_content", "violence",
+    "spam", "self_harm", "other",
+    name="reason_category",
+    create_type=False,
+)
 
-class ReportStatus(str, enum.Enum):
+_report_status_enum = PG_ENUM(
-    OPEN = "open"
+    "open", "in_review", "resolved", "dismissed",
-    IN_REVIEW = "in_review"
+    name="report_status",
-    RESOLVED = "resolved"
+    create_type=False,
-    DISMISSED = "dismissed"
+)
 
+_resolution_enum = PG_ENUM(
+    "action_taken", "action_not_needed", "duplicate", "escalated",
+    name="resolution",
+    create_type=False,
+)
 
-class Resolution(str, enum.Enum):
+_moderation_action_enum = PG_ENUM(
-    ACTION_TAKEN = "action_taken"
+    "warn", "suspend", "ban", "restrict", "remove", "restore",
-    DISMISSED = "dismissed"
+    name="moderation_action",
-    NO_VIOLATION = "no_violation"
+    create_type=False,
+)
 
-
+_appeal_status_enum = PG_ENUM(
-class ActionType(str, enum.Enum):
+    "pending", "approved", "rejected",
-    WARN = "warn"
+    name="appeal_status",
-    SUSPEND = "suspend"
+    create_type=False,
-    BAN = "ban"
+)
-    RESTRICT = "restrict"
-    REMOVE = "remove"
-    RESTORE = "restore"
-
-
-class AppealStatus(str, enum.Enum):
-    PENDING = "pending"
-    APPROVED = "approved"
-    REJECTED = "rejected"
 
 
 class Report(Base):
+    """A user-submitted report about another entity."""
+
     __tablename__ = "reports"
 
-    id = Column(Integer, primary_key=True, index=True)
+    id = Column(Integer, primary_key=True, autoincrement=True)
-    reporter_id = Column(Integer, ForeignKey("users.id", ondelete="CASCADE"), nullable=False)
+    reporter_id = Column(
-    target_type = Column(
+        Integer,
-        ENUM(TargetType, name="target_type", create_type=False),
+        ForeignKey("users.id", ondelete="CASCADE"),
         nullable=False,
     )
+    target_type = Column(_target_type_enum, nullable=False)
     target_id = Column(String(64), nullable=False)
-    reason_category = Column(
+    reason_category = Column(_reason_category_enum, nullable=False)
-        ENUM(ReasonCategory, name="reason_category", create_type=False),
-        nullable=False,
-    )
     details = Column(Text, nullable=True)
     status = Column(
-        ENUM(ReportStatus, name="report_status", create_type=False),
+        _report_status_enum,
-        default=ReportStatus.OPEN,
         nullable=False,
+        server_default="open",
     )
-    resolved_by = Column(Integer, ForeignKey("users.id", ondelete="SET NULL"), nullable=True)
+    resolved_by = Column(
-    resolution = Column(
+        Integer,
-        ENUM(Resolution, name="resolution", create_type=False),
+        ForeignKey("users.id", ondelete="SET NULL"),
         nullable=True,
     )
+    resolution = Column(_resolution_enum, nullable=True)
+    created_at = Column(
+        DateTime(timezone=True),
+        server_default=func.now(),
+    )
+    updated_at = Column(
+        DateTime(timezone=True),
+        onupdate=func.now(),
+    )
     resolved_at = Column(DateTime(timezone=True), nullable=True)
-    created_at = Column(DateTime(timezone=True), server_default=func.now())
-    updated_at = Column(DateTime(timezone=True), server_default=func.now(), onupdate=func.now())
 
-    reporter = relationship("User", foreign_keys=[reporter_id])
+    # Coalesce duplicate reports from the same reporter about the same target
-    resolved_by_user = relationship("User", foreign_keys=[resolved_by])
+    __table_args__ = (
-    moderation_actions = relationship("ModerationAction", back_populates="report")
+        UniqueConstraint("reporter_id", "target_type", "target_id",
+                         name="uq_reporter_target"),
+    )
+
+    # Relationships
+    reporter = relationship("User", back_populates="reports",
+                            foreign_keys=[reporter_id])
+    resolved_by_user = relationship("User", back_populates="resolved_reports",
+                                    foreign_keys=[resolved_by])
+    moderation_actions = relationship(
+        "ModerationAction",
+        back_populates="report",
+        cascade="all, delete-orphan",
+    )
+    appeals = relationship(
+        "Appeal",
+        back_populates="report",
+        cascade="all, delete-orphan",
+    )
 
 
 class ModerationAction(Base):
+    """A moderation action taken against a target."""
+
     __tablename__ = "moderation_actions"
 
-    id = Column(Integer, primary_key=True, index=True)
+    id = Column(Integer, primary_key=True, autoincrement=True)
-    moderator_id = Column(Integer, ForeignKey("users.id", ondelete="SET NULL"), nullable=False)
+    moderator_id = Column(
-    target_user_id = Column(Integer, ForeignKey("users.id", ondelete="CASCADE"), nullable=False)
+        Integer,
-    target_type = Column(
+        ForeignKey("users.id", ondelete="CASCADE"),
-        ENUM(TargetType, name="target_type", create_type=False),
         nullable=False,
     )
+    target_user_id = Column(
+        Integer,
+        ForeignKey("users.id", ondelete="SET NULL"),
+        nullable=True,
+    )
+    target_type = Column(_target_type_enum, nullable=False)
     target_id = Column(String(64), nullable=False)
-    action = Column(
+    action = Column(_moderation_action_enum, nullable=False)
-        ENUM(ActionType, name="action_type", create_type=False),
+    reason = Column(Text, nullable=False)
-        nullable=False,
+    report_id = Column(
+        Integer,
+        ForeignKey("reports.id", ondelete="SET NULL"),
+        nullable=True,
     )
-    reason = Column(Text, nullable=True)
-    report_id = Column(Integer, ForeignKey("reports.id", ondelete="SET NULL"), nullable=True)
     expires_at = Column(DateTime(timezone=True), nullable=True)
     revoked_at = Column(DateTime(timezone=True), nullable=True)
-    created_at = Column(DateTime(timezone=True), server_default=func.now())
+    created_at = Column(
+        DateTime(timezone=True),
+        server_default=func.now(),
+    )
 
-    moderator = relationship("User", foreign_keys=[moderator_id])
+    # Relationships
-    target_user = relationship("User", foreign_keys=[target_user_id])
+    moderator = relationship("User", back_populates="moderation_actions",
-    report = relationship("Report", back_populates="moderation_actions")
+                             foreign_keys=[moderator_id])
-    appeals = relationship("Appeal", back_populates="moderation_action")
+    target_user = relationship("User", back_populates="moderation_actions_target",
+                               foreign_keys=[target_user_id])
+    report = relationship(
+        "Report",
+        back_populates="moderation_actions",
+    )
+    appeals = relationship(
+        "Appeal",
+        back_populates="moderation_action",
+        cascade="all, delete-orphan",
+    )
 
 
 class Appeal(Base):
+    """An appeal against a moderation action."""
+
     __tablename__ = "appeals"
 
-    id = Column(Integer, primary_key=True, index=True)
+    id = Column(Integer, primary_key=True, autoincrement=True)
-    moderation_action_id = Column(Integer, ForeignKey("moderation_actions.id", ondelete="CASCADE"), nullable=False)
+    moderation_action_id = Column(
-    user_id = Column(Integer, ForeignKey("users.id", ondelete="CASCADE"), nullable=False)
+        Integer,
-    reason = Column(Text, nullable=False)
+        ForeignKey("moderation_actions.id", ondelete="CASCADE"),
-    status = Column(
-        ENUM(AppealStatus, name="appeal_status", create_type=False),
-        default=AppealStatus.PENDING,
         nullable=False,
     )
-    reviewed_by = Column(Integer, ForeignKey("users.id", ondelete="SET NULL"), nullable=True)
+    user_id = Column(
+        Integer,
+        ForeignKey("users.id", ondelete="CASCADE"),
+        nullable=False,
+    )
+    reason = Column(Text, nullable=False)
+    status = Column(
+        _appeal_status_enum,
+        nullable=False,
+        server_default="pending",
+    )
+    reviewed_by = Column(
+        Integer,
+        ForeignKey("users.id", ondelete="SET NULL"),
+        nullable=True,
+    )
     reviewed_at = Column(DateTime(timezone=True), nullable=True)
-    created_at = Column(DateTime(timezone=True), server_default=func.now())
+    created_at = Column(
+        DateTime(timezone=True),
+        server_default=func.now(),
+    )
 
-    moderation_action = relationship("ModerationAction", back_populates="appeals")
+    # Prevent duplicate open appeals per sanction
-    user = relationship("User", foreign_keys=[user_id])
+    __table_args__ = (
-    reviewed_by_user = relationship("User", foreign_keys=[reviewed_by])
+        UniqueConstraint("moderation_action_id", "user_id",
+                         name="uq_action_user_appeal"),
+    )
+
+    # Relationships
+    moderation_action = relationship(
+        "ModerationAction",
+        back_populates="appeals",
+    )
+    user = relationship("User", back_populates="appeals")
+    reviewed_by_user = relationship("User", back_populates="reviewed_appeals",
+                                    foreign_keys=[reviewed_by])

backend/app/models/user.py

@@ -2,20 +2,12 @@ from datetime import date
 from typing import Optional
 
 from sqlalchemy import Column, Integer, String, Boolean, DateTime, Date
-from sqlalchemy.dialects.postgresql import ENUM
 from sqlalchemy.orm import relationship
 from sqlalchemy.sql import func
-import enum
 
 from app.database import Base
 
 
-class UserRole(str, enum.Enum):
-    USER = "user"
-    MODERATOR = "moderator"
-    ADMIN = "admin"
-
-
 class User(Base):
     __tablename__ = "users"
 
@@ -25,25 +17,12 @@ class User(Base):
     hashed_password = Column(String(255), nullable=False)
     date_of_birth = Column(Date, nullable=True)
     is_active = Column(Boolean, default=True)
-    role = Column(
-        ENUM(UserRole, name="user_role", create_type=False),
-        default=UserRole.USER,
-        nullable=False,
-    )
-    banned_until = Column(DateTime(timezone=True), nullable=True)
-    suspended_until = Column(DateTime(timezone=True), nullable=True)
     created_at = Column(DateTime(timezone=True), server_default=func.now())
     updated_at = Column(DateTime(timezone=True), onupdate=func.now())
 
     sessions = relationship("Session", back_populates="user", cascade="all, delete-orphan")
     worlds = relationship("World", back_populates="owner")
     assets = relationship("Asset", back_populates="owner")
-    reports_made = relationship("Report", foreign_keys="Report.reporter_id", back_populates="reporter")
-    reports_resolved = relationship("Report", foreign_keys="Report.resolved_by", back_populates="resolved_by_user")
-    moderation_actions_made = relationship("ModerationAction", foreign_keys="ModerationAction.moderator_id", back_populates="moderator")
-    moderation_actions_targeted = relationship("ModerationAction", foreign_keys="ModerationAction.target_user_id", back_populates="target_user")
-    appeals_made = relationship("Appeal", foreign_keys="Appeal.user_id", back_populates="user")
-    appeals_reviewed = relationship("Appeal", foreign_keys="Appeal.reviewed_by", back_populates="reviewed_by_user")
 
     @property
     def is_adult(self) -> bool:

backend/docker-compose.yml

@@ -8,7 +8,7 @@ services:
       POSTGRES_PASSWORD: agp_password
       POSTGRES_DB: agp_db
     ports:
-      - "55433:5432"
+      - "5432:5432"
     volumes:
       - postgres_data:/var/lib/postgresql/data
     healthcheck: