kick (#417)

bcgov · Jan 14, 2025 · b164fbb · b164fbb
1 parent b42c227
commit b164fbb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/client/wfprev-war/src/main/angular/src/app/utils/messages.ts b/client/wfprev-war/src/main/angular/src/app/utils/messages.ts
@@ -5,6 +5,6 @@ export const Messages = {
   projectCreatedSuccess: 'Project Created Successfully',
   projectCreatedFailure: 'Create project failed',
   projectUpdatedSuccess: 'Project Updated Successfully',
-  projectUpdatedFailure: 'Create Updated failed',
+  projectUpdatedFailure: 'Project Updated failed',
   confirmCancel: 'Are you sure you want to cancel?',
 };
diff --git a/...prev-api/src/main/java/ca/bc/gov/nrs/wfprev/data/assemblers/ProjectResourceAssembler.java b/...prev-api/src/main/java/ca/bc/gov/nrs/wfprev/data/assemblers/ProjectResourceAssembler.java
@@ -187,7 +187,12 @@ public ProjectEntity updateEntity(ProjectModel model, ProjectEntity existingEnti
         entity.setRevisionCount(nonNullOrDefault(model.getRevisionCount(), existingEntity.getRevisionCount()));
         entity.setProjectStatusCode(existingEntity.getProjectStatusCode());
         entity.setSiteUnitName(nonNullOrDefault(model.getSiteUnitName(), existingEntity.getSiteUnitName()));
-        entity.setProgramAreaGuid((UUID) nonNullOrDefault(model.getProgramAreaGuid(), existingEntity.getProgramAreaGuid()));
+        entity.setProgramAreaGuid(
+            nonNullOrDefault(
+                model.getProgramAreaGuid() != null ? UUID.fromString(model.getProgramAreaGuid()) : null,
+                existingEntity.getProgramAreaGuid()
+            )
+        );
         entity.setForestRegionOrgUnitId(nonNullOrDefault(model.getForestRegionOrgUnitId(), existingEntity.getForestRegionOrgUnitId()));
         entity.setForestDistrictOrgUnitId(nonNullOrDefault(model.getForestDistrictOrgUnitId(), existingEntity.getForestDistrictOrgUnitId()));
         entity.setFireCentreOrgUnitId(nonNullOrDefault(model.getFireCentreOrgUnitId(), existingEntity.getFireCentreOrgUnitId()));