Merge pull request #1358 from bcgov/feature/ALCS-974-2

PDF Fixes
bcgov · Jan 30, 2024 · aa20fbc · aa20fbc
2 parents 33df229 + f32b4ae
commit aa20fbc
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 4 deletions.
diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.dto.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.dto.ts
@@ -141,6 +141,10 @@ export class UpdateNoticeOfIntentDto {
   @IsNumber()
   dateSubmittedToAlc?: number;
 
+  @IsOptional()
+  @IsString()
+  typeCode?: string;
+
   @IsOptional()
   @IsBoolean()
   hideFromPortal?: boolean;

diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts
@@ -2,10 +2,10 @@ import {
   ServiceNotFoundException,
   ServiceValidationException,
 } from '@app/common/exceptions/base.exception';
-import { Mapper } from 'automapper-core';
-import { InjectMapper } from 'automapper-nestjs';
 import { Injectable, Logger } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
+import { Mapper } from 'automapper-core';
+import { InjectMapper } from 'automapper-nestjs';
 import {
   FindOptionsRelations,
   FindOptionsWhere,
@@ -23,13 +23,13 @@ import { Board } from '../board/board.entity';
 import { CARD_TYPE } from '../card/card-type/card-type.entity';
 import { Card } from '../card/card.entity';
 import { CardService } from '../card/card.service';
-import { NoticeOfIntentType } from './notice-of-intent-type/notice-of-intent-type.entity';
 import { CodeService } from '../code/code.service';
 import { LocalGovernmentService } from '../local-government/local-government.service';
 import { NOI_SUBMISSION_STATUS } from './notice-of-intent-submission-status/notice-of-intent-status.dto';
 import { NoticeOfIntentSubmissionStatusService } from './notice-of-intent-submission-status/notice-of-intent-submission-status.service';
 import { NoticeOfIntentSubmissionService } from './notice-of-intent-submission/notice-of-intent-submission.service';
 import { NoticeOfIntentSubtype } from './notice-of-intent-subtype.entity';
+import { NoticeOfIntentType } from './notice-of-intent-type/notice-of-intent-type.entity';
 import {
   CreateNoticeOfIntentServiceDto,
   NoticeOfIntentDto,
@@ -333,6 +333,14 @@ export class NoticeOfIntentService {
       noticeOfIntent.hideFromPortal,
     );
 
+    if (updateDto.typeCode) {
+      noticeOfIntent.type = await this.typeRepository.findOneOrFail({
+        where: {
+          code: updateDto.typeCode,
+        },
+      });
+    }
+
     await this.repository.save(noticeOfIntent);
 
     await this.updateStatus(updateDto, noticeOfIntent);

diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts
@@ -208,6 +208,15 @@ export class ApplicationSubmissionService {
       );
     }
 
+    if (!applicationSubmission.isDraft && updateDto.typeCode) {
+      await this.applicationService.updateByFileNumber(
+        applicationSubmission.fileNumber,
+        {
+          typeCode: updateDto.typeCode,
+        },
+      );
+    }
+
     return this.getOrFailByUuid(submissionUuid, this.DEFAULT_RELATIONS);
   }
 

diff --git a/...s/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts b/...s/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts
@@ -136,6 +136,14 @@ export class NoticeOfIntentSubmissionService {
       );
     }
 
+    if (!noticeOfIntentSubmission.isDraft && updateDto.typeCode) {
+      await this.noticeOfIntentService.update(
+        noticeOfIntentSubmission.fileNumber,
+        {
+          typeCode: updateDto.typeCode,
+        },
+      );
+    }
     return this.getByUuid(submissionUuid, user);
   }
 

diff --git a/services/apps/alcs/src/portal/pdf-generation/generate-noi-submission-document.service.ts b/services/apps/alcs/src/portal/pdf-generation/generate-noi-submission-document.service.ts
@@ -356,7 +356,11 @@ export class GenerateNoiSubmissionDocumentService {
         submission.soilIsRemovingSoilForNewStructure,
       ),
       soilProposedStructures: submission.soilProposedStructures.map(
-        (structure, index) => ({ ...structure, index }),
+        (structure, index) => ({
+          area: structure.area ?? NO_DATA,
+          type: structure.type ?? NO_DATA,
+          index: index + 1,
+        }),
       ),
       soilStructureFarmUseReason: submission.soilStructureFarmUseReason,
       soilStructureResidentialUseReason: