fix bug with resend api rate limits and ensure artists only recieve o…

…ne artwork ready email
Refuge-Worldwide · May 22, 2024 · ba8b13d · ba8b13d
1 parent cb9bfa5
commit ba8b13d
Show file tree

Hide file tree

Showing 5 changed files with 366 additions and 169 deletions.
diff --git a/lib/resend/email.ts b/lib/resend/email.ts
@@ -7,7 +7,7 @@ import dayjs from "dayjs";
 
 export async function sendEmail(artist, show, severity) {
   try {
-    const data = await resend.sendEmail({
+    const { data, error } = await resend.emails.send({
       from: "Refuge Worldwide <[email protected]>",
       to: artist.email,
       subject: subject(severity),
@@ -25,11 +25,16 @@ export async function sendEmail(artist, show, severity) {
         showId: show.sys.id,
       }),
     });
+    if (error) {
+      throw new Error(error.name);
+    }
+
+    return data;
   } catch (error) {
     // send message to slack saying there was an issue sending the email
     console.log(error);
     sendSlackMessage(
-      `Failed to send email request to ${artist.name}(${artist.email}) on show *${show.title}*. ${error}. <@U04HG3VHHEW>`
+      `Failed to send email request to ${artist.name}(${artist.email}) on show *${show.title}*. ${error.name} - ${error.message}. <@U04HG3VHHEW>`
     );
     throw new Error(error);
   }
@@ -40,7 +45,7 @@ export async function sendConfirmationEmail(show) {
     show.artists.map(async (artist) => {
       if (artist.email) {
         try {
-          const data = await resend.sendEmail({
+          const { data, error } = await resend.emails.send({
             from: "Refuge Worldwide <[email protected]>",
             to: artist.email,
             subject:
@@ -59,11 +64,17 @@ export async function sendConfirmationEmail(show) {
               showId: show.id,
             }),
           });
+
+          if (error) {
+            throw new Error(error.name);
+          }
+
+          return data;
         } catch (error) {
           // send message to slack saying there was an issue sending the email
           console.log(error);
           sendSlackMessage(
-            `Failed to send email request to ${artist.name}(${artist.email}) on show *${show.title}*. ${error}. <@U04HG3VHHEW>`
+            `Failed to send email request to ${artist.name}(${artist.email}) on show *${show.title}*. ${error.name} - ${error.message}. <@U04HG3VHHEW>`
           );
         }
       }
@@ -72,21 +83,35 @@ export async function sendConfirmationEmail(show) {
 }
 
 export async function sendArtworkEmail(artist, date) {
-  const data = await resend.sendEmail({
-    from: "Refuge Worldwide <[email protected]>",
-    to: artist.email,
-    subject:
-      "Your show artwork for " + dayjs(date).format("dddd") + " is now ready",
-    reply_to: [
-      "[email protected]",
-      "[email protected]",
-      "[email protected]",
-    ],
-    react: ShowArtworkEmail({
-      userName: artist.name,
-      showDate: date,
-    }),
-  });
+  try {
+    const { data, error } = await resend.emails.send({
+      from: "Refuge Worldwide <[email protected]>",
+      to: artist.email,
+      subject:
+        "Your show artwork for " + dayjs(date).format("dddd") + " is now ready",
+      reply_to: [
+        "[email protected]",
+        "[email protected]",
+        "[email protected]",
+      ],
+      react: ShowArtworkEmail({
+        userName: artist.name,
+        showDate: date,
+      }),
+    });
+
+    if (error) {
+      throw new Error(error.name);
+    }
+
+    return data;
+  } catch (error) {
+    // send message to slack saying there was an issue sending the email
+    console.log(error);
+    sendSlackMessage(
+      `Failed to send artwork email to ${artist.name}(${artist.email}). ${error.name} - ${error.message}. <@U04HG3VHHEW>`
+    );
+  }
 }
 
 function subject(severity: string) {

diff --git a/package.json b/package.json
@@ -79,7 +79,7 @@
     "react-player": "^2.13.0",
     "react-select": "^5.6.1",
     "react-select-async-paginate": "^0.7.3",
-    "resend": "^1.0.0",
+    "resend": "^3.2.0",
     "sharp": "^0.31.3",
     "smoothscroll-polyfill": "^0.4.4",
     "swr": "^2.1.1",

diff --git a/pages/api/admin/artwork-email.ts b/pages/api/admin/artwork-email.ts
@@ -10,44 +10,58 @@ export default async function handler(
   res: NextApiResponse
 ) {
   const values = req.body;
-  switch (req.method) {
-    case "POST":
-      try {
-        const date = dayjs(values.date, "YYYY-MM-DD");
-        console.log(date);
-        const shows = await getUpcomingShowsByDate(date, true, "Submitted");
-        console.log(shows);
-        await Promise.all(
-          shows.map(async (show) => {
-            let showEmailed = false;
-            await Promise.all(
-              show.artistsCollection.items.map(async (artist) => {
-                if (artist.email) {
-                  try {
-                    await sendArtworkEmail(artist, date);
-                    showEmailed = true;
-                  } catch (error) {
-                    // send message to slack saying there was an issue sending the email
-                    console.log(error);
-                    sendSlackMessage(
-                      `Failed to send email request to ${artist.name}(${artist.email}) on show *${show.title}*. ${error}. <@U04HG3VHHEW>`
-                    );
-                  }
-                }
-              })
-            );
-            if (!showEmailed) {
-              sendSlackMessage(
-                `Show *${show.title}* has no emails assigned. They did not recieve artwork email. <https://app.contentful.com/spaces/${contentfulSpaceId}/entries/${show.sys.id}|Edit show >`
+
+  if (req.method !== "POST") {
+    return res.status(405).json({ message: "Method not allowed" });
+  }
+
+  try {
+    const date = dayjs(values.date, "YYYY-MM-DD");
+    console.log(date);
+
+    const shows = await getUpcomingShowsByDate(date, true, "Submitted");
+    console.log(shows);
+
+    const rateLimit = 10;
+    const delay = 1000 / rateLimit; // 100 milliseconds delay
+    const emailedArtists = new Set(); // Set to track emailed artist emails
+
+    await Promise.all(
+      shows.map(async (show) => {
+        let showEmailed = false;
+
+        for (const artist of show.artistsCollection.items) {
+          if (artist.email && !emailedArtists.has(artist.email)) {
+            try {
+              await sendArtworkEmail(artist, date);
+              emailedArtists.add(artist.email); // Add artist email to the set after emailing
+              showEmailed = true;
+              await new Promise((resolve) => setTimeout(resolve, delay)); // Respect the rate limit
+            } catch (error) {
+              console.log(error);
+              await sendSlackMessage(
+                `Failed to send email request to ${artist.name} (${artist.email}) on show *${show.title}*. ${error}. <@U04HG3VHHEW>`
               );
             }
-          })
-        );
-
-        return res.status(200).json("Artwork email sent");
-      } catch (error) {
-        console.log(error);
-        return res.status(400).json({ message: error.message });
-      }
+          } else if (!artist.email) {
+            console.log(`${artist.name} does not have an email`);
+            await sendSlackMessage(
+              `*${artist.name}* has no email assigned to them. <https://app.contentful.com/spaces/${contentfulSpaceId}/entries/${artist.sys.id}|Add email >`
+            );
+          }
+        }
+
+        if (!showEmailed) {
+          await sendSlackMessage(
+            `Show *${show.title}* has no emails assigned. They did not receive artwork email. <https://app.contentful.com/spaces/${contentfulSpaceId}/entries/${show.sys.id}|Edit show >`
+          );
+        }
+      })
+    );
+
+    return res.status(200).json("Artwork email sent");
+  } catch (error) {
+    console.log(error);
+    return res.status(400).json({ message: error.message });
   }
 }
diff --git a/pages/api/cron/show-submission-email.ts b/pages/api/cron/show-submission-email.ts
@@ -54,30 +54,32 @@ async function sendEmails(
   shows: ShowInterface[],
   severity: "initial" | "follow-up" | "late"
 ) {
-  await Promise.all(
-    shows.map(async (show) => {
-      let showEmailed = false;
-      await Promise.all(
-        show.artistsCollection.items.map(async (artist) => {
-          if (artist.email) {
-            await sendEmail(artist, show, severity);
-            showEmailed = true;
-          } else {
-            // send message to slack saying artist does not have email address assigned to them.
-            console.log(artist.name + " does not have email");
-            sendSlackMessage(
-              `*${artist.name}* has no email assigned to them. <https://app.contentful.com/spaces/${contentfulSpaceId}/entries/${artist.sys.id}|Add email >`
-            );
-          }
-        })
-      );
-      if (!showEmailed) {
-        sendSlackMessage(
-          `Show *${show.title}* has no emails assigned. They did not recieve ${severity} email. <https://app.contentful.com/spaces/${contentfulSpaceId}/entries/${show.sys.id}|Edit show >`
+  const delay = 105; // 105 milliseconds delay
+
+  for (const show of shows) {
+    let showEmailed = false;
+
+    const emailPromises = show.artistsCollection.items.map(async (artist) => {
+      if (artist.email) {
+        await sendEmail(artist, show, severity);
+        showEmailed = true;
+        await new Promise((resolve) => setTimeout(resolve, delay)); // Respect the rate limit
+      } else {
+        console.log(`${artist.name} does not have an email`);
+        await sendSlackMessage(
+          `*${artist.name}* has no email assigned to them. <https://app.contentful.com/spaces/${contentfulSpaceId}/entries/${artist.sys.id}|Add email >`
         );
       }
-    })
-  );
+    });
+
+    await Promise.all(emailPromises);
+
+    if (!showEmailed) {
+      await sendSlackMessage(
+        `Show *${show.title}* has no emails assigned. They did not receive ${severity} email. <https://app.contentful.com/spaces/${contentfulSpaceId}/entries/${show.sys.id}|Edit show >`
+      );
+    }
+  }
 }
 
 function checkEmails(shows: ShowInterface[]) {