feat: improved redis lookup

Author: JeanPierreNell

__tests__/unit/logic.test.ts

@@ -41,6 +41,12 @@ describe('TADProc Service', () => {
       });
     });
 
+    jest.spyOn(databaseManager, 'addOneGetCount').mockImplementation((...args: unknown[]): Promise<number> => {
+      return new Promise<number>((resolve, reject) => {
+        resolve(1);
+      });
+    });
+
     jest.spyOn(databaseManager, 'setAdd').mockImplementation((key: string, value: string): Promise<void> => {
       return new Promise<void>((resolve, reject) => {
         cacheString = value;

package-lock.json

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

package.json

@@ -102,8 +102,19 @@ export const handleChannels = async (
 
     // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
     const cacheKey = `tadp_${transactionID}_${message.id}_${message.cfg}`;
-
     const spanDBMembers = apm.startSpan('db.get.members');
+    const jtypologyCount = await databaseManager.addOneGetCount(cacheKey, channelResult);
+
+    // check if all Channel results for this transaction is found
+    if (jtypologyCount && jtypologyCount.length < message.channels.length) {
+      const spanCacheChannelResults = apm.startSpan('cache.add.channelResults');
+      // await databaseManager.setAdd(cacheKey, JSON.stringify(channelResults));
+      spanCacheChannelResults?.end();
+      span?.end();
+      loggerService.log('All channels not completed.');
+      return [];
+    }
+
     const jchannelResults = await databaseManager.getMembers(cacheKey);
     spanDBMembers?.end();
     const channelResults: ChannelResult[] = [];
@@ -115,28 +126,20 @@ export const handleChannels = async (
       }
     }
 
-    if (!message.channels.some((c) => c.id === channelResult.id && c.cfg === channelResult.cfg)) {
-      loggerService.warn('Channel not part of Message - ignoring.');
-      span?.end();
-      return [];
-    }
+    // if (!message.channels.some((c) => c.id === channelResult.id && c.cfg === channelResult.cfg)) {
+    //   loggerService.warn('Channel not part of Message - ignoring.');
+    //   span?.end();
+    //   return [];
+    // }
 
-    if (channelResults.some((t) => t.id === channelResult.id && t.cfg === channelResult.cfg)) {
-      loggerService.warn('Channel already processed - ignoring.');
-      span?.end();
-      return [];
-    }
+    // if (channelResults.some((t) => t.id === channelResult.id && t.cfg === channelResult.cfg)) {
+    //   loggerService.warn('Channel already processed - ignoring.');
+    //   span?.end();
+    //   return [];
+    // }
 
     channelResults.push(channelResult);
-    // check if all Channel results for this transaction is found
-    if (channelResults.length < message.channels.length) {
-      const spanCacheChannelResults = apm.startSpan('cache.add.channelResults');
-      await databaseManager.setAdd(cacheKey, JSON.stringify(channelResults));
-      spanCacheChannelResults?.end();
-      span?.end();
-      loggerService.log('All channels not completed.');
-      return [];
-    }
+
     let review = false;
     if (requiredConfigMessage)
       for (const configuredChannel of requiredConfigMessage.channels) {