Merge pull request #656 from bcgov/ccfri-4568-application-update-facility

CCFRI-4568 - Application Update Facility Info page

Author: vietle-cgi

backend/src/components/facility.js

@@ -30,9 +30,7 @@ function buildNewFacilityPayload(req) {
 function mapFacilityObjectForBack(data) {
   const facilityForBack = new MappableObjectForBack(data, FacilityMappings).toJSON();
 
-  if (facilityForBack.ccof_facilitystartdate) {
-    facilityForBack.ccof_facilitystartdate = `${facilityForBack.ccof_facilitystartdate}-01-01`;
-  }
+  facilityForBack.ccof_facilitystartdate = facilityForBack.ccof_facilitystartdate ? `${facilityForBack.ccof_facilitystartdate}-01-01` : null;
   if (facilityForBack.ccof_licensestartdate) {
     facilityForBack.ccof_licensestartdate = facilityForBack.ccof_licensestartdate + 'T12:00:00-07:00';
   }
@@ -80,7 +78,7 @@ function mapCCFRIObjectForFront(data) {
 }
 
 async function getFacilityByFacilityId(facilityId) {
-  const operation = `accounts(${facilityId})?$select=ccof_accounttype,name,ccof_facilitystartdate,address1_line1,address1_city,address1_stateorprovince,address1_postalcode,ccof_position,emailaddress1,address1_primarycontactname,telephone1,ccof_facilitylicencenumber,ccof_licensestartdate,ccof_formcomplete,ccof_everreceivedfundingundertheccofprogram,ccof_facilityreceived_ccof_funding,accountnumber,ccof_facilitystatus,ccof_is_facility_address_entered_manually`;
+  const operation = `accounts(${facilityId})?$select=ccof_accounttype,name,ccof_facilitystartdate,address1_line1,address1_city,address1_stateorprovince,address1_postalcode,ccof_position,emailaddress1,address1_primarycontactname,telephone1,ccof_facilitylicencenumber,ccof_licensestartdate,ccof_formcomplete,ccof_everreceivedfundingundertheccofprogram,ccof_facilityreceived_ccof_funding,accountnumber,ccof_facilitystatus,ccof_is_facility_address_entered_manually,ccof_is_facility_address_same_as_org,ccof_is_facility_contact_same_as_org,ccof_healthauthority`;
   const facility = await getOperation(operation);
 
   if (ACCOUNT_TYPE.FACILITY != facility?.ccof_accounttype) {

backend/src/components/lookup.js

@@ -6,8 +6,10 @@ const cache = require('memory-cache');
 const { PROGRAM_YEAR_STATUS_CODES, ORGANIZATION_PROVIDER_TYPES, CHANGE_REQUEST_TYPES } = require('../util/constants');
 const { ProgramYearMappings, SystemMessagesMappings } = require('../util/mapping/Mappings');
 const { MappableObjectForFront } = require('../util/mapping/MappableObject');
+const log = require('./logger');
 
 const lookupCache = new cache.Cache();
+const ONE_HOUR_MS = 60 * 60 * 1000; // Cache timeout set for one hour
 
 const organizationType = [
   {
@@ -75,7 +77,7 @@ async function getLicenseCategory() {
       .sort((a, b) => {
         return a.ccof_categorynumber - b.ccof_categorynumber;
       });
-    lookupCache.put('licenseCategory', resData, 60 * 60 * 1000);
+    lookupCache.put('licenseCategory', resData, ONE_HOUR_MS);
   }
   return resData;
 }
@@ -137,7 +139,7 @@ async function getLookupInfo(req, res) {
         return _.pick(item, ['ccof_childcarecategorynumber', 'ccof_name', 'ccof_description', 'ccof_childcare_categoryid']);
       });
 
-    const licenseCategory = await getLicenseCategory();
+    const [licenseCategory, healthAuthorities] = await Promise.all([getLicenseCategory(), getGlobalOptionsData('ccof_healthauthority')]);
     resData = {
       programYear: programYears,
       childCareCategory: childCareCategory,
@@ -146,8 +148,9 @@ async function getLookupInfo(req, res) {
       groupLicenseCategory: licenseCategory.groupLicenseCategory,
       familyLicenseCategory: licenseCategory.familyLicenseCategory,
       'changeRequestTypes:': CHANGE_REQUEST_TYPES,
+      healthAuthorities: healthAuthorities,
     };
-    lookupCache.put('lookups', resData, 60 * 60 * 1000);
+    lookupCache.put('lookups', resData, ONE_HOUR_MS);
   }
   return res.status(HttpStatus.OK).json(resData);
 }
@@ -159,11 +162,25 @@ async function getSystemMessages(req, res) {
     systemMessages = [];
     const resData = await getOperation(`ccof_systemmessages?$filter=(ccof_startdate le ${currentTime} and ccof_enddate ge ${currentTime})`);
     resData?.value.forEach((message) => systemMessages.push(new MappableObjectForFront(message, SystemMessagesMappings).data));
-    lookupCache.put('systemMessages', systemMessages, 60 * 60 * 1000);
+    lookupCache.put('systemMessages', systemMessages, ONE_HOUR_MS);
   }
   return res.status(HttpStatus.OK).json(systemMessages);
 }
 
+async function getGlobalOptionsData(operationName) {
+  try {
+    const response = await getOperation(`GlobalOptionSetDefinitions(Name='${operationName}')`);
+    const data =
+      response?.Options?.map((item) => ({
+        id: Number(item.Value),
+        description: item.Label?.LocalizedLabels?.[0]?.Label ?? null,
+      })) || [];
+    return data;
+  } catch (error) {
+    log.error(`Error getting global options data for ${operationName}:`, error);
+  }
+}
+
 module.exports = {
   getLookupInfo,
   getLicenseCategory,

backend/src/util/mapping/Mappings.js

@@ -42,6 +42,9 @@ const FacilityMappings = [
   { back: 'accountnumber', front: 'facilityAccountNumber' },
   { back: '_ccof_change_request_value', front: 'changeRequestId' }, //likely won't stay here
   { back: 'ccof_is_facility_address_entered_manually', front: 'isFacilityAddressEnteredManually' },
+  { back: 'ccof_is_facility_address_same_as_org', front: 'isFacilityAddressSameAsOrgStreetAddress' },
+  { back: 'ccof_is_facility_contact_same_as_org', front: 'isFacilityContactSameAsOrgContact' },
+  { back: 'ccof_healthauthority', front: 'healthAuthority' },
 ];
 
 const CCFRIFacilityMappings = [