2466 feat: discard and save and exit c & e draft functionality (#2485)

* feat: added cancel and discard functionality as well as save and exit

* chore: updated test

Author: PaulGreywal

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

@@ -39,8 +39,14 @@ <h2>C&E File ID: {{ file?.fileNumber }}</h2>
       />
     </section>
 
-    <div class="button-container">
-      <button type="button" mat-stroked-button color="primary" (click)="onSaveDraftClicked()">Save Draft</button>
+    <div class="button-row">
+      <div class="left-actions">
+        <button type="button" mat-stroked-button color="warn" (click)="onCancelDiscardClicked()">Cancel & Discard</button>
+      </div>
+      <div class="right-actions">
+        <button type="button" mat-stroked-button color="primary" (click)="onSaveDraftClicked()">Save Draft & Exit</button>
+        <button type="button" mat-flat-button color="primary">Finish & Create File</button>
+      </div>
     </div>
   </form>
 </div>

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

@@ -14,7 +14,10 @@ section.form-section {
   margin: 32px 0;
 }
 
-.button-container {
+.button-row {
   display: flex;
-  justify-content: flex-end;
+  justify-content: space-between;
+  align-items: center;
 }
+.left-actions { display: flex; }
+.right-actions { display: flex; gap: 12px; }

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

@@ -1,5 +1,5 @@
 import { AfterViewInit, Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import {
   catchError,
   debounceTime,
@@ -103,6 +103,7 @@ export class DraftComponent implements OnInit, AfterViewInit, OnDestroy {
     private readonly toastService: ToastService,
     private readonly propertyService: ComplianceAndEnforcementPropertyService,
     private readonly responsiblePartyService: ResponsiblePartiesService,
+    private readonly router: Router,
   ) {}
 
   ngOnInit(): void {
@@ -329,12 +330,30 @@ export class DraftComponent implements OnInit, AfterViewInit, OnDestroy {
       }
 
       this.toastService.showSuccessToast('C&E file draft saved');
+      await this.router.navigate(['/home']);
     } catch (error) {
       console.error('Error saving C&E file draft', error);
       this.toastService.showErrorToast('Failed to save C&E file draft');
     }
   }
 
+  async onCancelDiscardClicked() {
+    if (!this.file?.uuid) {
+      await this.router.navigate(['/home']);
+      return;
+    }
+
+    try {
+      await this.complianceAndEnforcementService.delete(this.file.uuid);
+      this.toastService.showSuccessToast('Draft discarded');
+    } catch (error) {
+      console.error('Error discarding C&E draft', error);
+      this.toastService.showErrorToast('Failed to discard draft');
+    } finally {
+      await this.router.navigate(['/home']);
+    }
+  }
+
   ngOnDestroy(): void {
     this.$destroy.next();
     this.$destroy.complete();

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@nestjs/common';
-import { DeleteResult, Repository } from 'typeorm';
+import { DeleteResult, In, Repository } from 'typeorm';
 import { InjectRepository } from '@nestjs/typeorm';
 import { AllegedActivity, ComplianceAndEnforcement, InitialSubmissionType } from './compliance-and-enforcement.entity';
 import { ComplianceAndEnforcementDto, UpdateComplianceAndEnforcementDto } from './compliance-and-enforcement.dto';
@@ -11,6 +11,7 @@ import {
 } from '../../../../../libs/common/src/exceptions/base.exception';
 import { ComplianceAndEnforcementSubmitterService } from './submitter/submitter.service';
 import { ComplianceAndEnforcementPropertyService } from './property/property.service';
+import { ComplianceAndEnforcementDocument } from './document/document.entity';
 
 @Injectable()
 export class ComplianceAndEnforcementService {
@@ -117,11 +118,63 @@ export class ComplianceAndEnforcementService {
   }
 
   async delete(uuid: string): Promise<DeleteResult> {
-    const entity = await this.repository.findOneBy({ uuid });
-    if (entity === null) {
-      throw new ServiceNotFoundException('A C&E file with this UUID does not exist. Unable to delete.');
+    const manager: any = this.repository.manager as any;
+
+    if (!manager || typeof manager.transaction !== 'function') {
+      const entity = await this.repository.findOneBy({ uuid });
+      if (!entity) {
+        throw new ServiceNotFoundException('A C&E file with this UUID does not exist. Unable to delete.');
+      }
+      return await this.repository.delete(uuid);
     }
 
-    return await this.repository.delete(uuid);
+    return await this.repository.manager.transaction(async (manager) => {
+      const file = await manager.findOne(ComplianceAndEnforcement, {
+        where: { uuid },
+      });
+
+      if (!file) {
+        throw new ServiceNotFoundException('A C&E file with this UUID does not exist. Unable to delete.');
+      }
+
+      // Delete C&E document link records for this file
+      const ceDocuments = await manager.find(ComplianceAndEnforcementDocument, {
+        where: { file: { uuid: file.uuid } },
+        relations: ['document', 'type'],
+      });
+      if (ceDocuments.length > 0) {
+        await manager.delete(ComplianceAndEnforcementDocument, { uuid: In(ceDocuments.map((d) => d.uuid)) });
+      }
+
+      // Delete Responsible Party Directors, then Parties
+      const parties = await manager.find(
+        (await import('./responsible-parties/responsible-party.entity')).ComplianceAndEnforcementResponsibleParty,
+        { where: { fileUuid: file.uuid }, relations: ['directors'] },
+      );
+      const directorUuids = parties.flatMap((p: any) => (p.directors ? p.directors.map((d: any) => d.uuid) : []));
+      if (directorUuids.length > 0) {
+        const Director = (await import('./responsible-parties/responsible-party-director.entity'))
+          .ComplianceAndEnforcementResponsiblePartyDirector;
+        await manager.delete(Director, { uuid: In(directorUuids) });
+      }
+      if (parties.length > 0) {
+        const Party = (await import('./responsible-parties/responsible-party.entity')).ComplianceAndEnforcementResponsibleParty;
+        await manager.delete(Party, { fileUuid: file.uuid });
+      }
+
+      // Delete Properties
+      const Property = (await import('./property/property.entity')).ComplianceAndEnforcementProperty;
+      await manager.delete(Property, { fileUuid: file.uuid });
+
+      // Delete Submitters (filter by file relation)
+      const Submitter = (await import('./submitter/submitter.entity')).ComplianceAndEnforcementSubmitter;
+      const submitters = await manager.find(Submitter, { where: { file: { uuid: file.uuid } } });
+      if (submitters.length > 0) {
+        await manager.delete(Submitter, { uuid: In(submitters.map((s: any) => s.uuid)) });
+      }
+
+      // Finally delete the C&E File at the end of all the other deletions
+      return await manager.delete(ComplianceAndEnforcement, { uuid: file.uuid });
+    });
   }
 }

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@nestjs/common';
-import { DeleteResult, In, Repository } from 'typeorm';
+import { DeleteResult, In, Repository, FindOptionsWhere } from 'typeorm';
 import { InjectRepository } from '@nestjs/typeorm';
 import { ComplianceAndEnforcementDocument, Section } from './document.entity';
 import { ComplianceAndEnforcementDocumentDto, UpdateComplianceAndEnforcementDocumentDto } from './document.dto';
@@ -34,13 +34,18 @@ export class ComplianceAndEnforcementDocumentService {
   ) {}
 
   async list(fileNumber?: string, section?: Section): Promise<ComplianceAndEnforcementDocumentDto[]> {
+    const criteria: FindOptionsWhere<ComplianceAndEnforcementDocument> = {};
+
+    if (fileNumber !== undefined) {
+      criteria.file = { fileNumber } as any;
+    }
+
+    if (section !== undefined) {
+      criteria.section = section;
+    }
+
     const entities = await this.repository.find({
-      where: {
-        file: {
-          fileNumber: fileNumber,
-        },
-        section,
-      },
+      where: criteria,
       relations: ['type', 'document'],
       order: {
         document: {

services/apps/alcs/src/alcs/compliance-and-enforcement/responsible-parties/responsible-parties.dto.ts

@@ -173,8 +173,9 @@ export class CreateComplianceAndEnforcementResponsiblePartyDto {
   @IsNumber()
   ownerSince?: number | null;
 
+  @IsOptional()
   @IsString()
-  corporateSummaryUuid: string | null;
+  corporateSummaryUuid?: string | null;
 }
 
 export class UpdateComplianceAndEnforcementResponsiblePartyDto {