console recent changes to merged in master

health-services/project-factory/Dockerfile

@@ -31,6 +31,4 @@ COPY . .
 EXPOSE 3000
 
 CMD ["yarn", "prod"]
- # Replaced by CMD ["yarn", "prod"]
-
-
+# Replaced by CMD ["yarn", "prod"]

health-services/project-factory/package.json

@@ -10,11 +10,11 @@
     "build": "yarn run build-ts",
     "build-ts": "tsc",
     "clean": "rm -rf ./dist",
-    "serve": "node dist/index.js",
+    "serve": "if [ \"$DEBUG\" = \"true\" ]; then node --inspect=0.0.0.0:9229 dist/index.js; else node dist/index.js; fi",
     "start": "yarn run dev",
     "test": "jest",
     "dev": "ts-node-dev --respawn src/server/index.ts",
-    "prod": "yarn build && yarn serve",
+    "prod": "if [ \"$DEBUG\" = \"true\" ]; then cp tsconfig.debug.json tsconfig.json; fi && yarn build && yarn serve",
     "watch-ts": "tsc --watch"
   },
   "repository": {

health-services/project-factory/src/server/config/index.ts

@@ -39,6 +39,8 @@ const config = {
   },
   facility: {
     facilityTab: process.env.FACILITY_TAB_NAME || "HCM_ADMIN_CONSOLE_FACILITIES",
+    facilityCodeColumn : "HCM_ADMIN_CONSOLE_FACILITY_CODE",
+    facilityType : "facility"
   },
   user: {
     userTab: process.env.USER_TAB_NAME || "HCM_ADMIN_CONSOLE_USER_LIST",
@@ -95,6 +97,8 @@ const config = {
     defaultLocale: process.env.LOCALE || "en_MZ",
     boundaryPrefix: "hcm-boundary",
     localizationModule: process.env.LOCALIZATION_MODULE || "hcm-admin-schemas",
+    localizationWaitTimeInBoundaryCreation: parseInt(process.env.LOCALIZATION_WAIT_TIME_IN_BOUNDARY_CREATION || "30000"),
+    localizationChunkSizeForBoundaryCreation: parseInt(process.env.LOCALIZATION_CHUNK_SIZE_FOR_BOUNDARY_CREATION || "2000"),
   },
   // targetColumnsForSpecificCampaigns: {
   //   bedNetCampaignColumns: ["HCM_ADMIN_CONSOLE_TARGET"],
@@ -148,6 +152,7 @@ const config = {
     localizationSearch: process.env.EGOV_LOCALIZATION_SEARCH || "localization/messages/v1/_search",
     localizationCreate: "localization/messages/v1/_upsert",
     projectTypeSearch: "project-factory/v1/project-type/search",
+    cacheBurst: process.env.CACHE_BURST || "localization/messages/cache-bust",
     boundaryRelationshipCreate: "boundary-service/boundary-relationships/_create",
     healthIndividualSearch: process.env.EGOV_HEALTH_INDIVIDUAL_SEARCH || "health-individual/v1/_search",
     projectFacilitySearch: process.env.EGOV_HEALTH_PROJECT_FACILITY_SEARCH || "health-project/facility/v1/_search",

health-services/project-factory/src/server/controllers/localisationController/localisation.controller.ts

@@ -3,6 +3,7 @@ import { logger } from "../../utils/logger";
 import { httpRequest } from "../../utils/request";
 import config from "../../config/index";
 import { convertLocalisationResponseToMap } from "../../utils/localisationUtils";
+import { defaultRequestInfo } from "../../api/coreApis";
 
 let cachedResponse = {};
 
@@ -82,6 +83,20 @@ class Localisation {
     );
     cachedResponse = { ...this.cachedResponse };
   };
+
+  // Calls the cache burst API of localization
+  public cacheBurst = async (
+  ) => {
+    logger.info(`Calling localization cache burst api`);
+    const RequestInfo = defaultRequestInfo;
+    const requestBody = {
+      RequestInfo
+    }
+    await httpRequest(
+      this.localizationHost + config.paths.cacheBurst,
+      requestBody)
+  };
+
 
   private checkCacheAndDeleteIfExists = (module: string, locale: "string") => {
     logger.info(
@@ -132,6 +147,7 @@ class Localisation {
       // Log and handle any errors that occur during the process
       console.log(e);
       logger.error(String(e));
+      throw new Error(e);
     }
   };
 }

health-services/project-factory/src/server/utils/campaignUtils.ts

@@ -958,7 +958,7 @@ async function enrichAndPersistCampaignWithError(requestBody: any, error: any) {
   requestBody.CampaignDetails.status = campaignStatuses?.failed;
   // requestBody.CampaignDetails.isActive = false;
   requestBody.CampaignDetails.boundaryCode =
-    getRootBoundaryCode(requestBody?.CampaignDetails?.boundaries) || null;
+    getRootBoundaryCode(requestBody?.boundariesCombined) || null;
   requestBody.CampaignDetails.projectType =
     requestBody?.CampaignDetails?.projectType || null;
   requestBody.CampaignDetails.hierarchyType =
@@ -1035,7 +1035,7 @@ async function enrichAndPersistCampaignForCreate(
   request.body.CampaignDetails.status =
     action == "create" ? campaignStatuses.started : campaignStatuses.drafted;
   request.body.CampaignDetails.boundaryCode = getRootBoundaryCode(
-    request.body.CampaignDetails.boundaries
+    request.body?.boundariesCombined
   );
   request.body.CampaignDetails.projectType =
     request?.body?.CampaignDetails?.projectType || null;
@@ -1111,7 +1111,7 @@ async function enrichAndPersistCampaignForUpdate(
         ? campaignStatuses.started
         : campaignStatuses.drafted;
   const boundaryCode = !request?.body?.CampaignDetails?.projectId
-    ? getRootBoundaryCode(request.body.CampaignDetails.boundaries)
+    ? getRootBoundaryCode(request.body?.boundariesCombined)
     : request?.body?.CampaignDetails?.boundaryCode ||
     ExistingCampaignDetails?.boundaryCode;
   request.body.CampaignDetails.boundaryCode = boundaryCode;
@@ -2414,6 +2414,7 @@ async function processAfterPersist(request: any, actionInUrl: any) {
         localizationMap
       );
     }
+    delete request.body?.boundariesCombined;
   } catch (error: any) {
     console.log(error);
     logger.error(error);

health-services/project-factory/src/server/utils/genericUtils.ts

@@ -374,7 +374,7 @@ async function fullProcessFlowForNewEntry(newEntryResponse: any, generatedResour
     const localizationMapModule = await getLocalizedMessagesHandler(request, request?.query?.tenantId);
     const localizationMap = { ...localizationMapHierarchy, ...localizationMapModule };
     let fileUrlResponse: any;
-    if(type != 'boundaryManagement' && request?.query?.campaignId != 'default' && type != 'boundaryGeometryManagement'){
+    if (type != 'boundaryManagement' && request?.query?.campaignId != 'default' && type != 'boundaryGeometryManagement') {
       const responseFromCampaignSearch = await getCampaignSearchResponse(request);
       const campaignObject = responseFromCampaignSearch?.CampaignDetails?.[0];
       logger.info(`checks for parent campaign for type: ${type}`)
@@ -407,7 +407,7 @@ async function fullProcessFlowForNewEntry(newEntryResponse: any, generatedResour
       await produceModifiedMessages(generatedResourceNew, updateGeneratedResourceTopic);
       request.body.generatedResource = finalResponse;
     }
-    else if (type == 'boundaryManagement'  || type === 'boundaryGeometryManagement'){
+    else if (type == 'boundaryManagement' || type === 'boundaryGeometryManagement') {
       // get boundary data from boundary relationship search api
       logger.info("Generating Boundary Data")
       const boundaryDataSheetGeneratedBeforeDifferentTabSeparation = await getBoundaryDataService(request, false);
@@ -601,10 +601,10 @@ function setAndFormatHeaders(worksheet: any, mainHeader: any, headerSet: any) {
 async function createReadMeSheet(request: any, workbook: any, mainHeader: any, localizationMap = {}) {
   const isSourceMicroplan = await isMicroplanRequest(request);
   let readMeConfig: any;
-  if(isSourceMicroplan) {
+  if (isSourceMicroplan) {
     readMeConfig = await getReadMeConfigForMicroplan(request);
   }
-  else{
+  else {
     readMeConfig = await getReadMeConfig(request);
   }
   const headerSet = new Set();
@@ -749,13 +749,13 @@ async function createFacilityAndBoundaryFile(facilitySheetData: any, boundaryShe
   hideUniqueIdentifierColumn(facilitySheet, createAndSearch?.["facility"]?.uniqueIdentifierColumn);
   changeFirstRowColumnColour(facilitySheet, 'E06666');
 
-  let receivedDropdowns=request.body?.dropdowns;
-  logger.info("started adding dropdowns in facility",JSON.stringify(receivedDropdowns))
+  let receivedDropdowns = request.body?.dropdowns;
+  logger.info("started adding dropdowns in facility", JSON.stringify(receivedDropdowns))
 
-  if(!receivedDropdowns||Object.keys(receivedDropdowns)?.length==0){
+  if (!receivedDropdowns || Object.keys(receivedDropdowns)?.length == 0) {
     logger.info("No dropdowns found");
-    receivedDropdowns= setDropdownFromSchema(request,schema,localizationMap);
-    logger.info("refetched drodowns",JSON.stringify(receivedDropdowns))
+    receivedDropdowns = setDropdownFromSchema(request, schema, localizationMap);
+    logger.info("refetched drodowns", JSON.stringify(receivedDropdowns))
   }
   await handledropdownthings(facilitySheet, receivedDropdowns);
   await handleHiddenColumns(facilitySheet, request.body?.hiddenColumns);
@@ -777,7 +777,7 @@ async function handledropdownthings(sheet: any, dropdowns: any) {
     logger.info("Dropdowns provided:", dropdowns);
     for (const key of Object.keys(dropdowns)) {
       if (dropdowns[key]) {
-        logger.info(`Processing dropdown key: ${key} with values: ${dropdowns[key]}`);      
+        logger.info(`Processing dropdown key: ${key} with values: ${dropdowns[key]}`);
         const firstRow = sheet.getRow(1);
         firstRow.eachCell({ includeEmpty: true }, (cell: any, colNumber: any) => {
           if (cell.value === key) {
@@ -815,7 +815,7 @@ async function handledropdownthings(sheet: any, dropdowns: any) {
 
 async function handleHiddenColumns(sheet: any, hiddenColumns: any) {
   // logger.info(sheet)
-  logger.info("hiddenColumns",hiddenColumns);
+  logger.info("hiddenColumns", hiddenColumns);
   if (hiddenColumns) {
     for (const columnName of hiddenColumns) {
       const firstRow = sheet.getRow(1);
@@ -849,13 +849,13 @@ async function createUserAndBoundaryFile(userSheetData: any, boundarySheetData:
   addDataToSheet(request, userSheet, userSheetData, undefined, undefined, true, false, localizationMap, fileUrl, schema);
   hideUniqueIdentifierColumn(userSheet, createAndSearch?.["user"]?.uniqueIdentifierColumn);
 
-  let receivedDropdowns=request.body?.dropdowns;
-  logger.info("started adding dropdowns in user",JSON.stringify(receivedDropdowns))
+  let receivedDropdowns = request.body?.dropdowns;
+  logger.info("started adding dropdowns in user", JSON.stringify(receivedDropdowns))
 
-  if(!receivedDropdowns||Object.keys(receivedDropdowns)?.length==0){
+  if (!receivedDropdowns || Object.keys(receivedDropdowns)?.length == 0) {
     logger.info("No dropdowns found");
-    receivedDropdowns= setDropdownFromSchema(request,schema,localizationMap);
-    logger.info("refetched drodowns",JSON.stringify(receivedDropdowns))
+    receivedDropdowns = setDropdownFromSchema(request, schema, localizationMap);
+    logger.info("refetched drodowns", JSON.stringify(receivedDropdowns))
   }
   await handledropdownthings(userSheet, receivedDropdowns);
   await handleHiddenColumns(userSheet, request.body?.hiddenColumns);
@@ -870,6 +870,8 @@ async function createUserAndBoundaryFile(userSheetData: any, boundarySheetData:
 
 
 async function generateFacilityAndBoundarySheet(tenantId: string, request: any, localizationMap?: { [key: string]: string }, filteredBoundary?: any, fileUrl?: any) {
+  const type = request?.query?.type || request?.body?.ResourceDetails?.type;
+  const typeWithoutWith = type.includes('With') ? type.split('With')[0] : type;
   // Get facility and boundary data
   logger.info("Generating facilities started");
   const allFacilities = await getAllFacilities(tenantId, request.body);
@@ -881,10 +883,10 @@ async function generateFacilityAndBoundarySheet(tenantId: string, request: any,
   if (fileUrl) {
     /* fetch facility from processed file 
     and generate facility sheet data */
+    schema = await callMdmsTypeSchema(request, tenantId, true, typeWithoutWith, "all");
     const processedFacilitySheetData = await getSheetData(fileUrl, localizedFacilityTab, false, undefined, localizationMap);
-    const modifiedProcessedFacilitySheetData = modifyProcessedSheetData(request, processedFacilitySheetData, localizationMap);
+    const modifiedProcessedFacilitySheetData = modifyProcessedSheetData(typeWithoutWith, processedFacilitySheetData, schema, localizationMap);
     facilitySheetData = modifiedProcessedFacilitySheetData;
-    schema = await callMdmsTypeSchema(request, tenantId, true, "facility", "all");
     setDropdownFromSchema(request, schema, localizationMap);
   }
   else {
@@ -903,9 +905,11 @@ async function generateFacilityAndBoundarySheet(tenantId: string, request: any,
 
 async function generateUserSheet(request: any, localizationMap?: { [key: string]: string }, filteredBoundary?: any, userData?: any, fileUrl?: any) {
   const tenantId = request?.query?.tenantId;
+  const type = request?.query?.type || request?.body?.ResourceDetails?.type;
+  const typeWithoutWith = type.includes('With') ? type.split('With')[0] : type;
   let schema: any;
   const isUpdate = fileUrl ? true : false;
-  schema = await callMdmsTypeSchema(request, tenantId, isUpdate, "user");
+  schema = await callMdmsTypeSchema(request, tenantId, isUpdate, typeWithoutWith);
   setDropdownFromSchema(request, schema, localizationMap);
   const headers = schema?.columns;
   const localizedHeaders = getLocalizedHeaders(headers, localizationMap);
@@ -917,7 +921,7 @@ async function generateUserSheet(request: any, localizationMap?: { [key: string]
     /* fetch facility from processed file 
     and generate facility sheet data */
     const processedUserSheetData = await getSheetData(fileUrl, localizedUserTab, false, undefined, localizationMap);
-    const modifiedProcessedUserSheetData = modifyProcessedSheetData(request, processedUserSheetData, localizationMap);
+    const modifiedProcessedUserSheetData = modifyProcessedSheetData(typeWithoutWith, processedUserSheetData, schema, localizationMap);
     userSheetData = modifiedProcessedUserSheetData;
   }
   else {
@@ -1075,7 +1079,7 @@ async function handleGenerateError(newEntryResponse: any, generatedResource: any
         code: error.code,
         description: error.description,
         message: error.message
-      } || String(error)
+      }
     }
   })
   generatedResource = { generatedResource: newEntryResponse };
@@ -1303,12 +1307,12 @@ async function getDataSheetReady(boundaryData: any, request: any, localizationMa
     mappedRowData[boundaryCodeIndex] = boundaryCode;
     return mappedRowData;
   });
-  if(type == "boundaryManagement"){
+  if (type == "boundaryManagement") {
     logger.info("Processing data for boundaryManagement type")
     const latLongBoundaryMap = await getLatLongMapForBoundaryCodes(request, boundaryCodeList);
     for (let d of data) {
       const boundaryCode = d[d.length - 1];  // Assume last element is the boundary code
-    
+
       if (latLongBoundaryMap[boundaryCode]) {
         const [latitude = null, longitude = null] = latLongBoundaryMap[boundaryCode];  // Destructure lat/long
         d.push(latitude);   // Append latitude
@@ -1359,7 +1363,7 @@ function modifyDataBasedOnDifferentTab(boundaryData: any, differentTabsBasedOnLe
 async function getLocalizedMessagesHandler(request: any, tenantId: any, module = config.localisation.localizationModule, overrideCache = false) {
   const localisationcontroller = Localisation.getInstance();
   const locale = getLocaleFromRequest(request);
-  const localizationResponse = await localisationcontroller.getLocalisedData(module, locale, tenantId,overrideCache);
+  const localizationResponse = await localisationcontroller.getLocalisedData(module, locale, tenantId, overrideCache);
   return localizationResponse;
 }
 

health-services/project-factory/src/server/utils/microplanUtils.ts

@@ -62,9 +62,8 @@ export async function getUserDataFromMicroplanSheet(request: any, fileStoreId: a
 export function getAllUserData(request: any, userMapping: any, localizationMap: any) {
   const emailKey = getLocalizedName("HCM_ADMIN_CONSOLE_USER_EMAIL_MICROPLAN", localizationMap);
   const nameKey = getLocalizedName("HCM_ADMIN_CONSOLE_USER_NAME_MICROPLAN", localizationMap);
-  const phoneNumberKey = getLocalizedName("HCM_ADMIN_CONSOLE_USER_PHONE_NUMBER_MICROPLAN", localizationMap);
   validateInConsistency(request, userMapping, emailKey, nameKey);
-  validateNationalDuplicacy(request, userMapping, phoneNumberKey);
+  validateNationalDuplicacy(request, userMapping, localizationMap);
   const dataToCreate: any = [];
   for (const phoneNumber of Object.keys(userMapping)) {
     const roles = userMapping[phoneNumber].map((user: any) => user.role).join(',');
@@ -94,30 +93,30 @@ function validateInConsistency(request: any, userMapping: any, emailKey: any, na
   request.body.sheetErrorDetails = Array.isArray(request.body.sheetErrorDetails) ? [...request.body.sheetErrorDetails, ...overallInconsistencies] : overallInconsistencies;
 }
 
-function validateNationalDuplicacy(request: any, userMapping: any, phoneNumberKey: any) {
+function validateNationalDuplicacy(request: any, userMapping: any, localizationMap: any) {
   const duplicates: any[] = [];
 
   for (const phoneNumber in userMapping) {
     const roleMap: any = {};
     const users = userMapping[phoneNumber];
 
     for (const user of users) {
-      if (user.role?.startsWith("Root ")) {
+      const userRole = user?.role;
+      if (userRole?.startsWith("ROOT_")) {
         // Trim the role
-        const trimmedRole = user.role.replace("Root ", "").trim().toLowerCase();
-        const trimmedRoleWithCapital = trimmedRole.charAt(0).toUpperCase() + trimmedRole.slice(1);
+        const trimmedRole = userRole.replace("ROOT_", "");
 
         // Check for duplicates in the roleMap
         if (roleMap[trimmedRole] && roleMap[trimmedRole]["!sheet#name!"] != user["!sheet#name!"]) {
-          const errorMessage: any = `An user with ${trimmedRoleWithCapital} role can’t be assigned to ${user.role} role`;
+          const errorMessage: any = `An user with ${getLocalizedName(trimmedRole, localizationMap)} role can’t be assigned to ${getLocalizedName(userRole, localizationMap)} role`;
           duplicates.push({ rowNumber: user["!row#number!"], sheetName: user["!sheet#name!"], status: "INVALID", errorDetails: errorMessage });
         } else {
           roleMap[trimmedRole] = user;
         }
       }
       else {
-        const trimmedRole = user.role.toLowerCase();
-        const errorMessage: any = `An user with ${"Root " + trimmedRole} role can’t be assigned to ${user.role} role`;
+        const trimmedRole = userRole;
+        const errorMessage: any = `An user with ${getLocalizedName("ROOT_" + trimmedRole, localizationMap)} role can’t be assigned to ${getLocalizedName(userRole, localizationMap)} role`;
         if (roleMap[trimmedRole] && roleMap[trimmedRole]["!sheet#name!"] != user["!sheet#name!"]) {
           duplicates.push({ rowNumber: user["!row#number!"], sheetName: user["!sheet#name!"], status: "INVALID", errorDetails: errorMessage });
         } else {

health-services/project-factory/src/server/utils/onGoingCampaignUpdateUtils.ts

@@ -33,9 +33,9 @@ function getCreatedResourceIds(resources: any, type: any) {
   const processedType = type === 'boundary'
     ? 'boundaryWithTarget'
     : (type.includes('With') ? type.split('With')[0] : type);
-    return resources
-      .filter((item: any) => item.type === processedType)
-      .map((item: any) => item.createResourceId);
+  return resources
+    .filter((item: any) => item.type === processedType)
+    .map((item: any) => item.createResourceId);
 }
 
 function buildSearchCriteria(request: any, createdResourceId: any, type: any) {
@@ -76,23 +76,10 @@ async function fetchFileUrls(request: any, processedFileStoreIdForUSerOrFacility
 
 
 
-function modifyProcessedSheetData(request: any, sheetData: any, localizationMap?: any) {
-  // const type = request?.query?.type || request?.body?.ResourceDetails?.type;
-  // const typeWithoutWith = type.includes('With') ? type.split('With')[0] : type;
+function modifyProcessedSheetData(type: any, sheetData: any, schema: any, localizationMap?: any) {
   if (!sheetData || sheetData.length === 0) return [];
 
-  // Find the row with the maximum number of keys
-  const maxLengthRow = sheetData.reduce((maxRow: any, row: any) => {
-    return Object.keys(row).length > Object.keys(maxRow).length ? row : maxRow;
-  }, {});
-
-  // Extract headers from the keys of the row with the maximum number of keys
-  const originalHeaders = Object.keys(maxLengthRow);
-  const statusIndex = originalHeaders.indexOf('#status#');
-  // Insert 'errordetails' after '#status#' if found
-  if (statusIndex !== -1) {
-    originalHeaders.splice(statusIndex + 1, 0, '#errorDetails#');
-  }
+  const originalHeaders = type === config?.facility?.facilityType ? [config?.facility?.facilityCodeColumn, ...schema?.columns] : schema?.columns;
 
   let localizedHeaders = getLocalizedHeaders(originalHeaders, localizationMap);