Merge pull request #457 from bcgov/change-request-new-facility-CCFRI-…

…2967 Change request new facility ccfri 2967
bcgov · Oct 24, 2023 · 8c774d1 · 8c774d1
2 parents 73e6278 + ed6116b
commit 8c774d1
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/backend/src/components/user.js b/backend/src/components/user.js
@@ -161,14 +161,12 @@ function updateFacilityWithChangeRequestDetails(changeRequestList, returnValue,
     let changeActionNewFacilityList = changeRequest?.ccof_change_action_change_request?.filter(item =>item.ccof_changetype === CHANGE_REQUEST_TYPES.NEW_FACILITY);
     for (const changeActionNewFacility of changeActionNewFacilityList) {
       let result = changeActionNewFacility?.ccof_change_request_new_facility_change_act.find(item => item['_ccof_facility_value'] === facilityId);
-      if (result) {
+      //RLO - if facilityAccountNumber exists, then then don't update the facility statuses, since this is now part of the PCF
+      if (result && !returnValue.facilityAccountNumber) {
         returnValue.changeRequestId = changeRequest?.ccof_change_requestid;
-        //RLO - if facilityAccountNumber exists, then then don't update the facility statuses, since this is now part of the PCF
-        if (!returnValue.facilityAccountNumber) {
-          returnValue.unlockCcfri = result?.ccof_unlock_ccfri;
-          returnValue.unlockNmf = result?.ccof_unlock_nmf_rfi;
-          returnValue.unlockRfi = result?.ccof_unlock_rfi;
-        }
+        returnValue.unlockCcfri = result?.ccof_unlock_ccfri;
+        returnValue.unlockNmf = result?.ccof_unlock_nmf_rfi;
+        returnValue.unlockRfi = result?.ccof_unlock_rfi;
       }
     }
   }