fix: dont send lottery emails to duplicate applications (#4346)

bloom-housing · Sep 23, 2024 · cba63b1 · cba63b1
1 parent a62f73b
commit cba63b1
Show file tree

Hide file tree

Showing 4 changed files with 87 additions and 75 deletions.
diff --git a/api/src/services/listing.service.ts b/api/src/services/listing.service.ts
@@ -278,53 +278,6 @@ export class ListingService implements OnModuleInit {
     return { emails: userEmails, publicUrl };
   }
 
-  public async getPublicUserEmailInfo(
-    listingId?: string,
-  ): Promise<{ [key: string]: string[] }> {
-    const userResults = await this.prisma.applications.findMany({
-      select: {
-        language: true,
-        applicant: {
-          select: {
-            emailAddress: true,
-          },
-        },
-      },
-      where: {
-        listingId,
-        applicant: {
-          emailAddress: {
-            not: null,
-          },
-        },
-      },
-    });
-
-    const result = {};
-    Object.keys(LanguagesEnum).forEach((languageKey) => {
-      const applications = userResults
-        .filter((user) => user.language === languageKey)
-        .map((userObj) => userObj.applicant.emailAddress);
-      if (applications.length) {
-        result[languageKey] = applications;
-      }
-    });
-
-    const noLanguageIndicated = userResults
-      .filter((user) => !user.language)
-      .map((userObj) => userObj.applicant.emailAddress);
-
-    if (!result[LanguagesEnum.en])
-      result[LanguagesEnum.en] = noLanguageIndicated;
-    else
-      result[LanguagesEnum.en] = [
-        ...result[LanguagesEnum.en],
-        ...noLanguageIndicated,
-      ];
-
-    return result;
-  }
-
   public async listingApprovalNotify(params: {
     user: User;
     listingInfo: IdDTO;

diff --git a/api/src/services/lottery.service.ts b/api/src/services/lottery.service.ts
@@ -9,7 +9,7 @@ import {
 import { SchedulerRegistry } from '@nestjs/schedule';
 import { ConfigService } from '@nestjs/config';
 import {
-  ApplicationLotteryTotal,
+  LanguagesEnum,
   ListingEventsTypeEnum,
   ListingsStatusEnum,
   LotteryStatusEnum,
@@ -343,6 +343,53 @@ export class LotteryService {
     };
   }
 
+  public async getPublicUserEmailInfo(
+    listingId?: string,
+  ): Promise<{ [key: string]: string[] }> {
+    const userResults = await this.prisma.applications.findMany({
+      select: {
+        userAccounts: {
+          select: {
+            email: true,
+          },
+        },
+        language: true,
+      },
+      where: {
+        listingId,
+        markedAsDuplicate: {
+          not: true,
+        },
+      },
+    });
+
+    const emailUsers = userResults.filter((user) => !!user.userAccounts?.email);
+
+    const result = {};
+    Object.keys(LanguagesEnum).forEach((languageKey) => {
+      const applications = emailUsers
+        .filter((user) => user.language === languageKey)
+        .map((userObj) => userObj.userAccounts.email);
+      if (applications.length) {
+        result[languageKey] = applications;
+      }
+    });
+
+    const noLanguageIndicated = emailUsers
+      .filter((user) => !user.language)
+      .map((userObj) => userObj.userAccounts.email);
+
+    if (!result[LanguagesEnum.en])
+      result[LanguagesEnum.en] = noLanguageIndicated;
+    else
+      result[LanguagesEnum.en] = [
+        ...result[LanguagesEnum.en],
+        ...noLanguageIndicated,
+      ];
+
+    return result;
+  }
+
   async publishLottery(listing: Listing): Promise<SuccessDTO> {
     const partnerUserEmailInfo = await this.listingService.getUserEmailInfo(
       [
@@ -354,8 +401,7 @@ export class LotteryService {
       listing.jurisdictions?.id,
     );
 
-    const publicUserEmailInfo =
-      await this.listingService.getPublicUserEmailInfo(listing.id);
+    const publicUserEmailInfo = await this.getPublicUserEmailInfo(listing.id);
 
     await this.updateLotteryStatus(
       listing.id,

diff --git a/api/test/integration/lottery.e2e-spec.ts b/api/test/integration/lottery.e2e-spec.ts
@@ -1032,9 +1032,12 @@ describe('Lottery Controller Tests', () => {
             confirmationCode: 'ABCD1234',
             submissionType: ApplicationSubmissionTypeEnum.electronical,
             language: LanguagesEnum.en,
-            applicant: {
+            userAccounts: {
               create: {
-                emailAddress: '[email protected]',
+                email: '[email protected]',
+                firstName: 'first',
+                lastName: 'last',
+                passwordHash: 'abcd1234',
               },
             },
           },
@@ -1044,9 +1047,12 @@ describe('Lottery Controller Tests', () => {
             confirmationCode: 'EFGH5678',
             submissionType: ApplicationSubmissionTypeEnum.electronical,
             language: LanguagesEnum.es,
-            applicant: {
+            userAccounts: {
               create: {
-                emailAddress: '[email protected]',
+                email: '[email protected]',
+                firstName: 'first',
+                lastName: 'last',
+                passwordHash: 'abcd1234',
               },
             },
           },
@@ -1056,9 +1062,24 @@ describe('Lottery Controller Tests', () => {
             confirmationCode: 'IJKL9012',
             submissionType: ApplicationSubmissionTypeEnum.electronical,
             language: null,
+            userAccounts: {
+              create: {
+                email: '[email protected]',
+                firstName: 'first',
+                lastName: 'last',
+                passwordHash: 'abcd1234',
+              },
+            },
+          },
+          {
+            preferences: [],
+            status: ApplicationStatusEnum.submitted,
+            confirmationCode: 'MNOP3456',
+            submissionType: ApplicationSubmissionTypeEnum.electronical,
+            language: null,
             applicant: {
               create: {
-                emailAddress: 'applicant3@email.com',
+                emailAddress: 'applicant4@email.com',
               },
             },
           },

diff --git a/api/test/unit/services/lottery.service.spec.ts b/api/test/unit/services/lottery.service.spec.ts
@@ -615,11 +615,9 @@ describe('Testing lottery service', () => {
         emails: ['[email protected]', '[email protected]'],
       });
 
-      jest
-        .spyOn(listingService, 'getPublicUserEmailInfo')
-        .mockResolvedValueOnce({
-          en: ['[email protected]'],
-        });
+      jest.spyOn(service, 'getPublicUserEmailInfo').mockResolvedValueOnce({
+        en: ['[email protected]'],
+      });
 
       await service.lotteryStatus(
         {
@@ -671,11 +669,9 @@ describe('Testing lottery service', () => {
       jest.spyOn(listingService, 'getUserEmailInfo').mockResolvedValueOnce({
         emails: ['[email protected]', '[email protected]'],
       });
-      jest
-        .spyOn(listingService, 'getPublicUserEmailInfo')
-        .mockResolvedValueOnce({
-          en: ['[email protected]'],
-        });
+      jest.spyOn(service, 'getPublicUserEmailInfo').mockResolvedValueOnce({
+        en: ['[email protected]'],
+      });
 
       await expect(
         async () =>
@@ -716,11 +712,9 @@ describe('Testing lottery service', () => {
       jest.spyOn(listingService, 'getUserEmailInfo').mockResolvedValueOnce({
         emails: ['[email protected]', '[email protected]'],
       });
-      jest
-        .spyOn(listingService, 'getPublicUserEmailInfo')
-        .mockResolvedValueOnce({
-          en: ['[email protected]'],
-        });
+      jest.spyOn(service, 'getPublicUserEmailInfo').mockResolvedValueOnce({
+        en: ['[email protected]'],
+      });
 
       await service.lotteryStatus(
         {
@@ -828,11 +822,9 @@ describe('Testing lottery service', () => {
         lotteryStatus: LotteryStatusEnum.ran,
       });
       prisma.jurisdictions.findFirst = jest.fn().mockResolvedValue(null);
-      jest
-        .spyOn(listingService, 'getPublicUserEmailInfo')
-        .mockResolvedValueOnce({
-          en: ['[email protected]'],
-        });
+      jest.spyOn(service, 'getPublicUserEmailInfo').mockResolvedValueOnce({
+        en: ['[email protected]'],
+      });
 
       jest.spyOn(listingService, 'getUserEmailInfo').mockResolvedValueOnce({
         emails: ['[email protected]', '[email protected]'],