[SSF-180] - Automated Emails 2 Implementation

apps/backend/src/donations/donations.module.ts

@@ -10,6 +10,7 @@ import { DonationItem } from '../donationItems/donationItems.entity';
 import { DonationItemsModule } from '../donationItems/donationItems.module';
 import { Allocation } from '../allocations/allocations.entity';
 import { AllocationModule } from '../allocations/allocations.module';
+import { EmailsModule } from '../emails/email.module';
 
 @Module({
   imports: [
@@ -22,6 +23,7 @@ import { AllocationModule } from '../allocations/allocations.module';
     forwardRef(() => AuthModule),
     DonationItemsModule,
     AllocationModule,
+    EmailsModule,
   ],
   controllers: [DonationsController],
   providers: [DonationService, DonationsSchedulerService],

apps/backend/src/donations/donations.service.spec.ts

@@ -16,6 +16,7 @@ import {
 import { FoodType } from '../donationItems/types';
 import { DonationItemsService } from '../donationItems/donationItems.service';
 import { DonationItem } from '../donationItems/donationItems.entity';
+import { EmailsService } from '../emails/email.service';
 
 jest.setTimeout(60000);
 
@@ -126,6 +127,10 @@ describe('DonationService', () => {
           provide: DataSource,
           useValue: testDataSource,
         },
+        {
+          provide: EmailsService,
+          useValue: { sendEmails: jest.fn() },
+        },
       ],
     }).compile();
 

apps/backend/src/donations/donations.service.ts

@@ -1,7 +1,6 @@
 import {
   BadRequestException,
   Injectable,
-  Logger,
   NotFoundException,
 } from '@nestjs/common';
 import { InjectDataSource, InjectRepository } from '@nestjs/typeorm';
@@ -15,11 +14,11 @@ import { DonationItemsService } from '../donationItems/donationItems.service';
 import { ReplaceDonationItemsDto } from '../donationItems/dtos/create-donation-items.dto';
 import { DonationItem } from '../donationItems/donationItems.entity';
 import { Allocation } from '../allocations/allocations.entity';
+import { EmailsService } from '../emails/email.service';
+import { emailTemplates } from '../emails/emailTemplates';
 
 @Injectable()
 export class DonationService {
-  private readonly logger = new Logger(DonationService.name);
-
   constructor(
     @InjectRepository(Donation) private repo: Repository<Donation>,
     @InjectRepository(Allocation)
@@ -30,6 +29,7 @@ export class DonationService {
     private manufacturerRepo: Repository<FoodManufacturer>,
     private donationItemsService: DonationItemsService,
     @InjectDataSource() private dataSource: DataSource,
+    private emailsService: EmailsService,
   ) {}
 
   async findOne(donationId: number): Promise<Donation> {
@@ -203,13 +203,22 @@ export class DonationService {
           break;
         }
 
-        this.logger.log(`Placeholder for sending automated email`);
+        const { subject, bodyHTML } =
+          emailTemplates.fmRecurringDonationReminder({
+            fmName: donation.foodManufacturer.foodManufacturerName,
+          });
+
+        try {
+          const fmEmails = [
+            donation.foodManufacturer.secondaryContactEmail,
+          ].filter((e): e is string => e !== null);
 
-        /**
-         * IMPORTANT: future logic below should only proceed if the email is successfully sent
-         */
-        const emailSent = true;
-        if (!emailSent) continue;
+          if (fmEmails.length > 0) {
+            await this.emailsService.sendEmails(fmEmails, subject, bodyHTML);
+          }
+        } catch (e) {
+          continue;
+        }
 
         dates.splice(i, 1);
         i--;
@@ -225,11 +234,22 @@ export class DonationService {
 
           // cascading recalculation of next dates when replacement dates are also expired
           while (nextDate.getTime() <= today.getTime() && occurrences > 0) {
-            this.logger.log(
-              `Placeholder for sending automated email for replacement date`,
-            );
-            const cascadeEmailSent = true;
-            if (!cascadeEmailSent) break;
+            const { subject: cs, bodyHTML: cb } =
+              emailTemplates.fmRecurringDonationReminder({
+                fmName: donation.foodManufacturer.foodManufacturerName,
+              });
+
+            try {
+              const fmEmails = [
+                donation.foodManufacturer.secondaryContactEmail,
+              ].filter((e): e is string => e !== null);
+
+              if (fmEmails.length > 0) {
+                await this.emailsService.sendEmails(fmEmails, cs, cb);
+              }
+            } catch (e) {
+              break;
+            }
 
             occurrences -= 1;
 

apps/backend/src/emails/emailTemplates.ts

@@ -98,4 +98,74 @@ export const emailTemplates = {
       <p>Best regards,<br />The Securing Safe Food Team</p>
     `,
   }),
+
+  fmRecurringDonationReminder: (params: { fmName: string }): EmailTemplate => ({
+    subject: 'Reminder: Submit Your Scheduled Recurring Donation with SSF',
+    bodyHTML: `
+      <p>Hi ${params.fmName},</p>
+      <p>
+        This is a friendly reminder from Securing Safe Food that your recurring donation
+        schedule indicates a new donation submission is due.
+      </p>
+      <p>
+        When you have a moment, please log into your account and submit your current
+        donation availability so we can continue matching your contributions with pantry requests.
+      </p>
+      <p>
+        We greatly appreciate your continued generosity and support of our mission. Your
+        recurring donations make a meaningful and consistent impact for the communities we serve.
+      </p>
+      <p>Best regards,<br />The Securing Safe Food Team</p>
+    `,
+  }),
+
+  trackingLinkAvailable: (params: {
+    pantryName: string;
+    fmName: string;
+    trackingLink: string;
+    volunteerName: string;
+    volunteerEmail: string;
+  }): EmailTemplate => ({
+    subject: `Tracking Information for your ${params.fmName} delivery (Securing Safe Food)`,
+    bodyHTML: `
+      <p>Hi ${params.pantryName},</p>
+      <p>
+        Good news! Tracking information is now available for your upcoming SSF delivery
+        from ${params.fmName}. You can use this tracking information to monitor the
+        status of your shipment or log into your portal for more information on your
+        expected donation.
+      </p>
+      <p>
+        Tracking Link: <a href="${params.trackingLink}">${params.trackingLink}</a>
+      </p>
+      <p>
+        You can use the tracking link above to monitor your shipment, or <a href="${EMAIL_REDIRECT_URL}/login">log into your portal</a> for full order details and updates.
+      </p>
+      <p>
+        If you experience any issues or have questions, please contact your coordinator,
+        ${params.volunteerName}, at <a href="mailto:${params.volunteerEmail}">${params.volunteerEmail}</a>, and our team will be happy to assist.
+      </p>
+      <p>Best regards,<br />The Securing Safe Food Team</p>
+    `,
+  }),
+
+  pantryConfirmsOrderDelivery: (params: {
+    volunteerName: string;
+    pantryName: string;
+    fmName: string;
+  }): EmailTemplate => ({
+    subject: `${params.pantryName} Confirmed for your ${params.fmName} Order`,
+    bodyHTML: `
+      <p>Hi ${params.volunteerName},</p>
+      <p>
+        ${params.pantryName} has confirmed receipt of the most recent ${params.fmName}
+        order you are assigned to. Please log into the platform to review the completed
+        request or check for additional information.
+      </p>
+      <p>
+        Thank you for your coordination and support in helping reach this order to completion!
+      </p>
+      <p>Best regards,<br />The Securing Safe Food Team</p>
+    `,
+  }),
 };

apps/backend/src/orders/order.module.ts

@@ -17,6 +17,7 @@ import { DonationItemsModule } from '../donationItems/donationItems.module';
 import { Allocation } from '../allocations/allocations.entity';
 import { DonationModule } from '../donations/donations.module';
 import { Donation } from '../donations/donations.entity';
+import { EmailsModule } from '../emails/email.module';
 
 @Module({
   imports: [
@@ -37,6 +38,7 @@ import { Donation } from '../donations/donations.entity';
     ManufacturerModule,
     DonationItemsModule,
     DonationModule,
+    EmailsModule,
   ],
   controllers: [OrdersController],
   providers: [OrdersService],

apps/backend/src/orders/order.service.ts

@@ -23,6 +23,8 @@ import { DonationService } from '../donations/donations.service';
 import { ApplicationStatus } from '../shared/types';
 import { Donation } from '../donations/donations.entity';
 import { VolunteerOrder } from '../volunteers/types';
+import { EmailsService } from '../emails/email.service';
+import { emailTemplates } from '../emails/emailTemplates';
 
 @Injectable()
 export class OrdersService {
@@ -36,6 +38,7 @@ export class OrdersService {
     private allocationsService: AllocationsService,
     private donationService: DonationService,
     @InjectDataSource() private dataSource: DataSource,
+    private emailsService: EmailsService,
   ) {}
 
   // TODO: when order is created, set FM
@@ -391,6 +394,7 @@ export class OrdersService {
       .execute();
   }
 
+  // Updated confirmDelivery()
   async confirmDelivery(
     orderId: number,
     dto: ConfirmDeliveryDto,
@@ -403,7 +407,10 @@ export class OrdersService {
       throw new BadRequestException('Invalid date format for dateReceived');
     }
 
-    const order = await this.repo.findOneBy({ orderId });
+    const order = await this.repo.findOne({
+      where: { orderId },
+      relations: ['request', 'request.pantry', 'foodManufacturer', 'assignee'],
+    });
 
     if (!order) {
       throw new NotFoundException(`Order ${orderId} not found`);
@@ -424,6 +431,18 @@ export class OrdersService {
 
     await this.requestsService.updateRequestStatus(order.requestId);
 
+    const { subject, bodyHTML } = emailTemplates.pantryConfirmsOrderDelivery({
+      volunteerName: `${order.assignee.firstName} ${order.assignee.lastName}`,
+      pantryName: order.request.pantry.pantryName,
+      fmName: order.foodManufacturer.foodManufacturerName,
+    });
+
+    await this.emailsService.sendEmails(
+      [order.assignee.email],
+      subject,
+      bodyHTML,
+    );
+
     return updatedOrder;
   }
 
@@ -472,7 +491,10 @@ export class OrdersService {
       dto.trackingLink = sanitized;
     }
 
-    const order = await this.repo.findOneBy({ orderId });
+    const order = await this.repo.findOne({
+      where: { orderId },
+      relations: ['request', 'request.pantry', 'foodManufacturer', 'assignee'],
+    });
     if (!order) {
       throw new NotFoundException(`Order ${orderId} not found`);
     }
@@ -504,6 +526,22 @@ export class OrdersService {
     ) {
       order.status = OrderStatus.SHIPPED;
       order.shippedAt = new Date();
+
+      const { subject, bodyHTML } = emailTemplates.trackingLinkAvailable({
+        pantryName: order.request.pantry.pantryName,
+        fmName: order.foodManufacturer.foodManufacturerName,
+        trackingLink: order.trackingLink,
+        volunteerName: `${order.assignee.firstName} ${order.assignee.lastName}`,
+        volunteerEmail: order.assignee.email,
+      });
+
+      const pantryEmails = [order.request.pantry.secondaryContactEmail].filter(
+        (e): e is string => e !== null,
+      );
+
+      if (pantryEmails.length > 0) {
+        await this.emailsService.sendEmails(pantryEmails, subject, bodyHTML);
+      }
     }
 
     await this.repo.save(order);