feat: only use background job scheduling with inngest

packages/lib/jobs/client/client.ts

@@ -74,7 +74,8 @@ export class JobClient<T extends ReadonlyArray<JobDefinition> = []> {
         };
 
         try {
-          return await eligibleJob.handler({ payload, io });
+          const result = await eligibleJob.handler({ payload, io });
+          return result;
         } catch (error) {
           console.error(`Direct job execution failed for ${options.name}:`, error);
           throw error;

packages/lib/jobs/definitions/emails/send-signing-email.handler.ts

@@ -32,16 +32,49 @@ export const run = async ({
 }) => {
   const { userId, documentId, recipientId, requestMetadata } = payload;
 
-  const [user, document, recipient] = await Promise.all([
+  try {
+    // First, check if the document exists directly before performing the multi-promise
+    const documentExists = await prisma.document.findFirst({
+      where: {
+        id: documentId,
+      },
+      select: { id: true },
+    });
+
+    if (!documentExists) {
+      throw new Error(`No Document found with ID ${documentId}`);
+    }
+
+    // Add a small delay to allow any pending transactions to complete
+    await new Promise<void>((resolve) => {
+      setTimeout(() => {
+        resolve();
+      }, 100);
+    });
+
+    const [user, recipient] = await Promise.all([
       prisma.user.findFirstOrThrow({
         where: {
           id: userId,
         },
       }),
-    prisma.document.findFirstOrThrow({
+
+      prisma.recipient.findFirstOrThrow({
+        where: {
+          id: recipientId,
+        },
+      }),
+    ]);
+
+    // Get the document without restricting to PENDING status
+    const document = await prisma.document.findFirstOrThrow({
       where: {
         id: documentId,
-        status: DocumentStatus.PENDING,
+        // Don't restrict to PENDING status, as it might still be in DRAFT status
+        // if the transaction hasn't fully completed yet
+        status: {
+          in: [DocumentStatus.DRAFT, DocumentStatus.PENDING],
+        },
       },
       include: {
         documentMeta: true,
@@ -53,13 +86,7 @@ export const run = async ({
           },
         },
       },
-    }),
-    prisma.recipient.findFirstOrThrow({
-      where: {
-        id: recipientId,
-      },
-    }),
-  ]);
+    });
 
     const { documentMeta, team } = document;
 
@@ -209,4 +236,8 @@ export const run = async ({
         }),
       });
     });
+  } catch (error) {
+    console.error(`Job failed with error:`, error);
+    throw error;
+  }
 };

packages/lib/server-only/document/send-document.tsx

@@ -133,31 +133,6 @@ export const sendDocument = async ({
     Object.assign(document, result);
   }
 
-  // Commented out server side checks for minimum 1 signature per signer now since we need to
-  // decide if we want to enforce this for API & templates.
-  // const fields = await getFieldsForDocument({
-  //   documentId: documentId,
-  //   userId: userId,
-  // });
-
-  // const fieldsWithSignerEmail = fields.map((field) => ({
-  //   ...field,
-  //   signerEmail:
-  //     document.Recipient.find((recipient) => recipient.id === field.recipientId)?.email ?? '',
-  // }));
-
-  // const everySignerHasSignature = document?.Recipient.every(
-  //   (recipient) =>
-  //     recipient.role !== RecipientRole.SIGNER ||
-  //     fieldsWithSignerEmail.some(
-  //       (field) => field.type === 'SIGNATURE' && field.signerEmail === recipient.email,
-  //     ),
-  // );
-
-  // if (!everySignerHasSignature) {
-  //   throw new Error('Some signers have not been assigned a signature field.');
-  // }
-
   const isRecipientSigningRequestEmailEnabled = extractDerivedDocumentEmailSettings(
     document.documentMeta,
   ).recipientSigningRequest;
@@ -165,52 +140,14 @@ export const sendDocument = async ({
   // Only send email if one of the following is true:
   // - It is explicitly set
   // - The email is enabled for signing requests AND sendEmail is undefined
-  if (sendEmail || (isRecipientSigningRequestEmailEnabled && sendEmail === undefined)) {
-    await Promise.all(
-      recipientsToNotify.map(async (recipient) => {
-        if (recipient.sendStatus === SendStatus.SENT || recipient.role === RecipientRole.CC) {
-          return;
-        }
-
-        await jobs.triggerJob({
-          name: 'send.signing.requested.email',
-          payload: {
-            userId,
-            documentId,
-            recipientId: recipient.id,
-            requestMetadata: requestMetadata?.requestMetadata,
-          },
-        });
-      }),
-    );
-  }
+  const shouldSendEmail =
+    sendEmail || (isRecipientSigningRequestEmailEnabled && sendEmail === undefined);
 
   const allRecipientsHaveNoActionToTake = document.recipients.every(
     (recipient) =>
       recipient.role === RecipientRole.CC || recipient.signingStatus === SigningStatus.SIGNED,
   );
 
-  if (allRecipientsHaveNoActionToTake) {
-    await jobs.triggerJob({
-      name: 'internal.seal-document',
-      payload: {
-        documentId,
-        requestMetadata: requestMetadata?.requestMetadata,
-      },
-    });
-
-    // Keep the return type the same for the `sendDocument` method
-    return await prisma.document.findFirstOrThrow({
-      where: {
-        id: documentId,
-      },
-      include: {
-        documentMeta: true,
-        recipients: true,
-      },
-    });
-  }
-
   const updatedDocument = await prisma.$transaction(async (tx) => {
     if (document.status === DocumentStatus.DRAFT) {
       await tx.documentAuditLog.create({
@@ -244,5 +181,47 @@ export const sendDocument = async ({
     teamId,
   });
 
+  // Now that the transaction is complete and document status is updated, trigger email jobs
+  if (shouldSendEmail) {
+    await Promise.all(
+      recipientsToNotify.map(async (recipient) => {
+        if (recipient.sendStatus === SendStatus.SENT || recipient.role === RecipientRole.CC) {
+          return;
+        }
+
+        await jobs.triggerJob({
+          name: 'send.signing.requested.email',
+          payload: {
+            userId,
+            documentId,
+            recipientId: recipient.id,
+            requestMetadata: requestMetadata?.requestMetadata,
+          },
+        });
+      }),
+    );
+  }
+
+  if (allRecipientsHaveNoActionToTake) {
+    await jobs.triggerJob({
+      name: 'internal.seal-document',
+      payload: {
+        documentId,
+        requestMetadata: requestMetadata?.requestMetadata,
+      },
+    });
+
+    // Keep the return type the same for the `sendDocument` method
+    return await prisma.document.findFirstOrThrow({
+      where: {
+        id: documentId,
+      },
+      include: {
+        documentMeta: true,
+        recipients: true,
+      },
+    });
+  }
+
   return updatedDocument;
 };