feat: Consolidate dnd embed formatter

Author: maael

src/interactions/dnd-poll.ts

@@ -1,7 +1,7 @@
 import { parse, format, eachDayOfInterval, isEqual } from 'date-fns'
-import { EmbedBuilder } from 'discord.js'
 import { google } from 'googleapis'
 import { MongoClient, ReturnDocument } from 'mongodb'
+import { getDiscordEmbedFromDbResult, parseDate } from '../shared/dnd-poll-embed'
 
 function getRangeFromTitle(title: string) {
   const [from, to] = title
@@ -13,10 +13,6 @@ function getRangeFromTitle(title: string) {
   return { from, to }
 }
 
-function parseDate(str: string) {
-  return parse(str, 'yyyy-MM-dd', new Date())
-}
-
 function getDays(start, end) {
   return eachDayOfInterval({ start, end })
 }
@@ -46,41 +42,7 @@ export async function handleDndPoll(body) {
       throw new Error('Missing schedule')
     }
     const voted = new Set(Object.values(result.dates).flat(1))
-    const example = new EmbedBuilder()
-      .setTitle(
-        `Dates for ${format(parseDate(result.from), 'EEEE dd/MM/yy')} to ${format(
-          parseDate(result.to),
-          'EEEE dd/MM/yy'
-        )}`
-      )
-      .setAuthor({ name: 'Hobby Scheduler' })
-      .addFields(
-        Object.entries(result.dates)
-          .map(([d, v]: any) => ({
-            name: `${format(d, 'dd/MM - EEEE')}`,
-            value: `${
-              v.length === 0
-                ? ':red_circle:'
-                : v.length === result.members.length
-                ? ':green_circle:'
-                : ':orange_circle:'
-            } - ${v.length}/${result.members.length}`,
-          }))
-          .concat([
-            {
-              name: 'Voted',
-              value: [...voted].map((m) => `<@${m}>`).join(', ') || 'No one',
-            },
-            {
-              name: 'Waiting on',
-              value:
-                result.members
-                  .filter((m) => !voted.has(m))
-                  .map((m) => `<@${m}>`)
-                  .join(', ') || 'No one',
-            },
-          ])
-      )
+    const example = getDiscordEmbedFromDbResult(result)
     console.info('updating to', example.toJSON())
     if (voted.size === result.members.length) {
       console.info('creating event')

src/scripts/poll.ts

@@ -11,12 +11,12 @@
  */
 
 import { SelectMenuBuilder } from '@discordjs/builders'
-import { parse } from 'date-fns'
 import { addDays } from 'date-fns/addDays'
 import { eachDayOfInterval } from 'date-fns/eachDayOfInterval'
 import { format } from 'date-fns/format'
-import { Client, Events, GatewayIntentBits, ActionRowBuilder, EmbedBuilder, TextChannel } from 'discord.js'
-import { MongoClient } from 'mongodb'
+import { Client, Events, GatewayIntentBits, ActionRowBuilder, TextChannel } from 'discord.js'
+import { MongoClient, ReturnDocument } from 'mongodb'
+import { getDiscordEmbedFromDbResult } from '../shared/dnd-poll-embed'
 ;(async () => {
   console.info('[start]')
   await sendMessage()
@@ -28,44 +28,12 @@ function getDays() {
   return eachDayOfInterval({ start: current, end: addDays(current, 13) })
 }
 
-function parseDate(str: string) {
-  return parse(str, 'yyyy-MM-dd', new Date())
-}
-
 async function sendMessage() {
   const client = await getClient()
   const channel = (await client.channels.fetch(process.env.DISCORD_DND_POLL_CHANNEL!)) as TextChannel
   const days = getDays()
   const result = await createDbRecord(days)
-  const voted = new Set(Object.values(result.dates).flat(1))
-  const embedopen = new EmbedBuilder()
-    .setTitle(
-      `Dates for ${format(parseDate(result.from), 'EEEE dd/MM/yy')} to ${format(parseDate(result.to), 'EEEE dd/MM/yy')}`
-    )
-    .setAuthor({ name: 'Hobby Scheduler' })
-    .addFields(
-      Object.entries(result.dates)
-        .map(([d, v]: any) => ({
-          name: `${format(d, 'dd/MM - EEEE')}`,
-          value: `${
-            v.length === 0 ? ':red_circle:' : v.length === result.members.length ? ':green_circle:' : ':orange_circle:'
-          } - ${v.length}/${result.members.length}`,
-        }))
-        .concat([
-          {
-            name: 'Voted',
-            value: [...voted].map((m) => `<@${m}>`).join(', ') || 'No one',
-          },
-          {
-            name: 'Waiting on',
-            value:
-              result.members
-                .filter((m) => !voted.has(m))
-                .map((m) => `<@${m}>`)
-                .join(', ') || 'No one',
-          },
-        ])
-    )
+  const embedopen = getDiscordEmbedFromDbResult(result)
   const _message = await channel.send({
     embeds: [embedopen],
     components: [
@@ -80,7 +48,6 @@ async function sendMessage() {
       ),
     ],
   })
-  console.info({ result })
   await client.destroy()
 }
 
@@ -97,10 +64,16 @@ async function createDbRecord(days: Date[]) {
         from,
         to,
         dates: days.reduce((acc, d) => ({ ...acc, [format(d, 'yyyy-MM-dd')]: [] })),
-        members: ['137678852628545539', '185741150714331136', '217741486115127297'],
+        members: [
+          '137678852628545539',
+          '185741150714331136',
+          '217741486115127297',
+          '272791476340260865',
+          '361624461243449345',
+        ],
       },
     },
-    { upsert: true }
+    { upsert: true, returnDocument: ReturnDocument.AFTER }
   )
   await client.close()
   return result

src/shared/dnd-poll-embed.ts

@@ -0,0 +1,43 @@
+import { format, parse } from 'date-fns'
+import { EmbedBuilder } from 'discord.js'
+
+export function getDiscordEmbedFromDbResult(result: any) {
+  console.info({ result })
+  const voted = new Set(Object.values(result.dates).flat(1))
+  const embedopen = new EmbedBuilder()
+    .setTitle(
+      `Dates for ${format(parseDate(result.from), 'EEEE dd/MM/yy')} to ${format(parseDate(result.to), 'EEEE dd/MM/yy')}`
+    )
+    .setAuthor({ name: 'Hobby Scheduler' })
+    .addFields(
+      Object.entries(result.dates)
+        .map(([d, v]: any) => ({
+          name: `${
+            v.length === 0 ? ':red_circle:' : v.length === result.members.length ? ':green_circle:' : ':orange_circle:'
+          } ${format(d, 'dd/MM - EEEE')}`,
+          value: [`${v.length}/${result.members.length}`, `${v.map((m) => `<@${m}>`).join(', ')}`]
+            .filter(Boolean)
+            .join(' - '),
+        }))
+        .concat([
+          {
+            name: 'Voted',
+            value: [...voted].map((m) => `<@${m}>`).join(', ') || 'No one',
+          },
+          {
+            name: 'Waiting on',
+            value:
+              result.members
+                .filter((m) => !voted.has(m))
+                .map((m) => `<@${m}>`)
+                .join(', ') || 'No one',
+          },
+        ])
+    )
+
+  return embedopen
+}
+
+export function parseDate(str: string) {
+  return parse(str, 'yyyy-MM-dd', new Date())
+}