Show Release Status in NOI Release Decision Dialog

bcgov · Sep 13, 2023 · a766884 · a766884
1 parent 8cd95f1
commit a766884
Show file tree

Hide file tree

Showing 8 changed files with 93 additions and 26 deletions.
diff --git a/...res/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.spec.ts b/...res/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.spec.ts
@@ -3,30 +3,28 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { createMock, DeepMocked } from '@golevelup/ts-jest';
 import { BehaviorSubject } from 'rxjs';
-import { ApplicationService } from '../../../../../services/application/application.service';
-import { ApplicationDecisionV2Service } from '../../../../../services/application/decision/application-decision-v2/application-decision-v2.service';
 import { NoticeOfIntentDecisionV2Service } from '../../../../../services/notice-of-intent/decision-v2/notice-of-intent-decision-v2.service';
 import { NoticeOfIntentDecisionDto } from '../../../../../services/notice-of-intent/decision/notice-of-intent-decision.dto';
-import { NoticeOfIntentService } from '../../../../../services/notice-of-intent/notice-of-intent.service';
+import { NoticeOfIntentSubmissionStatusService } from '../../../../../services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service';
 import { ReleaseDialogComponent } from './release-dialog.component';
 
 describe('ReleaseDialogComponent', () => {
   let component: ReleaseDialogComponent;
   let fixture: ComponentFixture<ReleaseDialogComponent>;
-  let mockNOIService: DeepMocked<NoticeOfIntentService>;
+  let mockNOISubmissionStatusService: DeepMocked<NoticeOfIntentSubmissionStatusService>;
   let mockNOIDecisionV2Service: DeepMocked<NoticeOfIntentDecisionV2Service>;
 
   beforeEach(async () => {
-    mockNOIService = createMock();
+    mockNOISubmissionStatusService = createMock();
     mockNOIDecisionV2Service = createMock();
     mockNOIDecisionV2Service.$decision = new BehaviorSubject<NoticeOfIntentDecisionDto | undefined>(undefined);
 
     await TestBed.configureTestingModule({
       declarations: [ReleaseDialogComponent],
       providers: [
         {
-          provide: NoticeOfIntentService,
-          useValue: mockNOIService,
+          provide: NoticeOfIntentSubmissionStatusService,
+          useValue: mockNOISubmissionStatusService,
         },
         {
           provide: NoticeOfIntentDecisionV2Service,

diff --git a/...features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.ts b/...features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.ts
@@ -2,7 +2,8 @@ import { Component, Inject, OnDestroy, OnInit } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { Subject, takeUntil } from 'rxjs';
 import { NoticeOfIntentDecisionV2Service } from '../../../../../services/notice-of-intent/decision-v2/notice-of-intent-decision-v2.service';
-import { NoticeOfIntentService } from '../../../../../services/notice-of-intent/notice-of-intent.service';
+import { NoticeOfIntentSubmissionStatusService } from '../../../../../services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service';
+import { NOI_SUBMISSION_STATUS } from '../../../../../services/notice-of-intent/notice-of-intent.dto';
 import { ApplicationPill } from '../../../../../shared/application-type-pill/application-type-pill.component';
 
 @Component({
@@ -16,33 +17,35 @@ export class ReleaseDialogComponent implements OnInit, OnDestroy {
   wasReleased = false;
 
   constructor(
-    private noticeOfIntentService: NoticeOfIntentService,
+    private noticeOfIntentSubmissionStatusService: NoticeOfIntentSubmissionStatusService,
     private decisionService: NoticeOfIntentDecisionV2Service,
     public matDialogRef: MatDialogRef<ReleaseDialogComponent>,
     @Inject(MAT_DIALOG_DATA) data: any
   ) {}
 
   ngOnInit(): void {
-    // this.applicationService.$applicationStatuses.pipe(takeUntil(this.$destroy)).subscribe((statuses) => {
-    //   if (statuses) {
-    //     const releasedStatus = statuses.find((status) => status.code === SUBMISSION_STATUS.ALC_DECISION);
-    //     if (releasedStatus) {
-    //       this.mappedType = {
-    //         label: releasedStatus.label,
-    //         backgroundColor: releasedStatus.alcsBackgroundColor,
-    //         borderColor: releasedStatus.alcsBackgroundColor,
-    //         textColor: releasedStatus.alcsColor,
-    //         shortLabel: releasedStatus.label,
-    //       };
-    //     }
-    //   }
-    // });
-
     this.decisionService.$decision.pipe(takeUntil(this.$destroy)).subscribe((decision) => {
       if (decision) {
         this.wasReleased = decision.wasReleased;
       }
     });
+    this.loadStatuses();
+  }
+
+  private async loadStatuses() {
+    const statuses = await this.noticeOfIntentSubmissionStatusService.listStatuses();
+    if (statuses) {
+      const releasedStatus = statuses.find((status) => status.code === NOI_SUBMISSION_STATUS.ALC_DECISION);
+      if (releasedStatus) {
+        this.mappedType = {
+          label: releasedStatus.label,
+          backgroundColor: releasedStatus.alcsBackgroundColor,
+          borderColor: releasedStatus.alcsBackgroundColor,
+          textColor: releasedStatus.alcsColor,
+          shortLabel: releasedStatus.label,
+        };
+      }
+    }
   }
 
   ngOnDestroy(): void {

diff --git a/...ent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.spec.ts b/...ent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.spec.ts
@@ -33,6 +33,22 @@ describe('NoticeOfIntentSubmissionStatusService', () => {
     expect(service).toBeTruthy();
   });
 
+  it('should call get for list all statuses', async () => {
+    mockHttpClient.get.mockReturnValue(
+      of([
+        {
+          code: 'fake',
+        },
+      ])
+    );
+
+    const res = await service.listStatuses();
+
+    expect(mockHttpClient.get).toHaveBeenCalledTimes(1);
+    expect(res.length).toEqual(1);
+    expect(res[0].code).toEqual('fake');
+  });
+
   it('should fetch statuses by fileNumber', async () => {
     mockHttpClient.get.mockReturnValue(
       of([

diff --git a/...f-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.ts b/...f-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.ts
@@ -3,7 +3,10 @@ import { Injectable } from '@angular/core';
 import { firstValueFrom } from 'rxjs';
 import { environment } from '../../../../environments/environment';
 import { ToastService } from '../../toast/toast.service';
-import { NoticeOfIntentSubmissionToSubmissionStatusDto } from './notice-of-intent-submission-status.dto';
+import {
+  NoticeOfIntentStatusDto,
+  NoticeOfIntentSubmissionToSubmissionStatusDto,
+} from './notice-of-intent-submission-status.dto';
 
 @Injectable({
   providedIn: 'root',
@@ -13,6 +16,15 @@ export class NoticeOfIntentSubmissionStatusService {
 
   constructor(private http: HttpClient, private toastService: ToastService) {}
 
+  async listStatuses(): Promise<NoticeOfIntentStatusDto[]> {
+    try {
+      return await firstValueFrom(this.http.get<NoticeOfIntentStatusDto[]>(`${this.baseUrl}`));
+    } catch (e) {
+      this.toastService.showErrorToast('Failed to fetch NOI Statuses');
+      throw e;
+    }
+  }
+
   async fetchSubmissionStatusesByFileNumber(
     fileNumber: string,
     showErrorToast = true

diff --git a/.../notice-of-intent-submission-status/notice-of-intent-submission-status.controller.spec.ts b/.../notice-of-intent-submission-status/notice-of-intent-submission-status.controller.spec.ts
@@ -46,6 +46,17 @@ describe('NoticeOfIntentSubmissionStatusController', () => {
     expect(controller).toBeDefined();
   });
 
+  it('should call the service for list statuses', async () => {
+    mockNoticeOfIntentSubmissionStatusService.listStatuses.mockResolvedValue(
+      [],
+    );
+
+    await controller.listStatuses();
+    expect(
+      mockNoticeOfIntentSubmissionStatusService.listStatuses,
+    ).toHaveBeenCalledTimes(1);
+  });
+
   it('should call service to get statuses by file number', async () => {
     const fakeFileNumber = 'fake';
 

diff --git a/...ntent/notice-of-intent-submission-status/notice-of-intent-submission-status.controller.ts b/...ntent/notice-of-intent-submission-status/notice-of-intent-submission-status.controller.ts
@@ -3,7 +3,11 @@ import { InjectMapper } from '@automapper/nestjs';
 import { Controller, Get, Param } from '@nestjs/common';
 import { ANY_AUTH_ROLE } from '../../../common/authorization/roles';
 import { UserRoles } from '../../../common/authorization/roles.decorator';
-import { NoticeOfIntentSubmissionToSubmissionStatusDto } from './notice-of-intent-status.dto';
+import { NoticeOfIntentSubmissionStatusType } from './notice-of-intent-status-type.entity';
+import {
+  NoticeOfIntentStatusDto,
+  NoticeOfIntentSubmissionToSubmissionStatusDto,
+} from './notice-of-intent-status.dto';
 import { NoticeOfIntentSubmissionToSubmissionStatus } from './notice-of-intent-status.entity';
 import { NoticeOfIntentSubmissionStatusService } from './notice-of-intent-submission-status.service';
 
@@ -15,6 +19,18 @@ export class NoticeOfIntentSubmissionStatusController {
     @InjectMapper() private mapper: Mapper,
   ) {}
 
+  @Get('')
+  async listStatuses() {
+    const statuses =
+      await this.noticeOfIntentSubmissionStatusService.listStatuses();
+
+    return this.mapper.mapArrayAsync(
+      statuses,
+      NoticeOfIntentSubmissionStatusType,
+      NoticeOfIntentStatusDto,
+    );
+  }
+
   @Get('/:fileNumber')
   async getStatusesByFileNumber(@Param('fileNumber') fileNumber) {
     const statuses =

diff --git a/...ent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.spec.ts b/...ent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.spec.ts
@@ -63,6 +63,13 @@ describe('NoticeOfIntentSubmissionStatusService', () => {
     expect(service).toBeDefined();
   });
 
+  it('should load all statuses from the repo', async () => {
+    mockSubmissionStatusTypeRepository.find.mockResolvedValue([]);
+
+    await service.listStatuses();
+    expect(mockSubmissionStatusTypeRepository.find).toHaveBeenCalledTimes(1);
+  });
+
   it('should successfully set initial statuses', async () => {
     mockSubmissionStatusTypeRepository.find.mockResolvedValue([
       new NoticeOfIntentSubmissionStatusType({

diff --git a/...f-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.ts b/...f-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.ts
@@ -24,6 +24,10 @@ export class NoticeOfIntentSubmissionStatusService {
     private noticeOfIntentSubmissionRepository: Repository<NoticeOfIntentSubmission>,
   ) {}
 
+  async listStatuses() {
+    return this.submissionStatusTypeRepository.find();
+  }
+
   async setInitialStatuses(submissionUuid: string, persist = true) {
     const statuses = await this.submissionStatusTypeRepository.find();
     const newStatuses: NoticeOfIntentSubmissionToSubmissionStatus[] = [];