Merge branch 'fetch-from-cbs' of https://7o9o-lb-526275444.ap-south-1.elb.amazonaws.com/md.asif5/yume_js into admin_api

src/app.js

@@ -2,10 +2,12 @@ const express = require('express');
 const cors = require('cors');
 const { logger, requestLogger } = require('./util/logger');
 const routes = require('./routes');
+const helmet = require('helmet');
 
 const app = express();
 
 app.use(cors());
+app.use(helmet());
 app.use(express.json());
 app.use(express.urlencoded({ extended: true }));
 

src/controllers/imps.controller.js

@@ -1,7 +1,11 @@
 const axios = require('axios');
 const { logger } = require('../util/logger');
+const {
+  recordInterBankTransaction,
+} = require('../services/recordkeeping.service');
 
 async function send(
+  customerNo,
   fromAccount,
   toAccount,
   amount,
@@ -20,7 +24,6 @@ async function send(
       stTransferAmount: amount,
       stRemarks: remarks,
     };
-    logger.info(reqData, 'request data to be sent to IMPS server');
     const response = await axios.post(
       'http://localhost:6768/kccb/api/IMPS/Producer',
       reqData,
@@ -30,7 +33,17 @@ async function send(
         },
       }
     );
-    logger.info(response, 'response from IMPS');
+    await recordInterBankTransaction(
+      customerNo,
+      'imps',
+      fromAccount,
+      toAccount,
+      ifscCode,
+      amount,
+      '',
+      '',
+      response.data
+    );
     return response.data;
   } catch (error) {
     logger.error(error, 'error from IMPS');

src/controllers/neft.controller.js

@@ -1,6 +1,10 @@
 const axios = require('axios');
+const {
+  recordInterBankTransaction,
+} = require('../services/recordkeeping.service');
 
 async function send(
+  customerNo,
   fromAccount,
   toAccount,
   amount,
@@ -8,6 +12,7 @@ async function send(
   beneficiaryName,
   remitterName
 ) {
+  const commission = 0;
   try {
     const response = await axios.post(
       'http://localhost:8690/kccb/Neftfundtransfer',
@@ -15,7 +20,7 @@ async function send(
         stFromAcc: fromAccount,
         stToAcc: toAccount,
         stTranAmt: amount,
-        stCommission: 0,
+        stCommission: commission,
         stIfscCode: ifscCode,
         stFullName: remitterName,
         stBeneName: beneficiaryName,
@@ -24,6 +29,18 @@ async function send(
         stAddress3: '',
       }
     );
+    await recordInterBankTransaction(
+      customerNo,
+      'neft',
+      fromAccount,
+      toAccount,
+      ifscCode,
+      amount,
+      commission,
+      beneficiaryName,
+      remitterName,
+      response.data.status
+    );
     return response.data;
   } catch (error) {
     throw new Error(

src/controllers/rtgs.controller.js

@@ -1,6 +1,10 @@
 const axios = require('axios');
+const {
+  recordInterBankTransaction,
+} = require('../services/recordkeeping.service');
 
 async function send(
+  customerNo,
   fromAccount,
   toAccount,
   amount,
@@ -8,6 +12,7 @@ async function send(
   beneficiaryName,
   remitterName
 ) {
+  const commission = 0;
   try {
     const response = await axios.post(
       'http://localhost:8690/kccb/Rtgsfundtransfer',
@@ -15,7 +20,7 @@ async function send(
         stFromAcc: fromAccount,
         stToAcc: toAccount,
         stTranAmt: amount,
-        stCommission: 0,
+        stCommission: commission,
         stIfscCode: ifscCode,
         stFullName: remitterName,
         stBeneName: beneficiaryName,
@@ -24,6 +29,18 @@ async function send(
         stAddress3: '',
       }
     );
+    await recordInterBankTransaction(
+      customerNo,
+      'rtgs',
+      fromAccount,
+      toAccount,
+      ifscCode,
+      amount,
+      commission,
+      beneficiaryName,
+      remitterName,
+      response.data.status
+    );
     return response.data;
   } catch (error) {
     throw new Error(

src/controllers/transactions.controller.js

@@ -13,6 +13,8 @@ async function getLastTen(accountNumber) {
       date: tx.stTransactionDate,
       amount: tx.stTransactionAmount.slice(0, -3),
       type: tx.stTransactionAmount.slice(-2),
+      balance: tx.stAccountBalance.slice(0, -3),
+      balanceType: tx.stAccountBalance.slice(-2),
     }));
     return processedTransactions;
   } catch (error) {
@@ -36,6 +38,8 @@ async function getFiltered(accountNumber, fromDate, toDate) {
       date: tx.stTransactionDate,
       amount: tx.stTransactionAmount.slice(0, -3),
       type: tx.stTransactionAmount.slice(-2),
+      balance: tx.stAccountBalance.slice(0, -3),
+      balanceType: tx.stAccountBalance.slice(-2),
     }));
     return processedTransactions;
   } catch (error) {

src/controllers/transfer.controller.js

@@ -1,12 +1,15 @@
 const axios = require('axios');
+const {
+  recordIntraBankTransaction,
+} = require('../services/recordkeeping.service');
 
 async function transfer(
   fromAccountNo,
   toAccountNo,
   toAccountType,
   amount,
-  // narration = 'transfer from mobile'
-  narration
+  customerNo,
+  narration = ''
 ) {
   try {
     const response = await axios.post(
@@ -19,6 +22,14 @@ async function transfer(
         narration,
       }
     );
+    await recordIntraBankTransaction(
+      customerNo,
+      fromAccountNo,
+      toAccountNo,
+      toAccountType,
+      amount,
+      response.data.status
+    );
     return response.data;
   } catch (error) {
     throw new Error(

src/routes/imps.route.js

@@ -13,6 +13,7 @@ const impsRoute = async (req, res) => {
 
   try {
     const result = await impsController.send(
+      req.user,
       fromAccount,
       toAccount,
       amount,

src/routes/neft.route.js

@@ -19,6 +19,7 @@ const neftRoute = async (req, res) => {
 
   try {
     const result = await neftController.send(
+      req.user,
       fromAccount,
       toAccount,
       amount,

src/routes/rtgs.route.js

@@ -19,6 +19,7 @@ const rtgsRoute = async (req, res) => {
 
   try {
     const result = await rtgsController.send(
+      req.user,
       fromAccount,
       toAccount,
       amount,

src/routes/transfer.route.js

@@ -14,7 +14,8 @@ const transferRoute = async (req, res) => {
       fromAccount,
       toAccount,
       toAccountType,
-      amount
+      amount,
+      req.user
     );
 
     if (result.status === 'O.K.') {

src/services/recordkeeping.service.js

@@ -0,0 +1,52 @@
+const db = require('../config/db');
+
+const recordIntraBankTransaction = async (
+  customerNo,
+  fromAccount,
+  toAccount,
+  accountType,
+  amount,
+  status
+) => {
+  const trxType = 'TRF';
+  const query =
+    'INSERT INTO transactions (customer_no, trx_type, from_account, to_account, to_account_type, amount, status) VALUES ($1, $2, $3, $4, $5, $6, $7)';
+  await db.query(query, [
+    customerNo,
+    trxType,
+    fromAccount,
+    toAccount,
+    accountType,
+    amount,
+    status,
+  ]);
+};
+const recordInterBankTransaction = async (
+  customerNo,
+  trxType,
+  fromAccount,
+  toAccount,
+  ifscCode,
+  amount,
+  commission,
+  beneficiaryName,
+  remitterName,
+  status
+) => {
+  const query =
+    'INSERT INTO transactions (customer_no, trx_type, from_account, to_account, ifsc_code, amount, commission, beneficiary_name, remitter_name, status) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)';
+  await db.query(query, [
+    customerNo,
+    trxType,
+    fromAccount,
+    toAccount,
+    ifscCode,
+    amount,
+    commission,
+    beneficiaryName,
+    remitterName,
+    status,
+  ]);
+};
+
+module.exports = { recordIntraBankTransaction, recordInterBankTransaction };