diff --git a/client/wfprev-war/src/main/angular/src/app/components/create-new-project-dialog/create-new-project-dialog.component.html b/client/wfprev-war/src/main/angular/src/app/components/create-new-project-dialog/create-new-project-dialog.component.html index c51982876..0201861ad 100644 --- a/client/wfprev-war/src/main/angular/src/app/components/create-new-project-dialog/create-new-project-dialog.component.html +++ b/client/wfprev-war/src/main/angular/src/app/components/create-new-project-dialog/create-new-project-dialog.component.html @@ -95,6 +95,26 @@ +
+
+ + +
+
+ + +
+
+ + +
+
diff --git a/client/wfprev-war/src/main/angular/src/app/components/create-new-project-dialog/create-new-project-dialog.component.spec.ts b/client/wfprev-war/src/main/angular/src/app/components/create-new-project-dialog/create-new-project-dialog.component.spec.ts index 0b10d0456..fa9a6f5b4 100644 --- a/client/wfprev-war/src/main/angular/src/app/components/create-new-project-dialog/create-new-project-dialog.component.spec.ts +++ b/client/wfprev-war/src/main/angular/src/app/components/create-new-project-dialog/create-new-project-dialog.component.spec.ts @@ -75,6 +75,9 @@ describe('CreateNewProjectDialogComponent', () => { projectLeadEmail: '', siteUnitName: '', closestCommunity: '', + primaryObjective : '', + secondaryObjective: '', + secondaryObjectiveRationale: '', }); }); @@ -149,6 +152,7 @@ describe('CreateNewProjectDialogComponent', () => { projectLeadEmail: 'john.doe@example.com', // Optional field siteUnitName: 'Unit 1', // Optional field closestCommunity: 'Community 1', // Required field + primaryObjective: 'WRR' // Required field }); // Call the function to create a project @@ -251,6 +255,7 @@ describe('CreateNewProjectDialogComponent', () => { projectLeadEmail: 'john.doe@example.com', siteUnitName: 'Unit 1', closestCommunity: 'Community 1', + primaryObjective: 'WRR' }); mockProjectService.createProject.and.returnValue(of({})); @@ -278,6 +283,7 @@ describe('CreateNewProjectDialogComponent', () => { siteUnitName: 'Unit 1', closestCommunity: 'Community 1', latLong: '70.123456, -123.332177', // Invalid latitude + primaryObjective: 'WRR' }); component.onCreate(); @@ -305,6 +311,7 @@ describe('CreateNewProjectDialogComponent', () => { siteUnitName: 'Unit 1', closestCommunity: 'Community 1', latLong: '48.3, -139', // Boundary value for BC + primaryObjective: 'WRR' }); mockProjectService.createProject.and.returnValue(of({})); @@ -335,6 +342,7 @@ describe('CreateNewProjectDialogComponent', () => { siteUnitName: 'Unit 1', closestCommunity: 'Community 1', latLong: 'invalid, format', // Invalid latLong format + primaryObjective: 'WRR' }); component.onCreate(); @@ -386,6 +394,7 @@ describe('CreateNewProjectDialogComponent', () => { bcParksRegion: 3, bcParksSection: 4, closestCommunity: 'Community 1', + primaryObjective: 'WRR' }); mockProjectService.createProject.and.returnValue(of({})); @@ -406,6 +415,17 @@ describe('CreateNewProjectDialogComponent', () => { expect(errorMessage).toBeNull(); }); + + it('should return null if there are no errors on the form control', () => { + // Arrange: Ensure no errors are set for the 'projectName' control + component.projectForm.get('projectName')?.setErrors(null); // Clear errors + + // Act: Call the getErrorMessage method + const errorMessage = component.getErrorMessage('projectName'); + + // Assert: Expect the method to return null + expect(errorMessage).toBeNull(); + }); it('should return required field message when "required" error exists', () => { component.projectForm.get('projectName')?.setErrors({ required: true }); @@ -450,6 +470,7 @@ describe('CreateNewProjectDialogComponent', () => { projectLeadEmail: 'john.doe@example.com', siteUnitName: 'Unit 1', closestCommunity: 'Community 1', + primaryObjective: 'WRR' }); // Act: Call the method to create a project diff --git a/client/wfprev-war/src/main/angular/src/app/components/create-new-project-dialog/create-new-project-dialog.component.ts b/client/wfprev-war/src/main/angular/src/app/components/create-new-project-dialog/create-new-project-dialog.component.ts index a3209b33a..1285cbb44 100644 --- a/client/wfprev-war/src/main/angular/src/app/components/create-new-project-dialog/create-new-project-dialog.component.ts +++ b/client/wfprev-war/src/main/angular/src/app/components/create-new-project-dialog/create-new-project-dialog.component.ts @@ -40,6 +40,7 @@ export class CreateNewProjectDialogComponent implements OnInit { bcParksRegions : any[] = []; bcParksSections: any[] = []; allBcParksSections: any[] = []; // To hold all sections initially + objectiveTypes: any[] = []; constructor( private readonly fb: FormBuilder, @@ -62,6 +63,9 @@ export class CreateNewProjectDialogComponent implements OnInit { projectLeadEmail: ['', [Validators.email, Validators.maxLength(50)]], siteUnitName: ['', [Validators.maxLength(50)]], closestCommunity: ['', [Validators.required, Validators.maxLength(50)]], + primaryObjective: ['', [Validators.required]], + secondaryObjective: [''], + secondaryObjectiveRationale: ['',[Validators.maxLength(50)]], }); // Dynamically enable/disable bcParksSection based on bcParksRegion selection @@ -89,12 +93,23 @@ export class CreateNewProjectDialogComponent implements OnInit { { name: 'forestDistrictCodes', property: 'forestDistricts', embeddedKey: 'forestDistrictCode' }, { name: 'bcParksRegionCodes', property: 'bcParksRegions', embeddedKey: 'bcParksRegionCode' }, { name: 'bcParksSectionCodes', property: 'allBcParksSections', embeddedKey: 'bcParksSectionCode' }, + { name: 'objectiveTypeCodes', property: 'objectiveTypes', embeddedKey: 'objectiveTypeCode' }, + ]; codeTables.forEach((table) => { this.codeTableService.fetchCodeTable(table.name).subscribe({ next: (data) => { this[table.property] = data?._embedded?.[table.embeddedKey] || []; + if (table.name === 'objectiveTypeCodes') { + const defaultObjective = this.objectiveTypes.find( + (type) => type.objectiveTypeCode === 'WRR' + ); + + if (defaultObjective) { + this.projectForm.get('primaryObjective')?.setValue('WRR'); + } + } }, error: (err) => { console.error(`Error fetching ${table.name}`, err); @@ -168,6 +183,16 @@ export class CreateNewProjectDialogComponent implements OnInit { totalPlannedCostPerHectare: this.projectForm.get('totalPlannedCostPerHectare')?.value ?? '', totalActualAmount: this.projectForm.get('totalActualAmount')?.value ?? 0, + primaryObjectiveTypeCode: { + objectiveTypeCode: this.projectForm.get('primaryObjective')?.value + }, + ...(this.projectForm.get('secondaryObjective')?.value && { + secondaryObjectiveTypeCode: { + objectiveTypeCode: this.projectForm.get('secondaryObjective')?.value + } + }), + secondaryObjectiveRationale: this.projectForm.get('secondaryObjectiveRationale')?.value, + isMultiFiscalYearProj: false, ...(validatedLatLong && { latitude: Number(validatedLatLong.latitude), diff --git a/client/wfprev-war/src/main/angular/src/app/components/edit-project/project-details/project-details.component.html b/client/wfprev-war/src/main/angular/src/app/components/edit-project/project-details/project-details.component.html index 397e0d9f8..703e97983 100644 --- a/client/wfprev-war/src/main/angular/src/app/components/edit-project/project-details/project-details.component.html +++ b/client/wfprev-war/src/main/angular/src/app/components/edit-project/project-details/project-details.component.html @@ -88,27 +88,27 @@
- +
- +
- + diff --git a/client/wfprev-war/src/main/angular/src/app/components/edit-project/project-details/project-details.component.ts b/client/wfprev-war/src/main/angular/src/app/components/edit-project/project-details/project-details.component.ts index 80e9a8488..5c9cb6b08 100644 --- a/client/wfprev-war/src/main/angular/src/app/components/edit-project/project-details/project-details.component.ts +++ b/client/wfprev-war/src/main/angular/src/app/components/edit-project/project-details/project-details.component.ts @@ -48,6 +48,7 @@ export class ProjectDetailsComponent implements OnInit, AfterViewInit, OnDestroy forestDistrictCode: any[] = []; bcParksRegionCode: any[] = []; bcParksSectionCode: any[] = []; + objectiveTypeCode: any[] = []; constructor( private readonly fb: FormBuilder, @@ -80,8 +81,8 @@ export class ProjectDetailsComponent implements OnInit, AfterViewInit, OnDestroy closestCommunityName: ['', [Validators.required]], forestRegionOrgUnitId: [''], forestDistrictOrgUnitId: [''], - primaryObjective: [''], - secondaryObjective: [''], + primaryObjectiveTypeCode: [''], + secondaryObjectiveTypeCode: [''], secondaryObjectiveRationale: [''], bcParksRegionOrgUnitId: [''], bcParksSectionOrgUnitId: [''], @@ -145,6 +146,8 @@ export class ProjectDetailsComponent implements OnInit, AfterViewInit, OnDestroy { name: 'forestDistrictCodes', embeddedKey: 'forestDistrictCode' }, { name: 'bcParksRegionCodes', embeddedKey: 'bcParksRegionCode' }, { name: 'bcParksSectionCodes', embeddedKey: 'bcParksSectionCode' }, + { name: 'objectiveTypeCodes', embeddedKey: 'objectiveTypeCode' }, + ]; codeTables.forEach((table) => { @@ -179,6 +182,9 @@ export class ProjectDetailsComponent implements OnInit, AfterViewInit, OnDestroy case 'bcParksSectionCode': this.bcParksSectionCode = data._embedded.bcParksSectionCode || []; break; + case 'objectiveTypeCode': + this.objectiveTypeCode = data._embedded.objectiveTypeCode || []; + break; } } @@ -249,8 +255,8 @@ export class ProjectDetailsComponent implements OnInit, AfterViewInit, OnDestroy closestCommunityName: data.closestCommunityName, forestRegionOrgUnitId: data.forestRegionOrgUnitId, forestDistrictOrgUnitId: data.forestDistrictOrgUnitId, - primaryObjective: data.primaryObjective, - secondaryObjective: data.secondaryObjective, + primaryObjectiveTypeCode: data.primaryObjectiveTypeCode?.objectiveTypeCode || '', + secondaryObjectiveTypeCode: data.secondaryObjectiveTypeCode?.objectiveTypeCode || '', secondaryObjectiveRationale: data.secondaryObjectiveRationale, bcParksRegionOrgUnitId: data.bcParksRegionOrgUnitId, bcParksSectionOrgUnitId: data.bcParksSectionOrgUnitId, @@ -273,6 +279,19 @@ export class ProjectDetailsComponent implements OnInit, AfterViewInit, OnDestroy forestAreaCode: { forestAreaCode: "COAST", }, + primaryObjectiveTypeCode: { + objectiveTypeCode: this.detailsForm.get('primaryObjectiveTypeCode')?.value + ? this.detailsForm.get('primaryObjectiveTypeCode')?.value + : this.projectDetail.primaryObjectiveTypeCode.objectiveTypeCode + }, + secondaryObjectiveTypeCode: { + objectiveTypeCode: this.detailsForm.get('secondaryObjectiveTypeCode')?.value + ? this.detailsForm.get('secondaryObjectiveTypeCode')?.value + : this.projectDetail.secondaryObjectiveTypeCode.objectiveTypeCode + }, + tertiaryObjectiveTypeCode: { + objectiveTypeCode: 'FOR_HEALTH' + } }; this.projectService.updateProject(this.projectGuid, updatedProject).subscribe({ next: () => { diff --git a/client/wfprev-war/src/main/angular/src/app/components/models.ts b/client/wfprev-war/src/main/angular/src/app/components/models.ts index 5509b94dc..18fa12129 100644 --- a/client/wfprev-war/src/main/angular/src/app/components/models.ts +++ b/client/wfprev-war/src/main/angular/src/app/components/models.ts @@ -35,4 +35,11 @@ export interface Project { updateUser?: string; latitude?: number; longitude?: number; + primaryObjectiveTypeCode?: { + objectiveTypeCode: string; + }; + secondaryObjectiveTypeCode?: { + objectiveTypeCode: string; + } + secondaryObjectiveRationale? :string; } diff --git a/client/wfprev-war/src/main/angular/src/app/services/code-table-services.spec.ts b/client/wfprev-war/src/main/angular/src/app/services/code-table-services.spec.ts new file mode 100644 index 000000000..9de48efed --- /dev/null +++ b/client/wfprev-war/src/main/angular/src/app/services/code-table-services.spec.ts @@ -0,0 +1,117 @@ +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 { CodeTableServices } from 'src/app/services/code-table-services'; + +describe('CodeTableServices', () => { + let service: CodeTableServices; + let httpMock: HttpTestingController; + let mockAppConfigService: jasmine.SpyObj; + let mockTokenService: jasmine.SpyObj; + + const mockConfig = { + rest: { + wfprev: 'http://mock-api.com' + }, + application: { + lazyAuthenticate: true, + enableLocalStorageToken: true, + localStorageTokenKey: 'oauth', + allowLocalExpiredToken: false, + baseUrl: 'http://mock-base-url.com', + acronym: 'TEST', + version: '1.0.0', + environment: 'test', + }, + webade: { + oauth2Url: 'http://mock-oauth-url.com', + clientId: 'mock-client-id', + authScopes: 'mock-scope', + checkTokenUrl: 'http://mock-check-token-url.com', + enableCheckToken: false, + } + }; + + beforeEach(() => { + mockAppConfigService = jasmine.createSpyObj('AppConfigService', ['getConfig']); + mockTokenService = jasmine.createSpyObj('TokenService', ['getOauthToken']); + + mockAppConfigService.getConfig.and.returnValue(mockConfig); + mockTokenService.getOauthToken.and.returnValue('mock-token'); + + TestBed.configureTestingModule({ + imports: [HttpClientTestingModule], + providers: [ + CodeTableServices, + { provide: AppConfigService, useValue: mockAppConfigService }, + { provide: TokenService, useValue: mockTokenService }, + ] + }); + + service = TestBed.inject(CodeTableServices); + httpMock = TestBed.inject(HttpTestingController); + }); + + afterEach(() => { + httpMock.verify(); + }); + + it('should fetch a code table from the API when not cached', () => { + const codeTableName = 'testCodeTable'; + const mockResponse = [{ code: '001', name: 'Test Code' }]; + + service.fetchCodeTable(codeTableName).subscribe((response) => { + expect(response).toEqual(mockResponse); + }); + + const req = httpMock.expectOne(`http://mock-api.com/wfprev-api/codes/${codeTableName}`); + expect(req.request.method).toBe('GET'); + expect(req.request.headers.get('Authorization')).toBe('Bearer mock-token'); + req.flush(mockResponse); + }); + + it('should return cached code table data if available', () => { + const codeTableName = 'cachedCodeTable'; + const cachedData = [{ code: '002', name: 'Cached Code' }]; + + // Simulate caching + (service as any).codeTableCache[codeTableName] = cachedData; + + service.fetchCodeTable(codeTableName).subscribe((response) => { + expect(response).toEqual(cachedData); + }); + + // Ensure no API call was made + httpMock.expectNone(`http://mock-api.com/wfprev-api/codes/${codeTableName}`); + }); + + it('should handle errors when fetching a code table', () => { + const codeTableName = 'errorCodeTable'; + + service.fetchCodeTable(codeTableName).subscribe({ + next: () => fail('Should have failed with an error'), + error: (error) => { + expect(error.message).toBe('Failed to get code table'); + } + }); + + const req = httpMock.expectOne(`http://mock-api.com/wfprev-api/codes/${codeTableName}`); + expect(req.request.method).toBe('GET'); + req.flush('Error', { status: 500, statusText: 'Server Error' }); + }); + + it('should cache the response after fetching a code table', () => { + const codeTableName = 'newCodeTable'; + const mockResponse = [{ code: '003', name: 'New Code' }]; + + service.fetchCodeTable(codeTableName).subscribe((response) => { + expect(response).toEqual(mockResponse); + expect((service as any).codeTableCache[codeTableName]).toEqual(mockResponse); + }); + + const req = httpMock.expectOne(`http://mock-api.com/wfprev-api/codes/${codeTableName}`); + expect(req.request.method).toBe('GET'); + req.flush(mockResponse); + }); +}); diff --git a/client/wfprev-war/src/main/angular/src/app/services/project-services.spec.ts b/client/wfprev-war/src/main/angular/src/app/services/project-services.spec.ts new file mode 100644 index 000000000..229447161 --- /dev/null +++ b/client/wfprev-war/src/main/angular/src/app/services/project-services.spec.ts @@ -0,0 +1,196 @@ +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 { Project } from 'src/app/components/models'; +import { ProjectService } from 'src/app/services/project-services'; + +describe('ProjectService', () => { + let service: ProjectService; + let httpMock: HttpTestingController; + let mockAppConfigService: jasmine.SpyObj; + let mockTokenService: jasmine.SpyObj; + + const mockConfig = { + rest: { + wfprev: 'http://mock-api.com' + }, + application: { + lazyAuthenticate: true, + enableLocalStorageToken: true, + localStorageTokenKey: 'oauth', + allowLocalExpiredToken: false, + baseUrl: 'http://mock-base-url.com', + acronym: 'TEST', // Add a mock acronym + version: '1.0.0', // Add a mock version + environment: 'test', // Add a mock environment + }, + webade: { + oauth2Url: 'http://mock-oauth-url.com', + clientId: 'mock-client-id', + authScopes: 'mock-scope', + checkTokenUrl: 'http://mock-check-token-url.com', + enableCheckToken: false, + } + }; + + + + beforeEach(() => { + mockAppConfigService = jasmine.createSpyObj('AppConfigService', ['getConfig']); + mockTokenService = jasmine.createSpyObj('TokenService', ['getOauthToken']); + + mockAppConfigService.getConfig.and.returnValue(mockConfig); + mockTokenService.getOauthToken.and.returnValue('mock-token'); + + TestBed.configureTestingModule({ + imports: [HttpClientTestingModule], + providers: [ + ProjectService, + { provide: AppConfigService, useValue: mockAppConfigService }, + { provide: TokenService, useValue: mockTokenService }, + ] + }); + + service = TestBed.inject(ProjectService); + httpMock = TestBed.inject(HttpTestingController); + }); + + afterEach(() => { + httpMock.verify(); + }); + + it('should fetch projects', () => { + const mockProjects = [{ projectName: 'Project 1' }]; + service.fetchProjects().subscribe((projects) => { + expect(projects).toEqual(mockProjects); + }); + + const req = httpMock.expectOne('http://mock-api.com/wfprev-api/projects'); + expect(req.request.method).toBe('GET'); + expect(req.request.headers.get('Authorization')).toBe('Bearer mock-token'); + req.flush(mockProjects); + }); + + it('should create a project', () => { + const mockProject = { projectName: 'New Project' }; + service.createProject(mockProject).subscribe((response) => { + expect(response).toEqual(mockProject); + }); + + const req = httpMock.expectOne('http://mock-api.com/wfprev-api/projects'); + expect(req.request.method).toBe('POST'); + expect(req.request.headers.get('Authorization')).toBe('Bearer mock-token'); + expect(req.request.body).toEqual(mockProject); + req.flush(mockProject); + }); + + it('should fetch project by project GUID', () => { + const mockProject = { projectName: 'Project 1' }; + const projectGuid = '12345'; + service.getProjectByProjectGuid(projectGuid).subscribe((project) => { + expect(project).toEqual(mockProject); + }); + + const req = httpMock.expectOne(`http://mock-api.com/wfprev-api/projects/${projectGuid}`); + expect(req.request.method).toBe('GET'); + expect(req.request.headers.get('Authorization')).toBe('Bearer mock-token'); + req.flush(mockProject); + }); + + it('should update a project', () => { + const projectGuid = '12345'; + const updatedProject: Project = { + projectName: 'Updated Project', + bcParksRegionOrgUnitId: 1, + bcParksSectionOrgUnitId: 2, + closestCommunityName: 'Community', + fireCentreOrgUnitId: 3, + isMultiFiscalYearProj: false, + programAreaGuid: 'program-guid', + projectDescription: 'Description', + projectLead: 'Lead', + projectLeadEmailAddress: 'email@example.com', + projectNumber: 100, + siteUnitName: 'Site Unit', + totalActualAmount: 1000, + totalAllocatedAmount: 500, + totalFundingRequestAmount: 200, + totalPlannedCostPerHectare: 10, + totalPlannedProjectSizeHa: 20, + forestDistrictOrgUnitId: 0, + forestRegionOrgUnitId: 0 + }; + + service.updateProject(projectGuid, updatedProject).subscribe((response) => { + expect(response).toEqual(updatedProject); + }); + + const req = httpMock.expectOne(`http://mock-api.com/wfprev-api/projects/${projectGuid}`); + expect(req.request.method).toBe('PUT'); + expect(req.request.headers.get('Authorization')).toBe('Bearer mock-token'); + expect(req.request.body).toEqual(updatedProject); + req.flush(updatedProject); + }); + + it('should handle errors when fetching projects', () => { + service.fetchProjects().subscribe({ + next: () => fail('Should have failed with an error'), + error: (error) => { + expect(error.message).toBe('Failed to fetch projects'); + } + }); + + const req = httpMock.expectOne('http://mock-api.com/wfprev-api/projects'); + expect(req.request.method).toBe('GET'); + req.flush('Error', { status: 500, statusText: 'Server Error' }); + }); + + it('should handle errors when fetching project details', () => { + const projectGuid = '12345'; + service.getProjectByProjectGuid(projectGuid).subscribe({ + next: () => fail('Should have failed with an error'), + error: (error) => { + expect(error.message).toBe('Failed to fetch project details'); + } + }); + + const req = httpMock.expectOne(`http://mock-api.com/wfprev-api/projects/${projectGuid}`); + req.flush('Error', { status: 500, statusText: 'Server Error' }); + }); + + it('should handle errors when updating a project', () => { + const projectGuid = '12345'; + const updatedProject: Project = { + projectName: 'Updated Project', + bcParksRegionOrgUnitId: 1, + bcParksSectionOrgUnitId: 2, + closestCommunityName: 'Community', + fireCentreOrgUnitId: 3, + isMultiFiscalYearProj: false, + programAreaGuid: 'program-guid', + projectDescription: 'Description', + projectLead: 'Lead', + projectLeadEmailAddress: 'email@example.com', + projectNumber: 100, + siteUnitName: 'Site Unit', + totalActualAmount: 1000, + totalAllocatedAmount: 500, + totalFundingRequestAmount: 200, + totalPlannedCostPerHectare: 10, + totalPlannedProjectSizeHa: 20, + forestDistrictOrgUnitId: 0, + forestRegionOrgUnitId: 0 + }; + + service.updateProject(projectGuid, updatedProject).subscribe({ + next: () => fail('Should have failed with an error'), + error: (error) => { + expect(error.message).toBe('Failed to update project'); + } + }); + + const req = httpMock.expectOne(`http://mock-api.com/wfprev-api/projects/${projectGuid}`); + req.flush('Error', { status: 500, statusText: 'Server Error' }); + }); +}); diff --git a/postman/Prevention.postman_collection.json b/postman/Prevention.postman_collection.json index 6e7d4e2d7..6a5f19c3f 100644 --- a/postman/Prevention.postman_collection.json +++ b/postman/Prevention.postman_collection.json @@ -137,7 +137,7 @@ "header": [], "body": { "mode": "raw", - "raw": "{\n \"projectTypeCode\": {\n \"projectTypeCode\": \"FUEL_MGMT\"\n },\n \"siteUnitName\": \"Vancouver Forest Unit\",\n \"forestAreaCode\": {\n \"forestAreaCode\": \"WEST\"\n },\n \"generalScopeCode\": {\n \"generalScopeCode\": \"SL_ACT\"\n },\n \"project_status_code\": \"ACTIVE\",\n \"programAreaGuid\": \"27602cd9-4b6e-9be0-e063-690a0a0afb50\",\n \"projectName\": \"Sample Forest Management Project\",\n \"projectLead\": \"Jane Smith\",\n \"projectLeadEmailAddress\": \"jane.smith@example.com\",\n \"projectDescription\": \"This is a comprehensive forest management project focusing on sustainable practices\",\n \"closestCommunityName\": \"Vancouver\",\n \"totalEstimatedCostAmount\": 100000.00,\n \"totalForecastAmount\": 95000.00,\n \"totalPlannedProjectSizeHa\": 500.00,\n \"totalPlannedCostPerHectare\": 200.00,\n \"totalActualAmount\": 0.00,\n \"isMultiFiscalYearProj\": false,\n \"forestRegionOrgUnitId\": 1001,\n \"forestDistrictOrgUnitId\": 2001,\n \"fireCentreOrgUnitId\": 3001,\n \"bcParksRegionOrgUnitId\": 4001,\n \"bcParksSectionOrgUnitId\": 5001,\n \"primaryObjectiveTypeCode\": {\n \"objectiveTypeCode\": \"CRIT_INFRA\"\n },\n \"secondaryObjectiveTypeCode\": {\n \"objectiveTypeCode\": \"WRR\"\n },\n \"tertiaryObjectiveTypeCode\": {\n \"objectiveTypeCode\": \"ECO_REST\"\n } \n}", + "raw": "{\n \"projectTypeCode\": {\n \"projectTypeCode\": \"FUEL_MGMT\"\n },\n \"siteUnitName\": \"Vancouver Forest Unit\",\n \"forestAreaCode\": {\n \"forestAreaCode\": \"WEST\"\n },\n \"generalScopeCode\": {\n \"generalScopeCode\": \"SL_ACT\"\n },\n \"project_status_code\": \"ACTIVE\",\n \"programAreaGuid\": \"27602cd9-4b6e-9be0-e063-690a0a0afb50\",\n \"projectName\": \"Sample Forest Management Project\",\n \"projectLead\": \"Jane Smith\",\n \"projectLeadEmailAddress\": \"jane.smith@example.com\",\n \"projectDescription\": \"This is a comprehensive forest management project focusing on sustainable practices\",\n \"closestCommunityName\": \"Vancouver\",\n \"totalEstimatedCostAmount\": 100000.00,\n \"totalForecastAmount\": 95000.00,\n \"totalPlannedProjectSizeHa\": 500.00,\n \"totalPlannedCostPerHectare\": 200.00,\n \"totalActualAmount\": 0.00,\n \"isMultiFiscalYearProj\": false,\n \"forestRegionOrgUnitId\": 1001,\n \"forestDistrictOrgUnitId\": 2001,\n \"fireCentreOrgUnitId\": 3001,\n \"bcParksRegionOrgUnitId\": 4001,\n \"bcParksSectionOrgUnitId\": 5001,\n \"primaryObjectiveTypeCode\": {\n \"objectiveTypeCode\": \"CRIT_INFRA\"\n },\n \"secondaryObjectiveTypeCode\": {\n \"objectiveTypeCode\": \"WRR\"\n },\n \"fireCentreOrgUnitId\": 3001,\n \"secondaryObjectiveRationale\": \"Rationale test\",\n \"tertiaryObjectiveTypeCode\": {\n \"objectiveTypeCode\": \"ECO_REST\"\n } \n}", "options": { "raw": { "language": "json" @@ -417,7 +417,7 @@ "header": [], "body": { "mode": "raw", - "raw": "{\n \"projectGuid\": \"{{projectGuid}}\",\n \"projectTypeCode\": {\n \"projectTypeCode\": \"FUEL_MGMT\"\n },\n \"siteUnitName\": \"Vancouver Forest Unit\",\n \"forestAreaCode\": {\n \"forestAreaCode\": \"COAST\"\n },\n \"generalScopeCode\": {\n \"generalScopeCode\": \"SL_ACT\"\n },\n \"project_status_code\": \"ACTIVE\",\n \"programAreaGuid\": \"27602cd9-4b6e-9be0-e063-690a0a0afb50\",\n \"projectName\": \"Test 3\",\n \"projectLead\": \"Jane Smith\",\n \"projectLeadEmailAddress\": \"jane.smith@example.com\",\n \"projectDescription\": \"This is a comprehensive forest management project focusing on sustainable practices\",\n \"closestCommunityName\": \"Vancouver\",\n \"totalEstimatedCostAmount\": 177000.00,\n \"totalForecastAmount\": 125000.00,\n \"totalPlannedProjectSizeHa\": 500.00,\n \"totalPlannedCostPerHectare\": 200.00,\n \"totalActualAmount\": 0.00,\n \"isMultiFiscalYearProj\": false,\n \"forestRegionOrgUnitId\": 1001,\n \"forestDistrictOrgUnitId\": 2001,\n \"fireCentreOrgUnitId\": 3001,\n \"bcParksRegionOrgUnitId\": 4001,\n \"bcParksSectionOrgUnitId\": 5001,\n \"primaryObjectiveTypeCode\": {\n \"objectiveTypeCode\": \"RECONCIL\"\n },\n \"secondaryObjectiveTypeCode\": {\n \"objectiveTypeCode\": \"HAZ_ABATE\"\n },\n \"tertiaryObjectiveTypeCode\": {\n \"objectiveTypeCode\": \"FOR_HEALTH\"\n } \n}", + "raw": "{\n \"projectGuid\": \"{{projectGuid}}\",\n \"projectTypeCode\": {\n \"projectTypeCode\": \"FUEL_MGMT\"\n },\n \"siteUnitName\": \"Vancouver Forest Unit\",\n \"forestAreaCode\": {\n \"forestAreaCode\": \"COAST\"\n },\n \"generalScopeCode\": {\n \"generalScopeCode\": \"SL_ACT\"\n },\n \"project_status_code\": \"ACTIVE\",\n \"programAreaGuid\": \"27602cd9-4b6e-9be0-e063-690a0a0afb50\",\n \"projectName\": \"Test 3\",\n \"projectLead\": \"Jane Smith\",\n \"projectLeadEmailAddress\": \"jane.smith@example.com\",\n \"projectDescription\": \"This is a comprehensive forest management project focusing on sustainable practices\",\n \"closestCommunityName\": \"Vancouver\",\n \"totalEstimatedCostAmount\": 177000.00,\n \"totalForecastAmount\": 125000.00,\n \"totalPlannedProjectSizeHa\": 500.00,\n \"totalPlannedCostPerHectare\": 200.00,\n \"totalActualAmount\": 0.00,\n \"isMultiFiscalYearProj\": false,\n \"forestRegionOrgUnitId\": 1001,\n \"forestDistrictOrgUnitId\": 2001,\n \"fireCentreOrgUnitId\": 3001,\n \"bcParksRegionOrgUnitId\": 4001,\n \"bcParksSectionOrgUnitId\": 5001,\n \"primaryObjectiveTypeCode\": {\n \"objectiveTypeCode\": \"RECONCIL\"\n },\n \"secondaryObjectiveTypeCode\": {\n \"objectiveTypeCode\": \"HAZ_ABATE\"\n },\n \"secondaryObjectiveRationale\": \"Rationale test\",\n \"tertiaryObjectiveTypeCode\": {\n \"objectiveTypeCode\": \"FOR_HEALTH\"\n } \n}", "options": { "raw": { "language": "json" diff --git a/server/wfprev-api/src/main/java/ca/bc/gov/nrs/wfprev/data/assemblers/ProjectResourceAssembler.java b/server/wfprev-api/src/main/java/ca/bc/gov/nrs/wfprev/data/assemblers/ProjectResourceAssembler.java index 9b006f1ab..f754dccf8 100644 --- a/server/wfprev-api/src/main/java/ca/bc/gov/nrs/wfprev/data/assemblers/ProjectResourceAssembler.java +++ b/server/wfprev-api/src/main/java/ca/bc/gov/nrs/wfprev/data/assemblers/ProjectResourceAssembler.java @@ -51,6 +51,9 @@ public ProjectEntity toEntity(ProjectModel resource) { if (resource.getTertiaryObjectiveTypeCode() != null) { entity.setTertiaryObjectiveTypeCode(toObjectiveTypeCodeEntity(resource.getTertiaryObjectiveTypeCode())); } + if (resource.getSecondaryObjectiveRationale() != null) { + entity.setSecondaryObjectiveRationale(resource.getSecondaryObjectiveRationale()); + } entity.setForestRegionOrgUnitId(resource.getForestRegionOrgUnitId()); entity.setForestDistrictOrgUnitId(resource.getForestDistrictOrgUnitId()); entity.setFireCentreOrgUnitId(resource.getFireCentreOrgUnitId()); @@ -109,6 +112,9 @@ public ProjectModel toModel(ProjectEntity entity) { if (entity.getTertiaryObjectiveTypeCode() != null) { resource.setTertiaryObjectiveTypeCode(toObjectiveTypeCodeModel(entity.getTertiaryObjectiveTypeCode())); } + if (entity.getSecondaryObjectiveRationale() != null) { + resource.setSecondaryObjectiveRationale(entity.getSecondaryObjectiveRationale()); + } resource.setProgramAreaGuid(entity.getProgramAreaGuid().toString()); resource.setForestRegionOrgUnitId(entity.getForestRegionOrgUnitId()); resource.setForestDistrictOrgUnitId(entity.getForestDistrictOrgUnitId()); @@ -236,10 +242,13 @@ public ProjectEntity updateEntity(ProjectModel model, ProjectEntity existingEnti entity.setProjectTypeCode(nonNullOrDefault(toProjectTypeCodeEntity(model.getProjectTypeCode()), existingEntity.getProjectTypeCode())); entity.setGeneralScopeCode(nonNullOrDefault(toGeneralScopeCodeEntity(model.getGeneralScopeCode()), existingEntity.getGeneralScopeCode())); entity.setProjectNumber(existingEntity.getProjectNumber()); - entity.setPrimaryObjectiveTypeCode(nonNullOrDefault(toObjectiveTypeCodeEntity(model.getPrimaryObjectiveTypeCode() != null ? model.getPrimaryObjectiveTypeCode() : null), existingEntity.getPrimaryObjectiveTypeCode())); - entity.setSecondaryObjectiveTypeCode(nonNullOrDefault(toObjectiveTypeCodeEntity(model.getSecondaryObjectiveTypeCode() != null ? model.getSecondaryObjectiveTypeCode() : null), existingEntity.getSecondaryObjectiveTypeCode())); - entity.setTertiaryObjectiveTypeCode(nonNullOrDefault(toObjectiveTypeCodeEntity(model.getTertiaryObjectiveTypeCode() != null ? model.getTertiaryObjectiveTypeCode() : null), existingEntity.getTertiaryObjectiveTypeCode())); - + entity.setPrimaryObjectiveTypeCode(nonNullOrDefault(toObjectiveTypeCodeEntity(model.getPrimaryObjectiveTypeCode() != null ? + model.getPrimaryObjectiveTypeCode() : null), existingEntity.getPrimaryObjectiveTypeCode())); + entity.setSecondaryObjectiveTypeCode(nonNullOrDefault(toObjectiveTypeCodeEntity(model.getSecondaryObjectiveTypeCode() != null ? + model.getSecondaryObjectiveTypeCode() : null), existingEntity.getSecondaryObjectiveTypeCode())); + entity.setTertiaryObjectiveTypeCode(nonNullOrDefault(toObjectiveTypeCodeEntity(model.getTertiaryObjectiveTypeCode() != null ? + model.getTertiaryObjectiveTypeCode() : null), existingEntity.getTertiaryObjectiveTypeCode())); + entity.setSecondaryObjectiveRationale(nonNullOrDefault(model.getSecondaryObjectiveRationale(), existingEntity.getSecondaryObjectiveRationale())); log.error("Updated entity: " + entity); return entity; } diff --git a/server/wfprev-api/src/main/java/ca/bc/gov/nrs/wfprev/data/entities/ProjectEntity.java b/server/wfprev-api/src/main/java/ca/bc/gov/nrs/wfprev/data/entities/ProjectEntity.java index cd89208d9..1d5771eb5 100644 --- a/server/wfprev-api/src/main/java/ca/bc/gov/nrs/wfprev/data/entities/ProjectEntity.java +++ b/server/wfprev-api/src/main/java/ca/bc/gov/nrs/wfprev/data/entities/ProjectEntity.java @@ -182,4 +182,7 @@ public class ProjectEntity implements Serializable { @ManyToOne(fetch = FetchType.EAGER, optional = true) @JoinColumn(name = "tertiary_objective_type_code") private ObjectiveTypeCodeEntity tertiaryObjectiveTypeCode; + + @Column(name = "secondary_objective_rationale", length = 300) + private String secondaryObjectiveRationale; } \ No newline at end of file diff --git a/server/wfprev-api/src/main/java/ca/bc/gov/nrs/wfprev/data/models/ProjectModel.java b/server/wfprev-api/src/main/java/ca/bc/gov/nrs/wfprev/data/models/ProjectModel.java index 69edbf50f..7fc3cada5 100644 --- a/server/wfprev-api/src/main/java/ca/bc/gov/nrs/wfprev/data/models/ProjectModel.java +++ b/server/wfprev-api/src/main/java/ca/bc/gov/nrs/wfprev/data/models/ProjectModel.java @@ -58,5 +58,6 @@ public class ProjectModel extends CommonModel { private ObjectiveTypeCodeModel primaryObjectiveTypeCode; private ObjectiveTypeCodeModel secondaryObjectiveTypeCode; private ObjectiveTypeCodeModel tertiaryObjectiveTypeCode; + private String secondaryObjectiveRationale; } \ No newline at end of file