@traxionpay/cbsmiddleware 0.0.11 → 0.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@traxionpay/cbsmiddleware",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "description": "This is a cbs middlware for RB Banks",
   "author": "Archer",
   "private": false,

package/src/banking/services/MBWIN.service.ts

@@ -10,6 +10,7 @@ import { AccountDto, ValidateOtp } from '../dto/account.dto';
 import { TransactionHistoryDto } from '../dto/transaction-history.dto'
 import { AccountTransferDto } from '../dto/account-transfer.dto'
 import { FetchBankBalanceDto } from '../dto/fetch-bank-balance.dto';
+import { formatTo09 } from 'src/helpers/utils';
 
 @Injectable()
 export class MBWINService implements BankService {
@@ -99,6 +100,7 @@ export class MBWINService implements BankService {
   async linkAccount(accountDto: AccountDto) {
 
     const { token, account, accountType, mobile, branch, fullName, birthDate } = accountDto;
+    const mobileFormatted = mobile? formatTo09(mobile) : '';
 
     if (!token) {
       throw new HttpException({
@@ -136,7 +138,7 @@ export class MBWINService implements BankService {
       }, HttpStatus.BAD_REQUEST);
     }
 
-    if (!mobile) {
+    if (!mobileFormatted) {
       throw new HttpException({
         statusCode: HttpStatus.BAD_REQUEST,
         code: 4000303009,  
@@ -181,7 +183,7 @@ export class MBWINService implements BankService {
         "appType": accountType,
         "displayName": fullName,
         "birthDate": birthDate,
-        "mobile1": mobile
+        "mobile1": mobileFormatted
       }
 
       this.logger.log({ payload: payload }, 'MBWIN Link Request');
@@ -303,7 +305,7 @@ export class MBWINService implements BankService {
   async processBalanceTransaction(fetchBalanceDto: FetchBankBalanceDto): Promise<any> {
 
     const { token, account, branch, accountType, fullName, birthDate, mobile, permissionKey } = fetchBalanceDto;
-
+    const mobileFormatted = mobile? formatTo09(mobile) : '';
     if (!token) {
       throw new HttpException({
         statusCode: HttpStatus.UNAUTHORIZED,
@@ -358,7 +360,7 @@ export class MBWINService implements BankService {
       }, HttpStatus.BAD_REQUEST);
     }
 
-    if (!mobile) {
+    if (!mobileFormatted) {
       throw new HttpException({
         statusCode: HttpStatus.BAD_REQUEST,
         code: 4000, //TBD
@@ -382,7 +384,7 @@ export class MBWINService implements BankService {
         "appType": accountType,
         "displayName": fullName,
         "birthDate": birthDate,
-        "mobile1": mobile
+        "mobile1": mobileFormatted
       }
 
       const httpsAgent = new https.Agent({
@@ -427,6 +429,7 @@ export class MBWINService implements BankService {
   async accountCashIn(accountTransferDto: AccountTransferDto): Promise<any> {
 
     const { token, sourceAccount, amount, birthDate, sourceBranch, fullName, sourceAccountType, mobile} = accountTransferDto;
+    const mobileFormatted = mobile? formatTo09(mobile) : '';
    
     if (!token) {
       throw new HttpException({
@@ -491,7 +494,7 @@ export class MBWINService implements BankService {
       }, HttpStatus.BAD_REQUEST);
     }
 
-    if (!mobile) {
+    if (!mobileFormatted) {
       throw new HttpException({
         statusCode: HttpStatus.BAD_REQUEST,
         code: 4000, //TBD
@@ -514,7 +517,7 @@ export class MBWINService implements BankService {
             "appType": sourceAccountType,
             "displayName": fullName,
             "birthDate": birthDate,
-            "mobile1": mobile
+            "mobile1": mobileFormatted
             }
       }
 
@@ -560,6 +563,7 @@ export class MBWINService implements BankService {
   async accountDeposit(accountTransferDto: AccountTransferDto): Promise<any> {
 
     const { token, destinationAccount, amount, birthDate, destinationBranch, fullName, destinationAccountType, mobile} = accountTransferDto;
+    const mobileFormatted = mobile? formatTo09(mobile) : '';
 
     if (!token) {
       throw new HttpException({
@@ -624,7 +628,7 @@ export class MBWINService implements BankService {
       }, HttpStatus.BAD_REQUEST);
     }
 
-    if (!mobile) {
+    if (!mobileFormatted) {
       throw new HttpException({
         statusCode: HttpStatus.BAD_REQUEST,
         code: 4000, //TBD
@@ -648,7 +652,7 @@ export class MBWINService implements BankService {
             "appType": destinationAccountType,
             "displayName": fullName,
             "birthDate": birthDate,
-            "mobile1": mobile
+            "mobile1": mobileFormatted
             }
       }
 
@@ -694,6 +698,7 @@ export class MBWINService implements BankService {
   async getTransactionHistory(transactionHistoryDto: TransactionHistoryDto) {
 
     const { token, account, dateFrom, dateTo, page, branch, accountType, fullName, birthDate, mobile, permissionKey } = transactionHistoryDto;
+    const mobileFormatted = mobile? formatTo09(mobile) : '';
     
     if (!token) {
       throw new HttpException({
@@ -767,7 +772,7 @@ export class MBWINService implements BankService {
       }, HttpStatus.BAD_REQUEST);
     }
 
-    if (!mobile) {
+    if (!mobileFormatted) {
       throw new HttpException({
         statusCode: HttpStatus.BAD_REQUEST,
         code: 4000, //TBD
@@ -793,7 +798,7 @@ export class MBWINService implements BankService {
             "appType": accountType,
             "displayName": fullName,
             "birthDate": birthDate,
-            "mobile1": mobile
+            "mobile1": mobileFormatted
             }
       }
 

package/src/banking/services/WelcomeBank.service.ts

@@ -286,6 +286,15 @@ export class WelcomeBankService implements BankService {
       AxiosErrorHelper.handleAxiosError(error);
     }
 
+    if (responseData.data.status === "99994") {
+      throw new HttpException({
+        statusCode: HttpStatus.BAD_REQUEST,
+        code: 400020309,
+        message: 'The customer\'s account is a corporate account / joint account',
+        data: { ...accountDto }
+      }, HttpStatus.BAD_REQUEST);
+    }
+
     if (responseData.data.status === "99997") {
       throw new HttpException({
         statusCode: HttpStatus.BAD_REQUEST,
@@ -431,6 +440,16 @@ export class WelcomeBankService implements BankService {
     catch (error) {
       AxiosErrorHelper.handleAxiosError(error);
     }
+    
+    if (responseData.data.status === "99994") {
+      throw new HttpException({
+        statusCode: HttpStatus.BAD_REQUEST,
+        code: 400020309,
+        message: 'The customer\'s account is a corporate account / joint account',
+        data: { ...validateOtp }
+      }, HttpStatus.BAD_REQUEST);
+    }
+
     if (responseData.data.status === "99997") {
       throw new HttpException({
         statusCode: HttpStatus.BAD_REQUEST,
@@ -444,7 +463,7 @@ export class WelcomeBankService implements BankService {
       throw new HttpException({
         statusCode: HttpStatus.BAD_REQUEST,
         code: 400020405,
-        message: 'Account type is not supported.',
+        message: '00001 Account type is not supported.',
         data: { ...validateOtp }
       }, HttpStatus.BAD_REQUEST);
     }

package/src/helpers/utils.ts

@@ -0,0 +1,24 @@
+export function formatTo09(input:string) {
+    if (!input) return null;
+  
+    // Remove all non-digits
+    let num = input.replace(/\D/g, '');
+  
+    // Remove country code if present
+    if (num.startsWith('63')) {
+      num = num.slice(2);
+    }
+  
+    // Remove leading zero if duplicated
+    if (num.startsWith('0')) {
+      num = num.slice(1);
+    }
+  
+    // At this point should be: 9XXXXXXXXX
+    if (!/^9\d{9}$/.test(num)) {
+      return null; // invalid PH mobile
+    }
+  
+    return '0' + num; // force 09XXXXXXXXX
+  }
+