chore: refactor slack messages

theapexlab · Nov 3, 2023 · bf16059 · bf16059
1 parent 46969db
commit bf16059
Show file tree

Hide file tree

Showing 7 changed files with 100 additions and 111 deletions.
diff --git a/packages/core/services/slack/constructAskBirthdayMessage.ts b/packages/core/services/slack/constructAskBirthdayMessage.ts
@@ -3,6 +3,8 @@ import type { ChatPostMessageArguments } from "@slack/web-api";
 import type { ChatReplaceMessageArguments } from "@/types/ChatReplaceMessageArguments";
 import { pickBirthdayActionId } from "@/types/SlackInteractionRequest";
 
+import { makeTextBlock, makeTextBlockWithDatepicker } from "./messageItems";
+
 type Arguments = {
   user: string;
   name: string;
@@ -15,30 +17,11 @@ const constructBaseAskBirthdayMessage = ({
 }: Arguments): Omit<ChatPostMessageArguments, "channel"> => ({
   text: "Please share your birthday with us! 🥳",
   blocks: [
-    {
-      type: "section",
-      text: {
-        type: "mrkdwn",
-        text: `Hey ${name}! 👋`,
-      },
-    },
-    {
-      type: "section",
-      text: {
-        type: "mrkdwn",
-        text: "Please share your birthday with us! 🥳",
-      },
-      accessory: {
-        type: "datepicker",
-        initial_date: "1995-01-01",
-        placeholder: {
-          type: "plain_text",
-          text: "Select a date",
-          emoji: true,
-        },
-        action_id: pickBirthdayActionId,
-      },
-    },
+    makeTextBlock(`Hey ${name}! 👋`),
+    makeTextBlockWithDatepicker(
+      "Please share your birthday with us! 🥳",
+      pickBirthdayActionId,
+    ),
   ],
   metadata: {
     event_type: "askBirthday",

diff --git a/packages/core/services/slack/constructAskPresentIdeasMessage.ts b/packages/core/services/slack/constructAskPresentIdeasMessage.ts
@@ -1,5 +1,7 @@
 import type { ChatPostMessageArguments } from "@slack/web-api";
 
+import { makeTextBlock } from "./messageItems";
+
 type Arguments = {
   birthdayPerson: string;
   user: string;
@@ -24,19 +26,9 @@ export const constructAskPresentIdeasMessage = ({
     },
     text: `Hey, <@${user}>! <@${birthdayPerson}>'s birthday is in 2 months. Do you have any present ideas?`,
     blocks: [
-      {
-        type: "section",
-        text: {
-          type: "mrkdwn",
-          text: `Hey ${name}! 👋`,
-        },
-      },
-      {
-        type: "section",
-        text: {
-          type: "mrkdwn",
-          text: `It's <@${birthdayPerson}>'s birthday is in 2 months. Do you have any present ideas?`,
-        },
-      },
+      makeTextBlock(`Hey ${name}! 👋`),
+      makeTextBlock(
+        `It's <@${birthdayPerson}>'s birthday is in 2 months. Do you have any present ideas?`,
+      ),
     ],
   }) satisfies ChatPostMessageArguments;
diff --git a/packages/core/services/slack/constructBirthdayConfirmedMessage.ts b/packages/core/services/slack/constructBirthdayConfirmedMessage.ts
@@ -1,16 +1,10 @@
 import type { ChatReplaceMessageArguments } from "@/types/ChatReplaceMessageArguments";
 
+import { makeTextBlock } from "./messageItems";
+
 export const constructBirthdayConfirmedMessage =
   (): ChatReplaceMessageArguments => ({
     replace_original: true,
     text: "Thanks for submitting your birthday! 🎉",
-    blocks: [
-      {
-        type: "section",
-        text: {
-          type: "mrkdwn",
-          text: `Thanks for submitting your birthday! 🎉`,
-        },
-      },
-    ],
+    blocks: [makeTextBlock(`Thanks for submitting your birthday! 🎉`)],
   });
diff --git a/packages/core/services/slack/constructConfirmBirthdayMessage.ts b/packages/core/services/slack/constructConfirmBirthdayMessage.ts
@@ -4,52 +4,21 @@ import {
   birthdayIncorrectActionId,
 } from "@/types/SlackInteractionRequest";
 
+import { makeActionsBlock, makeTextBlock } from "./messageItems";
+
 export const constructConfirmBirthdayMessage = (
   birthday: string,
 ): ChatReplaceMessageArguments =>
   ({
     replace_original: true,
     text: "Confirm your birthday",
     blocks: [
-      {
-        type: "section",
-        text: {
-          type: "mrkdwn",
-          text: `Are you sure your birthday is ${birthday}?`,
-        },
-      },
-      {
-        type: "actions",
-        elements: [
-          {
-            type: "button",
-            text: {
-              type: "plain_text",
-              emoji: true,
-              text: "Yes",
-            },
-            style: "primary",
-            action_id: birthdayConfirmActionId,
-            value: birthday,
-          },
-          {
-            type: "button",
-            text: {
-              type: "plain_text",
-              emoji: true,
-              text: "No",
-            },
-            style: "danger",
-            action_id: birthdayIncorrectActionId,
-            value: birthday,
-          },
-        ],
-      },
-    ],
-    metadata: {
-      event_type: "confirmBirthday",
-      event_payload: {
+      makeTextBlock(`Are you sure your birthday is ${birthday}?`),
+      makeActionsBlock(
+        birthdayConfirmActionId,
+        birthdayIncorrectActionId,
         birthday,
-      },
-    },
+        "",
+      ),
+    ],
   }) satisfies ChatReplaceMessageArguments;
diff --git a/packages/core/services/slack/constructIceBreakerQuestion.ts b/packages/core/services/slack/constructIceBreakerQuestion.ts
@@ -1,5 +1,7 @@
 import type { ChatPostMessageArguments, KnownBlock } from "@slack/web-api";
 
+import { makeTextBlock } from "./messageItems";
+
 type Arguments = {
   users: string[];
   channel: string;
@@ -19,25 +21,17 @@ export const constructIceBreakerQuestion = ({
     iceBreakerQuestions[Math.floor(Math.random() * iceBreakerQuestions.length)];
 
   const blocks: KnownBlock[] = [
-    {
-      type: "section",
-      text: {
-        type: "mrkdwn",
-        text: `${randomIceBreakerQuestion} Post your picks in the thread! 👇`,
-      },
-    },
+    makeTextBlock(
+      `${randomIceBreakerQuestion} Post your picks in the thread! 👇`,
+    ),
   ];
 
   if (users.length) {
-    blocks.push({
-      type: "section",
-      text: {
-        type: "mrkdwn",
-        text: `Let's see your ones ${users
-          .map((user) => `<@${user}>`)
-          .join(", ")}!`,
-      },
-    });
+    blocks.push(
+      makeTextBlock(
+        `Let's see your ones ${users.map((user) => `<@${user}>`).join(", ")}!`,
+      ),
+    );
   }
 
   return {

diff --git a/packages/core/services/slack/messageItems.ts b/packages/core/services/slack/messageItems.ts
@@ -0,0 +1,59 @@
+import type { ActionsBlock, SectionBlock } from "@slack/web-api";
+
+export const makeTextBlock = (text: string): SectionBlock => ({
+  type: "section",
+  text: {
+    type: "mrkdwn",
+    text,
+  },
+});
+
+export const makeTextBlockWithDatepicker = (
+  text: string,
+  actionId: string,
+): SectionBlock => ({
+  ...makeTextBlock(text),
+  accessory: {
+    type: "datepicker",
+    initial_date: "1995-01-01",
+    placeholder: {
+      type: "plain_text",
+      text: "Select a date",
+      emoji: true,
+    },
+    action_id: actionId,
+  },
+});
+
+export const makeActionsBlock = (
+  yesActionId: string,
+  noActionId: string,
+  yesValue: string,
+  noValue: string,
+): ActionsBlock => ({
+  type: "actions",
+  elements: [
+    {
+      type: "button",
+      text: {
+        type: "plain_text",
+        emoji: true,
+        text: "Yes",
+      },
+      style: "primary",
+      action_id: yesActionId,
+      value: yesValue,
+    },
+    {
+      type: "button",
+      text: {
+        type: "plain_text",
+        emoji: true,
+        text: "No",
+      },
+      style: "danger",
+      action_id: noActionId,
+      value: noValue,
+    },
+  ],
+});
diff --git a/tests/utils/generateIceBreakerTestUsers.ts b/tests/utils/generateIceBreakerTestUsers.ts
@@ -30,14 +30,12 @@ export const generateIceBreakerTestUsers = async (today?: string) => {
     start.add(6, "months"), // random day outside the window
   ];
 
-  await Promise.all(
-    birthdays.map((birthday, i) =>
-      testDb.insert(users).values({
-        id: `U${i + 1}`,
-        teamId: "T1",
-        birthday: birthday.toDate(),
-      }),
-    ),
+  await testDb.insert(users).values(
+    birthdays.map((birthday, i) => ({
+      id: `U${i + 1}`,
+      teamId: "T1",
+      birthday: birthday.toDate(),
+    })),
   );
 };