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/api/campaignApis.ts

@@ -1344,7 +1344,6 @@ async function performAndSaveResourceActivity(
         createAndSearchConfig?.createBulkDetails?.createPath,
         chunkData
       );
-      creationTime = Date.now();
       if (type == "facility" || type == "facilityMicroplan") {
         await handeFacilityProcess(
           request,
@@ -1849,21 +1848,9 @@ async function projectCreate(projectCreateBody: any, request: any) {
     logger.info(
       `for boundary type ${projectCreateResponse?.Project[0]?.address?.boundaryType} and code ${projectCreateResponse?.Project[0]?.address?.boundary}`
     );
-    // if (
-    //   !request.body.newlyCreatedBoundaryProjectMap[
-    //   projectCreateBody?.Projects?.[0]?.address?.boundary
-    //   ]
-    // ) {
-    //   request.body.newlyCreatedBoundaryProjectMap[
-    //     projectCreateBody?.Projects?.[0]?.address?.boundary
-    //   ] = {};
-    // }
     request.body.boundaryProjectMapping[
       projectCreateBody?.Projects?.[0]?.address?.boundary
     ].projectId = projectCreateResponse?.Project[0]?.id;
-    // request.body.newlyCreatedBoundaryProjectMap[
-    //   projectCreateBody?.Projects?.[0]?.address?.boundary
-    // ].projectId = projectCreateResponse?.Project[0]?.id;
   } else {
     throwError(
       "PROJECT",

health-services/project-factory/src/server/api/genericApis.ts

@@ -4,13 +4,12 @@ import FormData from "form-data"; // Import FormData for handling multipart/form
 import { defaultheader, httpRequest } from "../utils/request"; // Import httpRequest function for making HTTP requests
 import { getFormattedStringForDebug, logger } from "../utils/logger"; // Import logger for logging
 import { correctParentValues, findMapValue, generateActivityMessage, getBoundaryRelationshipData, getDataSheetReady, getLocalizedHeaders, sortCampaignDetails, throwError } from "../utils/genericUtils"; // Import utility functions
-import { extractCodesFromBoundaryRelationshipResponse, generateFilteredBoundaryData, getConfigurableColumnHeadersBasedOnCampaignType, getFiltersFromCampaignSearchResponse, getLocalizedName } from '../utils/campaignUtils'; // Import utility functions
+import { extractCodesFromBoundaryRelationshipResponse, generateFilteredBoundaryData, getConfigurableColumnHeadersBasedOnCampaignType, getFiltersFromCampaignSearchResponse, getLocalizedName, processDataForTargetCalculation } from '../utils/campaignUtils'; // Import utility functions
 import { getCampaignSearchResponse, getHierarchy } from './campaignApis';
 const _ = require('lodash'); // Import lodash library
 import { getExcelWorkbookFromFileURL } from "../utils/excelUtils";
 import { processMapping } from "../utils/campaignMappingUtils";
 
-
 //Function to get Workbook with different tabs (for type target)
 const getTargetWorkbook = async (fileUrl: string, localizationMap?: any) => {
   // Define headers for HTTP request
@@ -209,6 +208,7 @@ const getTargetSheetDataAfterCode = async (
   for (const sheetName of localizedSheetNames) {
     const worksheet = workbook.getWorksheet(sheetName);
     const sheetData = getSheetDataFromWorksheet(worksheet);
+    const jsonData = getJsonData(sheetData,true,true, sheetName);
 
     // Find the target column index where the first row value matches codeColumnName
     const firstRow = sheetData[0];
@@ -224,44 +224,7 @@ const getTargetSheetDataAfterCode = async (
       console.warn(`Column "${codeColumnName}" not found in sheet "${sheetName}".`);
       continue;
     }
-
-    // Process data from sheet
-    const processedData = sheetData.map((row: any, rowIndex: any) => {
-      if (rowIndex <= 0) return null; // Skip header row
-
-      let rowData: any = { [codeColumnName]: row[boundaryCodeColumnIndex] };
-
-      // Add integer values in the target column for the current row
-      let sumOfCurrentTargets = 0;
-      let sumOfParentTargets = 0;
-      const remainingColumns = row.length - boundaryCodeColumnIndex - 1;
-      const halfPoint = Math.floor(remainingColumns / 2);
-      let startColIndex = boundaryCodeColumnIndex + 1;
-
-      if (request?.body?.parentCampaign) {
-        for (let colIndex = startColIndex; colIndex < startColIndex + halfPoint; colIndex++) {
-          const value = row[colIndex];
-          if (typeof value === 'number' && Number.isInteger(value)) {
-            sumOfParentTargets += value;
-          }
-        }
-        // Add the sum to the row data
-        rowData['Parent Target at the Selected Boundary level'] = sumOfParentTargets;
-
-        // Calculate middle point of remaining columns
-        startColIndex = boundaryCodeColumnIndex + 1 + halfPoint;
-      }
-      for (let colIndex = startColIndex; colIndex < row.length; colIndex++) {
-        const value = row[colIndex];
-        if (typeof value === 'number' && Number.isInteger(value)) {
-          sumOfCurrentTargets += value;
-        }
-      }
-
-      // Add the sum to the row data
-      rowData['Target at the Selected Boundary level'] = sumOfCurrentTargets;
-      return rowData;
-    }).filter(Boolean); // Remove null entries
+    const processedData = await processDataForTargetCalculation(request, jsonData, codeColumnName, localizationMap);
 
     workbookData[sheetName] = processedData;
   }

health-services/project-factory/src/server/app.ts

@@ -50,7 +50,7 @@ class App {
         extended: true,
       })
     );
-    this.app.use(bodyParser.json());
+    // this.app.use(bodyParser.json());
     this.app.use(tracingMiddleware);
     this.app.use(requestMiddleware);
     this.app.use(errorLogger);

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);
     }
   };
 }