Merge pull request #2129 from bcgov/hotfix/ALCS-2546

2546: Pass submitted date to upstream submission methods

Author: trslater

services/apps/alcs/src/alcs/notification/notification.controller.ts

@@ -117,18 +117,20 @@ export class NotificationController {
       user,
     );
 
+    const notification = await this.notificationService.getByFileNumber(submission.fileNumber);
+
     const documents = await this.notificationDocumentService.list(fileNumber);
     const document = documents.find(
       (document) => document.type?.code === DOCUMENT_TYPE.LTSA_LETTER,
     );
 
     if (document) {
-      const emailDidSend =
-        await this.notificationSubmissionService.sendAndRecordLTSAPackage(
-          submission,
-          document,
-          user,
-        );
+      const emailDidSend = await this.notificationSubmissionService.sendAndRecordLTSAPackage(
+        submission,
+        document,
+        user,
+        notification.dateSubmittedToAlc ?? undefined,
+      );
 
       if (!emailDidSend) {
         throw new BaseServiceException(

services/apps/alcs/src/portal/notification-submission/notification-submission.controller.ts

@@ -156,9 +156,10 @@ export class NotificationSubmissionController {
     if (validationResult.noticeOfIntentSubmission) {
       const validatedApplicationSubmission = validationResult.noticeOfIntentSubmission;
 
-      await this.generatePdf(notificationSubmission, req.user.entity);
-
-      await this.notificationSubmissionService.submitToAlcs(validatedApplicationSubmission);
+      // Ensure PDF and DB record have the same submission date
+      const dateSubmitted = new Date();
+      await this.generatePdf(notificationSubmission, req.user.entity, dateSubmitted);
+      await this.notificationSubmissionService.submitToAlcs(validatedApplicationSubmission, dateSubmitted);
 
       const finalSubmission = await this.notificationSubmissionService.getByUuid(uuid, req.user.entity);
 
@@ -172,15 +173,15 @@ export class NotificationSubmissionController {
     }
   }
 
-  private async generatePdf(submission: NotificationSubmission, user: User) {
-    const savedDocument =
-      await this.generateSrwDocumentService.generateAndAttach(
-        submission.fileNumber,
-        user,
-      );
+  private async generatePdf(submission: NotificationSubmission, user: User, dateSubmitted: Date) {
+    const savedDocument = await this.generateSrwDocumentService.generateAndAttach(
+      submission.fileNumber,
+      user,
+      dateSubmitted,
+    );
 
     if (savedDocument) {
-      await this.notificationSubmissionService.sendAndRecordLTSAPackage(submission, savedDocument, user);
+      await this.notificationSubmissionService.sendAndRecordLTSAPackage(submission, savedDocument, user, dateSubmitted);
     } else {
       throw new BaseServiceException('A document failed to generate', undefined, 'DocumentGenerationError');
     }

services/apps/alcs/src/portal/notification-submission/notification-submission.service.spec.ts

@@ -243,24 +243,18 @@ describe('NotificationSubmissionService', () => {
     mockNotificationService.submit.mockRejectedValue(new Error());
 
     await expect(
-      service.submitToAlcs(
-        noticeOfIntentSubmission as ValidatedNotificationSubmission,
-      ),
-    ).rejects.toMatchObject(
-      new BaseServiceException(`Failed to submit notification: ${fileNumber}`),
-    );
+      service.submitToAlcs(noticeOfIntentSubmission as ValidatedNotificationSubmission, new Date()),
+    ).rejects.toMatchObject(new BaseServiceException(`Failed to submit notification: ${fileNumber}`));
   });
 
   it('should call out to service on submitToAlcs', async () => {
     const notification = new Notification({
       dateSubmittedToAlc: new Date(),
     });
-    mockStatusService.setStatusDate.mockResolvedValue(
-      new NotificationSubmissionToSubmissionStatus(),
-    );
+    mockStatusService.setStatusDate.mockResolvedValue(new NotificationSubmissionToSubmissionStatus());
 
     mockNotificationService.submit.mockResolvedValue(notification);
-    await service.submitToAlcs(mockSubmission);
+    await service.submitToAlcs(mockSubmission, new Date());
 
     expect(mockNotificationService.submit).toBeCalledTimes(1);
     expect(mockStatusService.setStatusDate).toHaveBeenCalledTimes(1);

services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts

@@ -366,14 +366,14 @@ export class NotificationSubmissionService {
     };
   }
 
-  async submitToAlcs(notificationSubmission: ValidatedNotificationSubmission) {
+  async submitToAlcs(notificationSubmission: ValidatedNotificationSubmission, dateSubmitted: Date) {
     try {
       const submittedNotification = await this.notificationService.submit({
         fileNumber: notificationSubmission.fileNumber,
         applicant: notificationSubmission.applicant,
         localGovernmentUuid: notificationSubmission.localGovernmentUuid,
         typeCode: notificationSubmission.typeCode,
-        dateSubmittedToAlc: new Date(),
+        dateSubmittedToAlc: dateSubmitted,
       });
 
       await this.notificationSubmissionStatusService.setStatusDate(
@@ -414,8 +414,9 @@ export class NotificationSubmissionService {
     submission: NotificationSubmission,
     document: NotificationDocument,
     user: User,
+    dateSubmitted?: Date,
   ): Promise<boolean> {
-    const templateData = await this.generateSrwEmailData(submission, document);
+    const templateData = await this.generateSrwEmailData(submission, document, dateSubmitted);
 
     const didSend = await this.emailService.sendEmail({
       to: [templateData.to],
@@ -458,6 +459,7 @@ export class NotificationSubmissionService {
   private async generateSrwEmailData(
     submission: NotificationSubmission,
     pdfDocument: NotificationDocument,
+    dateSubmitted?: Date,
   ) {
     const notification = await this.notificationService.getByFileNumber(
       submission.fileNumber,
@@ -468,9 +470,7 @@ export class NotificationSubmissionService {
       fileNumber: submission.fileNumber,
       contactName: `${submission.contactFirstName} ${submission.contactLastName}`,
       status: 'ALC Response Sent',
-      dateSubmitted: dayjs(notification.dateSubmittedToAlc).format(
-        'MMMM DD, YYYY',
-      ),
+      dateSubmitted: dayjs(dateSubmitted).format('MMMM DD, YYYY'),
       fileName: pdfDocument.document.fileName,
       submittersFileNumber: submission.submittersFileNumber!,
     });

services/apps/alcs/src/portal/pdf-generation/generate-srw-document.service.spec.ts

@@ -98,7 +98,7 @@ describe('GenerateSrwDocumentService', () => {
       name: 'Bruce Wayne',
     });
 
-    const res = await service.generate('fake', userEntity);
+    const res = await service.generate('fake', userEntity, new Date());
 
     expect(mockCdogsService.generateDocument).toBeCalledTimes(1);
     expect(mockLocalGovernmentService.getByUuid).toBeCalledTimes(1);

services/apps/alcs/src/portal/pdf-generation/generate-srw-document.service.ts

@@ -31,18 +31,14 @@ export class GenerateSrwDocumentService {
     private notificationDocumentService: NotificationDocumentService,
     private localGovernmentService: LocalGovernmentService,
     private notificationParcelService: NotificationParcelService,
-    private notificationService: NotificationService,
   ) {}
 
-  async generate(fileNumber: string, user: User) {
-    const submission = await this.notificationSubmissionService.getByFileNumber(
-      fileNumber,
-      user,
-    );
+  async generate(fileNumber: string, user: User, dateSubmitted: Date) {
+    const submission = await this.notificationSubmissionService.getByFileNumber(fileNumber, user);
 
     const documents = await this.notificationDocumentService.list(fileNumber);
 
-    const payload = await this.preparePdfPayload(submission, documents);
+    const payload = await this.preparePdfPayload(submission, documents, dateSubmitted);
 
     return await this.documentGenerationService.generateDocument(
       `${fileNumber}_SRW_Date_Time`,
@@ -51,8 +47,8 @@ export class GenerateSrwDocumentService {
     );
   }
 
-  async generateAndAttach(fileNumber: string, user: User) {
-    const reviewRes = await this.generate(fileNumber, user);
+  async generateAndAttach(fileNumber: string, user: User, dateSubmitted: Date) {
+    const reviewRes = await this.generate(fileNumber, user, dateSubmitted);
 
     if (reviewRes.status === HttpStatus.OK) {
       return await this.notificationDocumentService.attachDocumentAsBuffer({
@@ -76,11 +72,8 @@ export class GenerateSrwDocumentService {
   private async preparePdfPayload(
     submission: NotificationSubmission,
     documents: NotificationDocument[],
+    dateSubmitted: Date,
   ) {
-    const notification = await this.notificationService.getByFileNumber(
-      submission.fileNumber,
-    );
-
     const localGovernment = submission.localGovernmentUuid
       ? await this.localGovernmentService.getByUuid(
           submission.localGovernmentUuid,
@@ -116,12 +109,8 @@ export class GenerateSrwDocumentService {
       .join(', ');
 
     return {
-      generatedDateTime: dayjs
-        .tz(new Date(), 'Canada/Pacific')
-        .format('MMM DD, YYYY hh:mm:ss Z'),
-      dateSubmitted: dayjs
-        .tz(notification.dateSubmittedToAlc, 'Canada/Pacific')
-        .format('MMMM DD, YYYY'),
+      generatedDateTime: dayjs.tz(new Date(), 'Canada/Pacific').format('MMM DD, YYYY hh:mm:ss Z'),
+      dateSubmitted: dayjs.tz(dateSubmitted, 'Canada/Pacific').format('MMMM DD, YYYY'),
       fileNumber: submission.fileNumber,
       applicant: submission.applicant,
       firstName: submission.contactFirstName,