fix: refactor prisma relations (#1581)

2025-01-13 13:41:53 +11:00
parent 48b55758e3
commit 7d0a9c6439
143 changed files with 687 additions and 790 deletions
--- a/packages/lib/server-only/document/complete-document-with-token.ts
+++ b/packages/lib/server-only/document/complete-document-with-token.ts
@@ -14,7 +14,10 @@ import {

 import { jobs } from '../../jobs/client';
 import type { TRecipientActionAuth } from '../../types/document-auth';
-import { ZWebhookDocumentSchema } from '../../types/webhook-payload';
+import {
+  ZWebhookDocumentSchema,
+  mapDocumentToWebhookDocumentPayload,
+} from '../../types/webhook-payload';
 import { getIsRecipientsTurnToSign } from '../recipient/get-is-recipient-turn';
 import { triggerWebhook } from '../webhooks/trigger/trigger-webhook';
 import { sendPendingEmail } from './send-pending-email';
@@ -31,7 +34,7 @@ const getDocument = async ({ token, documentId }: CompleteDocumentWithTokenOptio
  return await prisma.document.findFirstOrThrow({
    where: {
      id: documentId,
-      Recipient: {
+      recipients: {
        some: {
          token,
        },
@@ -39,7 +42,7 @@ const getDocument = async ({ token, documentId }: CompleteDocumentWithTokenOptio
    },
    include: {
      documentMeta: true,
-      Recipient: {
+      recipients: {
        where: {
          token,
        },
@@ -59,11 +62,11 @@ export const completeDocumentWithToken = async ({
    throw new Error(`Document ${document.id} must be pending`);
  }

-  if (document.Recipient.length === 0) {
+  if (document.recipients.length === 0) {
    throw new Error(`Document ${document.id} has no recipient with token ${token}`);
  }

-  const [recipient] = document.Recipient;
+  const [recipient] = document.recipients;

  if (recipient.signingStatus === SigningStatus.SIGNED) {
    throw new Error(`Recipient ${recipient.id} has already signed`);
@@ -195,7 +198,7 @@ export const completeDocumentWithToken = async ({
  const haveAllRecipientsSigned = await prisma.document.findFirst({
    where: {
      id: document.id,
-      Recipient: {
+      recipients: {
        every: {
          OR: [{ signingStatus: SigningStatus.SIGNED }, { role: RecipientRole.CC }],
        },
@@ -219,13 +222,13 @@ export const completeDocumentWithToken = async ({
    },
    include: {
      documentMeta: true,
-      Recipient: true,
+      recipients: true,
    },
  });

  await triggerWebhook({
    event: WebhookTriggerEvents.DOCUMENT_SIGNED,
-    data: ZWebhookDocumentSchema.parse(updatedDocument),
+    data: ZWebhookDocumentSchema.parse(mapDocumentToWebhookDocumentPayload(updatedDocument)),
    userId: updatedDocument.userId,
    teamId: updatedDocument.teamId ?? undefined,
  });
--- a/packages/lib/server-only/document/create-document.ts
+++ b/packages/lib/server-only/document/create-document.ts
@@ -13,7 +13,10 @@ import type { Team, TeamGlobalSettings } from '@documenso/prisma/client';
 import { TeamMemberRole } from '@documenso/prisma/client';
 import { DocumentSchema } from '@documenso/prisma/generated/zod';

-import { ZWebhookDocumentSchema } from '../../types/webhook-payload';
+import {
+  ZWebhookDocumentSchema,
+  mapDocumentToWebhookDocumentPayload,
+} from '../../types/webhook-payload';
 import { getFile } from '../../universal/upload/get-file';
 import { putPdfFile } from '../../universal/upload/put-file';
 import { triggerWebhook } from '../webhooks/trigger/trigger-webhook';
@@ -178,7 +181,7 @@ export const createDocument = async ({
      },
      include: {
        documentMeta: true,
-        Recipient: true,
+        recipients: true,
      },
    });

@@ -188,7 +191,7 @@ export const createDocument = async ({

    await triggerWebhook({
      event: WebhookTriggerEvents.DOCUMENT_CREATED,
-      data: ZWebhookDocumentSchema.parse(createdDocument),
+      data: ZWebhookDocumentSchema.parse(mapDocumentToWebhookDocumentPayload(createdDocument)),
      userId,
      teamId,
    });
--- a/packages/lib/server-only/document/delete-document.ts
+++ b/packages/lib/server-only/document/delete-document.ts
@@ -58,7 +58,7 @@ export const deleteDocument = async ({
      id,
    },
    include: {
-      Recipient: true,
+      recipients: true,
      documentMeta: true,
      team: {
        include: {
@@ -77,7 +77,7 @@ export const deleteDocument = async ({

  const isUserOwner = document.userId === userId;
  const isUserTeamMember = document.team?.members.some((member) => member.userId === userId);
-  const userRecipient = document.Recipient.find((recipient) => recipient.email === user.email);
+  const userRecipient = document.recipients.find((recipient) => recipient.email === user.email);

  if (!isUserOwner && !isUserTeamMember && !userRecipient) {
    throw new AppError(AppErrorCode.UNAUTHORIZED, {
@@ -128,7 +128,7 @@ export const deleteDocument = async ({

 type HandleDocumentOwnerDeleteOptions = {
  document: Document & {
-    Recipient: Recipient[];
+    recipients: Recipient[];
    documentMeta: DocumentMeta | null;
  };
  team?:
@@ -210,7 +210,7 @@ const handleDocumentOwnerDelete = async ({

  // Send cancellation emails to recipients.
  await Promise.all(
-    document.Recipient.map(async (recipient) => {
+    document.recipients.map(async (recipient) => {
      if (recipient.sendStatus !== SendStatus.SENT) {
        return;
      }
--- a/packages/lib/server-only/document/duplicate-document-by-id.ts
+++ b/packages/lib/server-only/document/duplicate-document-by-id.ts
@@ -56,7 +56,7 @@ export const duplicateDocument = async ({
  const createDocumentArguments: Prisma.DocumentCreateArgs = {
    data: {
      title: document.title,
-      User: {
+      user: {
        connect: {
          id: document.userId,
        },
--- a/packages/lib/server-only/document/find-documents.ts
+++ b/packages/lib/server-only/document/find-documents.ts
@@ -45,12 +45,12 @@ export type FindDocumentsOptions = {

 export const ZFindDocumentsResponseSchema = ZFindResultResponse.extend({
  data: DocumentSchema.extend({
-    User: UserSchema.pick({
+    user: UserSchema.pick({
      id: true,
      name: true,
      email: true,
    }),
-    Recipient: RecipientSchema.array(),
+    recipients: RecipientSchema.array(),
    team: TeamSchema.pick({
      id: true,
      url: true,
@@ -112,8 +112,8 @@ export const findDocuments = async ({
  const searchFilter: Prisma.DocumentWhereInput = {
    OR: [
      { title: { contains: query, mode: 'insensitive' } },
-      { Recipient: { some: { name: { contains: query, mode: 'insensitive' } } } },
-      { Recipient: { some: { email: { contains: query, mode: 'insensitive' } } } },
+      { recipients: { some: { name: { contains: query, mode: 'insensitive' } } } },
+      { recipients: { some: { email: { contains: query, mode: 'insensitive' } } } },
    ],
  };

@@ -137,7 +137,7 @@ export const findDocuments = async ({
    {
      OR: [
        {
-          Recipient: {
+          recipients: {
            some: {
              email: user.email,
            },
@@ -174,7 +174,7 @@ export const findDocuments = async ({
          deletedAt: null,
        },
        {
-          Recipient: {
+          recipients: {
            some: {
              email: user.email,
              documentDeletedAt: null,
@@ -195,13 +195,13 @@ export const findDocuments = async ({
                deletedAt: null,
              },
              {
-                User: {
+                user: {
                  email: team.teamEmail.email,
                },
                deletedAt: null,
              },
              {
-                Recipient: {
+                recipients: {
                  some: {
                    email: team.teamEmail.email,
                    documentDeletedAt: null,
@@ -266,14 +266,14 @@ export const findDocuments = async ({
        [orderByColumn]: orderByDirection,
      },
      include: {
-        User: {
+        user: {
          select: {
            id: true,
            name: true,
            email: true,
          },
        },
-        Recipient: true,
+        recipients: true,
        team: {
          select: {
            id: true,
@@ -313,7 +313,7 @@ const findDocumentsFilter = (status: ExtendedDocumentStatus, user: User) => {
        },
        {
          status: ExtendedDocumentStatus.COMPLETED,
-          Recipient: {
+          recipients: {
            some: {
              email: user.email,
            },
@@ -321,7 +321,7 @@ const findDocumentsFilter = (status: ExtendedDocumentStatus, user: User) => {
        },
        {
          status: ExtendedDocumentStatus.PENDING,
-          Recipient: {
+          recipients: {
            some: {
              email: user.email,
            },
@@ -333,7 +333,7 @@ const findDocumentsFilter = (status: ExtendedDocumentStatus, user: User) => {
      status: {
        not: ExtendedDocumentStatus.DRAFT,
      },
-      Recipient: {
+      recipients: {
        some: {
          email: user.email,
          signingStatus: SigningStatus.NOT_SIGNED,
@@ -357,7 +357,7 @@ const findDocumentsFilter = (status: ExtendedDocumentStatus, user: User) => {
        },
        {
          status: ExtendedDocumentStatus.PENDING,
-          Recipient: {
+          recipients: {
            some: {
              email: user.email,
              signingStatus: SigningStatus.SIGNED,
@@ -378,7 +378,7 @@ const findDocumentsFilter = (status: ExtendedDocumentStatus, user: User) => {
        },
        {
          status: ExtendedDocumentStatus.COMPLETED,
-          Recipient: {
+          recipients: {
            some: {
              email: user.email,
            },
@@ -443,7 +443,7 @@ const findTeamDocumentsFilter = (
          status: {
            not: ExtendedDocumentStatus.DRAFT,
          },
-          Recipient: {
+          recipients: {
            some: {
              email: teamEmail,
            },
@@ -453,7 +453,7 @@ const findTeamDocumentsFilter = (

        // Filter to display all documents that have been sent by the team email.
        filter.OR.push({
-          User: {
+          user: {
            email: teamEmail,
          },
          OR: visibilityFilters,
@@ -472,7 +472,7 @@ const findTeamDocumentsFilter = (
        status: {
          not: ExtendedDocumentStatus.DRAFT,
        },
-        Recipient: {
+        recipients: {
          some: {
            email: teamEmail,
            signingStatus: SigningStatus.NOT_SIGNED,
@@ -498,7 +498,7 @@ const findTeamDocumentsFilter = (
      if (teamEmail && filter.OR) {
        filter.OR.push({
          status: ExtendedDocumentStatus.DRAFT,
-          User: {
+          user: {
            email: teamEmail,
          },
          OR: visibilityFilters,
@@ -523,7 +523,7 @@ const findTeamDocumentsFilter = (
          status: ExtendedDocumentStatus.PENDING,
          OR: [
            {
-              Recipient: {
+              recipients: {
                some: {
                  email: teamEmail,
                  signingStatus: SigningStatus.SIGNED,
@@ -535,7 +535,7 @@ const findTeamDocumentsFilter = (
              OR: visibilityFilters,
            },
            {
-              User: {
+              user: {
                email: teamEmail,
              },
              OR: visibilityFilters,
@@ -560,7 +560,7 @@ const findTeamDocumentsFilter = (
      if (teamEmail && filter.OR) {
        filter.OR.push(
          {
-            Recipient: {
+            recipients: {
              some: {
                email: teamEmail,
              },
@@ -568,7 +568,7 @@ const findTeamDocumentsFilter = (
            OR: visibilityFilters,
          },
          {
-            User: {
+            user: {
              email: teamEmail,
            },
            OR: visibilityFilters,
--- a/packages/lib/server-only/document/get-document-by-id.ts
+++ b/packages/lib/server-only/document/get-document-by-id.ts
@@ -26,14 +26,14 @@ export const getDocumentById = async ({ documentId, userId, teamId }: GetDocumen
    include: {
      documentData: true,
      documentMeta: true,
-      User: {
+      user: {
        select: {
          id: true,
          name: true,
          email: true,
        },
      },
-      Recipient: {
+      recipients: {
        select: {
          email: true,
        },
@@ -119,14 +119,14 @@ export const getDocumentWhereInput = async ({
  if (team.teamEmail) {
    documentWhereInput.OR.push(
      {
-        Recipient: {
+        recipients: {
          some: {
            email: team.teamEmail.email,
          },
        },
      },
      {
-        User: {
+        user: {
          email: team.teamEmail.email,
        },
      },
@@ -154,7 +154,7 @@ export const getDocumentWhereInput = async ({
    {
      OR: [
        {
-          Recipient: {
+          recipients: {
            some: {
              email: user.email,
            },
--- a/packages/lib/server-only/document/get-document-by-token.ts
+++ b/packages/lib/server-only/document/get-document-by-token.ts
@@ -41,7 +41,7 @@ export const getDocumentByToken = async ({ token }: GetDocumentByTokenOptions) =

  const result = await prisma.document.findFirstOrThrow({
    where: {
-      Recipient: {
+      recipients: {
        some: {
          token,
        },
@@ -66,17 +66,17 @@ export const getDocumentAndSenderByToken = async ({

  const result = await prisma.document.findFirstOrThrow({
    where: {
-      Recipient: {
+      recipients: {
        some: {
          token,
        },
      },
    },
    include: {
-      User: true,
+      user: true,
      documentData: true,
      documentMeta: true,
-      Recipient: {
+      recipients: {
        where: {
          token,
        },
@@ -96,9 +96,9 @@ export const getDocumentAndSenderByToken = async ({
  });

  // eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars
-  const { password: _password, ...User } = result.User;
+  const { password: _password, ...user } = result.user;

-  const recipient = result.Recipient[0];
+  const recipient = result.recipients[0];

  // Sanity check, should not be possible.
  if (!recipient) {
@@ -125,7 +125,7 @@ export const getDocumentAndSenderByToken = async ({

  return {
    ...result,
-    User,
+    user,
  };
 };

@@ -144,14 +144,14 @@ export const getDocumentAndRecipientByToken = async ({

  const result = await prisma.document.findFirstOrThrow({
    where: {
-      Recipient: {
+      recipients: {
        some: {
          token,
        },
      },
    },
    include: {
-      Recipient: {
+      recipients: {
        where: {
          token,
        },
@@ -160,7 +160,7 @@ export const getDocumentAndRecipientByToken = async ({
    },
  });

-  const [recipient] = result.Recipient;
+  const [recipient] = result.recipients;

  // Sanity check, should not be possible.
  if (!recipient) {
@@ -185,8 +185,5 @@ export const getDocumentAndRecipientByToken = async ({
    });
  }

-  return {
-    ...result,
-    Recipient: result.Recipient,
-  };
+  return result;
 };
--- a/packages/lib/server-only/document/get-document-with-details-by-id.ts
+++ b/packages/lib/server-only/document/get-document-with-details-by-id.ts
@@ -21,8 +21,8 @@ export type GetDocumentWithDetailsByIdOptions = {
 export const ZGetDocumentWithDetailsByIdResponseSchema = DocumentSchema.extend({
  documentData: DocumentDataSchema,
  documentMeta: DocumentMetaSchema.nullable(),
-  Recipient: RecipientSchema.array(),
-  Field: FieldSchema.array(),
+  recipients: RecipientSchema.array(),
+  fields: FieldSchema.array(),
 });

 export type TGetDocumentWithDetailsByIdResponse = z.infer<
@@ -45,8 +45,8 @@ export const getDocumentWithDetailsById = async ({
    include: {
      documentData: true,
      documentMeta: true,
-      Recipient: true,
-      Field: true,
+      recipients: true,
+      fields: true,
    },
  });

--- a/packages/lib/server-only/document/get-stats.ts
+++ b/packages/lib/server-only/document/get-stats.ts
@@ -85,8 +85,8 @@ const getCounts = async ({ user, createdAt, search }: GetCountsOption) => {
  const searchFilter: Prisma.DocumentWhereInput = {
    OR: [
      { title: { contains: search, mode: 'insensitive' } },
-      { Recipient: { some: { name: { contains: search, mode: 'insensitive' } } } },
-      { Recipient: { some: { email: { contains: search, mode: 'insensitive' } } } },
+      { recipients: { some: { name: { contains: search, mode: 'insensitive' } } } },
+      { recipients: { some: { email: { contains: search, mode: 'insensitive' } } } },
    ],
  };

@@ -113,7 +113,7 @@ const getCounts = async ({ user, createdAt, search }: GetCountsOption) => {
      },
      where: {
        status: ExtendedDocumentStatus.PENDING,
-        Recipient: {
+        recipients: {
          some: {
            email: user.email,
            signingStatus: SigningStatus.NOT_SIGNED,
@@ -132,7 +132,7 @@ const getCounts = async ({ user, createdAt, search }: GetCountsOption) => {
      },
      where: {
        createdAt,
-        User: {
+        user: {
          email: {
            not: user.email,
          },
@@ -140,7 +140,7 @@ const getCounts = async ({ user, createdAt, search }: GetCountsOption) => {
        OR: [
          {
            status: ExtendedDocumentStatus.PENDING,
-            Recipient: {
+            recipients: {
              some: {
                email: user.email,
                signingStatus: SigningStatus.SIGNED,
@@ -150,7 +150,7 @@ const getCounts = async ({ user, createdAt, search }: GetCountsOption) => {
          },
          {
            status: ExtendedDocumentStatus.COMPLETED,
-            Recipient: {
+            recipients: {
              some: {
                email: user.email,
                signingStatus: SigningStatus.SIGNED,
@@ -191,8 +191,8 @@ const getTeamCounts = async (options: GetTeamCountsOption) => {
  const searchFilter: Prisma.DocumentWhereInput = {
    OR: [
      { title: { contains: options.search, mode: 'insensitive' } },
-      { Recipient: { some: { name: { contains: options.search, mode: 'insensitive' } } } },
-      { Recipient: { some: { email: { contains: options.search, mode: 'insensitive' } } } },
+      { recipients: { some: { name: { contains: options.search, mode: 'insensitive' } } } },
+      { recipients: { some: { email: { contains: options.search, mode: 'insensitive' } } } },
    ],
  };

@@ -234,7 +234,7 @@ const getTeamCounts = async (options: GetTeamCountsOption) => {
          {
            OR: [
              { userId: options.userId },
-              { Recipient: { some: { email: options.currentUserEmail } } },
+              { recipients: { some: { email: options.currentUserEmail } } },
            ],
          },
        ],
@@ -257,7 +257,7 @@ const getTeamCounts = async (options: GetTeamCountsOption) => {
          teamId,
        },
        {
-          User: {
+          user: {
            email: teamEmail,
          },
        },
@@ -274,7 +274,7 @@ const getTeamCounts = async (options: GetTeamCountsOption) => {
        userId: userIdWhereClause,
        createdAt,
        status: ExtendedDocumentStatus.PENDING,
-        Recipient: {
+        recipients: {
          some: {
            email: teamEmail,
            signingStatus: SigningStatus.NOT_SIGNED,
@@ -296,7 +296,7 @@ const getTeamCounts = async (options: GetTeamCountsOption) => {
        OR: [
          {
            status: ExtendedDocumentStatus.PENDING,
-            Recipient: {
+            recipients: {
              some: {
                email: teamEmail,
                signingStatus: SigningStatus.SIGNED,
@@ -307,7 +307,7 @@ const getTeamCounts = async (options: GetTeamCountsOption) => {
          },
          {
            status: ExtendedDocumentStatus.COMPLETED,
-            Recipient: {
+            recipients: {
              some: {
                email: teamEmail,
                signingStatus: SigningStatus.SIGNED,
--- a/packages/lib/server-only/document/reject-document-with-token.ts
+++ b/packages/lib/server-only/document/reject-document-with-token.ts
@@ -6,7 +6,10 @@ import { prisma } from '@documenso/prisma';
 import { WebhookTriggerEvents } from '@documenso/prisma/client';

 import { DOCUMENT_AUDIT_LOG_TYPE } from '../../types/document-audit-logs';
-import { ZWebhookDocumentSchema } from '../../types/webhook-payload';
+import {
+  ZWebhookDocumentSchema,
+  mapDocumentToWebhookDocumentPayload,
+} from '../../types/webhook-payload';
 import type { RequestMetadata } from '../../universal/extract-request-metadata';
 import { createDocumentAuditLogData } from '../../utils/document-audit-logs';
 import { triggerWebhook } from '../webhooks/trigger/trigger-webhook';
@@ -31,17 +34,17 @@ export async function rejectDocumentWithToken({
      documentId,
    },
    include: {
-      Document: {
+      document: {
        include: {
-          User: true,
-          Recipient: true,
+          user: true,
+          recipients: true,
          documentMeta: true,
        },
      },
    },
  });

-  const document = recipient?.Document;
+  const document = recipient?.document;

  if (!recipient || !document) {
    throw new TRPCError({
@@ -97,7 +100,7 @@ export async function rejectDocumentWithToken({
      id: document.id,
    },
    include: {
-      Recipient: true,
+      recipients: true,
      documentMeta: true,
    },
  });
@@ -109,7 +112,7 @@ export async function rejectDocumentWithToken({
  // Trigger webhook for document rejection
  await triggerWebhook({
    event: WebhookTriggerEvents.DOCUMENT_REJECTED,
-    data: ZWebhookDocumentSchema.parse(updatedDocument),
+    data: ZWebhookDocumentSchema.parse(mapDocumentToWebhookDocumentPayload(updatedDocument)),
    userId: document.userId,
    teamId: document.teamId ?? undefined,
  });
--- a/packages/lib/server-only/document/resend-document.tsx
+++ b/packages/lib/server-only/document/resend-document.tsx
@@ -54,7 +54,7 @@ export const resendDocument = async ({
  const document = await prisma.document.findUnique({
    where: documentWhereInput,
    include: {
-      Recipient: {
+      recipients: {
        where: {
          id: {
            in: recipients,
@@ -80,7 +80,7 @@ export const resendDocument = async ({
    throw new Error('Document not found');
  }

-  if (document.Recipient.length === 0) {
+  if (document.recipients.length === 0) {
    throw new Error('Document has no recipients');
  }

@@ -101,7 +101,7 @@ export const resendDocument = async ({
  }

  await Promise.all(
-    document.Recipient.map(async (recipient) => {
+    document.recipients.map(async (recipient) => {
      if (recipient.role === RecipientRole.CC) {
        return;
      }
--- a/packages/lib/server-only/document/seal-document.ts
+++ b/packages/lib/server-only/document/seal-document.ts
@@ -14,7 +14,10 @@ import {
 } from '@documenso/prisma/client';
 import { signPdf } from '@documenso/signing';

-import { ZWebhookDocumentSchema } from '../../types/webhook-payload';
+import {
+  ZWebhookDocumentSchema,
+  mapDocumentToWebhookDocumentPayload,
+} from '../../types/webhook-payload';
 import type { RequestMetadata } from '../../universal/extract-request-metadata';
 import { getFile } from '../../universal/upload/get-file';
 import { putPdfFile } from '../../universal/upload/put-file';
@@ -43,7 +46,7 @@ export const sealDocument = async ({
  const document = await prisma.document.findFirstOrThrow({
    where: {
      id: documentId,
-      Recipient: {
+      recipients: {
        every: {
          signingStatus: SigningStatus.SIGNED,
        },
@@ -52,7 +55,7 @@ export const sealDocument = async ({
    include: {
      documentData: true,
      documentMeta: true,
-      Recipient: true,
+      recipients: true,
      team: {
        select: {
          teamGlobalSettings: {
@@ -89,7 +92,7 @@ export const sealDocument = async ({
      documentId: document.id,
    },
    include: {
-      Signature: true,
+      signature: true,
    },
  });

@@ -206,13 +209,13 @@ export const sealDocument = async ({
    include: {
      documentData: true,
      documentMeta: true,
-      Recipient: true,
+      recipients: true,
    },
  });

  await triggerWebhook({
    event: WebhookTriggerEvents.DOCUMENT_COMPLETED,
-    data: ZWebhookDocumentSchema.parse(updatedDocument),
+    data: ZWebhookDocumentSchema.parse(mapDocumentToWebhookDocumentPayload(updatedDocument)),
    userId: document.userId,
    teamId: document.teamId ?? undefined,
  });
--- a/packages/lib/server-only/document/search-documents-with-keyword.ts
+++ b/packages/lib/server-only/document/search-documents-with-keyword.ts
@@ -35,7 +35,7 @@ export const searchDocumentsWithKeyword = async ({
          deletedAt: null,
        },
        {
-          Recipient: {
+          recipients: {
            some: {
              email: {
                contains: query,
@@ -48,7 +48,7 @@ export const searchDocumentsWithKeyword = async ({
        },
        {
          status: DocumentStatus.COMPLETED,
-          Recipient: {
+          recipients: {
            some: {
              email: user.email,
            },
@@ -60,7 +60,7 @@ export const searchDocumentsWithKeyword = async ({
        },
        {
          status: DocumentStatus.PENDING,
-          Recipient: {
+          recipients: {
            some: {
              email: user.email,
            },
@@ -91,7 +91,7 @@ export const searchDocumentsWithKeyword = async ({
      ],
    },
    include: {
-      Recipient: true,
+      recipients: true,
      team: {
        select: {
          url: true,
@@ -140,7 +140,7 @@ export const searchDocumentsWithKeyword = async ({
      return canAccessDocument;
    })
    .map((document) => {
-      const { Recipient, ...documentWithoutRecipient } = document;
+      const { recipients, ...documentWithoutRecipient } = document;

      let documentPath;

@@ -149,13 +149,13 @@ export const searchDocumentsWithKeyword = async ({
      } else if (document.teamId && document.team) {
        documentPath = `${formatDocumentsPath(document.team.url)}/${document.id}`;
      } else {
-        documentPath = getSigningLink(Recipient, user);
+        documentPath = getSigningLink(recipients, user);
      }

      return {
        ...documentWithoutRecipient,
        path: documentPath,
-        value: [document.id, document.title, ...document.Recipient.map((r) => r.email)].join(' '),
+        value: [document.id, document.title, ...document.recipients.map((r) => r.email)].join(' '),
      };
    });

--- a/packages/lib/server-only/document/send-completed-email.ts
+++ b/packages/lib/server-only/document/send-completed-email.ts
@@ -32,8 +32,8 @@ export const sendCompletedEmail = async ({ documentId, requestMetadata }: SendDo
    include: {
      documentData: true,
      documentMeta: true,
-      Recipient: true,
-      User: true,
+      recipients: true,
+      user: true,
      team: {
        select: {
          id: true,
@@ -50,11 +50,11 @@ export const sendCompletedEmail = async ({ documentId, requestMetadata }: SendDo

  const isDirectTemplate = document?.source === DocumentSource.TEMPLATE_DIRECT_LINK;

-  if (document.Recipient.length === 0) {
+  if (document.recipients.length === 0) {
    throw new Error('Document has no recipients');
  }

-  const { User: owner } = document;
+  const { user: owner } = document;

  const completedDocument = await getFile(document.documentData);

@@ -83,7 +83,7 @@ export const sendCompletedEmail = async ({ documentId, requestMetadata }: SendDo
  //    - Recipient emails are disabled
  if (
    isOwnerDocumentCompletedEmailEnabled &&
-    (!document.Recipient.find((recipient) => recipient.email === owner.email) ||
+    (!document.recipients.find((recipient) => recipient.email === owner.email) ||
      !isDocumentCompletedEmailEnabled)
  ) {
    const template = createElement(DocumentCompletedEmailTemplate, {
@@ -150,7 +150,7 @@ export const sendCompletedEmail = async ({ documentId, requestMetadata }: SendDo
  }

  await Promise.all(
-    document.Recipient.map(async (recipient) => {
+    document.recipients.map(async (recipient) => {
      const customEmailTemplate = {
        'signer.name': recipient.name,
        'signer.email': recipient.email,
--- a/packages/lib/server-only/document/send-delete-email.ts
+++ b/packages/lib/server-only/document/send-delete-email.ts
@@ -23,7 +23,7 @@ export const sendDeleteEmail = async ({ documentId, reason }: SendDeleteEmailOpt
      id: documentId,
    },
    include: {
-      User: true,
+      user: true,
      documentMeta: true,
      team: {
        include: {
@@ -45,7 +45,7 @@ export const sendDeleteEmail = async ({ documentId, reason }: SendDeleteEmailOpt
    return;
  }

-  const { email, name } = document.User;
+  const { email, name } = document.user;

  const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL() || 'http://localhost:3000';

--- a/packages/lib/server-only/document/send-document.tsx
+++ b/packages/lib/server-only/document/send-document.tsx
@@ -21,7 +21,10 @@ import {

 import { jobs } from '../../jobs/client';
 import { extractDerivedDocumentEmailSettings } from '../../types/document-email';
-import { ZWebhookDocumentSchema } from '../../types/webhook-payload';
+import {
+  ZWebhookDocumentSchema,
+  mapDocumentToWebhookDocumentPayload,
+} from '../../types/webhook-payload';
 import { getFile } from '../../universal/upload/get-file';
 import { insertFormValuesInPdf } from '../pdf/insert-form-values-in-pdf';
 import { triggerWebhook } from '../webhooks/trigger/trigger-webhook';
@@ -36,7 +39,7 @@ export type SendDocumentOptions = {

 export const ZSendDocumentResponseSchema = DocumentSchema.extend({
  documentMeta: DocumentMetaSchema.nullable(),
-  Recipient: RecipientSchema.array(),
+  recipients: RecipientSchema.array(),
 });

 export type TSendDocumentResponse = z.infer<typeof ZSendDocumentResponseSchema>;
@@ -68,7 +71,7 @@ export const sendDocument = async ({
          }),
    },
    include: {
-      Recipient: {
+      recipients: {
        orderBy: [{ signingOrder: { sort: 'asc', nulls: 'last' } }, { id: 'asc' }],
      },
      documentMeta: true,
@@ -80,7 +83,7 @@ export const sendDocument = async ({
    throw new Error('Document not found');
  }

-  if (document.Recipient.length === 0) {
+  if (document.recipients.length === 0) {
    throw new Error('Document has no recipients');
  }

@@ -90,13 +93,13 @@ export const sendDocument = async ({

  const signingOrder = document.documentMeta?.signingOrder || DocumentSigningOrder.PARALLEL;

-  let recipientsToNotify = document.Recipient;
+  let recipientsToNotify = document.recipients;

  if (signingOrder === DocumentSigningOrder.SEQUENTIAL) {
    // Get the currently active recipient.
-    recipientsToNotify = document.Recipient.filter(
-      (r) => r.signingStatus === SigningStatus.NOT_SIGNED && r.role !== RecipientRole.CC,
-    ).slice(0, 1);
+    recipientsToNotify = document.recipients
+      .filter((r) => r.signingStatus === SigningStatus.NOT_SIGNED && r.role !== RecipientRole.CC)
+      .slice(0, 1);

    // Secondary filter so we aren't resending if the current active recipient has already
    // received the document.
@@ -194,7 +197,7 @@ export const sendDocument = async ({
    );
  }

-  const allRecipientsHaveNoActionToTake = document.Recipient.every(
+  const allRecipientsHaveNoActionToTake = document.recipients.every(
    (recipient) =>
      recipient.role === RecipientRole.CC || recipient.signingStatus === SigningStatus.SIGNED,
  );
@@ -215,7 +218,7 @@ export const sendDocument = async ({
      },
      include: {
        documentMeta: true,
-        Recipient: true,
+        recipients: true,
      },
    });
  }
@@ -241,14 +244,14 @@ export const sendDocument = async ({
      },
      include: {
        documentMeta: true,
-        Recipient: true,
+        recipients: true,
      },
    });
  });

  await triggerWebhook({
    event: WebhookTriggerEvents.DOCUMENT_SENT,
-    data: ZWebhookDocumentSchema.parse(updatedDocument),
+    data: ZWebhookDocumentSchema.parse(mapDocumentToWebhookDocumentPayload(updatedDocument)),
    userId,
    teamId,
  });
--- a/packages/lib/server-only/document/send-pending-email.ts
+++ b/packages/lib/server-only/document/send-pending-email.ts
@@ -21,14 +21,14 @@ export const sendPendingEmail = async ({ documentId, recipientId }: SendPendingE
  const document = await prisma.document.findFirst({
    where: {
      id: documentId,
-      Recipient: {
+      recipients: {
        some: {
          id: recipientId,
        },
      },
    },
    include: {
-      Recipient: {
+      recipients: {
        where: {
          id: recipientId,
        },
@@ -46,7 +46,7 @@ export const sendPendingEmail = async ({ documentId, recipientId }: SendPendingE
    throw new Error('Document not found');
  }

-  if (document.Recipient.length === 0) {
+  if (document.recipients.length === 0) {
    throw new Error('Document has no recipients');
  }

@@ -58,7 +58,7 @@ export const sendPendingEmail = async ({ documentId, recipientId }: SendPendingE
    return;
  }

-  const [recipient] = document.Recipient;
+  const [recipient] = document.recipients;

  const { email, name } = recipient;

--- a/packages/lib/server-only/document/super-delete-document.ts
+++ b/packages/lib/server-only/document/super-delete-document.ts
@@ -30,9 +30,9 @@ export const superDeleteDocument = async ({ id, requestMetadata }: SuperDeleteDo
      id,
    },
    include: {
-      Recipient: true,
+      recipients: true,
      documentMeta: true,
-      User: true,
+      user: true,
      team: {
        include: {
          teamGlobalSettings: true,
@@ -45,7 +45,7 @@ export const superDeleteDocument = async ({ id, requestMetadata }: SuperDeleteDo
    throw new Error('Document not found');
  }

-  const { status, User: user } = document;
+  const { status, user } = document;

  const isDocumentDeletedEmailEnabled = extractDerivedDocumentEmailSettings(
    document.documentMeta,
@@ -54,11 +54,11 @@ export const superDeleteDocument = async ({ id, requestMetadata }: SuperDeleteDo
  // if the document is pending, send cancellation emails to all recipients
  if (
    status === DocumentStatus.PENDING &&
-    document.Recipient.length > 0 &&
+    document.recipients.length > 0 &&
    isDocumentDeletedEmailEnabled
  ) {
    await Promise.all(
-      document.Recipient.map(async (recipient) => {
+      document.recipients.map(async (recipient) => {
        if (recipient.sendStatus !== SendStatus.SENT) {
          return;
        }
--- a/packages/lib/server-only/document/viewed-document.ts
+++ b/packages/lib/server-only/document/viewed-document.ts
@@ -6,7 +6,10 @@ import { ReadStatus, SendStatus } from '@documenso/prisma/client';
 import { WebhookTriggerEvents } from '@documenso/prisma/client';

 import type { TDocumentAccessAuthTypes } from '../../types/document-auth';
-import { ZWebhookDocumentSchema } from '../../types/webhook-payload';
+import {
+  ZWebhookDocumentSchema,
+  mapDocumentToWebhookDocumentPayload,
+} from '../../types/webhook-payload';
 import { triggerWebhook } from '../webhooks/trigger/trigger-webhook';

 export type ViewedDocumentOptions = {
@@ -71,7 +74,7 @@ export const viewedDocument = async ({
    },
    include: {
      documentMeta: true,
-      Recipient: true,
+      recipients: true,
    },
  });

@@ -81,7 +84,7 @@ export const viewedDocument = async ({

  await triggerWebhook({
    event: WebhookTriggerEvents.DOCUMENT_OPENED,
-    data: ZWebhookDocumentSchema.parse(document),
+    data: ZWebhookDocumentSchema.parse(mapDocumentToWebhookDocumentPayload(document)),
    userId: document.userId,
    teamId: document.teamId ?? undefined,
  });