added helmet for security

also throw 409 status code if account already exists in beneficiaries table against that customer

.env

@@ -1,3 +0,0 @@
-PORT=8080
-DATABASE_URL=postgresql://kmobile_app_rw:kmobile@localhost:5431/kmobile_banking
-JWT_SECRET=supersecret

.gitignore

@@ -1 +1,3 @@
 node_modules/
+.env
+logs/requests.log

package-lock.json

@@ -17,7 +17,9 @@
         "jsonwebtoken": "^9.0.2",
         "pg": "^8.16.0",
         "pino": "^9.7.0",
-        "pino-http": "^10.4.0"
+        "pino-http": "^10.4.0",
+        "redis": "^5.7.0",
+        "uuid": "^11.1.0"
       },
       "devDependencies": {
         "@eslint/js": "^9.28.0",
@@ -265,6 +267,61 @@
         "url": "https://opencollective.com/pkgr"
       }
     },
+    "node_modules/@redis/bloom": {
+      "version": "5.7.0",
+      "resolved": "https://registry.npmjs.org/@redis/bloom/-/bloom-5.7.0.tgz",
+      "integrity": "sha512-KtBHDH2Aw1BxYDQd87PJsdEmZcpMbD4oPzdBwB4IvSRmMovukO2NNGi5vpCHhCoicS83zu7cjX1fw79uFBZFJA==",
+      "engines": {
+        "node": ">= 18"
+      },
+      "peerDependencies": {
+        "@redis/client": "^5.7.0"
+      }
+    },
+    "node_modules/@redis/client": {
+      "version": "5.7.0",
+      "resolved": "https://registry.npmjs.org/@redis/client/-/client-5.7.0.tgz",
+      "integrity": "sha512-YV3Knspdj9k6H6s4v8QRcj1WBxHt40vtPmszLKGwRUOUpUOLWSlI9oCUjprMDcQNzgSCXGXYdL/Aj6nT2+Ub0w==",
+      "dependencies": {
+        "cluster-key-slot": "1.1.2"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@redis/json": {
+      "version": "5.7.0",
+      "resolved": "https://registry.npmjs.org/@redis/json/-/json-5.7.0.tgz",
+      "integrity": "sha512-VP3wtse1PSB/UjZAV1lWyDrWrrZcwi/cjb3L0lIarcIJ+EbHliB2QPml0Bvjz8F8F0eDJRtChJVXFc+jhGxCtA==",
+      "engines": {
+        "node": ">= 18"
+      },
+      "peerDependencies": {
+        "@redis/client": "^5.7.0"
+      }
+    },
+    "node_modules/@redis/search": {
+      "version": "5.7.0",
+      "resolved": "https://registry.npmjs.org/@redis/search/-/search-5.7.0.tgz",
+      "integrity": "sha512-dDZIq8pZJnT+kZ9xRlLLi2Rvkd792z9eh31QRIwPr5wXjAXeaQ+Nf65em6dLpsxZ60MmhwDwLrBPJpYVjKPBPQ==",
+      "engines": {
+        "node": ">= 18"
+      },
+      "peerDependencies": {
+        "@redis/client": "^5.7.0"
+      }
+    },
+    "node_modules/@redis/time-series": {
+      "version": "5.7.0",
+      "resolved": "https://registry.npmjs.org/@redis/time-series/-/time-series-5.7.0.tgz",
+      "integrity": "sha512-AJTF9sz3y1MJAukgQW4Jw8zt8qGOE3+1d87pufOP35zsFBlHipGscpctoXiNMebfy0114y/FjSprr65LjbJQSQ==",
+      "engines": {
+        "node": ">= 18"
+      },
+      "peerDependencies": {
+        "@redis/client": "^5.7.0"
+      }
+    },
     "node_modules/@types/estree": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz",
@@ -644,6 +701,14 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/cluster-key-slot": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz",
+      "integrity": "sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -2894,6 +2959,21 @@
         "node": ">= 12.13.0"
       }
     },
+    "node_modules/redis": {
+      "version": "5.7.0",
+      "resolved": "https://registry.npmjs.org/redis/-/redis-5.7.0.tgz",
+      "integrity": "sha512-ZRbiWYBUYdDTopodRjCVwwCLThrkciPW3bOrkdMCW3nYEelBwUGN6SovmACDsiLUB7mnU3mXnaI5f0W7bDcwng==",
+      "dependencies": {
+        "@redis/bloom": "5.7.0",
+        "@redis/client": "5.7.0",
+        "@redis/json": "5.7.0",
+        "@redis/search": "5.7.0",
+        "@redis/time-series": "5.7.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
     "node_modules/resolve-from": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
@@ -3399,6 +3479,18 @@
         "punycode": "^2.1.0"
       }
     },
+    "node_modules/uuid": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.1.0.tgz",
+      "integrity": "sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==",
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
+      "bin": {
+        "uuid": "dist/esm/bin/uuid"
+      }
+    },
     "node_modules/vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",

package.json

@@ -21,7 +21,9 @@
     "jsonwebtoken": "^9.0.2",
     "pg": "^8.16.0",
     "pino": "^9.7.0",
-    "pino-http": "^10.4.0"
+    "pino-http": "^10.4.0",
+    "redis": "^5.7.0",
+    "uuid": "^11.1.0"
   },
   "devDependencies": {
     "@eslint/js": "^9.28.0",

src/app.js

@@ -1,14 +1,36 @@
 const express = require('express');
 const cors = require('cors');
-const { logger } = require('./util/logger');
+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 }));
 
