fix: regression in esign flow (#304)

* chore: upgrade prisma

* fix: schema

* fix: recipient list

* fix: redirection

* fix: query

* refactor: task

* fix: add update for no trigger

* fix: type

* feat: query

* fix: delete unused recipients

* fix: email and logic

* refactor: remove unused code

* fix: recipient bug

* fix: jobs

Author: G3root

package-lock.json

@@ -122,7 +122,7 @@
     "postcss": "^8.4.38",
     "prettier": "^3.1.0",
     "prettier-plugin-tailwindcss": "^0.5.13",
-    "prisma": "^5.12.1",
+    "prisma": "^5.13.0",
     "tailwindcss": "^3.4.3",
     "tsx": "^4.7.0",
     "typescript": "^5.4.5"

package.json

@@ -33,7 +33,7 @@ export const TemplateFieldForm = ({
       });
 
       if (status === "COMPLETE") {
-        router.push(`/${companyPublicId}/documents`);
+        router.push(`/${companyPublicId}/documents/esign`);
       }
     },
   });

src/components/template/template-field-form/index.tsx

@@ -4,34 +4,20 @@ import { client } from "@/trigger";
 import { eventTrigger } from "@trigger.dev/sdk";
 import { render } from "jsx-email";
 
-export interface TypeGeneralPayload {
+export type TConfirmationEmailPayload = {
   fileUrl: string;
   documentName: string;
   senderName: string | null;
   company: {
     name: string;
     logo?: string | null;
   };
-}
-
-export interface TConfirmationEmailPayload extends TypeGeneralPayload {
-  recipient: { name: string | null; email: string };
-}
-
-export type TRecipientsKind = TypeGeneralPayload & {
-  kind: "RECIPIENTS";
-  recipients: { id: string; name: string | null; email: string }[];
-};
-
-export type TRecipientKind = TypeGeneralPayload & {
-  kind: "RECIPIENT";
-  recipient: { id: string; name: string | null; email: string };
+  recipient: { name?: string | null; email: string };
 };
 
-export type TConfirmationEmailJobPayload = TRecipientKind | TRecipientsKind;
-
-type Payload = TConfirmationEmailPayload;
-export const sendEsignConfirmationEmail = async (payload: Payload) => {
+export const sendEsignConfirmationEmail = async (
+  payload: TConfirmationEmailPayload,
+) => {
   const html = await render(
     ESignConfirmationEmail({
       documentName: payload.documentName,
@@ -42,11 +28,11 @@ export const sendEsignConfirmationEmail = async (payload: Payload) => {
   );
   await sendMail({
     to: payload.recipient.email,
-    subject: "Completed e-signed documents from all partiess",
+    subject: "Completed e-signed documents from all parties",
     html,
     attachments: [
       {
-        filename: "signed_document.pdf",
+        filename: payload.documentName,
         path: payload.fileUrl,
       },
     ],
@@ -61,40 +47,9 @@ client.defineJob({
     name: "esign.send-confirmation",
   }),
 
-  run: async (payload: TConfirmationEmailJobPayload, io) => {
-    if (payload.kind === "RECIPIENT") {
-      await io.runTask(
-        `send-confirmation-email-${payload.recipient.id}`,
-        async () => {
-          await sendEsignConfirmationEmail({
-            documentName: payload.documentName,
-            senderName: payload.senderName,
-            company: payload.company,
-            fileUrl: payload.fileUrl,
-            recipient: {
-              name: payload.recipient?.name,
-              email: payload.recipient.email,
-            },
-          });
-        },
-      );
-    }
-
-    if (payload.kind === "RECIPIENTS") {
-      for (const recipient of payload.recipients) {
-        await io.runTask(`recpient-${recipient.id}`, async () => {
-          await sendEsignConfirmationEmail({
-            documentName: payload.documentName,
-            senderName: payload.senderName,
-            company: payload.company,
-            fileUrl: payload.fileUrl,
-            recipient: {
-              name: recipient?.name,
-              email: recipient.email,
-            },
-          });
-        });
-      }
-    }
+  run: async (payload: TConfirmationEmailPayload, io) => {
+    await io.runTask("send confirmation email", async () => {
+      await sendEsignConfirmationEmail(payload);
+    });
   },
 });

src/jobs/esign-confirmation-email.ts

@@ -1,6 +1,5 @@
 import EsignEmail from "@/emails/EsignEmail";
 import { env } from "@/env";
-import { EsignRecipientStatus } from "@/prisma/enums";
 import { db } from "@/server/db";
 import { sendMail } from "@/server/mailer";
 import { client } from "@/trigger";
@@ -9,8 +8,8 @@ import { render } from "jsx-email";
 
 export interface TEmailPayload {
   documentName?: string;
-  message?: string;
-  recipient?: {
+  message?: string | null;
+  recipient: {
     id: string;
     name: string | null | undefined;
     email: string;
@@ -57,18 +56,19 @@ client.defineJob({
   }),
 
   run: async (payload: TEsignEmailJob, io) => {
-    await io.runTask(`send esign email`, async () => {
+    await io.runTask("send esign email", async () => {
       await sendEsignEmail(payload);
-      if (payload?.recipient?.id) {
-        await db.esignRecipient.update({
-          where: {
-            id: payload.recipient.id,
-          },
-          data: {
-            status: EsignRecipientStatus.SENT,
-          },
-        });
-      }
+    });
+
+    await io.runTask("update recipient status", async () => {
+      await db.esignRecipient.update({
+        where: {
+          id: payload.recipient.id,
+        },
+        data: {
+          status: "SENT",
+        },
+      });
     });
   },
 });

src/jobs/esign-email.ts

@@ -2,14 +2,14 @@ import { db } from "@/server/db";
 import {
   completeEsignDocuments,
   generateEsignPdf,
-  getEmailSpecificInfoFromTemplate,
   uploadEsignDocuments,
   type TEsignGetTemplate,
 } from "@/server/esign";
 import { getPresignedGetUrl } from "@/server/file-uploads";
 import { client } from "@/trigger";
-import { invokeTrigger } from "@trigger.dev/sdk";
+import { eventTrigger } from "@trigger.dev/sdk";
 import { z } from "zod";
+import { type TConfirmationEmailPayload } from "./esign-confirmation-email";
 
 const schema = z.object({
   bucketKey: z.string(),
@@ -22,20 +22,29 @@ const schema = z.object({
   templateId: z.string(),
   uploaderName: z.string(),
   userAgent: z.string(),
+  recipients: z.array(
+    z.object({ email: z.string(), name: z.string().nullish() }),
+  ),
+  company: z.object({
+    name: z.string(),
+    logo: z.string().nullish(),
+  }),
 });
 
 export type TESignPdfSchema = Omit<z.infer<typeof schema>, "fields"> & {
   fields: TEsignGetTemplate["fields"];
 };
-type TPayload = z.infer<typeof schema>;
 
-export const CompleteSignDocumentJob = client.defineJob({
+client.defineJob({
   id: "esign.complete-pdf",
   name: "esign_complete_pdf",
   version: "0.0.1",
-  trigger: invokeTrigger(),
+  trigger: eventTrigger({
+    name: "esign.sign-pdf",
+    schema,
+  }),
 
-  run: async (payload: TPayload, io) => {
+  run: async (payload, io) => {
     const {
       bucketKey,
       data,
@@ -47,6 +56,8 @@ export const CompleteSignDocumentJob = client.defineJob({
       userAgent,
       uploaderName,
       templateId,
+      recipients,
+      company,
     } = payload;
 
     const uploadedDocument = await io.runTask("upload documents", async () => {
@@ -80,24 +91,22 @@ export const CompleteSignDocumentJob = client.defineJob({
       });
     });
 
-    await io.runTask("send-confirmation-email", async () => {
-      const _fileUrl = await getPresignedGetUrl(
-        uploadedDocument.bucketData.key,
-      );
-      const _payload = await getEmailSpecificInfoFromTemplate(templateId, db);
-      const payload = {
-        documentName: _payload.documentName,
-        senderName: _payload.senderName,
-        company: _payload.company,
-        fileUrl: _fileUrl.url,
-        recipients: _payload.recipients,
-        kind: "RECIPIENTS",
-      };
+    await io.runTask("send all recipients confirmation email", async () => {
+      const file = await getPresignedGetUrl(uploadedDocument.bucketData.key);
 
-      await io.sendEvent(`trigger-confirmation-email`, {
-        name: "esign.send-confirmation",
-        payload,
-      });
+      const data: { name: string; payload: TConfirmationEmailPayload }[] =
+        recipients.map((recipient) => ({
+          payload: {
+            fileUrl: file.url,
+            documentName: templateName,
+            recipient,
+            company,
+            senderName: uploaderName,
+          },
+          name: "esign.send-confirmation",
+        }));
+
+      await io.sendEvents(`trigger-confirmation-email`, data);
     });
   },
 });

src/jobs/esign-pdf.ts

@@ -42,7 +42,8 @@ const formSchema = z.object({
           .object({
             options: z
               .array(z.object({ id: z.string(), value: z.string() }))
-              .nonempty(),
+              .nonempty()
+              .optional(),
           })
           .optional(),
       }),