2415 QA Create Header and Overview Tab from Submission (#2491)

* Fix status not setting
- Move set status logic to backend
- Update logic to allow setting status given different states
- Allow setting status by file number or UUID

* Always set closed date when opening file

* Add address and owner name to details header
- Pass property owner name into header
- Determine property owner name in parent component when loading file
- Allow filtering responsible parties by party type
- Add address/name to header template

* Use fake timers, so times line up

* Add HTTP mock

* Catch potentially missing parties

Also caught property not being loaded with file

Author: trslater

alcs-frontend/src/app/features/compliance-and-enforcement/compliance-and-enforcement.component.html

@@ -1,6 +1,6 @@
 <div class="layout">
   <div class="file">
-    <app-compliance-and-enforcement-details-header [file]="file" />
+    <app-compliance-and-enforcement-details-header [file]="file" [propertyOwnerName]="propertyOwnerName" />
     <div class="content">
       <div class="nav">
         <div *ngFor="let route of detailsRoutes" class="nav-link" data-testid="details-nav-link">

alcs-frontend/src/app/features/compliance-and-enforcement/compliance-and-enforcement.component.spec.ts

@@ -3,16 +3,19 @@ import { ComplianceAndEnforcementService } from '../../services/compliance-and-e
 import { ActivatedRoute } from '@angular/router';
 import { createMock, DeepMocked } from '@golevelup/ts-jest';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { HttpClient } from '@angular/common/http';
 
 describe('ComplianceAndEnforcementComponent', () => {
   let component: ComplianceAndEnforcementComponent;
   let fixture: ComponentFixture<ComplianceAndEnforcementComponent>;
   let mockService: DeepMocked<ComplianceAndEnforcementService>;
   let mockRoute: DeepMocked<ActivatedRoute>;
+  let mockHttpClient: DeepMocked<HttpClient>;
 
   beforeEach(async () => {
     mockService = createMock<ComplianceAndEnforcementService>();
     mockRoute = createMock<ActivatedRoute>();
+    mockHttpClient = createMock();
 
     await TestBed.configureTestingModule({
       imports: [],
@@ -26,6 +29,10 @@ describe('ComplianceAndEnforcementComponent', () => {
           provide: ActivatedRoute,
           useValue: mockRoute,
         },
+        {
+          provide: HttpClient,
+          useValue: mockHttpClient,
+        },
       ],
     });
 

alcs-frontend/src/app/features/compliance-and-enforcement/compliance-and-enforcement.component.ts

@@ -8,6 +8,8 @@ import {
   FetchOptions,
 } from '../../services/compliance-and-enforcement/compliance-and-enforcement.service';
 import { ToastService } from '../../services/toast/toast.service';
+import { ResponsiblePartiesService } from '../../services/compliance-and-enforcement/responsible-parties/responsible-parties.service';
+import { ResponsiblePartyType } from '../../services/compliance-and-enforcement/responsible-parties/responsible-parties.dto';
 
 @Component({
   selector: 'app-compliance-and-enforcement',
@@ -21,11 +23,13 @@ export class ComplianceAndEnforcementComponent implements OnInit, OnDestroy {
 
   fileNumber?: string;
   file?: ComplianceAndEnforcementDto;
+  propertyOwnerName?: string;
 
   constructor(
     private readonly route: ActivatedRoute,
     private readonly router: Router,
     private readonly service: ComplianceAndEnforcementService,
+    private readonly responsiblePartyService: ResponsiblePartiesService,
     private readonly toastService: ToastService,
   ) {}
 
@@ -45,7 +49,7 @@ export class ComplianceAndEnforcementComponent implements OnInit, OnDestroy {
 
       if (fileNumber) {
         this.fileNumber = fileNumber;
-        this.loadFile(fileNumber, { withSubmitters: true });
+        this.loadFile(fileNumber, { withSubmitters: true, withProperty: true });
       }
     });
   }
@@ -58,6 +62,15 @@ export class ComplianceAndEnforcementComponent implements OnInit, OnDestroy {
   async loadFile(fileNumber: string, options?: FetchOptions) {
     try {
       await this.service.loadFile(fileNumber, options);
+
+      if (this.file) {
+        const parties = await this.responsiblePartyService.fetchByFileNumber(
+          fileNumber,
+          ResponsiblePartyType.PROPERTY_OWNER,
+        );
+
+        this.propertyOwnerName = parties?.[0].organizationName || parties?.[0].individualName;
+      }
     } catch (error) {
       console.error('Error loading file:', error);
       this.toastService.showErrorToast('Failed to load file');

alcs-frontend/src/app/features/compliance-and-enforcement/details/header/details-header.component.html

@@ -5,7 +5,9 @@
       <div class="first-row">
         <div class="title">
           <h5 class="detail-heading">
-            <div class="file-number">{{ file?.fileNumber }}</div>
+            <div class="file-number">
+              {{ file?.fileNumber }} - {{ file?.property?.civicAddress }} - {{ propertyOwnerName }}
+            </div>
           </h5>
         </div>
       </div>

alcs-frontend/src/app/features/compliance-and-enforcement/details/header/details-header.component.ts

@@ -31,6 +31,8 @@ export class DetailsHeaderComponent implements OnDestroy {
     return this._file;
   }
 
+  @Input() propertyOwnerName?: string;
+
   ngOnDestroy(): void {
     this.$destroy.next();
     this.$destroy.complete();

alcs-frontend/src/app/features/compliance-and-enforcement/details/overview/details-overview.component.ts

@@ -45,7 +45,7 @@ export class DetailsOverviewComponent implements OnInit, OnDestroy {
       return;
     }
 
-    await this.service.setStatus(this.fileNumber, this.status.value);
+    await this.service.setStatus(this.fileNumber, this.status.value, { idType: 'fileNumber' });
     this.service.loadFile(this.fileNumber, { withProperty: true });
 
     this.endEdit();

alcs-frontend/src/app/services/compliance-and-enforcement/compliance-and-enforcement.service.ts

@@ -3,7 +3,6 @@ import { Injectable } from '@angular/core';
 import { BehaviorSubject, firstValueFrom, Observable } from 'rxjs';
 import { environment } from '../../../environments/environment';
 import { ComplianceAndEnforcementDto, UpdateComplianceAndEnforcementDto } from './compliance-and-enforcement.dto';
-import moment from 'moment';
 
 export enum Status {
   OPEN = 'Open',
@@ -67,16 +66,18 @@ export class ComplianceAndEnforcementService {
     return this.http.patch<ComplianceAndEnforcementDto>(`${this.url}/${id}?idType=${options.idType}`, updateDto);
   }
 
-  async setStatus(fileNumber: string, status: Status) {
-    const dto: UpdateComplianceAndEnforcementDto = {
-      dateClosed: status === Status.CLOSED ? moment.now() : null,
-    };
-
-    await firstValueFrom(this.update(fileNumber, dto, { idType: 'fileNumber' }));
+  async setStatus(
+    id: string,
+    status: Status,
+    options: { idType: string } = { idType: 'uuid' },
+  ): Promise<ComplianceAndEnforcementDto> {
+    return await firstValueFrom(
+      this.http.patch<ComplianceAndEnforcementDto>(`${this.url}/${id}/status?idType=${options.idType}`, status),
+    );
   }
 
   async delete(uuid: string): Promise<UpdateComplianceAndEnforcementDto> {
-    return await firstValueFrom(this.http.delete<UpdateComplianceAndEnforcementDto>(`${this.url}/${uuid}`));
+    return await firstValueFrom(this.http.delete<ComplianceAndEnforcementDto>(`${this.url}/${uuid}`));
   }
 
   async submit(uuid: string): Promise<ComplianceAndEnforcementDto> {

alcs-frontend/src/app/services/compliance-and-enforcement/responsible-parties/responsible-parties.service.ts

@@ -1,4 +1,4 @@
-import { HttpClient } from '@angular/common/http';
+import { HttpClient, HttpParams } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { firstValueFrom, Observable } from 'rxjs';
 import { environment } from '../../../../environments/environment';
@@ -7,6 +7,7 @@ import {
   CreateResponsiblePartyDto,
   UpdateResponsiblePartyDto,
   FOIPPACategory,
+  ResponsiblePartyType,
 } from './responsible-parties.dto';
 import { OwnerDto, SubmissionOwnersDto } from '../../../shared/document-upload-dialog/document-upload-dialog.dto';
 
@@ -23,7 +24,7 @@ export class ResponsiblePartiesService {
   }
 
   async fetchSubmission(fileNumber: string): Promise<SubmissionOwnersDto> {
-    const responsibleParties = await this.fetchByFileNumber(fileNumber);
+    const responsibleParties = await this.fetchByFileNumber(fileNumber, ResponsiblePartyType.PROPERTY_OWNER);
     const responsiblePartiesOwners: OwnerDto[] = responsibleParties.map((party) => ({
       ...party,
       displayName: '',
@@ -39,10 +40,16 @@ export class ResponsiblePartiesService {
     };
   }
 
-  async fetchByFileNumber(fileNumber: string): Promise<ResponsiblePartyDto[]> {
-    return await firstValueFrom(
-      this.http.get<ResponsiblePartyDto[]>(`${this.url}/file/${fileNumber}?idType=fileNumber`),
-    );
+  async fetchByFileNumber(fileNumber: string, partyType?: ResponsiblePartyType): Promise<ResponsiblePartyDto[]> {
+    let params = new HttpParams();
+
+    params = params.set('idType', 'fileNumber');
+
+    if (partyType) {
+      params = params.set('partyType', partyType);
+    }
+
+    return await firstValueFrom(this.http.get<ResponsiblePartyDto[]>(`${this.url}/file/${fileNumber}`, { params }));
   }
 
   create(createDto: CreateResponsiblePartyDto): Observable<ResponsiblePartyDto> {

services/apps/alcs/src/alcs/compliance-and-enforcement/compliance-and-enforcement.controller.ts

@@ -4,7 +4,7 @@ import * as config from 'config';
 import { RolesGuard } from '../../common/authorization/roles-guard.service';
 import { UserRoles } from '../../common/authorization/roles.decorator';
 import { AUTH_ROLE, ROLES_ALLOWED_APPLICATIONS } from '../../common/authorization/roles';
-import { ComplianceAndEnforcementService } from './compliance-and-enforcement.service';
+import { ComplianceAndEnforcementService, Status } from './compliance-and-enforcement.service';
 import { ComplianceAndEnforcementDto, UpdateComplianceAndEnforcementDto } from './compliance-and-enforcement.dto';
 import { DeleteResult } from 'typeorm';
 
@@ -50,6 +50,16 @@ export class ComplianceAndEnforcementController {
     return await this.service.update(id, updateDto, { idType });
   }
 
+  @Patch('/:id/status')
+  @UserRoles(AUTH_ROLE.ADMIN, AUTH_ROLE.C_AND_E)
+  async setStatus(
+    @Param('id') id: string,
+    @Body() status: Status,
+    @Query('idType') idType: string = 'uuid',
+  ): Promise<ComplianceAndEnforcementDto> {
+    return await this.service.setStatus(id, status, { idType });
+  }
+
   @Post('/:id/submit')
   @UserRoles(AUTH_ROLE.ADMIN, AUTH_ROLE.C_AND_E)
   async submit(@Param('id') id: string): Promise<ComplianceAndEnforcementDto> {

services/apps/alcs/src/alcs/compliance-and-enforcement/compliance-and-enforcement.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { DeleteResult, In, Repository } from 'typeorm';
 import { InjectRepository } from '@nestjs/typeorm';
-import { AllegedActivity, ComplianceAndEnforcement, InitialSubmissionType } from './compliance-and-enforcement.entity';
+import { ComplianceAndEnforcement } from './compliance-and-enforcement.entity';
 import { ComplianceAndEnforcementDto, UpdateComplianceAndEnforcementDto } from './compliance-and-enforcement.dto';
 import { InjectMapper } from 'automapper-nestjs';
 import { Mapper } from 'automapper-core';
@@ -13,7 +13,15 @@ import {
 import { ComplianceAndEnforcementSubmitterService } from './submitter/submitter.service';
 import { ComplianceAndEnforcementPropertyService } from './property/property.service';
 import { ComplianceAndEnforcementDocument } from './document/document.entity';
-import { ComplianceAndEnforcementValidatorService, ValidatedComplianceAndEnforcement } from './compliance-and-enforcement-validator.service';
+import {
+  ComplianceAndEnforcementValidatorService,
+  ValidatedComplianceAndEnforcement,
+} from './compliance-and-enforcement-validator.service';
+
+export enum Status {
+  OPEN = 'Open',
+  CLOSED = 'Closed',
+}
 
 @Injectable()
 export class ComplianceAndEnforcementService {
@@ -120,6 +128,33 @@ export class ComplianceAndEnforcementService {
     return this.mapper.map(savedEntity, ComplianceAndEnforcement, ComplianceAndEnforcementDto);
   }
 
+  async setStatus(
+    id: string,
+    status: Status,
+    options: { idType: string } = { idType: 'uuid' },
+  ): Promise<ComplianceAndEnforcementDto> {
+    const entity = await this.repository.findOneBy({ [options.idType]: id });
+    if (entity === null) {
+      throw new ServiceConflictException('A C&E file with this UUID does not exist. Unable to update.');
+    }
+
+    const updateDto: UpdateComplianceAndEnforcementDto = {};
+
+    if (status === Status.CLOSED) {
+      updateDto.dateClosed = new Date().getTime();
+    }
+
+    if (status === Status.OPEN) {
+      updateDto.dateClosed = null;
+
+      if (!entity.dateOpened) {
+        updateDto.dateOpened = new Date().getTime();
+      }
+    }
+
+    return this.update(id, updateDto, options);
+  }
+
   async delete(uuid: string): Promise<DeleteResult> {
     const manager: any = this.repository.manager as any;
 
@@ -161,7 +196,8 @@ export class ComplianceAndEnforcementService {
         await manager.delete(Director, { uuid: In(directorUuids) });
       }
       if (parties.length > 0) {
-        const Party = (await import('./responsible-parties/responsible-party.entity')).ComplianceAndEnforcementResponsibleParty;
+        const Party = (await import('./responsible-parties/responsible-party.entity'))
+          .ComplianceAndEnforcementResponsibleParty;
         await manager.delete(Party, { fileUuid: file.uuid });
       }
 
@@ -195,14 +231,14 @@ export class ComplianceAndEnforcementService {
     // Get submitters, properties, and responsible parties
     const submitters = await this.submitterService.fetchByFileNumber(entity.fileNumber);
     const properties = await this.propertyService.fetchParcels(entity.fileNumber);
-    
+
     // Get responsible parties with directors
     const responsibleParties = await this.repository.manager.find(
       (await import('./responsible-parties/responsible-party.entity')).ComplianceAndEnforcementResponsibleParty,
-      { 
-        where: { fileUuid: uuid }, 
-        relations: ['directors'] 
-      }
+      {
+        where: { fileUuid: uuid },
+        relations: ['directors'],
+      },
     );
 
     // Validate the submission
@@ -215,7 +251,7 @@ export class ComplianceAndEnforcementService {
 
     if (validationResult.errors.length > 0) {
       // Create a detailed error message
-      const errorMessages = validationResult.errors.map(error => error.message).join('; ');
+      const errorMessages = validationResult.errors.map((error) => error.message).join('; ');
       throw new ServiceValidationException(`Validation failed: ${errorMessages}`);
     }