chore: allow same signer docs

packages/lib/server-only/field/set-fields-for-document.ts

@@ -94,9 +94,7 @@ export const setFieldsForDocument = async ({
   const linkedFields = fields.map((field) => {
     const existing = existingFields.find((existingField) => existingField.id === field.id);
 
-    const recipient = document.recipients.find(
+    const recipient = document.recipients.find((recipient) => recipient.id === field.recipientId);
-      (recipient) => recipient.email.toLowerCase() === field.signerEmail.toLowerCase(),
-    );
 
     // Each field MUST have a recipient associated with it.
     if (!recipient) {
@@ -127,8 +125,6 @@ export const setFieldsForDocument = async ({
   const persistedFields = await prisma.$transaction(async (tx) => {
     return await Promise.all(
       linkedFields.map(async (field) => {
-        const fieldSignerEmail = field.signerEmail.toLowerCase();
-
         const parsedFieldMeta = field.fieldMeta
           ? ZFieldMetaSchema.parse(field.fieldMeta)
           : undefined;
@@ -211,6 +207,13 @@ export const setFieldsForDocument = async ({
             id: field._persisted?.id ?? -1,
             documentId,
           },
+          include: {
+            recipient: {
+              select: {
+                email: true,
+              },
+            },
+          },
           update: {
             page: field.pageNumber,
             positionX: field.pageX,
@@ -236,10 +239,7 @@ export const setFieldsForDocument = async ({
             },
             recipient: {
               connect: {
-                documentId_email: {
+                id: field.recipientId,
-                  documentId,
-                  email: fieldSignerEmail,
-                },
               },
             },
           },
@@ -251,7 +251,7 @@ export const setFieldsForDocument = async ({
 
         const baseAuditLog = {
           fieldId: upsertedField.secondaryId,
-          fieldRecipientEmail: fieldSignerEmail,
+          fieldRecipientEmail: upsertedField.recipient?.email ?? '',
           fieldRecipientId: upsertedField.recipientId,
           fieldType: upsertedField.type,
         };
@@ -339,7 +339,7 @@ export const setFieldsForDocument = async ({
 type FieldData = {
   id?: number | null;
   type: FieldType;
-  signerEmail: string;
+  recipientId: number;
   pageNumber: number;
   pageX: number;
   pageY: number;

packages/lib/server-only/field/set-fields-for-template.ts

@@ -23,6 +23,7 @@ export type SetFieldsForTemplateOptions = {
     id?: number | null;
     type: FieldType;
     signerEmail: string;
+    recipientId: number;
     pageNumber: number;
     pageX: number;
     pageY: number;

packages/lib/server-only/recipient/set-document-recipients.ts

@@ -125,16 +125,12 @@ export const setDocumentRecipients = async ({
 
   const removedRecipients = existingRecipients.filter(
     (existingRecipient) =>
-      !normalizedRecipients.find(
+      !normalizedRecipients.find((recipient) => recipient.id === existingRecipient.id),
-        (recipient) =>
-          recipient.id === existingRecipient.id || recipient.email === existingRecipient.email,
-      ),
   );
 
   const linkedRecipients = normalizedRecipients.map((recipient) => {
     const existing = existingRecipients.find(
-      (existingRecipient) =>
+      (existingRecipient) => existingRecipient.id === recipient.id,
-        existingRecipient.id === recipient.id || existingRecipient.email === recipient.email,
     );
 
     if (

packages/prisma/migrations/20250205122523_remove_unique_email_recipient/migration.sql

@@ -0,0 +1,2 @@
+-- DropIndex
+DROP INDEX "Recipient_documentId_email_key";

packages/prisma/migrations/20250206120241_add_email_index_recipient_model/migration.sql

@@ -0,0 +1,5 @@
+-- DropIndex
+DROP INDEX "Recipient_templateId_email_key";
+
+-- CreateIndex
+CREATE INDEX "Recipient_email_idx" ON "Recipient"("email");

packages/prisma/schema.prisma

@@ -443,11 +443,10 @@ model Recipient {
   fields            Field[]
   signatures        Signature[]
 
-  @@unique([documentId, email])
-  @@unique([templateId, email])
   @@index([documentId])
   @@index([templateId])
   @@index([token])
+  @@index([email])
 }
 
 enum FieldType {

packages/trpc/server/field-router/router.ts

@@ -429,6 +429,7 @@ export const fieldRouter = router({
         teamId,
         fields: fields.map((field) => ({
           id: field.nativeId,
+          recipientId: field.recipientId,
           signerEmail: field.signerEmail,
           type: field.type,
           pageNumber: field.pageNumber,

packages/trpc/server/field-router/schema.ts

@@ -112,14 +112,15 @@ export const ZSetDocumentFieldsRequestSchema = z.object({
     z.object({
       formId: z.string().min(1),
       nativeId: z.number().optional(),
+      id: z.number().optional(),
       type: z.nativeEnum(FieldType),
-      signerEmail: z.string().min(1),
+      recipientId: z.number(),
-      pageNumber: z.number().min(1),
+      pageNumber: ZFieldPageNumberSchema,
-      pageX: z.number().min(0),
+      pageX: ZFieldPageXSchema,
-      pageY: z.number().min(0),
+      pageY: ZFieldPageYSchema,
-      pageWidth: z.number().min(0),
+      pageWidth: ZFieldWidthSchema,
-      pageHeight: z.number().min(0),
+      pageHeight: ZFieldHeightSchema,
-      fieldMeta: ZFieldMetaSchema,
+      fieldMeta: ZFieldMetaSchema.optional(),
     }),
   ),
 });

packages/ui/primitives/document-flow/add-fields.tsx

@@ -92,7 +92,7 @@ export type FieldFormType = {
   pageY: number;
   pageWidth: number;
   pageHeight: number;
-  signerEmail: string;
+  recipientId: number;
   fieldMeta?: FieldMeta;
 };
 
@@ -143,8 +143,7 @@ export const AddFieldsFormPartial = ({
         pageY: Number(field.positionY),
         pageWidth: Number(field.width),
         pageHeight: Number(field.height),
-        signerEmail:
+        recipientId: field.recipientId,
-          recipients.find((recipient) => recipient.id === field.recipientId)?.email ?? '',
         fieldMeta: field.fieldMeta ? ZFieldMetaSchema.parse(field.fieldMeta) : undefined,
       })),
       typedSignatureEnabled: typedSignatureEnabled ?? false,
@@ -348,7 +347,7 @@ export const AddFieldsFormPartial = ({
         pageY,
         pageWidth: fieldPageWidth,
         pageHeight: fieldPageHeight,
-        signerEmail: selectedSigner.email,
+        recipientId: selectedSigner.id,
         fieldMeta: undefined,
       };
 
@@ -441,7 +440,7 @@ export const AddFieldsFormPartial = ({
         const newField: TAddFieldsFormSchema['fields'][0] = {
           ...structuredClone(lastActiveField),
           formId: nanoid(12),
-          signerEmail: selectedSigner?.email ?? lastActiveField.signerEmail,
+          recipientId: selectedSigner?.id ?? lastActiveField.recipientId,
           pageX: lastActiveField.pageX + 3,
           pageY: lastActiveField.pageY + 3,
         };
@@ -449,7 +448,7 @@ export const AddFieldsFormPartial = ({
         append(newField);
       }
     },
-    [append, lastActiveField, selectedSigner?.email, toast],
+    [append, lastActiveField, selectedSigner?.id, toast],
   );
 
   const onFieldPaste = useCallback(
@@ -462,13 +461,13 @@ export const AddFieldsFormPartial = ({
         append({
           ...copiedField,
           formId: nanoid(12),
-          signerEmail: selectedSigner?.email ?? copiedField.signerEmail,
+          recipientId: selectedSigner?.id ?? copiedField.recipientId,
           pageX: copiedField.pageX + 3,
           pageY: copiedField.pageY + 3,
         });
       }
     },
-    [append, fieldClipboard, selectedSigner?.email],
+    [append, fieldClipboard, selectedSigner?.id],
   );
 
   useEffect(() => {
@@ -567,7 +566,7 @@ export const AddFieldsFormPartial = ({
       localFields.some(
         (field) =>
           (field.type === FieldType.SIGNATURE || field.type === FieldType.FREE_SIGNATURE) &&
-          field.signerEmail === signer.email,
+          field.recipientId === signer.id,
       ),
     );
 
@@ -637,7 +636,7 @@ export const AddFieldsFormPartial = ({
 
               {isDocumentPdfLoaded &&
                 localFields.map((field, index) => {
-                  const recipientIndex = recipients.findIndex((r) => r.email === field.signerEmail);
+                  const recipientIndex = recipients.findIndex((r) => r.id === field.recipientId);
                   const hasFieldError =
                     emptyCheckboxFields.find((f) => f.formId === field.formId) ||
                     emptyRadioFields.find((f) => f.formId === field.formId) ||
@@ -649,7 +648,7 @@ export const AddFieldsFormPartial = ({
                       recipientIndex={recipientIndex === -1 ? 0 : recipientIndex}
                       field={field}
                       disabled={
-                        selectedSigner?.email !== field.signerEmail ||
+                        selectedSigner?.id !== field.recipientId ||
                         !canRecipientBeModified(selectedSigner, fields)
                       }
                       minHeight={MIN_HEIGHT_PX}

packages/ui/primitives/document-flow/add-fields.types.ts

@@ -9,7 +9,7 @@ export const ZAddFieldsFormSchema = z.object({
       formId: z.string().min(1),
       nativeId: z.number().optional(),
       type: z.nativeEnum(FieldType),
-      signerEmail: z.string().min(1),
+      recipientId: z.number(),
       pageNumber: z.number().min(1),
       pageX: z.number().min(0),
       pageY: z.number().min(0),