feat: add multi-currency dataCache

README.md

@@ -180,9 +180,9 @@ flowchart TD
 ```mermaid
 graph TD
     A([Start]) --> B{Check Cache}
-    B -->|Cache Hit?| C[Retrieve Pain.001 from Cache]
-    B -->|No| D[Get Pain.001 from Database]
-    D --> E[Cache Pain.001]
+    B -->|Cache Hit?| C[Retrieve Pacs.008 from Cache]
+    B -->|No| D[Get Pacs.008 from Database]
+    D --> E[Cache Pacs.008]
     C --> F[Insert TransactionHistory]
     E --> F
     F --> G[Insert Creditor and Debtor Accounts]
@@ -312,7 +312,8 @@ graph TD
               "Amt": 31020.89,
               "Ccy": "USD"
             },
-            "CcyOfTrf": "USD"
+            "CcyOfTrf": "USD",
+            "XchgRate": 1.00,
           }
         },
         "ChrgBr": "DEBT",
@@ -672,6 +673,7 @@ graph TD
           "Ccy": "XTS"
         }
       },
+      "XchgRate": 1.00,
       "ChrgBr": "DEBT",
       "ChrgsInf": {
         "Amt": {

package.json

@@ -41,7 +41,7 @@
     "@fastify/swagger": "^8.8.0",
     "@fastify/swagger-ui": "^3.0.0",
     "@tazama-lf/auth-lib": "^0.0.9",
-    "@tazama-lf/frms-coe-lib": "^5.0.0-rc.3",
+    "@tazama-lf/frms-coe-lib": "^5.0.0-rc.4",
     "@tazama-lf/frms-coe-startup-lib": "^2.3.0-rc.4",
     "ajv": "^8.16.0",
     "arangojs": "^8.8.0",

src/index.ts

@@ -82,7 +82,7 @@ if (cluster.isPrimary && configuration.maxCPU !== 1) {
         await runServer();
       }
     } catch (err) {
-      loggerService.error(`Error while starting NATS server on Worker ${process.pid}`, err);
+      loggerService.error(`Error while starting ${configuration.functionName}`, err);
       process.exit(1);
     }
   })();

src/logic.service.ts

@@ -223,7 +223,11 @@ export const handlePacs008 = async (transaction: Pacs008, transactionType: strin
 
   const TxTp = transactionType;
   transaction.TxTp = TxTp;
-  const Amt = transaction.FIToFICstmrCdtTrf.CdtTrfTxInf.InstdAmt.Amt.Amt;
+  const InstdAmt = transaction.FIToFICstmrCdtTrf.CdtTrfTxInf.InstdAmt.Amt.Amt;
+  const InstdAmtCcy = transaction.FIToFICstmrCdtTrf.CdtTrfTxInf.InstdAmt.Amt.Ccy;
+  const IntrBkSttlmAmt = transaction.FIToFICstmrCdtTrf.CdtTrfTxInf.IntrBkSttlmAmt.Amt.Amt;
+  const IntrBkSttlmAmtCcy = transaction.FIToFICstmrCdtTrf.CdtTrfTxInf.IntrBkSttlmAmt.Amt.Ccy;
+  const XchgRate = transaction.FIToFICstmrCdtTrf.CdtTrfTxInf.XchgRate;
   const Ccy = transaction.FIToFICstmrCdtTrf.CdtTrfTxInf.InstdAmt.Amt.Ccy;
   const creDtTm = transaction.FIToFICstmrCdtTrf.GrpHdr.CreDtTm;
   const EndToEndId = transaction.FIToFICstmrCdtTrf.CdtTrfTxInf.PmtId.EndToEndId;
@@ -246,7 +250,7 @@ export const handlePacs008 = async (transaction: Pacs008, transactionType: strin
   const transactionRelationship: TransactionRelationship = {
     from: `accounts/${debtorAcctId}`,
     to: `accounts/${creditorAcctId}`,
-    Amt,
+    Amt: InstdAmt,
     Ccy,
     CreDtTm: creDtTm,
     EndToEndId,
@@ -255,42 +259,47 @@ export const handlePacs008 = async (transaction: Pacs008, transactionType: strin
     TxTp,
   };
 
-  const accountInserts = [cacheDatabaseManager.addAccount(debtorAcctId), cacheDatabaseManager.addAccount(creditorAcctId)];
+  const pendingPromises = [cacheDatabaseManager.addAccount(debtorAcctId), cacheDatabaseManager.addAccount(creditorAcctId)];
 
   const dataCache: DataCache = {
     cdtrId: creditorId,
     dbtrId: debtorId,
     cdtrAcctId: creditorAcctId,
     dbtrAcctId: debtorAcctId,
     creDtTm,
-    amt: {
-      amt: parseFloat(Amt),
-      ccy: Ccy,
+    instdAmt: {
+      amt: parseFloat(InstdAmt),
+      ccy: InstdAmtCcy,
+    },
+    intrBkSttlmAmt: {
+      amt: parseFloat(IntrBkSttlmAmt),
+      ccy: IntrBkSttlmAmtCcy,
     },
+    xchgRate: XchgRate,
   };
   transaction.DataCache = dataCache;
 
   const cacheBuffer = createMessageBuffer({ DataCache: { ...dataCache } });
   if (cacheBuffer) {
     const redisTTL = configuration.redisConfig.distributedCacheTTL;
-    accountInserts.push(cacheDatabaseManager.set(EndToEndId, cacheBuffer, redisTTL ? Number(redisTTL) : 0));
+    pendingPromises.push(cacheDatabaseManager.set(EndToEndId, cacheBuffer, redisTTL ? Number(redisTTL) : 0));
   } else {
     // this is fatal
     throw new Error('[pacs008] data cache could not be serialised');
   }
 
   if (!configuration.QUOTING) {
-    accountInserts.push(cacheDatabaseManager.addEntity(creditorId, creDtTm));
-    accountInserts.push(cacheDatabaseManager.addEntity(debtorId, creDtTm));
+    pendingPromises.push(cacheDatabaseManager.addEntity(creditorId, creDtTm));
+    pendingPromises.push(cacheDatabaseManager.addEntity(debtorId, creDtTm));
 
-    await Promise.all(accountInserts);
+    await Promise.all(pendingPromises);
 
     await Promise.all([
       cacheDatabaseManager.addAccountHolder(creditorId, creditorAcctId, creDtTm),
       cacheDatabaseManager.addAccountHolder(debtorId, debtorAcctId, creDtTm),
     ]);
   } else {
-    await Promise.all(accountInserts);
+    await Promise.all(pendingPromises);
   }
   cacheDatabaseManager.saveTransactionRelationship(transactionRelationship);
 
@@ -459,10 +468,15 @@ export const rebuildCache = async (endToEndId: string, writeToRedis: boolean, id
     cdtrAcctId: cdtTrfTxInf.CdtrAcct.Id.Othr[0].Id,
     dbtrAcctId: cdtTrfTxInf.DbtrAcct.Id.Othr[0].Id,
     creDtTm: pacs008.FIToFICstmrCdtTrf.GrpHdr.CreDtTm,
-    amt: {
+    instdAmt: {
       amt: parseFloat(cdtTrfTxInf.InstdAmt.Amt.Amt),
       ccy: cdtTrfTxInf.InstdAmt.Amt.Ccy,
     },
+    intrBkSttlmAmt: {
+      amt: parseFloat(cdtTrfTxInf.IntrBkSttlmAmt.Amt.Amt),
+      ccy: cdtTrfTxInf.IntrBkSttlmAmt.Amt.Ccy,
+    },
+    xchgRate: cdtTrfTxInf.XchgRate,
   };
 
   if (writeToRedis) {

src/schemas/pacs.008.json

@@ -79,6 +79,9 @@
               },
               "required": ["Amt"]
             },
+            "XchgRate": {
+              "type": "string"
+            },
             "ChrgBr": {
               "type": "string"
             },

src/schemas/pain.001.json

@@ -318,6 +318,9 @@
                         },
                         "CcyOfTrf": {
                           "type": "string"
+                        },
+                        "XchgRate": {
+                          "type": "string"
                         }
                       },
                       "required": ["Amt", "CcyOfTrf"]