EOD Reminders: Adds support for retries (#456)

* EOD Reminders: Adds support for retries * switch to remind sequentially * throw for http error * adds missing await
coronasafe · May 19, 2024 · dbb2ee9 · dbb2ee9
1 parent d550c28
commit dbb2ee9
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 24 deletions.
diff --git a/activities-bot/src/sendReminder.mjs b/activities-bot/src/sendReminder.mjs
@@ -1,4 +1,9 @@
-import { getContributors, getEODUpdates, sendSlackMessage } from "./utils.mjs";
+import {
+  getContributors,
+  getEODUpdates,
+  sendSlackMessage,
+  withRetry,
+} from "./utils.mjs";
 
 const remind = async ({ slackId, updates }) => {
   await sendSlackMessage(
@@ -35,14 +40,11 @@ async function main() {
   const eodUpdates = await getEODUpdates();
 
   console.info("⚙️ Reminding users...");
-  await Promise.all(
-    Object.entries(allContributors).map(([githubId, slackId]) =>
-      remind({
-        slackId,
-        updates: eodUpdates[githubId],
-      }),
-    ),
-  );
+  for (const [githubId, slackId] of Object.entries(allContributors)) {
+    await withRetry(() => remind({ slackId, updates: eodUpdates[githubId] }), {
+      attempts: 3,
+    });
+  }
   console.info("✅ Completed!");
 }
 

diff --git a/activities-bot/src/utils.mjs b/activities-bot/src/utils.mjs
@@ -44,6 +44,16 @@ function isAllowedEvent(event) {
   }
 }
 
+const throwForHttpError = async (promise) => {
+  const res = await promise;
+
+  if (!res.ok) {
+    throw new Error(await res.text());
+  }
+
+  return res;
+};
+
 const octokit = new Octokit({ auth: GITHUB_TOKEN });
 
 export async function getEvents(allowedAuthors) {
@@ -112,17 +122,22 @@ const leaderboardApiHeaders = {
 const eodUpdatesApi = `${LEADERBOARD_URL}/api/slack-eod-bot/eod-updates`;
 
 export async function getEODUpdates() {
-  const res = await fetch(eodUpdatesApi, {
-    headers: leaderboardApiHeaders,
-  });
+  const res = await throwForHttpError(
+    fetch(eodUpdatesApi, {
+      headers: leaderboardApiHeaders,
+    }),
+  );
+
   return res.json();
 }
 
 export async function flushEODUpdates() {
-  await fetch(eodUpdatesApi, {
-    headers: leaderboardApiHeaders,
-    method: "DELETE",
-  });
+  const res = await throwForHttpError(
+    fetch(eodUpdatesApi, {
+      headers: leaderboardApiHeaders,
+      method: "DELETE",
+    }),
+  );
 }
 
 const slackApiHeaders = {
@@ -131,15 +146,17 @@ const slackApiHeaders = {
 };
 
 export async function sendSlackMessage(channel, text, blocks) {
-  const res = await fetch("https://slack.com/api/chat.postMessage", {
-    method: "POST",
-    headers: slackApiHeaders,
-    body: JSON.stringify({
-      channel,
-      text,
-      ...blocks,
+  const res = await throwForHttpError(
+    fetch("https://slack.com/api/chat.postMessage", {
+      method: "POST",
+      headers: slackApiHeaders,
+      body: JSON.stringify({
+        channel,
+        text,
+        ...blocks,
+      }),
     }),
-  });
+  );
 
   const data = await res.json();
   if (!data.ok) {
@@ -252,3 +269,17 @@ export async function postEODMessage({ github, slack, updates }) {
     getHumanReadableUpdates(updates, slack, github),
   );
 }
+
+export async function withRetry(method, { attempts }) {
+  while (attempts) {
+    try {
+      return await method();
+    } catch (error) {
+      attempts -= 1;
+
+      if (!attempts) {
+        throw error;
+      }
+    }
+  }
+}