Wfprev 381 (#778)

Author: yzlucas

client/wfprev-war/src/main/angular/src/app/components/edit-project/project-fiscals/project-fiscals.component.spec.ts

@@ -640,4 +640,31 @@ describe('ProjectFiscalsComponent', () => {
     const control = component.getFiscalControl(0, 'testField');
     expect(control).toBeTruthy();
   });
+
+  it('should return default fiscal data with expected values', () => {
+    component.projectGuid = 'test-guid';
+
+    const result = component.getDefaultFiscalData();
+
+    expect(result).toEqual({
+      fiscalYear: 0,
+      projectFiscalName: '',
+      projectGuid: 'test-guid',
+      planFiscalStatusCode: 'DRAFT',
+      proposalTypeCode: 'NEW',
+      projectPlanStatusCode: 'ACTIVE',
+      activityCategoryCode: '',
+      fiscalPlannedProjectSizeHa: 0,
+      fiscalPlannedCostPerHaAmt: 0,
+      fiscalReportedSpendAmount: 0,
+      fiscalActualAmount: 0,
+      fiscalActualCostPerHaAmt: 0,
+      firstNationsEngagementInd: false,
+      firstNationsDelivPartInd: false,
+      isApprovedInd: false,
+      isDelayedInd: false,
+      totalCostEstimateAmount: 0
+    });
+  });
+
 });

client/wfprev-war/src/main/angular/src/app/components/edit-project/project-fiscals/project-fiscals.component.ts

@@ -249,7 +249,7 @@ export class ProjectFiscalsComponent implements OnInit, CanComponentDeactivate
       // And to prevent adding another unsaved fiscal
       return; 
     }
-    const newFiscalData = { fiscalYear: '', projectFiscalName: '', projectGuid: this.projectGuid, planFiscalStatusCode: 'DRAFT', proposalTypeCode: 'NEW'};
+    const newFiscalData = this.getDefaultFiscalData();
     this.projectFiscals.push(newFiscalData);
     this.fiscalForms.push(this.createFiscalForm(newFiscalData));
     this.selectedTabIndex = this.projectFiscals.length - 1; // Navigate to the newly added tab
@@ -262,8 +262,9 @@ export class ProjectFiscalsComponent implements OnInit, CanComponentDeactivate
 
     if (isNewEntry) {
       // Case 1: New entry → Clear all fields
-      this.fiscalForms[index].reset();
-    } else {
+      this.fiscalForms[index].reset(this.getDefaultFiscalData());
+    }
+    else {
       // Case 2: Existing entry → Revert to original API values
       const originalData = this.originalFiscalValues[index];
       this.fiscalForms[index].patchValue(originalData);
@@ -296,7 +297,7 @@ export class ProjectFiscalsComponent implements OnInit, CanComponentDeactivate
         projectGuid: updatedData.projectGuid,
         projectPlanFiscalGuid: updatedData.projectPlanFiscalGuid,
         activityCategoryCode: updatedData.activityCategoryCode,
-        fiscalYear: updatedData.fiscalYear ? parseInt(updatedData.fiscalYear, 10) : undefined,
+        fiscalYear: updatedData.fiscalYear ? parseInt(updatedData.fiscalYear, 10) : 0,
         projectPlanStatusCode: isUpdate ? updatedData.projectPlanStatusCode : "ACTIVE",
         planFiscalStatusCode: updatedData.planFiscalStatusCode,
         projectFiscalName: updatedData.projectFiscalName,
@@ -459,5 +460,27 @@ export class ProjectFiscalsComponent implements OnInit, CanComponentDeactivate
     return this.fiscalForms[i].get(controlName) as FormControl;
   }
 
+  getDefaultFiscalData(): ProjectFiscal {
+    return {
+      fiscalYear: 0,
+      projectFiscalName: '',
+      projectGuid: this.projectGuid,
+      planFiscalStatusCode: 'DRAFT',
+      proposalTypeCode: 'NEW',
+      projectPlanStatusCode: 'ACTIVE',
+      activityCategoryCode: '',
+      fiscalPlannedProjectSizeHa: 0,
+      fiscalPlannedCostPerHaAmt: 0,
+      fiscalReportedSpendAmount: 0,
+      fiscalActualAmount: 0,
+      fiscalActualCostPerHaAmt: 0,
+      firstNationsEngagementInd: false,
+      firstNationsDelivPartInd: false,
+      isApprovedInd: false,
+      isDelayedInd: false,
+      totalCostEstimateAmount: 0
+    };
+  }
+
 }
 

client/wfprev-war/src/main/angular/src/app/components/models.ts

