Merge pull request #2471 from bcgov/2451-failed-to-fetch-documents-error-in-portal-part-ii

Add case for to handle access to non-government BCeID's apps

Author: trslater

services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts

@@ -96,14 +96,11 @@ export class ApplicationSubmissionReviewController {
       );
     }
 
-    const applicationReview =
-      await this.applicationSubmissionReviewService.getByFileNumber(fileNumber);
+    const applicationSubmission = req.user.entity.bceidBusinessGuid
+      ? await this.applicationSubmissionService.getForNonGovernmentBusinessByFileId(fileNumber, req.user.entity)
+      : await this.applicationSubmissionService.getByFileNumber(fileNumber, req.user.entity);
 
-    const applicationSubmission =
-      await this.applicationSubmissionService.getByFileNumber(
-        fileNumber,
-        req.user.entity,
-      );
+    const applicationReview = await this.applicationSubmissionReviewService.getByFileNumber(fileNumber);
 
     if (!applicationSubmission) {
       throw new NotFoundException(

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

@@ -425,6 +425,41 @@ export class ApplicationSubmissionService {
     return existingApplication;
   }
 
+  async getForNonGovernmentBusinessByFileId(fileNumber: string, user: User) {
+    if (!user.bceidBusinessGuid) {
+      throw new Error('Must have business BCeID GUID to access this submission');
+    }
+
+    const existingApplication = await this.applicationSubmissionRepository.findOne({
+      where: [
+        //Owns
+        {
+          fileNumber,
+          createdBy: {
+            bceidBusinessGuid: user.bceidBusinessGuid,
+          },
+          isDraft: false,
+        },
+      ],
+      order: {
+        auditUpdatedAt: 'DESC',
+        owners: {
+          firstName: 'ASC',
+          parcels: {
+            purchasedDate: 'ASC',
+          },
+        },
+      },
+      relations: { ...this.DEFAULT_RELATIONS, createdBy: true },
+    });
+
+    if (!existingApplication) {
+      throw new ServiceNotFoundException(`Failed to load application with File ID ${fileNumber}`);
+    }
+
+    return existingApplication;
+  }
+
   async getByFileNumber(fileNumber: string, user: User) {
     return await this.applicationSubmissionRepository.findOne({
       where: {
@@ -482,6 +517,8 @@ export class ApplicationSubmissionService {
       const localGovernment = await this.localGovernmentService.getByGuid(user.bceidBusinessGuid);
       if (localGovernment) {
         return await this.getForGovernmentByFileId(fileId, localGovernment);
+      } else {
+        return await this.getForNonGovernmentBusinessByFileId(fileId, user);
       }
     }