Add client_id column to user submitted data.

Author: tvandort

clients/privacy-center/next-env.d.ts

@@ -1,7 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
 /// <reference types="next/navigation-types/compat/navigation" />
-/// <reference path="./.next/types/routes.d.ts" />
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/app/api-reference/config/typescript for more information.

src/fides/api/alembic/migrations/versions/xx_2026_04_09_0838_d76443a8a2e3_add_client_id_columns_to_user_submitted_.py

@@ -0,0 +1,52 @@
+"""add client id columns to user submitted data
+
+Revision ID: d76443a8a2e3
+Revises: d4e6f8a0b2c3
+Create Date: 2026-04-09 08:38:43.724458
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'd76443a8a2e3'
+down_revision = 'd4e6f8a0b2c3'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.add_column(
+        "comment",
+        sa.Column(
+            "client_id",
+            sa.String(),
+            sa.ForeignKey("client.id", ondelete="SET NULL"),
+            nullable=True,
+        ),
+    )
+    op.add_column(
+        "attachment",
+        sa.Column(
+            "client_id",
+            sa.String(),
+            sa.ForeignKey("client.id", ondelete="SET NULL"),
+            nullable=True,
+        ),
+    )
+    op.add_column(
+        "event_audit",
+        sa.Column(
+            "client_id",
+            sa.String(),
+            sa.ForeignKey("client.id", ondelete="SET NULL"),
+            nullable=True,
+        ),
+    )
+
+
+def downgrade():
+    op.drop_column("event_audit", "client_id")
+    op.drop_column("attachment", "client_id")
+    op.drop_column("comment", "client_id")

src/fides/api/models/attachment.py

@@ -20,6 +20,7 @@
 from fides.api.service.storage.util import AllowedFileType
 
 if TYPE_CHECKING:
+    from fides.api.models.client import ClientDetail
     from fides.api.models.comment import Comment
     from fides.api.models.fides_user import FidesUser
     from fides.api.models.privacy_request import PrivacyRequest
@@ -104,6 +105,9 @@ class Attachment(Base):
     user_id = Column(
         String, ForeignKey("fidesuser.id", ondelete="SET NULL"), nullable=True
     )
+    client_id = Column(
+        String, ForeignKey("client.id", ondelete="SET NULL"), nullable=True
+    )
     # Not all users in the system have a username, and users can be deleted.
     # Store a non-normalized copy of username for these cases.
     username = Column(String, nullable=True)
@@ -118,6 +122,13 @@ class Attachment(Base):
         lazy="selectin",
         uselist=False,
     )
+    client: "ClientDetail" = relationship(
+        "ClientDetail",
+        lazy="selectin",
+        uselist=False,
+        foreign_keys=[client_id],
+        primaryjoin="Attachment.client_id == ClientDetail.id",
+    )
 
     references = relationship(
         "AttachmentReference",

src/fides/api/models/comment.py

@@ -12,6 +12,7 @@
 
 if TYPE_CHECKING:
     from fides.api.models.attachment import Attachment, AttachmentReference
+    from fides.api.models.client import ClientDetail
     from fides.api.models.fides_user import FidesUser
     from fides.api.models.privacy_request import PrivacyRequest
 
@@ -96,6 +97,9 @@ class Comment(Base):
     user_id = Column(
         String, ForeignKey("fidesuser.id", ondelete="SET NULL"), nullable=True
     )
+    client_id = Column(
+        String, ForeignKey("client.id", ondelete="SET NULL"), nullable=True
+    )
     # Not all users in the system have a username, and users can be deleted.
     # Store a non-normalized copy of username for these cases.
     username = Column(String, nullable=True)
@@ -107,6 +111,13 @@ class Comment(Base):
         lazy="selectin",
         uselist=False,
     )
+    client: "ClientDetail" = relationship(
+        "ClientDetail",
+        lazy="selectin",
+        uselist=False,
+        foreign_keys=[client_id],
+        primaryjoin="Comment.client_id == ClientDetail.id",
+    )
 
     references = relationship(
         "CommentReference",

src/fides/api/models/event_audit.py

@@ -1,14 +1,19 @@
 """EventAudit model and related enums for comprehensive audit logging."""
 
 from enum import Enum as EnumType
+from typing import TYPE_CHECKING
 
-from sqlalchemy import Column, String, Text
+from sqlalchemy import Column, ForeignKey, String, Text
 from sqlalchemy.dialects.postgresql import JSONB
 from sqlalchemy.ext.declarative import declared_attr
+from sqlalchemy.orm import relationship
 
 from fides.api.db.base_class import Base
 from fides.api.db.util import EnumColumn
 
+if TYPE_CHECKING:
+    from fides.api.models.client import ClientDetail
+
 
 class EventAuditType(str, EnumType):
     """Hierarchical event types for audit logging - variable depth as needed."""
@@ -85,6 +90,16 @@ def __tablename__(cls) -> str:
     # Uses EventAuditType values but left as String to avoid future migrations
     event_type = Column(String, index=True, nullable=False)
     user_id = Column(String, nullable=True, index=True)
+    client_id = Column(
+        String, ForeignKey("client.id", ondelete="SET NULL"), nullable=True, index=True
+    )
+    client: "ClientDetail" = relationship(
+        "ClientDetail",
+        lazy="selectin",
+        uselist=False,
+        foreign_keys=[client_id],
+        primaryjoin="EventAudit.client_id == ClientDetail.id",
+    )
 
     # Resource information
     resource_type = Column(String, nullable=True, index=True)