Merge pull request #1797 from bcgov/hotfix/ALCS-2145

Fix Submission PDF Including "Other" Documents with Non-Applicant Source
bcgov · Jul 29, 2024 · feafb40 · feafb40
2 parents 3d1406f + 0a966e3
commit feafb40
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
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
@@ -204,12 +204,13 @@ export class GenerateNoiSubmissionDocumentService {
 
     const otherDocuments = documents.filter(
       (e) =>
-        !e.typeCode ||
+        (!e.typeCode ||
         [
           DOCUMENT_TYPE.PHOTOGRAPH,
           DOCUMENT_TYPE.PROFESSIONAL_REPORT,
           DOCUMENT_TYPE.OTHER,
-        ].includes((e.typeCode ?? 'undefined') as DOCUMENT_TYPE),
+        ].includes((e.typeCode ?? 'undefined') as DOCUMENT_TYPE)) &&
+        e.document.source === DOCUMENT_SOURCE.APPLICANT,
     );
 
     const proposalMap = documents.filter(

diff --git a/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts b/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts
@@ -253,12 +253,13 @@ export class GenerateSubmissionDocumentService {
 
     const otherDocuments = documents.filter(
       (e) =>
-        !e.typeCode ||
+        (!e.typeCode ||
         [
           DOCUMENT_TYPE.PHOTOGRAPH,
           DOCUMENT_TYPE.PROFESSIONAL_REPORT,
           DOCUMENT_TYPE.OTHER,
-        ].includes((e.typeCode ?? 'undefined') as DOCUMENT_TYPE),
+        ].includes((e.typeCode ?? 'undefined') as DOCUMENT_TYPE)) &&
+        e.document.source === DOCUMENT_SOURCE.APPLICANT,
     );
 
     const proposalMap = documents.filter(