ethyca-fides 2.64.1rc0__py2.py3-none-any.whl → 2.64.2b0__py2.py3-none-any.whl

fides/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-06-24T11:20:40-0400",
+ "date": "2025-06-26T17:32:16+0200",
  "dirty": false,
  "error": null,
- "full-revisionid": "21463b495627cf56ebf6405ae00a63c0c1184d53",
- "version": "2.64.1rc0"
+ "full-revisionid": "a393007f54ae4f6f6660c0eadb35ad167a869be7",
+ "version": "2.64.2b0"
 }
 '''  # END VERSION_JSON
 

fides/api/alembic/migrations/versions/6a76a1fa4f3f_add_manual_task_instance_table.py

@@ -0,0 +1,256 @@
+"""add_manual_task_instance_table
+
+Revision ID: 6a76a1fa4f3f
+Revises: ba414a58ba90
+Create Date: 2025-06-10 22:45:27.591492
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.dialects.postgresql import JSONB
+
+# revision identifiers, used by Alembic.
+revision = "6a76a1fa4f3f"
+down_revision = "ba414a58ba90"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # Add execution_timing column to manual_task_config
+    op.add_column(
+        "manual_task_config",
+        sa.Column(
+            "execution_timing",
+            sa.String(),
+            nullable=False,
+            server_default="pre_execution",
+        ),
+    )
+
+    # Remove due_date column from manual_task
+    op.drop_column("manual_task", "due_date")
+
+    # Create manual_task_instance table
+    op.create_table(
+        "manual_task_instance",
+        sa.Column("id", sa.String(), 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("task_id", sa.String(), nullable=False),
+        sa.Column("config_id", sa.String(), nullable=False),
+        sa.Column("entity_id", sa.String(), nullable=False),
+        sa.Column("entity_type", sa.String(), nullable=False),
+        sa.Column("status", sa.String(), nullable=False, server_default="pending"),
+        sa.Column("due_date", sa.DateTime(timezone=True), nullable=True),
+        sa.Column("completed_at", sa.DateTime(timezone=True), nullable=True),
+        sa.Column("completed_by_id", sa.String(), nullable=True),
+        sa.ForeignKeyConstraint(
+            ["config_id"], ["manual_task_config.id"], ondelete="CASCADE"
+        ),
+        sa.ForeignKeyConstraint(["task_id"], ["manual_task.id"], ondelete="CASCADE"),
+        sa.PrimaryKeyConstraint("id"),
+    )
+
+    # Create indexes for manual_task_instance
+    op.create_index(
+        "ix_manual_task_instance_task_id", "manual_task_instance", ["task_id"]
+    )
+    op.create_index(
+        "ix_manual_task_instance_config_id", "manual_task_instance", ["config_id"]
+    )
+    op.create_index(
+        "ix_manual_task_instance_entity_id", "manual_task_instance", ["entity_id"]
+    )
+    op.create_index(
+        "ix_manual_task_instance_entity_type", "manual_task_instance", ["entity_type"]
+    )
+    op.create_index(
+        "ix_manual_task_instance_status", "manual_task_instance", ["status"]
+    )
+    op.create_index(
+        "ix_manual_task_instance_completed_at", "manual_task_instance", ["completed_at"]
+    )
+    # Composite index for common query pattern
+    op.create_index(
+        "ix_manual_task_instance_entity",
+        "manual_task_instance",
+        ["entity_type", "entity_id"],
+    )
+
+    # Create manual_task_submission table
+    op.create_table(
+        "manual_task_submission",
+        sa.Column("id", sa.String(), 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("task_id", sa.String(), nullable=False),
+        sa.Column("config_id", sa.String(), nullable=False),
+        sa.Column("field_id", sa.String(), nullable=False),
+        sa.Column("instance_id", sa.String(), nullable=False),
+        sa.Column("submitted_by", sa.String(), nullable=True),
+        sa.Column("submitted_at", sa.DateTime(timezone=True), nullable=False),
+        sa.Column("data", JSONB, nullable=False),
+        sa.ForeignKeyConstraint(
+            ["config_id"], ["manual_task_config.id"], ondelete="CASCADE"
+        ),
+        sa.ForeignKeyConstraint(
+            ["field_id"], ["manual_task_config_field.id"], ondelete="CASCADE"
+        ),
+        sa.ForeignKeyConstraint(
+            ["instance_id"], ["manual_task_instance.id"], ondelete="CASCADE"
+        ),
+        sa.ForeignKeyConstraint(["task_id"], ["manual_task.id"], ondelete="CASCADE"),
+        sa.ForeignKeyConstraint(
+            ["submitted_by"], ["fidesuser.id"], ondelete="SET NULL"
+        ),
+        sa.PrimaryKeyConstraint("id"),
+    )
+
+    # Create indexes for manual_task_submission
+    op.create_index(
+        "ix_manual_task_submission_task_id", "manual_task_submission", ["task_id"]
+    )
+    op.create_index(
+        "ix_manual_task_submission_config_id", "manual_task_submission", ["config_id"]
+    )
+    op.create_index(
+        "ix_manual_task_submission_field_id", "manual_task_submission", ["field_id"]
+    )
+    op.create_index(
+        "ix_manual_task_submission_instance_id",
+        "manual_task_submission",
+        ["instance_id"],
+    )
+    op.create_index(
+        "ix_manual_task_submission_submitted_by",
+        "manual_task_submission",
+        ["submitted_by"],
+    )
+    op.create_index(
+        "ix_manual_task_submission_submitted_at",
+        "manual_task_submission",
+        ["submitted_at"],
+    )
+    # Composite index for common query pattern
+    op.create_index(
+        "ix_manual_task_submission_instance_field",
+        "manual_task_submission",
+        ["instance_id", "field_id"],
+    )
+
+    # Add foreign key constraint to manual_task_log.instance_id
+    op.create_foreign_key(
+        "fk_manual_task_log_instance_id",
+        "manual_task_log",
+        "manual_task_instance",
+        ["instance_id"],
+        ["id"],
+        ondelete="CASCADE",
+    )
+
+    # Update foreign key constraint for manual_task_log.config_id to use CASCADE
+    op.drop_constraint(
+        "fk_manual_task_log_config_id", "manual_task_log", type_="foreignkey"
+    )
+    op.create_foreign_key(
+        "fk_manual_task_log_config_id",
+        "manual_task_log",
+        "manual_task_config",
+        ["config_id"],
+        ["id"],
+        ondelete="CASCADE",
+    )
+
+
+def downgrade():
+    # Drop execution_timing column from manual_task_config
+    op.drop_column("manual_task_config", "execution_timing")
+
+    # Add due_date column to manual_task
+    op.add_column(
+        "manual_task",
+        sa.Column("due_date", sa.DateTime(timezone=True), nullable=True),
+    )
+
+    # Drop foreign key constraint from manual_task_log.instance_id
+    op.drop_constraint(
+        "fk_manual_task_log_instance_id", "manual_task_log", type_="foreignkey"
+    )
+
+    # Revert foreign key constraint for manual_task_log.config_id back to SET NULL
+    op.drop_constraint(
+        "fk_manual_task_log_config_id", "manual_task_log", type_="foreignkey"
+    )
+    op.create_foreign_key(
+        "fk_manual_task_log_config_id",
+        "manual_task_log",
+        "manual_task_config",
+        ["config_id"],
+        ["id"],
+        ondelete="SET NULL",
+    )
+
+    # Drop indexes first
+    op.drop_index(
+        "ix_manual_task_submission_instance_field", table_name="manual_task_submission"
+    )
+    op.drop_index(
+        "ix_manual_task_submission_submitted_at", table_name="manual_task_submission"
+    )
+    op.drop_index(
+        "ix_manual_task_submission_submitted_by", table_name="manual_task_submission"
+    )
+    op.drop_index(
+        "ix_manual_task_submission_instance_id", table_name="manual_task_submission"
+    )
+    op.drop_index(
+        "ix_manual_task_submission_field_id", table_name="manual_task_submission"
+    )
+    op.drop_index(
+        "ix_manual_task_submission_config_id", table_name="manual_task_submission"
+    )
+    op.drop_index(
+        "ix_manual_task_submission_task_id", table_name="manual_task_submission"
+    )
+
+    op.drop_index("ix_manual_task_instance_entity", table_name="manual_task_instance")
+    op.drop_index(
+        "ix_manual_task_instance_completed_at", table_name="manual_task_instance"
+    )
+    op.drop_index("ix_manual_task_instance_status", table_name="manual_task_instance")
+    op.drop_index(
+        "ix_manual_task_instance_entity_type", table_name="manual_task_instance"
+    )
+    op.drop_index(
+        "ix_manual_task_instance_entity_id", table_name="manual_task_instance"
+    )
+    op.drop_index(
+        "ix_manual_task_instance_config_id", table_name="manual_task_instance"
+    )
+    op.drop_index("ix_manual_task_instance_task_id", table_name="manual_task_instance")
+
+    # Drop tables in reverse order to handle foreign key constraints
+    op.drop_table("manual_task_submission")
+    op.drop_table("manual_task_instance")

fides/api/alembic/migrations/versions/aadfe83c5644_add_manual_task_to_connectiontype_enum.py

@@ -0,0 +1,46 @@
+"""add_manual_task_to_connectiontype_enum
+
+Revision ID: aadfe83c5644
+Revises: 6a76a1fa4f3f
+Create Date: 2025-06-19 18:55:08.131278
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "aadfe83c5644"
+down_revision = "6a76a1fa4f3f"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # Add manual_task to ConnectionType enum
+    op.execute("alter type connectiontype rename to connectiontype_old")
+    op.execute(
+        "create type connectiontype as enum('attentive_email', 'bigquery', 'datahub', 'dynamodb', 'fides', 'generic_consent_email', 'generic_erasure_email', 'dynamic_erasure_email', 'google_cloud_sql_mysql', 'google_cloud_sql_postgres', 'https', 'manual', 'manual_webhook', 'manual_task', 'mariadb', 'mongodb', 'mssql', 'mysql', 'okta', 'postgres', 'rds_mysql', 'rds_postgres', 'redshift', 's3', 'saas', 'scylla', 'snowflake', 'sovrn', 'timescale', 'website')"
+    )
+    op.execute(
+        (
+            "alter table connectionconfig alter column connection_type type connectiontype using "
+            "connection_type::text::connectiontype"
+        )
+    )
+    op.execute("drop type connectiontype_old")
+
+
+def downgrade():
+    # Remove manual_task from ConnectionType enum
+    op.execute("alter type connectiontype rename to connectiontype_old")
+    op.execute(
+        "create type connectiontype as enum('attentive_email', 'bigquery', 'datahub', 'dynamodb', 'fides', 'generic_consent_email', 'generic_erasure_email', 'dynamic_erasure_email', 'google_cloud_sql_mysql', 'google_cloud_sql_postgres', 'https', 'manual', 'manual_webhook', 'mariadb', 'mongodb', 'mssql', 'mysql', 'okta', 'postgres', 'rds_mysql', 'rds_postgres', 'redshift', 's3', 'saas', 'scylla', 'snowflake', 'sovrn', 'timescale', 'website')"
+    )
+    op.execute(
+        (
+            "alter table connectionconfig alter column connection_type type connectiontype using "
+            "connection_type::text::connectiontype"
+        )
+    )
+    op.execute("drop type connectiontype_old")

fides/api/db/base.py

@@ -36,6 +36,10 @@ from fides.api.models.manual_tasks.manual_task_config import (
     ManualTaskConfig,
     ManualTaskConfigField,
 )
+from fides.api.models.manual_tasks.manual_task_instance import (
+    ManualTaskInstance,
+    ManualTaskSubmission,
+)
 from fides.api.models.manual_tasks.manual_task_log import ManualTaskLog
 from fides.api.models.manual_webhook import AccessManualWebhook
 from fides.api.models.messaging import MessagingConfig

fides/api/db/database.py

@@ -15,8 +15,8 @@ from sqlalchemy_utils.types.encrypted.encrypted_type import InvalidCiphertextErr
 
 from fides.api.db.base import Base  # type: ignore[attr-defined]
 from fides.api.db.seed import load_default_resources
+from fides.api.db.session import get_db_engine
 from fides.api.util.errors import get_full_exception_name
-from fides.core.utils import get_db_engine
 
 DatabaseHealth = Literal["healthy", "unhealthy", "needs migration"]
 
@@ -41,6 +41,14 @@ def upgrade_db(alembic_config: Config, revision: str = "head") -> None:
     command.upgrade(alembic_config, revision)
 
 
+def init_db(database_url: str) -> None:
+    """
+    Runs the migrations and creates all of the database objects.
+    """
+    alembic_config = get_alembic_config(database_url)
+    upgrade_db(alembic_config)
+
+
 def downgrade_db(alembic_config: Config, revision: str = "head") -> None:
     """Downgrade the database to the specified migration revision."""
     log.info(f"Running database downgrade to revision {revision}")
@@ -78,7 +86,7 @@ def reset_db(database_url: str) -> None:
     Drops all tables/metadata from the database.
     """
     log.info("Resetting database...")
-    engine = get_db_engine(database_url)
+    engine = get_db_engine(database_uri=database_url)
     with engine.connect() as connection:
         log.info("Dropping tables...")
         Base.metadata.drop_all(connection)
@@ -136,3 +144,20 @@ def configure_db(database_url: str, revision: Optional[str] = "head") -> None:
         log.error("Unable to configure database: {}: {}", error_type, error)
         log.opt(exception=True).error(error)
         raise
+
+
+def check_missing_migrations(database_url: str) -> None:
+    """
+    Tries to autogenerate migrations, returns True if a migration
+    was generated.
+    """
+
+    engine = get_db_engine(database_uri=database_url)
+    connection = engine.connect()
+
+    migration_context = migration.MigrationContext.configure(connection)
+    result = command.autogen.compare_metadata(migration_context, Base.metadata)  # type: ignore[attr-defined]
+
+    if result:
+        raise SystemExit("Migrations needs to be generated!")
+    print("No migrations need to be generated.")

fides/api/models/attachment.py

@@ -5,9 +5,9 @@ from typing import IO, TYPE_CHECKING, Any, Tuple
 
 from fideslang.validation import AnyHttpUrlString
 from loguru import logger as log
-from sqlalchemy import Column
+from sqlalchemy import Column, DateTime
 from sqlalchemy import Enum as EnumColumn
-from sqlalchemy import ForeignKey, String, UniqueConstraint, orm
+from sqlalchemy import ForeignKey, Index, String, UniqueConstraint, func, orm
 from sqlalchemy.ext.declarative import declared_attr
 from sqlalchemy.orm import Session, relationship
 
@@ -64,8 +64,14 @@ class AttachmentReference(Base):
         """Overriding base class method to set the table name."""
         return "attachment_reference"
 
+    created_at = Column(
+        DateTime(timezone=True), server_default=func.now(), nullable=False
+    )
+
     attachment_id = Column(
-        String, ForeignKey("attachment.id", ondelete="CASCADE"), nullable=False
+        String,
+        ForeignKey("attachment.id", name="attachment_reference_attachment_id_fkey"),
+        nullable=False,
     )
     reference_id = Column(String, nullable=False)
     reference_type = Column(EnumColumn(AttachmentReferenceType), nullable=False)
@@ -74,6 +80,8 @@ class AttachmentReference(Base):
         UniqueConstraint(
             "attachment_id", "reference_id", name="_attachment_reference_uc"
         ),
+        Index("ix_attachment_reference_reference_id", "reference_id"),
+        Index("ix_attachment_reference_reference_type", "reference_type"),
     )
 
     # Relationships
@@ -92,6 +100,10 @@ class Attachment(Base):
     Stores information about an Attachment.
     """
 
+    created_at = Column(
+        DateTime(timezone=True), server_default=func.now(), nullable=False
+    )
+
     user_id = Column(
         String, ForeignKey("fidesuser.id", ondelete="SET NULL"), nullable=True
     )

fides/api/models/comment.py

@@ -1,13 +1,13 @@
 from enum import Enum as EnumType
 from typing import TYPE_CHECKING, Any
 
-from sqlalchemy import Column
+from sqlalchemy import Column, DateTime
 from sqlalchemy import Enum as EnumColumn
-from sqlalchemy import ForeignKey, String, UniqueConstraint, orm
+from sqlalchemy import ForeignKey, Index, String, func, orm
 from sqlalchemy.ext.declarative import declared_attr
 from sqlalchemy.orm import Session, relationship
 
-from fides.api.db.base_class import Base
+from fides.api.db.base_class import Base, FidesBase
 from fides.api.models.attachment import Attachment, AttachmentReferenceType
 
 if TYPE_CHECKING:
@@ -48,12 +48,24 @@ class CommentReference(Base):
         """Overriding base class method to set the table name."""
         return "comment_reference"
 
-    comment_id = Column(String, ForeignKey("comment.id"), nullable=False)
+    id = Column(String(255), primary_key=True, default=FidesBase.generate_uuid)
+    created_at = Column(
+        DateTime(timezone=True), server_default=func.now(), nullable=False
+    )
+
+    comment_id = Column(
+        String,
+        ForeignKey(
+            "comment.id", name="comment_reference_comment_id_fkey", ondelete="CASCADE"
+        ),
+        nullable=False,
+    )
     reference_id = Column(String, nullable=False)
     reference_type = Column(EnumColumn(CommentReferenceType), nullable=False)
 
     __table_args__ = (
-        UniqueConstraint("comment_id", "reference_id", name="comment_reference_uc"),
+        Index("ix_comment_reference_reference_id", "reference_id"),
+        Index("ix_comment_reference_reference_type", "reference_type"),
     )
 
     comment = relationship(
@@ -75,6 +87,11 @@ class Comment(Base):
     Stores information about a Comment.
     """
 
+    id = Column(String(255), primary_key=True, default=FidesBase.generate_uuid)
+    created_at = Column(
+        DateTime(timezone=True), server_default=func.now(), nullable=False
+    )
+
     user_id = Column(
         String, ForeignKey("fidesuser.id", ondelete="SET NULL"), nullable=True
     )

fides/api/models/connectionconfig.py

@@ -53,6 +53,7 @@ class ConnectionType(enum.Enum):
     https = "https"
     manual = "manual"  # Deprecated - use manual_webhook instead
     manual_webhook = "manual_webhook"  # Runs upfront before the traversal
+    manual_task = "manual_task"  # Manual task integration
     mariadb = "mariadb"
     mongodb = "mongodb"
     mssql = "mssql"
@@ -88,6 +89,7 @@ class ConnectionType(enum.Enum):
             ConnectionType.google_cloud_sql_postgres.value: "Google Cloud SQL for Postgres",
             ConnectionType.https.value: "Policy Webhook",
             ConnectionType.manual_webhook.value: "Manual Process",
+            ConnectionType.manual_task.value: "Manual Task",
             ConnectionType.manual.value: "Manual Connector",
             ConnectionType.mariadb.value: "MariaDB",
             ConnectionType.mongodb.value: "MongoDB",
@@ -132,6 +134,7 @@ class ConnectionType(enum.Enum):
             ConnectionType.google_cloud_sql_postgres.value: SystemType.database,
             ConnectionType.https.value: SystemType.manual,
             ConnectionType.manual_webhook.value: SystemType.manual,
+            ConnectionType.manual_task.value: SystemType.manual,
             ConnectionType.manual.value: SystemType.manual,
             ConnectionType.mariadb.value: SystemType.database,
             ConnectionType.mongodb.value: SystemType.database,
@@ -229,6 +232,14 @@ class ConnectionConfig(Base):
         uselist=False,
     )
 
+    manual_task = relationship(  # type: ignore[misc]
+        "ManualTask",
+        primaryjoin="and_(ConnectionConfig.id == foreign(ManualTask.parent_entity_id), "
+        "ManualTask.parent_entity_type == 'connection_config')",
+        cascade="delete",
+        uselist=False,
+    )
+
     pre_approval_webhooks = relationship(  # type: ignore[misc]
         "PreApprovalWebhook",
         back_populates="connection_config",

fides/api/models/db_cache.py

@@ -32,7 +32,7 @@ class DBCache(Base):
     cache_value = Column(BYTEA, nullable=False)
 
     __table_args__ = (
-        Index("ix_dbcache_namespace_cache_key", "namespace", "cache_key"),
+        Index("ix_dbcache_namespace_cache_key", "namespace", "cache_key", unique=True),
     )
 
     @classmethod

fides/api/models/detection_discovery/core.py

@@ -159,6 +159,8 @@ class MonitorConfig(Base):
         "MonitorExecution",
         cascade="all, delete-orphan",
         backref="monitor_config",
+        primaryjoin="MonitorExecution.monitor_config_key == foreign(MonitorConfig.key)",
+        single_parent=True,
     )
 
     shared_config_id = Column(
@@ -342,16 +344,16 @@ class StagedResourceAncestor(Base):
     Its entries should be deleted when the staged resource is deleted, via cascade.
     """
 
+    id = Column(String(255), primary_key=True, default=FidesBase.generate_uuid)
+
     ancestor_urn = Column(
         String,
         ForeignKey("stagedresource.urn", ondelete="CASCADE"),
-        primary_key=True,
         nullable=False,
     )
     descendant_urn = Column(
         String,
         ForeignKey("stagedresource.urn", ondelete="CASCADE"),
-        primary_key=True,
         nullable=False,
     )
 
@@ -372,6 +374,7 @@ class StagedResourceAncestor(Base):
         UniqueConstraint(
             "ancestor_urn", "descendant_urn", name="uq_staged_resource_ancestor"
         ),
+        Index("ix_staged_resource_ancestor_pkey", "id", unique=True),
         Index("ix_staged_resource_ancestor_ancestor", "ancestor_urn"),
         Index("ix_staged_resource_ancestor_descendant", "descendant_urn"),
     )
@@ -470,12 +473,7 @@ class StagedResource(Base):
         server_default="{}",
         default=dict,
     )
-    user_assigned_system_id = Column(
-        String,
-        ForeignKey(System.id_field_path),
-        nullable=True,
-        index=True,
-    )
+    user_assigned_system_id = Column(String, nullable=True, index=True)
 
     # pointers to child and parent URNs
     children = Column(
@@ -527,7 +525,7 @@ class StagedResource(Base):
 
     data_uses = Column(
         ARRAY(String),
-        nullable=False,
+        nullable=True,
         server_default="{}",
         default=dict,
     )
@@ -588,12 +586,14 @@ class MonitorExecution(Base):
     configuration details used in connecting to the external data store.
     """
 
-    monitor_config_key = Column(
-        String,
-        ForeignKey(MonitorConfig.key),
-        nullable=False,
-        index=True,
-    )
+    # redefined here because there's a minor, unintended discrepancy between
+    # this `id` field and that of the `Base` class, which explicitly sets `index=True`.
+    # TODO: we likely should _not_ be setting `index=True` on the `id`
+    # attribute of the `Base` class, as `primary_key=True` already specifies a
+    # primary key constraint, which will implicitly create an index for the field.
+    id = Column(String(255), primary_key=True, default=FidesBase.generate_uuid)
+
+    monitor_config_key = Column(String, nullable=False, index=True)
     status = Column(String, nullable=True)
     started = Column(
         DateTime(timezone=True),

fides/api/models/fides_user_respondent_email_verification.py

@@ -3,12 +3,13 @@ from __future__ import annotations
 from datetime import datetime, timedelta, timezone
 from typing import TYPE_CHECKING, Any, Optional
 
-from sqlalchemy import Column, DateTime, ForeignKey, String
+from sqlalchemy import Column, DateTime, ForeignKey, Index, String
 from sqlalchemy.ext.declarative import declared_attr
 from sqlalchemy.orm import Session, relationship
+from sqlalchemy.sql import func
 
 from fides.api.cryptography.cryptographic_util import generate_secure_random_string
-from fides.api.db.base_class import Base
+from fides.api.db.base_class import Base, FidesBase
 from fides.api.util.identity_verification import IdentityVerificationMixin
 from fides.config import get_config
 
@@ -40,6 +41,22 @@ class FidesUserRespondentEmailVerification(Base, IdentityVerificationMixin):
     def __tablename__(self) -> str:
         return "fides_user_respondent_email_verification"
 
+    # redefined here because there's a minor, unintended discrepancy between
+    # this `id` field and that of the `Base` class, which explicitly sets `index=True`.
+    # TODO: we likely should _not_ be setting `index=True` on the `id`
+    # attribute of the `Base` class, as `primary_key=True` already specifies a
+    # primary key constraint, which will implicitly create an index for the field.
+    id = Column(String(255), primary_key=True, default=FidesBase.generate_uuid)
+    created_at = Column(
+        DateTime(timezone=True), server_default=func.now(), nullable=False
+    )
+    updated_at = Column(
+        DateTime(timezone=True),
+        server_default=func.now(),
+        onupdate=func.now(),
+        nullable=False,
+    )
+
     user_id = Column(
         String,
         ForeignKey("fidesuser.id", ondelete="CASCADE"),
@@ -59,6 +76,14 @@ class FidesUserRespondentEmailVerification(Base, IdentityVerificationMixin):
         foreign_keys=[user_id],
     )
 
+    __table_args__ = (
+        Index(
+            "ix_fides_user_respondent_email_verification_id",
+            "id",
+            unique=True,
+        ),
+    )
+
     @classmethod
     def create(
         cls, db: Session, *, data: dict[str, Any], check_name: bool = False