fix: remove status from channel object

Author: cshezi

package-lock.json

@@ -39,7 +39,7 @@
   ],
   "license": "ISC",
   "dependencies": {
-    "@frmscoe/frms-coe-lib": "^2.1.3",
+    "@frmscoe/frms-coe-lib": "^2.1.5",
     "@frmscoe/frms-coe-startup-lib": "^2.1.0",
     "@log4js-node/logstash-http": "^1.1.0",
     "arangojs": "^8.4.0",

package.json

@@ -7,14 +7,20 @@ import { type ChannelResult } from '@frmscoe/frms-coe-lib/lib/interfaces/process
 import { type TypologyResult } from '@frmscoe/frms-coe-lib/lib/interfaces/processor-files/TypologyResult';
 import { databaseManager, loggerService } from '..';
 import apm from '../apm';
-import { type MetaData } from '../interfaces/metaData';
+import { type MetaData } from '@frmscoe/frms-coe-lib/lib/interfaces/metaData';
+import { CalculateDuration } from '@frmscoe/frms-coe-lib/lib/helpers/calculatePrcg';
+
+interface HandleResults {
+  channelResults: ChannelResult[];
+  review: boolean;
+}
 
 export const handleChannels = async (
   message: Message,
   transaction: Pacs002,
   networkMap: NetworkMap,
   channelResult: ChannelResult,
-): Promise<ChannelResult[]> => {
+): Promise<HandleResults> => {
   const span = apm.startSpan('handleChannels');
 
   try {
@@ -30,7 +36,7 @@ export const handleChannels = async (
     if (jchannelCount && jchannelCount < message.channels.length) {
       span?.end();
       loggerService.log('All channels not completed.');
-      return [];
+      return { channelResults: [], review: false };
     }
     const jchannelResults = await databaseManager.getMemberValues(cacheKey);
     spanDBMembers?.end();
@@ -42,24 +48,19 @@ export const handleChannels = async (
       if (configuredChannel) {
         const channelRes = channelResults.find((c) => c.id === configuredChannel.id && c.cfg === configuredChannel.cfg);
         if (!channelRes) continue;
-        const channelIndex = channelResults.findIndex((c) => c.id === configuredChannel.id && c.cfg === configuredChannel.cfg);
         for (const typology of configuredChannel.typologies) {
           const typologyResult = channelRes?.typologyResult.find((t) => t.id === typology.id && t.cfg === typology.cfg);
           if (!typologyResult) continue;
           if (typologyResult.review) review = true;
         }
-
-        channelResults[channelIndex].status = review ? 'ALRT' : 'NALT';
-        // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-        loggerService.log(`Transaction: ${transactionID} has status: ${channelRes.status}`);
       }
     }
 
     // Delete interim cache as transaction processed to fulfilment
     await databaseManager.deleteKey(cacheKey);
 
     span?.end();
-    return channelResults;
+    return { channelResults, review };
   } catch (error) {
     span?.end();
     loggerService.error(error as string);
@@ -73,7 +74,7 @@ export const handleTypologies = async (
   networkMap: NetworkMap,
   typologyResult: TypologyResult,
   metaData?: MetaData,
-): Promise<any> => {
+): Promise<HandleResults> => {
   let span;
   const startTime = process.hrtime.bigint();
   try {
@@ -84,8 +85,8 @@ export const handleTypologies = async (
     // check if all results for this Channel is found
     if (jtypologyCount && jtypologyCount < channel.typologies.length) {
       return {
-        result: 'Incomplete',
-        tadpReqBody: undefined,
+        review: false,
+        channelResults: [],
       };
     }
 
@@ -94,17 +95,12 @@ export const handleTypologies = async (
     const typologyResults: TypologyResult[] = jtypologyResults.map((jtypologyResult) => jtypologyResult.typologyResult as TypologyResult);
     if (!typologyResults || !typologyResults.length)
       return {
-        result: 'Error',
-        tadpReqBody: undefined,
+        review: false,
+        channelResults: [],
       };
 
-    // Keep scaffold here - this will be used in future.
-    // const expressionRes = await arangoDBService.getExpression(channel.channel_id);
-    // if (!expressionRes)
-    //   return 0.0;
-
     const channelResult: ChannelResult = {
-      prcgTm: calculateDuration(startTime),
+      prcgTm: CalculateDuration(startTime),
       result: 0.0,
       cfg: channel.cfg,
       id: channel.id,
@@ -117,29 +113,24 @@ export const handleTypologies = async (
     if (!message) {
       loggerService.error(`Failed to process Channel ${channel.id} request , Message missing from networkmap.`);
       return {
-        result: 'Error',
-        tadpReqBody: undefined,
+        review: false,
+        channelResults: [],
       };
     }
 
-    const channelResults = await handleChannels(message, transaction, networkMap, channelResult);
+    const { channelResults, review } = await handleChannels(message, transaction, networkMap, channelResult);
     apmTadProc?.end();
 
     span = apm.startSpan(`[${transactionID}] Delete Channel interim cache key`);
     await databaseManager.deleteKey(cacheKey);
     span?.end();
-    return channelResults;
+    return { channelResults, review };
   } catch (error) {
     span?.end();
     loggerService.error(`Failed to process Channel ${channel.id} request`, error as Error, 'executeRequest');
     return {
-      result: 'Error',
-      tadpReqBody: undefined,
+      review: false,
+      channelResults: [],
     };
   }
 };
-
-export const calculateDuration = (startTime: bigint): number => {
-  const endTime = process.hrtime.bigint();
-  return Number(endTime - startTime);
-};

src/interfaces/metaData.ts

@@ -4,13 +4,13 @@
 import { type Pacs002, type NetworkMap } from '@frmscoe/frms-coe-lib/lib/interfaces';
 import { Alert } from '@frmscoe/frms-coe-lib/lib/interfaces/processor-files/Alert';
 import { type CMSRequest } from '@frmscoe/frms-coe-lib/lib/interfaces/processor-files/CMSRequest';
-import { type ChannelResult } from '@frmscoe/frms-coe-lib/lib/interfaces/processor-files/ChannelResult';
 import { type TADPResult } from '@frmscoe/frms-coe-lib/lib/interfaces/processor-files/TADPResult';
 import { type TypologyResult } from '@frmscoe/frms-coe-lib/lib/interfaces/processor-files/TypologyResult';
 import apm from '../apm';
 import { databaseManager, loggerService, server } from '../index';
-import { type MetaData } from '../interfaces/metaData';
-import { calculateDuration, handleTypologies } from './helper.service';
+import { type MetaData } from '@frmscoe/frms-coe-lib/lib/interfaces/metaData';
+import { handleTypologies } from './helper.service';
+import { CalculateDuration } from '@frmscoe/frms-coe-lib/lib/helpers/calculatePrcg';
 
 export const handleExecute = async (rawTransaction: any): Promise<any> => {
   let apmTransaction = null;
@@ -43,15 +43,13 @@ export const handleExecute = async (rawTransaction: any): Promise<any> => {
     )[0];
 
     loggerService.debug(`Processing Channel ${channel.id}.`);
-    let review = false;
-    const channelResults: ChannelResult[] = await handleTypologies(transaction, channel, networkMap, typologyResult, metaData);
+    const { channelResults, review } = await handleTypologies(transaction, channel, networkMap, typologyResult, metaData);
 
     if (channelResults.length > 0 && channelResults.length === networkMap.messages[0].channels.length) {
-      if (channelResults.some((c: ChannelResult) => c.status === 'ALRT')) review = true;
       toReturn.id = networkMap.messages[0].id;
       toReturn.cfg = networkMap.messages[0].cfg;
       toReturn.channelResult = channelResults;
-      toReturn.prcgTm = calculateDuration(startTime);
+      toReturn.prcgTm = CalculateDuration(startTime);
 
       const alert = new Alert();
       alert.tadpResult = toReturn;
@@ -69,7 +67,7 @@ export const handleExecute = async (rawTransaction: any): Promise<any> => {
       const spanInsertTransactionHistory = apm.startSpan('db.insert.transactionHistory');
       await databaseManager.insertTransaction(transactionID, transaction, networkMap, alert);
       spanInsertTransactionHistory?.end();
-      result.report.tadpResult.prcgTm = calculateDuration(startTime);
+      result.report.tadpResult.prcgTm = CalculateDuration(startTime);
       await server.handleResponse(result);
     }
     apmTransaction?.end();