@@ -49,25 +49,29 @@ export interface Project {
 }
 
 export interface ProjectFiscal {
-  projectGuid?: string;
+  projectGuid: string;
+  activityCategoryCode: string;
+  fiscalYear: number;
+  projectPlanStatusCode: string;
+  planFiscalStatusCode: string;
+  projectFiscalName: string;
+  isApprovedInd: boolean;
+  isDelayedInd: boolean;
+  totalCostEstimateAmount: number;
+  fiscalPlannedProjectSizeHa: number;
+  fiscalPlannedCostPerHaAmt: number;
+  fiscalReportedSpendAmount: number;
+  fiscalActualAmount: number;
+  fiscalActualCostPerHaAmt: number;
+  firstNationsDelivPartInd: boolean;
+  firstNationsEngagementInd: boolean;
+
   projectPlanFiscalGuid?: string;
-  activityCategoryCode?: string;
-  fiscalYear?: number;
-  projectPlanStatusCode?: string;
-  planFiscalStatusCode?: string;
-  projectFiscalName?: string;
   projectFiscalDescription?: string;
   businessAreaComment?: string;
   estimatedClwrrAllocAmount?: number;
   fiscalAncillaryFundAmount?: number;
-  fiscalPlannedProjectSizeHa?: number;
-  fiscalPlannedCostPerHaAmt?: number;
-  fiscalReportedSpendAmount?: number;
-  fiscalActualAmount?: number;
   fiscalCompletedSizeHa?: number;
-  fiscalActualCostPerHaAmt?: number;
-  firstNationsDelivPartInd?: boolean;
-  firstNationsEngagementInd?: boolean;
   firstNationsPartner?: string;
   resultsNumber?: string;
   resultsOpeningId?: string;
@@ -76,16 +80,14 @@ export interface ProjectFiscal {
   submittedByUserGuid?: string;
   submittedByUserUserid?: string;
   submissionTimestamp?: string;
-  isApprovedInd?: boolean;
-  isDelayedInd?: boolean;
   fiscalForecastAmount?: number;
-  totalCostEstimateAmount?: number;
   cfsProjectCode?: string;
   otherPartner?: string;
   proposalTypeCode?: string;
   ancillaryFundingProvider?: string;
 }
 
+
 export interface ActivityModel {
   activityGuid?: string;
   projectPlanFiscalGuid?: string;

client/wfprev-war/src/main/angular/src/app/services/project-services.spec.ts

@@ -2,7 +2,7 @@ import { TestBed } from '@angular/core/testing';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { AppConfigService } from 'src/app/services/app-config.service';
 import { TokenService } from 'src/app/services/token.service';
-import { FeaturesResponse, Project, ProjectBoundary } from 'src/app/components/models';
+import { FeaturesResponse, Project, ProjectBoundary, ProjectFiscal } from 'src/app/components/models';
 import { ProjectService } from 'src/app/services/project-services';
 import { HttpEventType } from '@angular/common/http';
 import { of } from 'rxjs';
@@ -60,7 +60,29 @@ describe('ProjectService', () => {
     },
     locationGeometry: [-124, 49],
   };
+    const projectGuid = '12345';
+    const projectPlanFiscalGuid = 'fiscal-6789';
 
+    const updatedFiscal: ProjectFiscal = {
+      projectGuid,
+      projectPlanFiscalGuid,
+      fiscalYear: 2024,
+      projectFiscalName: 'Updated Fiscal',
+      activityCategoryCode: 'RX_DEV',
+      planFiscalStatusCode: 'COMPLETE',
+      projectPlanStatusCode: 'ACTIVE',
+      proposalTypeCode: 'NEW',
+      isApprovedInd: false,
+      isDelayedInd: false,
+      totalCostEstimateAmount: 0,
+      fiscalPlannedProjectSizeHa: 0,
+      fiscalPlannedCostPerHaAmt: 0,
+      fiscalReportedSpendAmount: 0,
+      fiscalActualAmount: 0,
+      fiscalActualCostPerHaAmt: 0,
+      firstNationsDelivPartInd: false,
+      firstNationsEngagementInd: false
+    };
 
 
   beforeEach(() => {
@@ -253,27 +275,25 @@ describe('ProjectService', () => {
 
   it('should create a project fiscal', () => {
     const projectGuid = '12345';
-    const mockFiscal = { fiscalYear: 2023, projectFiscalName: 'New Fiscal' };
 
-    service.createProjectFiscal(projectGuid, mockFiscal).subscribe((response) => {
-      expect(response).toEqual(mockFiscal);
+    service.createProjectFiscal(projectGuid, updatedFiscal).subscribe((response) => {
+      expect(response).toEqual(updatedFiscal);
     });
 
     const req = httpMock.expectOne(`http://mock-api.com/wfprev-api/projects/${projectGuid}/projectFiscals`);
     expect(req.request.method).toBe('POST');
     expect(req.request.headers.get('Authorization')).toBe('Bearer mock-token');
-    expect(req.request.body).toEqual(mockFiscal);
-    req.flush(mockFiscal);
+    expect(req.request.body).toEqual(updatedFiscal);
+    req.flush(updatedFiscal);
   });
 
   it('should handle errors when creating a project fiscal', () => {
     const projectGuid = '12345';
-    const mockFiscal = { fiscalYear: 2023, projectFiscalName: 'New Fiscal' };
 
-    service.createProjectFiscal(projectGuid, mockFiscal).subscribe({
+    service.createProjectFiscal(projectGuid, updatedFiscal).subscribe({
       next: () => fail('Should have failed with an error'),
       error: (error) => {
-        expect(error.message).toBe('Failed to create project fiscal'); // ✅ Now correctly matches the service error
+        expect(error.message).toBe('Failed to create project fiscal');
       }
     });
 
@@ -284,7 +304,6 @@ describe('ProjectService', () => {
   it('should update a project fiscal', () => {
     const projectGuid = '12345';
     const projectPlanFiscalGuid = 'fiscal-6789';
-    const updatedFiscal = { fiscalYear: 2024, projectFiscalName: 'Updated Fiscal' };
 
     service.updateProjectFiscal(projectGuid, projectPlanFiscalGuid, updatedFiscal).subscribe((response) => {
       expect(response).toEqual(updatedFiscal);
@@ -300,7 +319,6 @@ describe('ProjectService', () => {
   it('should handle errors when updating a project fiscal', () => {
     const projectGuid = '12345';
     const projectPlanFiscalGuid = 'fiscal-6789';
-    const updatedFiscal = { fiscalYear: 2024, projectFiscalName: 'Updated Fiscal' };
 
     service.updateProjectFiscal(projectGuid, projectPlanFiscalGuid, updatedFiscal).subscribe({
       next: () => fail('Should have failed with an error'),