Refactor DBL Upload email to do its own data & config loading

Author: CarsonF

src/components/dbl-upload-notification/emails/dbl-upload.email.tsx

@@ -1,26 +1,37 @@
 import { type NonEmptyArray } from '@seedcompany/common';
 import type { Verse } from '@seedcompany/scripture';
 import type { Range } from '~/common';
-import { EmailTemplate, LanguageRef, Mjml, useFrontendUrl } from '~/core/email';
-import { type Engagement } from '../../../components/engagement/dto';
-import { type Language } from '../../../components/language/dto';
-import { type Project } from '../../../components/project/dto';
-import { type User } from '../../../components/user/dto';
+import {
+  EmailTemplate,
+  Headers,
+  LanguageRef,
+  Mjml,
+  useConfig,
+  useFrontendUrl,
+  useResources,
+} from '~/core/email';
+import { type LanguageEngagement } from '../../engagement/dto';
 
 interface Props {
-  recipient: User;
-  project: Pick<Project, 'id' | 'name'>;
-  engagement: Pick<Engagement, 'id'>;
-  language: Pick<Language, 'id' | 'name' | 'ethnologue'>;
+  engagement: LanguageEngagement;
   completedBooks: NonEmptyArray<Range<Verse>>;
-  dblFormUrl: string;
 }
 
-export function DBLUpload(props: Props) {
-  const { language, project, completedBooks, engagement, dblFormUrl } = props;
+export async function DBLUpload(props: Props) {
+  const { engagement, completedBooks } = props;
+
+  const resources = useResources();
+  const [language, project] = await Promise.all([
+    resources.load('Language', props.engagement.language.value!.id),
+    resources.load('Project', props.engagement.project.id),
+  ]);
+
+  const config = useConfig().email.notifyDblUpload!;
+
   const languageName = language.name.value;
   return (
     <EmailTemplate title={`${languageName || 'Language'} needs a DBL upload`}>
+      {config.replyTo && <Headers replyTo={config.replyTo} />}
       <Mjml.Section>
         <Mjml.Column>
           <Mjml.Text>
@@ -136,7 +147,7 @@ export function DBLUpload(props: Props) {
         <Mjml.Column>
           <Mjml.Text>
             🔗{' '}
-            <a href={dblFormUrl} style={{ backgroundColor: 'yellow' }}>
+            <a href={config.formUrl} style={{ backgroundColor: 'yellow' }}>
               Seed Company DBL Publication Request Form
             </a>
           </Mjml.Text>

src/components/dbl-upload-notification/handlers/dbl-upload-notification.handler.tsx

@@ -1,6 +1,7 @@
 import { ModuleRef } from '@nestjs/core';
 import {
   asNonEmptyArray,
+  asyncPool,
   groupBy,
   type NonEmptyArray,
   setOf,
@@ -11,7 +12,6 @@ import {
   splitRangeByBook,
   type Verse,
 } from '@seedcompany/scripture';
-import { type ComponentProps as PropsOf } from 'react';
 import { type ID, type Range } from '~/common';
 import {
   ConfigService,
@@ -96,44 +96,23 @@ export class DBLUploadNotificationHandler
       .get(ProjectMemberRepository, { strict: false })
       .listAsNotifiers(engagement.project.id, ['ProjectManager']);
 
-    const notifyeesProps = await Promise.all(
-      notifyees
-        .filter((n) => n.email)
-        .map(({ id: userId }) =>
-          this.gatherTemplateProps(
-            userId,
-            engagement.id,
-            engagement.language.value!.id,
-            engagement.project.id,
-            completedBooks,
-          ),
-        ),
-    );
-
     this.logger.info('Notifying', {
-      engagement: notifyeesProps[0]?.engagement.id ?? undefined,
-      reportId: report.id,
-      reportDate: report.start,
+      language: engagement.language.value!.id,
       books: completedBooks.map((r) => r.start.book.name),
-      emails: notifyeesProps.map((r) => r.recipient.email.value),
+      emails: notifyees.flatMap((r) => r.email ?? []),
     });
 
-    for (const props of notifyeesProps) {
-      // members without an email address are already omitted
-      const to = props.recipient.email.value!;
-      await this.mailer
-        .withOptions({ send: !!this.config.email.notifyDblUpload })
-        .compose(
-          {
-            to,
-            ...(this.config.email.notifyDblUpload?.replyTo && {
-              'reply-to': this.config.email.notifyDblUpload.replyTo,
-            }),
-          },
-          <DBLUpload {...props} />,
-        )
-        .send();
-    }
+    await asyncPool(Infinity, notifyees, async ({ id: user, email }) => {
+      if (!email) {
+        return;
+      }
+      const msg = await this.identity.asUser(user, async () =>
+        this.mailer
+          .withOptions({ send: !!this.config.email.notifyDblUpload })
+          .compose(email, [DBLUpload, { engagement, completedBooks }]),
+      );
+      await msg.send();
+    });
   }
 
   private async determineCompletedProducts(report: ProgressReport) {
@@ -215,30 +194,4 @@ export class DBLUploadNotificationHandler
       });
     return asNonEmptyArray(completedBooks);
   }
-
-  private async gatherTemplateProps(
-    recipientId: ID<'User'>,
-    engagementId: ID,
-    languageId: ID,
-    projectId: ID,
-    completedBooks: NonEmptyArray<Range<Verse>>,
-  ) {
-    return await this.identity.asUser(recipientId, async () => {
-      const [recipient, language, engagement, project] = await Promise.all([
-        this.resources.load('User', recipientId),
-        this.resources.load('Language', languageId),
-        this.resources.load('Engagement', engagementId),
-        this.resources.load('Project', projectId),
-      ]);
-
-      return {
-        recipient,
-        language,
-        project,
-        engagement,
-        completedBooks,
-        dblFormUrl: this.config.email.notifyDblUpload?.formUrl ?? '',
-      } satisfies PropsOf<typeof DBLUpload>;
-    });
-  }
 }