+app.use((req, res, next) => {
+  const start = Date.now();
+
+  res.on('finish', () => {
+    requestLogger.info(
+      {
+        ip: req.ip || req.connection.remoteAddress,
+        method: req.method,
+        url: req.originalUrl,
+        headers: req.headers,
+        body: req.body,
+        status: res.statusCode,
+        responseTime: `${Date.now() - start}ms`,
+      },
+      'Incoming request'
+    );
+  });
+  next();
+});
+
 app.use('/api', routes);
 app.get('/health', (_, res) => res.send('server is healthy'));
 app.use((err, _req, res, _next) => {

src/config/redis.js

@@ -0,0 +1,58 @@
+const { createClient } = require('redis');
+const { redisUrl } = require('./config');
+const { logger } = require('../util/logger');
+
+const client = createClient({
+  url: redisUrl,
+  socket: {
+    reconnectStrategy: (retries) => {
+      const delay = Math.min(retries * 100, 5000);
+      logger.info(`Redis reconnecting attempt ${retries}, delay ${delay}ms`);
+      return delay;
+    },
+  },
+});
+
+client.on('connect', () => logger.info('Connected to redis'));
+client.on('error', (err) => logger.error(err, 'Redis error'));
+client.on('ready', () => logger.info('Redis client ready'));
+client.on('end', () => logger.info('Redis connection closed'));
+
+client
+  .connect()
+  .catch((err) => logger.error(err, 'Failed to connect to Redis'));
+
+// Helper functions
+async function setJson(key, value, ttl = null) {
+  try {
+    const jsonValue = JSON.stringify(value);
+    if (ttl) {
+      return await client.set(key, jsonValue, { EX: ttl });
+    }
+    return await client.set(key, jsonValue);
+  } catch (err) {
+    logger.error(err, 'Redis setJson error');
+    throw err;
+  }
+}
+
+async function getJson(key) {
+  try {
+    const value = await client.get(key);
+    return value ? JSON.parse(value) : null;
+  } catch (err) {
+    logger.error(err, 'Redis getJson error');
+    throw err;
+  }
+}
+
+process.on('SIGTERM', async () => {
+  logger.info('SIGTERM received - closing Redis connection');
+  await client.quit();
+});
+
+module.exports = {
+  client,
+  getJson,
+  setJson,
+};

src/controllers/auth.controller.js

@@ -14,7 +14,8 @@ async function login(req, res) {
   const currentTime = new Date().toISOString();
   try {
     const user = await authService.validateUser(customerNo, password);
-    if (!user) return res.status(401).json({ error: 'invalid credentials' });
+    if (!user || !password)
+      return res.status(401).json({ error: 'invalid credentials' });
     const token = generateToken(user.customer_no, '1d');
     const FirstTimeLogin = await authService.CheckFirstTimeLogin(customerNo);
     await db.query('UPDATE users SET last_login = $1 WHERE customer_no = $2', [
@@ -34,7 +35,6 @@ async function fetchUserDetails(req, res) {
     const user = await authService.findUserByCustomerNo(customerNo);
     if (!user) return res.status(404).json({ message: 'USER_NOT_FOUND' });
     return res.json(user);
-
   } catch (err) {
     logger.error(err, 'error occured while fetching user details');
     res.status(500).json({ error: 'something went wrong' });
@@ -102,4 +102,11 @@ async function setTransactionPassword(req, res) {
   }
 }
 
-module.exports = { login, tpin, setTpin, setLoginPassword, setTransactionPassword,fetchUserDetails };
+module.exports = {
+  login,
+  tpin,
+  setTpin,
+  setLoginPassword,
+  setTransactionPassword,
+  fetchUserDetails,
+};

src/controllers/beneficiary.controller.js

@@ -1,5 +1,7 @@
 const { logger } = require('../util/logger');
 const beneficiaryService = require('../services/beneficiary.service');
+const db = require('../config/db');
+const randomName = require('../util/name.generator');
 
 async function validateWithinBank(req, res) {
   const { accountNumber } = req.query;
@@ -22,4 +24,126 @@ async function validateWithinBank(req, res) {
   }
 }
 
-module.exports = { validateWithinBank };
+async function validateOutsideBank(req, res) {
+  const { accountNo, ifscCode, remitterName } = req.query;
+  if (!accountNo || !ifscCode || !remitterName) {
+    res.status(401).json({ error: 'BAD_REQUEST' });
+    return;
+  }
+
+  try {
+    const refNo = await beneficiaryService.validateOutsideBank(
+      accountNo,
+      ifscCode,
+      remitterName
+    );
+    if (!refNo)
+      return res.status(401).json({ error: 'invalid account number' });
+    //**IN PRODUCTION** poll the redis server continuously giving the refNo since the response from NPCI will be stored there
+    await delay(3000);
+    const name = randomName();
+    return res.json({ name });
+  } catch (err) {
+    logger.error(err, 'beneficiary validation within bank failed');
+    res.status(500).json({ error: 'invalid account number' });
+  }
+}
+
+async function addBeneficiary(req, res) {
+  try {
+    const { accountNo, ifscCode, accountType, name } = req.body;
+    const customerNo = req.user;
+    const query =
+      'INSERT INTO beneficiaries (customer_no, account_no, account_type, ifsc_code, name) VALUES ($1, $2, $3, $4, $5)';
+    await db.query(query, [customerNo, accountNo, accountType, ifscCode, name]);
+    res.json({ message: 'SUCCESS' });
+  } catch (error) {
+    logger.error(error, 'Error adding beneficiary');
+    if (
+      error.message ==
+      'duplicate key value violates unique constraint "beneficiaries_pkey"'
+    ) {
+      res.status(409).json({ error: 'BENEFICIARY_ALREADY_EXITS' });
+    }
+    res.status(500).json({ error: 'INTERNAL_SERVER_ERROR' });
+  }
+}
+
+async function getBeneficiary(req, res) {
+  const { accountNo } = req.query;
+  let beneficiaryDetails;
+  try {
+    if (accountNo) {
+      beneficiaryDetails = await beneficiaryService.getSingleBeneficiary(
+        req.user,
+        accountNo
+      );
+    } else {
+      beneficiaryDetails = await beneficiaryService.getAllBeneficiaries(
+        req.user
+      );
+    }
+    if (!beneficiaryDetails) {
+      res.status(404).json({ error: 'NO_BENEFICIARY_FOUND' });
+      return;
+    }
+
+    res.json(beneficiaryDetails);
+  } catch (error) {
+    logger.error(error, 'error fetching beneficiaries');
+    res.status(500).json({ error: 'INTERNAL_SERVER_ERROR' });
+  }
+}
+
+async function deleteBeneficiary(req, res) {
+  const { beneficiaryAccountNo } = req.params;
+  try {
+    await beneficiaryService.deleteBeneficiary(req.user, beneficiaryAccountNo);
+    res.status(204).send();
+  } catch (error) {
+    if (error.message === 'ACCOUNT_NOT_FOUND') {
+      logger.warn(
+        `beneficiary ${beneficiaryAccountNo} does not exist for the customer ${req.user}`
+      );
+      return res.status(400).json({ error: 'INVALID_BENEFICIARY_ACCOUNT_NO' });
+    } else {
+      logger.error(error, 'error deleting beneficiary');
+      return res.status(500).json({ error: 'INTERNAL_SERVER_ERROR' });
+    }
+  }
+}
+
+async function getIfscDetails(req, res) {
+  const { ifscCode } = req.query;
+  if (!ifscCode) {
+    res.status(403).json({ error: 'BAD_REQUEST' });
+    return;
+  }
+  console.log(ifscCode);
+  try {
+    const query = 'SELECT * FROM ifsc_details WHERE ifsc_code = $1';
+    const result = await db.query(query, [ifscCode]);
+    console.log(result.rows);
+    if (!result.rows) {
+      res.status(404).json({ error: 'NOT_FOUND' });
+      return;
+    }
+    res.json(result.rows[0]);
+  } catch (error) {
+    logger.error(error, 'error fetching ifsc code');
+    res.status(500).json({ error: 'INTERNAL_SERVER_ERROR' });
+  }
+}
+
+function delay(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+module.exports = {
+  validateWithinBank,
+  validateOutsideBank,
+  addBeneficiary,
+  getIfscDetails,
+  getBeneficiary,
+  deleteBeneficiary,
+};

src/controllers/imps.controller.js

@@ -0,0 +1,56 @@
+const axios = require('axios');
+const { logger } = require('../util/logger');
+const {
+  recordInterBankTransaction,
+} = require('../services/recordkeeping.service');
+
+async function send(
+  customerNo,
+  fromAccount,
+  toAccount,
+  amount,
+  ifscCode,
+  beneficiaryName,
+  beneficiaryAcctType = 'SAVING',
+  remarks = ''
+) {
+  try {
+    const reqData = {
+      stBenAccNo: toAccount,
+      stBeneName: beneficiaryName,
+      stBenAccType: beneficiaryAcctType,
+      stBenIFSC: ifscCode,
+      stFromAccDetails: fromAccount,
+      stTransferAmount: amount,
+      stRemarks: remarks,
+    };
+    const response = await axios.post(
+      'http://localhost:6768/kccb/api/IMPS/Producer',
+      reqData,
+      {
+        headers: {
+          'Content-Type': 'application/json',
+        },
+      }
+    );
+    await recordInterBankTransaction(
+      customerNo,
+      'imps',
+      fromAccount,
+      toAccount,
+      ifscCode,
+      amount,
+      '',
+      '',
+      response.data
+    );
+    return response.data;
+  } catch (error) {
+    logger.error(error, 'error from IMPS');
+    throw new Error(
+      'API call failed: ' + (error.response?.data?.message || error.message)
+    );
+  }
+}
+
+module.exports = { send };

src/controllers/neft.controller.js

@@ -0,0 +1,52 @@
+const axios = require('axios');
+const {
+  recordInterBankTransaction,
+} = require('../services/recordkeeping.service');
+
+async function send(
+  customerNo,
+  fromAccount,
+  toAccount,
+  amount,
+  ifscCode,
+  beneficiaryName,
+  remitterName
+) {
+  const commission = 0;
+  try {
+    const response = await axios.post(
+      'http://localhost:8690/kccb/Neftfundtransfer',
+      {
+        stFromAcc: fromAccount,
+        stToAcc: toAccount,
+        stTranAmt: amount,
+        stCommission: commission,
+        stIfscCode: ifscCode,
+        stFullName: remitterName,
+        stBeneName: beneficiaryName,
+        stAddress1: '',
+        stAddress2: '',
+        stAddress3: '',
+      }
+    );
+    await recordInterBankTransaction(
+      customerNo,
+      'neft',
+      fromAccount,
+      toAccount,
+      ifscCode,
+      amount,
+      commission,
+      beneficiaryName,
+      remitterName,
+      response.data.status
+    );
+    return response.data;
+  } catch (error) {
+    throw new Error(
+      'API call failed: ' + (error.response?.data?.message || error.message)
+    );
+  }
+}
+
+module.exports = { send };

src/controllers/npci.controller.js

@@ -0,0 +1,28 @@
+const db = require('../config/db');
+const { getJson, setJson } = require('../config/redis');
+const { logger } = require('../util/logger');
+
+async function npciResponse(req, res) {
+  const { resp } = req.body;
+  if (resp.status === 'Success') {
+    await handleNPCISuccess(resp);
+  } else {
+    await handleNPCIFailure(resp);
+  }
+  res.send('ok');
+}
+
+async function handleNPCISuccess(response) {
+  const { txnid, benename } = response;
+  try {
+    await setJson(txnid, benename);
+  } catch (error) {
+    logger.error(error, 'error processing npci response');
+  }
+}
+
+async function handleNPCIFailure(response) {
+  console.log(response);
+}
+
+module.exports = { npciResponse };

src/controllers/rtgs.controller.js

@@ -0,0 +1,53 @@
+const axios = require('axios');
+const {
+  recordInterBankTransaction,
+} = require('../services/recordkeeping.service');
+
+async function send(
+  customerNo,
+  fromAccount,
+  toAccount,
+  amount,
+  ifscCode,
+  beneficiaryName,
+  remitterName
+) {
+  const commission = 0;
+  try {
+    const response = await axios.post(
+      'http://localhost:8690/kccb/Rtgsfundtransfer',
+      {
+        stFromAcc: fromAccount,
+        stToAcc: toAccount,
+        stTranAmt: amount,
+        stCommission: commission,
+        stIfscCode: ifscCode,
+        stFullName: remitterName,
+        stBeneName: beneficiaryName,
+        stAddress1: '',
+        stAddress2: '',
+        stAddress3: '',
+      }
+    );
+    await recordInterBankTransaction(
+      customerNo,
+      'rtgs',
+      fromAccount,
+      toAccount,
+      ifscCode,
+      amount,
+      commission,
+      beneficiaryName,
+      remitterName,
+      response.data.status
+    );
+    return response.data;
+  } catch (error) {
+    throw new Error(
+      'API call to CBS failed' +
+        (error.response?.data?.message || error.message)
+    );
+  }
+}
+
+module.exports = { send };

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) {
@@ -21,5 +23,29 @@ async function getLastTen(accountNumber) {
     );
   }
 }
-
+async function getFiltered(accountNumber, fromDate, toDate) {
-module.exports = { getLastTen };
+  try {
+    const response = await axios.get(
+      `http://localhost:8688/kccb/cbs/montlyacctstmt/details`,
+      {
+        params: { stacctno: accountNumber, fromdate: fromDate, todate: toDate },
+      }
+    );
+    const transactions = response.data;
+    const processedTransactions = transactions.map((tx) => ({
+      id: tx.stTransactionNumber,
+      name: tx.stTransactionDesc,
+      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) {
+    throw new Error(
+      'API call failde: ' + (error.response?.data?.message || error.message)
+    );
+  }
+}
+module.exports = { getLastTen, getFiltered };

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'
+  customerNo,
-  narration
+  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/auth.route.js

@@ -9,6 +9,10 @@ router.get('/user_details', authenticate, authController.fetchUserDetails);
 router.get('/tpin', authenticate, authController.tpin);
 router.post('/tpin', authenticate, authController.setTpin);
 router.post('/login_password', authenticate, authController.setLoginPassword);
-router.post('/transaction_password', authenticate, authController.setTransactionPassword);
+router.post(
+  '/transaction_password',
+  authenticate,
+  authController.setTransactionPassword
+);
 
 module.exports = router;

src/routes/beneficiary.route.js

@@ -1,8 +1,17 @@
 const express = require('express');
 const beneficiaryController = require('../controllers/beneficiary.controller');
+const newBeneficiaryValidator = require('../validators/beneficiary.validator');
 
 const router = express.Router();
 
 router.get('/validate/within-bank', beneficiaryController.validateWithinBank);
+router.get('/validate/outside-bank', beneficiaryController.validateOutsideBank);
+router.get('/ifsc-details', beneficiaryController.getIfscDetails);
+router.get('/', beneficiaryController.getBeneficiary);
+router.post('/', newBeneficiaryValidator, beneficiaryController.addBeneficiary);
+router.delete(
+  '/:beneficiaryAccountNo',
+  beneficiaryController.deleteBeneficiary
+);
 
 module.exports = router;

src/routes/imps.route.js

@@ -0,0 +1,38 @@
+const express = require('express');
+const impsController = require('../controllers/imps.controller');
+const { logger } = require('../util/logger');
+const impsValidator = require('../validators/imps.validator');
+const paymentSecretValidator = require('../validators/payment.secret.validator');
+
+const router = express.Router();
+router.use(impsValidator, paymentSecretValidator);
+
+const impsRoute = async (req, res) => {
+  const { fromAccount, toAccount, ifscCode, amount, beneficiaryName } =
+    req.body;
+
+  try {
+    const result = await impsController.send(
+      req.user,
+      fromAccount,
+      toAccount,
+      amount,
+      ifscCode,
+      beneficiaryName,
+      'SAVING',
+      'check'
+    );
+
+    if (result.startsWith('Message produced successfully')) {
+      return res.json({ message: 'SUCCESS' });
+    } else {
+      return res.json({ error: 'INVALID_REQUEST' });
+    }
+  } catch (error) {
+    logger.error(error, 'error occured while doing IMPS');
+    return res.json({ error: 'INTERVAL_SERVER_ERROR' });
+  }
+};
+router.post('/', impsRoute);
+
+module.exports = router;

src/routes/index.js

@@ -5,6 +5,10 @@ const transactionRoute = require('./transactions.route');
 const authenticate = require('../middlewares/auth.middleware');
 const transferRoute = require('./transfer.route');
 const beneficiaryRoute = require('./beneficiary.route');
+const neftRoute = require('./neft.route');
+const rtgsRoute = require('./rtgs.route');
+const impsRoute = require('./imps.route');
+const { npciResponse } = require('../controllers/npci.controller');
 
 const router = express.Router();
 
@@ -12,6 +16,10 @@ router.use('/auth', authRoute);
 router.use('/customer', authenticate, detailsRoute);
 router.use('/transactions/account/:accountNo', authenticate, transactionRoute);
 router.use('/payment/transfer', authenticate, transferRoute);
-router.use('/beneficiary', beneficiaryRoute);
+router.use('/payment/neft', authenticate, neftRoute);
+router.use('/payment/rtgs', authenticate, rtgsRoute);
+router.use('/payment/imps', authenticate, impsRoute);
+router.use('/beneficiary', authenticate, beneficiaryRoute);
+router.use('/npci/beneficiary-response', npciResponse);
 
 module.exports = router;

src/routes/neft.route.js

@@ -0,0 +1,50 @@
+const express = require('express');
+const neftController = require('../controllers/neft.controller');
+const { logger } = require('../util/logger');
+const neftValidator = require('../validators/neft.validator.js');
+const paymentSecretValidator = require('../validators/payment.secret.validator');
+
+const router = express.Router();
+router.use(neftValidator, paymentSecretValidator);
+
+const neftRoute = async (req, res) => {
+  const {
+    fromAccount,
+    toAccount,
+    ifscCode,
+    amount,
+    beneficiaryName,
+    remitterName,
+  } = req.body;
+
+  try {
+    const result = await neftController.send(
+      req.user,
+      fromAccount,
+      toAccount,
+      amount,
+      ifscCode,
+      beneficiaryName,
+      remitterName
+    );
+    logger.info(result);
+
+    if (result.status.startsWith('O.K.')) {
+      const utr = result.status.slice(9, 25);
+      return res.json({ message: 'SUCCESS', utr });
+    } else if (result.status.includes('INSUFFICIENT FUNDS')) {
+      return res.status(422).json({ error: 'INSUFFICIENT_FUNDS' });
+    } else if (result.status.includes('INVALID CHECK DIGIT')) {
+      return res.status(400).json({ error: 'INVALID_ACCOUNT_NUMBER' });
+    } else {
+      return res.status(400).json({ error: 'PROBLEM_TRANSFERRING_FUNDS' });
+    }
+  } catch (error) {
+    logger.error(error, 'error occured while doing NEFT transaction');
+    return res.status(500).json({ error: 'INTERNAL_SERVER_ERROR' });
+  }
+};
+
+router.post('/', neftRoute);
+
+module.exports = router;

src/routes/rtgs.route.js

@@ -0,0 +1,49 @@
+const express = require('express');
+const rtgsController = require('../controllers/rtgs.controller');
+const { logger } = require('../util/logger');
+const rtgsValidator = require('../validators/rtgs.validator.js');
+const paymentSecretValidator = require('../validators/payment.secret.validator');
+
+const router = express.Router();
+router.use(rtgsValidator, paymentSecretValidator);
+
+const rtgsRoute = async (req, res) => {
+  const {
+    fromAccount,
+    toAccount,
+    ifscCode,
+    amount,
+    beneficiaryName,
+    remitterName,
+  } = req.body;
+
+  try {
+    const result = await rtgsController.send(
+      req.user,
+      fromAccount,
+      toAccount,
+      amount,
+      ifscCode,
+      beneficiaryName,
+      remitterName
+    );
+
+    if (result.status.startsWith('O.K.')) {
+      const utr = result.status.slice(9, 25);
+      return res.json({ message: 'SUCCESS', utr });
+    } else if (result.status.includes('INSUFFICIENT FUNDS')) {
+      return res.status(422).json({ error: 'INSUFFICIENT_FUNDS' });
+    } else if (result.status.includes('INVALID CHECK DIGIT')) {
+      return res.status(400).json({ error: 'INVALID_ACCOUNT_NUMBER' });
+    } else {
+      return res.status(400).json({ error: 'PROBLEM_TRANSFERRING_FUNDS' });
+    }
+  } catch (error) {
+    logger.error(error, 'error occured while doing NEFT transaction');
+    return res.status(500).json({ error: 'INTERNAL_SERVER_ERROR' });
+  }
+};
+
+router.post('/', rtgsRoute);
+
+module.exports = router;

src/routes/transactions.route.js

@@ -3,15 +3,44 @@ const { logger } = require('../util/logger');
 
 const transactionsRoute = async (req, res) => {
   const accountNo = req.params.accountNo;
+  const { fromDate, toDate } = req.query;
+  let data;
   try {
-    const data = await transactionsController.getLastTen(accountNo);
+    if (fromDate && toDate) {
+      if (!isValidDDMMYYYY(fromDate) || !isValidDDMMYYYY(toDate)) {
+        return res.status(400).json({ error: 'INVALID_DATE_FORMAT' });
+      }
+      data = await transactionsController.getFiltered(
+        accountNo,
+        fromDate,
+        toDate
+      );
+    } else {
+      data = await transactionsController.getLastTen(accountNo);
+    }
     return res.json(data);
   } catch (error) {
-    logger.error('error retriving last 10 txns', error);
+    logger.error('error retriving transaction history', error);
     return res
       .status(500)
       .json({ message: 'error occured while fetching transactions' });
   }
 };
 
+function isValidDDMMYYYY(dateStr) {
+  if (!/^\d{8}$/.test(dateStr)) return false;
+
+  const day = parseInt(dateStr.slice(0, 2), 10);
+  const month = parseInt(dateStr.slice(2, 4), 10);
+  const year = parseInt(dateStr.slice(4), 10);
+
+  const date = new Date(year, month - 1, day);
+
+  return (
+    date.getFullYear() === year &&
+    date.getMonth() === month - 1 &&
+    date.getDate() === day
+  );
+}
+
 module.exports = transactionsRoute;

src/routes/transfer.route.js

@@ -1,24 +1,10 @@
 const transferController = require('../controllers/transfer.controller');
 const { logger } = require('../util/logger');
 const express = require('express');
-const tpinValidator = require('../validators/tpin.validator');
-const tpasswordValidator = require('../validators/tpassword.validator');
 const transferValidator = require('../validators/transfer.validator');
+const passwordValidator = require('../validators/payment.secret.validator.js');
 
 const router = express.Router();
-// Added for tpassword
-const passwordValidator=async(req,res,next)=>{
-  const{tpin,tpassword} =req.body;
-  if(tpin){
-    return tpinValidator(req,res,next);
-  }
-  else if(tpassword){
-    return tpasswordValidator(req,res,next);
-  }
-  else{
-    return res.status(400).json({error:"tpin or tpassword is required"})
-  }
-}
 router.use(passwordValidator, transferValidator);
 
 const transferRoute = async (req, res) => {
@@ -28,7 +14,8 @@ const transferRoute = async (req, res) => {
       fromAccount,
       toAccount,
       toAccountType,
-      amount
+      amount,
+      req.user
     );
 
     if (result.status === 'O.K.') {

src/services/auth.service.js

@@ -48,10 +48,10 @@ async function setTpin(customerNo, tpin) {
 async function setLoginPassword(customerNo, login_psw) {
   const hashedLoginPassword = await hashPassword(login_psw);
   try {
-    await db.query('UPDATE users SET password_hash = $1 ,is_first_login = false WHERE customer_no = $2', [
+    await db.query(
-      hashedLoginPassword,
+      'UPDATE users SET password_hash = $1 ,is_first_login = false WHERE customer_no = $2',
-      customerNo,
+      [hashedLoginPassword, customerNo]
-    ]);
+    );
   } catch (error) {
     throw new Error(
       `error occured while while setting new Login Password ${error.message}`
@@ -62,7 +62,7 @@ async function setLoginPassword(customerNo, login_psw) {
 async function validateTransactionPassword(customerNo, tpassword) {
   const user = await findUserByCustomerNo(customerNo);
   if (!user?.transaction_password) return null;
-  const isMatch = await comparePassword(tpassword, user.transaction_password );
+  const isMatch = await comparePassword(tpassword, user.transaction_password);
   return isMatch;
 }
 
@@ -70,10 +70,10 @@ async function validateTransactionPassword(customerNo, tpassword) {
 async function setTransactionPassword(customerNo, trans_psw) {
   const hashedTransPassword = await hashPassword(trans_psw);
   try {
-    await db.query('UPDATE users SET transaction_password = $1 WHERE customer_no = $2', [
+    await db.query(
-      hashedTransPassword,
+      'UPDATE users SET transaction_password = $1 WHERE customer_no = $2',
-      customerNo,
+      [hashedTransPassword, customerNo]
-    ]);
+    );
   } catch (error) {
     throw new Error(
       `error occured while while setting new Transaction Password ${error.message}`
@@ -81,5 +81,13 @@ async function setTransactionPassword(customerNo, trans_psw) {
   }
 }
 
-module.exports = { validateUser, findUserByCustomerNo, setTpin, validateTpin, 
+module.exports = {
-  CheckFirstTimeLogin, setLoginPassword, validateTransactionPassword,setTransactionPassword };
+  validateUser,
+  findUserByCustomerNo,
+  setTpin,
+  validateTpin,
+  CheckFirstTimeLogin,
+  setLoginPassword,
+  validateTransactionPassword,
+  setTransactionPassword,
+};

src/services/beneficiary.service.js

@@ -1,10 +1,15 @@
+const axios = require('axios');
 const { logger } = require('../util/logger');
+const { v4: uuidv4 } = require('uuid');
+const db = require('../config/db');
 
 async function validateWithinBank(accountNo) {
-  const url = `http://localhost:8687/kccb/cbs/acctInfo/details?stacctno=${accountNo}`;
+  const url = 'http://localhost:8687/kccb/cbs/acctInfo/details';
   try {
-    const response = await fetch(url);
+    const response = await axios.get(url, {
-    const data = await response.json();
+      params: { stacctno: accountNo },
+    });
+    const data = response.data;
     const customerName = data.customername;
     return customerName;
   } catch (error) {
@@ -13,4 +18,63 @@ async function validateWithinBank(accountNo) {
   }
 }
 
-module.exports = { validateWithinBank };
+async function validateOutsideBank(accountNo, ifscCode, name) {
+  const uuid = `KCC${uuidv4().replace(/-/g, '')}`;
+  const url = `http://localhost:9091/kccb/benenamelookup/ReqBeneDetails/${uuid}`;
+  try {
+    const response = await axios.post(url, {
+      acctNo: accountNo,
+      ifsccode: ifscCode,
+      remittername: name,
+    });
+    if (response.data) {
+      console.log(response.data);
+      return uuid;
+    }
+  } catch (error) {
+    logger.error(error, 'error while validating customer from NPCI');
+    throw new Error('error in beneficiary validation');
+  }
+}
+
+async function getSingleBeneficiary(customerNo, accountNo) {
+  const queryStr =
+    'SELECT b.account_no, b.name, b.account_type, b.ifsc_code, i.bank_name, i.branch_name FROM beneficiaries b JOIN ifsc_details i ON b.ifsc_code = i.ifsc_code WHERE customer_no = $1 AND account_no = $2';
+  const result = await db.query(queryStr, [customerNo, accountNo]);
+  return result.rows[0];
+}
+
+async function deleteBeneficiary(customerNo, beneficiaryAccountNo) {
+  const queryStr =
+    'DELETE FROM beneficiaries WHERE customer_no = $1 AND account_no = $2';
+  const result = await db.query(queryStr, [customerNo, beneficiaryAccountNo]);
+  if (result.rowCount == 0) {
+    throw new Error('ACCOUNT_NOT_FOUND');
+  }
+  return;
+}
+
+async function getAllBeneficiaries(customerNo) {
+  const queryStr =
+    'SELECT b.account_no, b.name, b.account_type, b.ifsc_code, i.bank_name, i.branch_name FROM beneficiaries b JOIN ifsc_details i ON b.ifsc_code = i.ifsc_code WHERE customer_no = $1';
+  const result = await db.query(queryStr, [customerNo]);
+  const list = result.rows.map((row) => {
+    return {
+      accountNo: row['account_no'],
+      name: row['name'],
+      accountType: row['account_type'],
+      ifscCode: row['ifsc_code'],
+      bankName: row['bank_name'],
+      branchName: row['branch_name'],
+    };
+  });
+
+  return list;
+}
+module.exports = {
+  validateWithinBank,
+  validateOutsideBank,
+  getAllBeneficiaries,
+  getSingleBeneficiary,
+  deleteBeneficiary,
+};

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

src/util/logger.js

@@ -1,6 +1,19 @@
 const pino = require('pino');
+const fs = require('fs');
+const path = require('path');
+
 const isDev = process.env.NODE_ENV !== 'production';
 
+const logDir = path.join(__dirname, '../..', 'logs');
+if (!fs.existsSync(logDir)) {
+  fs.mkdirSync(logDir);
+}
+
+const requestLoggerStream = pino.destination({
+  dest: path.join(logDir, 'requests.log'),
+  sync: false,
+});
+
 const logger = pino({
   transport: isDev
     ? {
@@ -15,8 +28,12 @@ const logger = pino({
   level: isDev ? 'debug' : 'info',
 });
 
-const requestLogger = (req, _res, next) => {
+const requestLogger = pino(
-  logger.info(`${req.method} ${req.url}`);
+  {
-  next();
+    level: 'info',
-};
+    base: null,
+  },
+  requestLoggerStream
+);
+
 module.exports = { logger, requestLogger };

src/util/name.generator.js

@@ -0,0 +1,36 @@
+const indianFirstNames = [
+  'Aarav',
+  'Vivaan',
+  'Aditya',
+  'Vihaan',
+  'Krishna',
+  'Ishaan',
+  'Rohan',
+  'Ananya',
+  'Diya',
+  'Aisha',
+  'Priya',
+  'Sneha',
+];
+const indianLastNames = [
+  'Sharma',
+  'Verma',
+  'Iyer',
+  'Reddy',
+  'Patel',
+  'Mehta',
+  'Choudhary',
+  'Kumar',
+  'Das',
+  'Rao',
+];
+
+function getRandomIndianName() {
+  const firstName =
+    indianFirstNames[Math.floor(Math.random() * indianFirstNames.length)];
+  const lastName =
+    indianLastNames[Math.floor(Math.random() * indianLastNames.length)];
+  return `${firstName} ${lastName}`;
+}
+
+module.exports = getRandomIndianName;

src/validators/beneficiary.validator.js

@@ -0,0 +1,33 @@
+const db = require('../config/db');
+
+const newBeneficiaryValidator = async (req, res, next) => {
+  const { accountNo, name, ifscCode, accountType } = req.body;
+
+  if (!accountNo || !/^[0-9]{7,20}$/.test(accountNo)) {
+    res.status(400).json({ error: 'INVALID_ACCOUNT_NO' });
+    return;
+  }
+
+  if (!name || !accountType) {
+    res.status(400).json({ error: 'BAD_REQUEST' });
+    return;
+  }
+
+  if (!ifscCode || !/^[A-Z]{4}0[0-9]{6}$/.test(ifscCode)) {
+    res.status(400).json({ error: 'INVALID_IFSC' });
+    return;
+  }
+  const query_str =
+    'SELECT EXISTS(SELECT 1 FROM ifsc_details WHERE ifsc_code = $1)';
+  const result = await db.query(query_str, [ifscCode]);
+  const exists = result.rows[0].exists;
+  if (!exists) {
+    res.status(400).json({ error: 'INVALID_IFSC_CODE' });
+    return;
+  }
+
+  // if everthing is ok then move forward
+  next();
+};
+
+module.exports = newBeneficiaryValidator;

src/validators/imps.validator.js

@@ -0,0 +1,36 @@
+const impsValidator = (req, res, next) => {
+  const {
+    fromAccount,
+    toAccount,
+    amount,
+    remitterName,
+    beneficiaryName,
+    ifscCode,
+  } = req.body;
+
+  if (!isAccountNumbersValid(fromAccount, toAccount)) {
+    return res.status(400).json({ error: 'INVALID_ACCOUNT_NUMBER_FORMAT' });
+  }
+
+  if (amount < 1) {
+    return res.status(400).json({ error: 'INVALID_AMOUNT' });
+  }
+
+  if (!remitterName || !beneficiaryName) {
+    return res
+      .status(400)
+      .json({ error: 'REMITTER_NAME AND BENEFICIARY_NAME REQUIRED' });
+  }
+
+  if (!ifscCode || !/^[A-Z]{4}0[0-9]{6}$/.test(ifscCode)) {
+    return res.status(400).json({ error: 'INVALID_IFSC_CODE' });
+  }
+
+  next();
+};
+
+const isAccountNumbersValid = (fromAcct, toAcct) => {
+  return !(!fromAcct || !toAcct || fromAcct.length != 11 || toAcct.length < 7);
+};
+
+module.exports = impsValidator;

src/validators/neft.validator.js

@@ -0,0 +1,36 @@
+const neftValidator = (req, res, next) => {
+  const {
+    fromAccount,
+    toAccount,
+    amount,
+    remitterName,
+    beneficiaryName,
+    ifscCode,
+  } = req.body;
+
+  if (!isAccountNumbersValid(fromAccount, toAccount)) {
+    return res.status(400).json({ error: 'INVALID_ACCOUNT_NUMBER_FORMAT' });
+  }
+
+  if (amount < 1) {
+    return res.status(400).json({ error: 'INVALID_AMOUNT' });
+  }
+
+  if (!remitterName || !beneficiaryName) {
+    return res
+      .status(400)
+      .json({ error: 'REMITTER_NAME AND BENEFICIARY_NAME REQUIRED' });
+  }
+
+  if (!ifscCode || !/^[A-Z]{4}0[0-9]{6}$/.test(ifscCode)) {
+    return res.status(400).json({ error: 'INVALID_IFSC_CODE' });
+  }
+
+  next();
+};
+
+const isAccountNumbersValid = (fromAcct, toAcct) => {
+  return !(!fromAcct || !toAcct || fromAcct.length != 11 || toAcct.length < 7);
+};
+
+module.exports = neftValidator;

src/validators/payment.secret.validator.js

@@ -0,0 +1,15 @@
+const tpasswordValidator = require('./tpassword.validator.js');
+const tpinValidator = require('./tpin.validator.js');
+
+const paymentSecretValidator = async (req, res, next) => {
+  const { tpin, tpassword } = req.body;
+  if (tpin) {
+    return tpinValidator(req, res, next);
+  } else if (tpassword) {
+    return tpasswordValidator(req, res, next);
+  } else {
+    return res.status(400).json({ error: 'tpin or tpassword is required' });
+  }
+};
+
+module.exports = paymentSecretValidator;

src/validators/rtgs.validator.js

@@ -0,0 +1,36 @@
+const rtgsValidator = (req, res, next) => {
+  const {
+    fromAccount,
+    toAccount,
+    amount,
+    remitterName,
+    beneficiaryName,
+    ifscCode,
+  } = req.body;
+
+  if (!isAccountNumbersValid(fromAccount, toAccount)) {
+    return res.status(400).json({ error: 'INVALID_ACCOUNT_NUMBER_FORMAT' });
+  }
+
+  if (amount < 200000) {
+    return res.status(400).json({ error: 'AMOUNT_SHOULD_BE_MORE_THAN_200000' });
+  }
+
+  if (!remitterName || !beneficiaryName) {
+    return res
+      .status(400)
+      .json({ error: 'REMITTER_NAME AND BENEFICIARY_NAME REQUIRED' });
+  }
+
+  if (!ifscCode || !/^[A-Z]{4}0[0-9]{6}$/.test(ifscCode)) {
+    return res.status(400).json({ error: 'INVALID_IFSC_CODE' });
+  }
+
+  next();
+};
+
+const isAccountNumbersValid = (fromAcct, toAcct) => {
+  return !(!fromAcct || !toAcct || fromAcct.length != 11 || toAcct.length < 7);
+};
+
+module.exports = rtgsValidator;

src/validators/transfer.validator.js

@@ -1,7 +1,7 @@
-const transferValidator = async (req, res, next) => {
+const transferValidator = (req, res, next) => {
   const { fromAccount, toAccount, toAccountType, amount } = req.body;
 
-  const accountTypes = ['SB', 'LN','Savings','Current'];
+  const accountTypes = ['SB', 'LN', 'Savings', 'Current'];
   if (!fromAccount || fromAccount.length != 11) {
     return res.status(400).json({ error: 'INVALID_ACCOUNT_NUMBER_FORMAT' });
   }