Ensuring tickettemplate name shows up in the email (#249)

Author: fforres

emails/templates/tickets/event-invitation.tsx

@@ -15,14 +15,14 @@ import * as React from "react";
 import { BigFooter, TicketTemplate } from "emails/templates/helpers/tickets";
 
 interface EmailProps {
-  eventName: string;
+  ticketName: string;
   userName?: string;
   eventLogoCloudflareImageURL: string;
   userEmail: string;
 }
 
 export const EventInvitation = ({
-  eventName,
+  ticketName,
   userName,
   userEmail,
   eventLogoCloudflareImageURL,
@@ -31,7 +31,7 @@ export const EventInvitation = ({
     <TicketTemplate theme="light">
       <Container className="px-10 py-10 w-full max-w-3xl font-light">
         <Section className="">
-          <Preview>Tienes una invitación a {eventName}</Preview>
+          <Preview>Tienes una invitación a {ticketName}</Preview>
           <Row className="h-20 mb-14">
             <Column>
               <Img
@@ -50,7 +50,7 @@ export const EventInvitation = ({
           </Text>
 
           <Text className="text-xl text-center mb-16 px-8 text-gray-500">
-            {eventName}
+            {ticketName}
           </Text>
 
           <Text className="text-xl mb-12">
@@ -91,7 +91,8 @@ export const EventInvitation = ({
 };
 
 EventInvitation.PreviewProps = {
-  eventName: "El Potencial Clave de la Recuperación Aumentada (RAG) con OpenAI",
+  ticketName:
+    "El Potencial Clave de la Recuperación Aumentada (RAG) con OpenAI",
   userName: "John Doe",
   eventLogoCloudflareImageURL:
     "https://imagedelivery.net/dqFoxiedZNoncKJ9uqxz0g/6cdd148e-b931-4b7a-f983-d75d388aff00",

emails/templates/tickets/ticket-confirmation.tsx

@@ -14,15 +14,15 @@ import * as React from "react";
 import { BigFooter, TicketTemplate } from "emails/templates/helpers/tickets";
 
 interface EmailProps {
-  eventName: string;
+  ticketName: string;
   userTicketId: string;
   userName?: string;
   eventLogoCloudflareImageURL: string;
   userEmail: string;
 }
 
 export const TicketConfirmation = ({
-  eventName,
+  ticketName,
   userTicketId,
   userName,
   userEmail,
@@ -32,7 +32,7 @@ export const TicketConfirmation = ({
     <TicketTemplate theme="light">
       <Container className="px-10 py-10 w-full max-w-3xl font-light">
         <Section className="">
-          <Preview>Tu ticket para {eventName}</Preview>
+          <Preview>Tu ticket para {ticketName}</Preview>
           <Row className="h-20 mb-14">
             <Column>
               <Img
@@ -51,7 +51,7 @@ export const TicketConfirmation = ({
           </Text>
 
           <Text className="text-xl text-center mb-8 px-8 text-gray-500">
-            {eventName}
+            {ticketName}
           </Text>
 
           <Container className="px-20 mb-12">
@@ -84,7 +84,8 @@ export const TicketConfirmation = ({
 };
 
 TicketConfirmation.PreviewProps = {
-  eventName: "El Potencial Clave de la Recuperación Aumentada (RAG) con OpenAI",
+  ticketName:
+    "El Potencial Clave de la Recuperación Aumentada (RAG) con OpenAI",
   userName: "John Doe",
   userTicketId: "c7fa5dc0-ffa2-4369-bac7-3aa52d7cc640",
   eventLogoCloudflareImageURL:

src/notifications/tickets.ts

@@ -90,40 +90,71 @@ export const sendAddedToWaitlistEmail = async ({
 export const sendTicketInvitationEmails = async ({
   DB,
   logger,
-  users,
-  ticketId,
+  userTicketIds,
   RPC_SERVICE_EMAIL,
 }: {
   DB: ORM_TYPE;
   logger: Logger;
-  users: USER[];
-  ticketId: string;
+  userTicketIds: string[];
   RPC_SERVICE_EMAIL: Context["RPC_SERVICE_EMAIL"];
 }) => {
-  const ticketInformation = await DB.query.ticketsSchema.findFirst({
-    where: (t, { eq }) => eq(t.id, ticketId),
+  const userTickets = await DB.query.userTicketsSchema.findMany({
+    where: (t, { inArray }) => inArray(t.id, userTicketIds),
     with: {
-      event: true,
+      user: true,
+      ticketTemplate: {
+        with: {
+          event: true,
+        },
+      },
     },
   });
 
-  if (!ticketInformation) {
-    throw applicationError(
-      `Could not find ticket and event information associated to: ${ticketId}`,
-      ServiceErrors.NOT_FOUND,
-      logger,
-    );
-  }
+  const to: {
+    name?: string;
+    email: string;
+    tags: { name: string; value: string }[];
+    userTicketId: string;
+    ticketName: string;
+    ticketId: string;
+    eventId: string;
+  }[] = [];
+
+  userTickets.forEach((userTicket) => {
+    if (!userTicket.user) {
+      return null;
+    }
+
+    to.push({
+      name: userTicket.user.name ?? undefined,
+      email: userTicket.user.email,
+      ticketName: userTicket.ticketTemplate.name,
+      ticketId: userTicket.ticketTemplate.id,
+      userTicketId: userTicket.id,
+      eventId: userTicket.ticketTemplate.event.id,
+      tags: [
+        {
+          name: "userTicket",
+          value: userTicket.id,
+        },
+        {
+          name: "ticketId",
+          value: userTicket.ticketTemplate.id,
+        },
+        {
+          name: "eventId",
+          value: userTicket.ticketTemplate.event.id,
+        },
+        {
+          name: "userId",
+          value: userTicket.user?.id ?? "",
+        },
+      ],
+    });
+  });
 
   await RPC_SERVICE_EMAIL.bulkSendEventTicketInvitations({
-    eventName: ticketInformation.event.name,
-    ticketId: ticketInformation.id,
-    eventId: ticketInformation.event.id,
-    to: users.map((user) => ({
-      name: user.name ?? undefined,
-      email: user.email,
-      tags: [],
-    })),
+    to,
   });
 };
 
@@ -207,6 +238,6 @@ export const sendActualUserTicketQREmails = async ({
 
   await RPC_SERVICE_EMAIL.bulkSendUserQRTicketEmail({
     to,
-    eventName: userTickets[0].ticketTemplate.event.name,
+    ticketName: userTickets[0].ticketTemplate.name,
   });
 };

src/schema/invitations/mutations.ts

@@ -4,7 +4,6 @@ import { GraphQLError } from "graphql";
 import { builder } from "~/builder";
 import {
   insertUserTicketsSchema,
-  selectUsersSchema,
   selectUserTicketsSchema,
   userTicketsSchema,
 } from "~/datasources/db/schema";
@@ -13,7 +12,6 @@ import { sendTicketInvitationEmails } from "~/notifications/tickets";
 import { createInitialPurchaseOrder } from "~/schema/purchaseOrder/helpers";
 import { UserTicketRef } from "~/schema/shared/refs";
 import { ticketsFetcher } from "~/schema/ticket/ticketsFetcher";
-import { usersFetcher } from "~/schema/user/userFetcher";
 
 const GiftTicketsToUserInput = builder.inputType("GiftTicketsToUserInput", {
   fields: (t) => ({
@@ -117,23 +115,14 @@ builder.mutationField("giftTicketsToUsers", (t) =>
         .returning();
 
       if (notifyUsers) {
-        const userIdsWithTickets = createdUserTickets
-          .map((userTicket) => userTicket.userId)
-          .filter(Boolean);
-        const users = await usersFetcher.searchUsers({
-          DB,
-          search: {
-            userIds: userIdsWithTickets,
-          },
-        });
-
-        const parsedUsers = users.map((user) => selectUsersSchema.parse(user));
+        const userTicketIds = createdUserTickets.map(
+          (userTicket) => userTicket.id,
+        );
 
         await sendTicketInvitationEmails({
           DB,
           logger,
-          ticketId: ticket.id,
-          users: parsedUsers,
+          userTicketIds,
           RPC_SERVICE_EMAIL,
         });
       }

workers/transactional_email_service/index.tsx

@@ -235,30 +235,30 @@ export default class EmailService extends WorkerEntrypoint<ENV> {
   async bulkSendUserQRTicketEmail({
     // TODO: Change this image
     eventLogoCloudflareImageURL = DEFAULT_CLOUDFLARE_LOGO_URL,
-    eventName,
+    ticketName,
     to,
   }: {
     eventLogoCloudflareImageURL?: string;
-    eventName: string;
+    ticketName: string;
     to: (ReceiverType & { userTicketId: string })[];
   }) {
     this.logger.info(`About to send ConfirmationWaitlistAccepted`, {
-      eventName,
+      ticketName,
     });
     const resendArgs = to.map(
       (receiver) =>
         ({
           htmlContent: render(
             <TicketConfirmation
               eventLogoCloudflareImageURL={eventLogoCloudflareImageURL}
-              eventName={eventName}
+              ticketName={ticketName}
               userTicketId={receiver.userTicketId}
               userName={receiver.name}
               userEmail={receiver.email}
             />,
           ),
           tags: receiver.tags,
-          subject: `Tu ticket para ${eventName}`,
+          subject: `Tu ticket para ${ticketName}`,
           to: [
             {
               name: receiver.name,
@@ -278,36 +278,33 @@ export default class EmailService extends WorkerEntrypoint<ENV> {
   async bulkSendEventTicketInvitations({
     // TODO: Change this image
     eventLogoCloudflareImageURL = DEFAULT_CLOUDFLARE_LOGO_URL,
-    eventName,
-    ticketId,
-    eventId,
     to,
   }: {
     eventLogoCloudflareImageURL?: string;
-    eventName: string;
-    ticketId: string;
-    eventId: string;
-    to: ReceiverType[];
+    to: (ReceiverType & {
+      userTicketId: string;
+      ticketName: string;
+      ticketId: string;
+      eventId: string;
+    })[];
   }) {
-    this.logger.info(`About to send batch EventInvitation`, {
-      eventName,
-      eventId,
-      ticketId,
-    });
+    this.logger.info(
+      `About to send bulkSendEventTicketInvitations to ${to.length} users`,
+    );
 
     const resendArgs = to.map(
       (receiver) =>
         ({
           htmlContent: render(
             <EventInvitation
               eventLogoCloudflareImageURL={eventLogoCloudflareImageURL}
-              eventName={eventName}
+              ticketName={receiver.ticketName}
               userName={receiver.name}
               userEmail={receiver.email}
             />,
           ),
           tags: receiver.tags,
-          subject: `Estás invitado a ${eventName}`,
+          subject: `Estás invitado a ${receiver.ticketName}`,
           to: [
             {
               name: receiver.name,