@traxionpay/cbsmiddleware 0.0.2 → 0.0.3

package/dist/banking/services/WelcomeBank.service.js

@@ -123,8 +123,8 @@ let WelcomeBankService = class WelcomeBankService {
         if (!refreshToken) {
             throw new common_1.HttpException({
                 statusCode: common_1.HttpStatus.BAD_REQUEST,
-                code: 400020206,
-                message: 'Bank token should not be empty.',
+                code: 400020205,
+                message: 'Refresh token is required.',
                 data: { refreshToken }
             }, common_1.HttpStatus.BAD_REQUEST);
         }
@@ -144,6 +144,14 @@ let WelcomeBankService = class WelcomeBankService {
                 httpsAgent,
             });
             this.logger.log({ responseData: response }, 'Welcome Bank Refresh Token Successful');
+            if (response.data.message === "Unable to Process this request. Please check your payload.") {
+                throw new common_1.HttpException({
+                    statusCode: common_1.HttpStatus.BAD_REQUEST,
+                    code: 400020206,
+                    message: 'Invalid refresh token.',
+                    data: { refreshToken }
+                }, common_1.HttpStatus.BAD_REQUEST);
+            }
             return {
                 success: true,
                 ...response.data,
@@ -167,15 +175,15 @@ let WelcomeBankService = class WelcomeBankService {
             throw new common_1.HttpException({
                 statusCode: common_1.HttpStatus.BAD_REQUEST,
                 code: 400020304,
-                message: 'Bank account number should not be empty.',
+                message: 'Account number is required.',
                 data: { accountDto }
             }, common_1.HttpStatus.BAD_REQUEST);
         }
         if (!accountType) {
             throw new common_1.HttpException({
                 statusCode: common_1.HttpStatus.BAD_REQUEST,
-                code: 4400020306,
-                message: 'Bank account type should not be empty.',
+                code: 400020306,
+                message: 'Account type is required.',
                 data: { accountDto }
             }, common_1.HttpStatus.BAD_REQUEST);
         }
@@ -183,7 +191,7 @@ let WelcomeBankService = class WelcomeBankService {
             throw new common_1.HttpException({
                 statusCode: common_1.HttpStatus.BAD_REQUEST,
                 code: 4000203009,
-                message: 'Mobile Number should not be empty.',
+                message: 'Mobile number is required.',
                 data: { accountDto }
             }, common_1.HttpStatus.BAD_REQUEST);
         }
@@ -194,6 +202,7 @@ let WelcomeBankService = class WelcomeBankService {
         const totpPrevious = this.generateTOTP(timeInSeconds - 30);
         this.logger.log(`TOTP GENERATED FOR WELCOMEBANK LINK ACCOUNT: ${totp}, For Time stamp: ${isoTimestamp}`);
         this.logger.log(`TOTP GENERATED FOR PREVIOUS TIME: ${totpPrevious}`);
+        let responseData;
         try {
             const headers = {
                 'Authorization': `Bearer ${token}`,
@@ -204,13 +213,17 @@ let WelcomeBankService = class WelcomeBankService {
                 rejectUnauthorized: false,
             });
             let response;
+            let formattedMobile = mobile;
+            if (mobile.startsWith("63") && mobile.length > 2) {
+                formattedMobile = "0" + mobile.slice(2);
+            }
             if (String(this.config.WELCOMBANK_ENABLEENCRYPTION).toLowerCase() === 'true') {
                 let payload;
                 payload = {
                     "acc": account,
                     "br": branch,
                     "accType": accountType,
-                    "mobile": mobile
+                    "mobile": formattedMobile
                 };
                 payload = this.encryptPayloadWithOTP(payload, totp);
                 const encodedPayload = encodeURIComponent(payload);
@@ -220,43 +233,68 @@ let WelcomeBankService = class WelcomeBankService {
                 });
             }
             else {
-                response = await axios_1.default.get(`${this.config.WELCOMEBANK_URL}:${this.config.WELCOMEBANK_PORT}/api/linkaccount?acc=${account}&br=${branch}&accType=${accountType}&mobile=${mobile}`, {
+                response = await axios_1.default.get(`${this.config.WELCOMEBANK_URL}:${this.config.WELCOMEBANK_PORT}/api/linkaccount?acc=${account}&br=${branch}&accType=${accountType}&mobile=${formattedMobile}`, {
                     headers: headers,
                     httpsAgent
                 });
             }
-            let responseData = response.data;
-            this.logger.log({ responseData: response }, 'Welcome Bank Link Account Successful');
+            this.logger.log({ responseData: response.data }, 'Welcome Bank Link Account Successful');
             if (String(this.config.WELCOMBANK_ENABLEENCRYPTION).toLowerCase() === 'true') {
-                const encryptedResponsePayload = responseData.data;
+                const encryptedResponsePayload = response.data.data;
                 if (!encryptedResponsePayload) {
                     throw new Error("Encrypted response expected but not found");
                 }
-                let decryptedResponse;
                 try {
-                    decryptedResponse = this.decryptPayloadWithOTP(encryptedResponsePayload, totp);
+                    responseData = this.decryptPayloadWithOTP(encryptedResponsePayload, totp);
                 }
                 catch (error) {
                     this.logger.warn("Decryption with current OTP failed, trying with previous OTP");
+                    responseData = this.decryptPayloadWithOTP(encryptedResponsePayload, totpPrevious);
                 }
-                if (!decryptedResponse) {
-                    decryptedResponse = this.decryptPayloadWithOTP(encryptedResponsePayload, totpPrevious);
-                }
-                return {
-                    success: true,
-                    data: decryptedResponse,
-                };
             }
             else {
-                return {
-                    success: true,
-                    ...responseData,
-                };
+                responseData = response.data;
             }
         }
         catch (error) {
+            if (error.response.data.message === "Mobile number is not registered in the account.") {
+                throw new common_1.HttpException({
+                    statusCode: common_1.HttpStatus.BAD_REQUEST,
+                    code: 400020307,
+                    message: 'Mobile number is not registered in the account.',
+                    data: { accountDto }
+                }, common_1.HttpStatus.BAD_REQUEST);
+            }
             axios_error_helper_1.AxiosErrorHelper.handleAxiosError(error);
         }
+        if (responseData.data.status === "99997") {
+            throw new common_1.HttpException({
+                statusCode: common_1.HttpStatus.BAD_REQUEST,
+                code: 400020303,
+                message: 'Account not found',
+                data: { ...accountDto }
+            }, common_1.HttpStatus.BAD_REQUEST);
+        }
+        if (responseData.data.status === "00001") {
+            throw new common_1.HttpException({
+                statusCode: common_1.HttpStatus.BAD_REQUEST,
+                code: 400020305,
+                message: 'Account type is not supported.',
+                data: { ...accountDto }
+            }, common_1.HttpStatus.BAD_REQUEST);
+        }
+        if (responseData.data.status === "00007") {
+            throw new common_1.HttpException({
+                statusCode: common_1.HttpStatus.BAD_REQUEST,
+                code: 400020307,
+                message: 'Mobile number is not registered in the account.',
+                data: { ...accountDto }
+            }, common_1.HttpStatus.BAD_REQUEST);
+        }
+        return {
+            success: true,
+            ...responseData,
+        };
     }
     async validateOtp(validateOtp) {
         const { token, account, branch, accountType, otp } = validateOtp;
@@ -272,7 +310,7 @@ let WelcomeBankService = class WelcomeBankService {
             throw new common_1.HttpException({
                 statusCode: common_1.HttpStatus.BAD_REQUEST,
                 code: 400020404,
-                message: 'Bank account number should not be empty.',
+                message: 'Account number is required.',
                 data: { validateOtp }
             }, common_1.HttpStatus.BAD_REQUEST);
         }
@@ -280,7 +318,7 @@ let WelcomeBankService = class WelcomeBankService {
             throw new common_1.HttpException({
                 statusCode: common_1.HttpStatus.BAD_REQUEST,
                 code: 400020406,
-                message: 'Bank account type should not be empty.',
+                message: 'Account type is required.',
                 data: { validateOtp }
             }, common_1.HttpStatus.BAD_REQUEST);
         }
@@ -288,7 +326,7 @@ let WelcomeBankService = class WelcomeBankService {
             throw new common_1.HttpException({
                 statusCode: common_1.HttpStatus.BAD_REQUEST,
                 code: 400020408,
-                message: 'Mobile Number should not be empty.',
+                message: 'OTP is required.',
                 data: { validateOtp }
             }, common_1.HttpStatus.BAD_REQUEST);
         }
@@ -299,6 +337,7 @@ let WelcomeBankService = class WelcomeBankService {
         const totpPrevious = this.generateTOTP(timeInSeconds - 30);
         this.logger.log(`TOTP GENERATED FOR WELCOME BANK VALIDATE OTP: ${totp}, For Time stamp: ${isoTimestamp}`);
         this.logger.log(`TOTP GENERATED FOR PREVIOUS TIME: ${totpPrevious}`);
+        let responseData;
         try {
             const headers = {
                 'Authorization': `Bearer ${token}`,
@@ -322,38 +361,55 @@ let WelcomeBankService = class WelcomeBankService {
                 headers: headers,
                 httpsAgent
             });
-            let responseData = response.data;
-            this.logger.log({ responseData: response }, 'Welcome Bank Validate OTP Successful');
+            this.logger.log({ responseData: response.data }, 'Welcome Bank Validate OTP Successful');
             if (String(this.config.WELCOMBANK_ENABLEENCRYPTION).toLowerCase() === 'true') {
-                const encryptedResponsePayload = responseData.data;
+                const encryptedResponsePayload = response.data.data;
                 if (!encryptedResponsePayload) {
                     throw new Error("Encrypted response expected but not found");
                 }
-                let decryptedResponse;
                 try {
-                    decryptedResponse = this.decryptPayloadWithOTP(encryptedResponsePayload, totp);
+                    responseData = this.decryptPayloadWithOTP(encryptedResponsePayload, totp);
                 }
                 catch (error) {
                     this.logger.warn("Decryption with current OTP failed, trying with previous OTP");
+                    responseData = this.decryptPayloadWithOTP(encryptedResponsePayload, totpPrevious);
                 }
-                if (!decryptedResponse) {
-                    decryptedResponse = this.decryptPayloadWithOTP(encryptedResponsePayload, totpPrevious);
-                }
-                return {
-                    success: true,
-                    data: decryptedResponse,
-                };
             }
             else {
-                return {
-                    success: true,
-                    ...responseData,
-                };
+                responseData = response.data;
             }
         }
         catch (error) {
             axios_error_helper_1.AxiosErrorHelper.handleAxiosError(error);
         }
+        if (responseData.data.status === "99997") {
+            throw new common_1.HttpException({
+                statusCode: common_1.HttpStatus.BAD_REQUEST,
+                code: 400020403,
+                message: 'Account number is required.',
+                data: { ...validateOtp }
+            }, common_1.HttpStatus.BAD_REQUEST);
+        }
+        if (responseData.data.status === "00001") {
+            throw new common_1.HttpException({
+                statusCode: common_1.HttpStatus.BAD_REQUEST,
+                code: 400020405,
+                message: 'Account type is not supported.',
+                data: { ...validateOtp }
+            }, common_1.HttpStatus.BAD_REQUEST);
+        }
+        if (responseData.data.status === "00005") {
+            throw new common_1.HttpException({
+                statusCode: common_1.HttpStatus.BAD_REQUEST,
+                code: 400020407,
+                message: 'Invalid or expired OTP.',
+                data: { ...validateOtp }
+            }, common_1.HttpStatus.BAD_REQUEST);
+        }
+        return {
+            success: true,
+            ...responseData,
+        };
     }
     async processBalanceTransaction(fetchBalanceDto) {
         const { token, permissionKey, account, branch, accountType } = fetchBalanceDto;
@@ -367,17 +423,17 @@ let WelcomeBankService = class WelcomeBankService {
         }
         if (!permissionKey) {
             throw new common_1.HttpException({
-                statusCode: common_1.HttpStatus.UNAUTHORIZED,
+                statusCode: common_1.HttpStatus.FORBIDDEN,
                 code: 403020504,
-                message: 'Bank permission key should not be empty.',
+                message: 'Permission key is required.',
                 data: { fetchBalanceDto }
-            }, common_1.HttpStatus.UNAUTHORIZED);
+            }, common_1.HttpStatus.FORBIDDEN);
         }
         if (!account) {
             throw new common_1.HttpException({
                 statusCode: common_1.HttpStatus.BAD_REQUEST,
                 code: 400020506,
-                message: 'Bank account number should not be empty.',
+                message: 'Account number is required.',
                 data: { fetchBalanceDto }
             }, common_1.HttpStatus.BAD_REQUEST);
         }
@@ -385,7 +441,7 @@ let WelcomeBankService = class WelcomeBankService {
             throw new common_1.HttpException({
                 statusCode: common_1.HttpStatus.BAD_REQUEST,
                 code: 400020508,
-                message: 'Bank account type should not be empty.',
+                message: 'Account type is required.',
                 data: { fetchBalanceDto }
             }, common_1.HttpStatus.BAD_REQUEST);
         }
@@ -396,6 +452,7 @@ let WelcomeBankService = class WelcomeBankService {
         const totpPrevious = this.generateTOTP(timeInSeconds - 30);
         this.logger.log(`TOTP GENERATED FOR WELCOME BANK BALANCE INQUIRY: ${totp}, For Time stamp: ${isoTimestamp}`);
         this.logger.log(`TOTP GENERATED FOR PREVIOUS TIME: ${totpPrevious}`);
+        let responseData;
         try {
             const headers = {
                 'Authorization': `Bearer ${token}`,
@@ -419,38 +476,55 @@ let WelcomeBankService = class WelcomeBankService {
                 headers: headers,
                 httpsAgent
             });
-            let responseData = response.data;
-            this.logger.log({ responseData: response }, 'Welcome Bank Balance Inquiry Successful');
+            this.logger.log({ responseData: response.data }, 'Welcome Bank Balance Inquiry Successful');
             if (String(this.config.WELCOMBANK_ENABLEENCRYPTION).toLowerCase() === 'true') {
-                const encryptedResponsePayload = responseData.data;
+                const encryptedResponsePayload = response.data.data;
                 if (!encryptedResponsePayload) {
                     throw new Error("Encrypted response expected but not found");
                 }
-                let decryptedResponse;
                 try {
-                    decryptedResponse = this.decryptPayloadWithOTP(encryptedResponsePayload, totp);
+                    responseData = this.decryptPayloadWithOTP(encryptedResponsePayload, totp);
                 }
                 catch (error) {
                     this.logger.warn("Decryption with current OTP failed, trying with previous OTP");
+                    responseData = this.decryptPayloadWithOTP(encryptedResponsePayload, totpPrevious);
                 }
-                if (!decryptedResponse) {
-                    decryptedResponse = this.decryptPayloadWithOTP(encryptedResponsePayload, totpPrevious);
-                }
-                return {
-                    success: true,
-                    data: decryptedResponse,
-                };
             }
             else {
-                return {
-                    success: true,
-                    ...responseData,
-                };
+                responseData = response.data;
             }
         }
         catch (error) {
             axios_error_helper_1.AxiosErrorHelper.handleAxiosError(error);
         }
+        if (responseData.data.status === "99999") {
+            throw new common_1.HttpException({
+                statusCode: common_1.HttpStatus.FORBIDDEN,
+                code: 403020503,
+                message: 'Invalid permission key.',
+                data: { ...fetchBalanceDto }
+            }, common_1.HttpStatus.FORBIDDEN);
+        }
+        if (responseData.data.status === "99997") {
+            throw new common_1.HttpException({
+                statusCode: common_1.HttpStatus.BAD_REQUEST,
+                code: 400020505,
+                message: 'Account not found.',
+                data: { ...fetchBalanceDto }
+            }, common_1.HttpStatus.BAD_REQUEST);
+        }
+        if (responseData.data.status === "00001") {
+            throw new common_1.HttpException({
+                statusCode: common_1.HttpStatus.BAD_REQUEST,
+                code: 400020507,
+                message: 'Account type is not supported.',
+                data: { ...fetchBalanceDto }
+            }, common_1.HttpStatus.BAD_REQUEST);
+        }
+        return {
+            success: true,
+            ...responseData,
+        };
     }
     async accountCashIn(accountTransferDto) {
         const { token, permissionKey, sourceAccount, sourceBranch, sourceAccountType, destinationAccount, destinationBranch, destinationAccountType, amount } = accountTransferDto;
@@ -466,7 +540,7 @@ let WelcomeBankService = class WelcomeBankService {
             throw new common_1.HttpException({
                 statusCode: common_1.HttpStatus.FORBIDDEN,
                 code: 403020604,
-                message: 'Bank permission key should not be empty.',
+                message: 'Permission key is required.',
                 data: { accountTransferDto }
             }, common_1.HttpStatus.FORBIDDEN);
         }
@@ -474,7 +548,7 @@ let WelcomeBankService = class WelcomeBankService {
             throw new common_1.HttpException({
                 statusCode: common_1.HttpStatus.BAD_REQUEST,
                 code: 400020606,
-                message: 'Bank source account number should not be empty.',
+                message: 'Source account number is required.',
                 data: { accountTransferDto }
             }, common_1.HttpStatus.BAD_REQUEST);
         }
@@ -482,7 +556,7 @@ let WelcomeBankService = class WelcomeBankService {
             throw new common_1.HttpException({
                 statusCode: common_1.HttpStatus.BAD_REQUEST,
                 code: 400020608,
-                message: 'Bank source account type should not be empty.',
+                message: 'Source account type is required.',
                 data: { accountTransferDto }
             }, common_1.HttpStatus.BAD_REQUEST);
         }
@@ -490,7 +564,7 @@ let WelcomeBankService = class WelcomeBankService {
             throw new common_1.HttpException({
                 statusCode: common_1.HttpStatus.BAD_REQUEST,
                 code: 400020610,
-                message: 'Bank destination account number should not be empty.',
+                message: 'Destination account number is required.',
                 data: { accountTransferDto }
             }, common_1.HttpStatus.BAD_REQUEST);
         }
@@ -498,7 +572,7 @@ let WelcomeBankService = class WelcomeBankService {
             throw new common_1.HttpException({
                 statusCode: common_1.HttpStatus.BAD_REQUEST,
                 code: 400020612,
-                message: 'Bank destination account type should not be empty.',
+                message: 'Destination account type is required.',
                 data: { accountTransferDto }
             }, common_1.HttpStatus.BAD_REQUEST);
         }
@@ -506,7 +580,7 @@ let WelcomeBankService = class WelcomeBankService {
             throw new common_1.HttpException({
                 statusCode: common_1.HttpStatus.BAD_REQUEST,
                 code: 400020613,
-                message: 'Amount should not be empty.',
+                message: 'Transaction amount is required.',
                 data: { accountTransferDto }
             }, common_1.HttpStatus.BAD_REQUEST);
         }
@@ -517,6 +591,7 @@ let WelcomeBankService = class WelcomeBankService {
         const totpPrevious = this.generateTOTP(timeInSeconds - 30);
         this.logger.log(`TOTP GENERATED FOR WELCOME BANK CASH IN: ${totp}, For Time stamp: ${isoTimestamp}`);
         this.logger.log(`TOTP GENERATED FOR PREVIOUS TIME: ${totpPrevious}`);
+        let responseData;
         try {
             const headers = {
                 'Authorization': `Bearer ${token}`,
@@ -544,38 +619,63 @@ let WelcomeBankService = class WelcomeBankService {
                 headers: headers,
                 httpsAgent
             });
-            let responseData = response.data;
-            this.logger.log({ responseData: response }, 'Welcome Bank Cash In Successful');
+            this.logger.log({ responseData: response.data }, 'Welcome Bank Cash In Successful');
             if (String(this.config.WELCOMBANK_ENABLEENCRYPTION).toLowerCase() === 'true') {
-                const encryptedResponsePayload = responseData.data;
+                const encryptedResponsePayload = response.data.data;
                 if (!encryptedResponsePayload) {
                     throw new Error("Encrypted response expected but not found");
                 }
-                let decryptedResponse;
                 try {
-                    decryptedResponse = this.decryptPayloadWithOTP(encryptedResponsePayload, totp);
+                    responseData = this.decryptPayloadWithOTP(encryptedResponsePayload, totp);
                 }
                 catch (error) {
                     this.logger.warn("Decryption with current OTP failed, trying with previous OTP");
+                    responseData = this.decryptPayloadWithOTP(encryptedResponsePayload, totpPrevious);
                 }
-                if (!decryptedResponse) {
-                    decryptedResponse = this.decryptPayloadWithOTP(encryptedResponsePayload, totpPrevious);
-                }
-                return {
-                    success: true,
-                    data: decryptedResponse,
-                };
             }
             else {
-                return {
-                    success: true,
-                    ...responseData,
-                };
+                responseData = response.data;
             }
         }
         catch (error) {
             axios_error_helper_1.AxiosErrorHelper.handleAxiosError(error);
         }
+        if (responseData.data.status === "99999") {
+            throw new common_1.HttpException({
+                statusCode: common_1.HttpStatus.FORBIDDEN,
+                code: 403020603,
+                message: 'Invalid permission key.',
+                data: { ...accountTransferDto }
+            }, common_1.HttpStatus.FORBIDDEN);
+        }
+        if (responseData.data.status === "99997") {
+            throw new common_1.HttpException({
+                statusCode: common_1.HttpStatus.BAD_REQUEST,
+                code: 400020605,
+                message: 'Account not found.',
+                data: { ...accountTransferDto }
+            }, common_1.HttpStatus.BAD_REQUEST);
+        }
+        if (responseData.data.status === "00001") {
+            throw new common_1.HttpException({
+                statusCode: common_1.HttpStatus.BAD_REQUEST,
+                code: 400020607,
+                message: 'Account type is not supported.',
+                data: { ...accountTransferDto }
+            }, common_1.HttpStatus.BAD_REQUEST);
+        }
+        if (responseData.data.status === "00004") {
+            throw new common_1.HttpException({
+                statusCode: common_1.HttpStatus.UNPROCESSABLE_ENTITY,
+                code: 422020614,
+                message: 'Invalid transaction amount value.',
+                data: { ...accountTransferDto }
+            }, common_1.HttpStatus.UNPROCESSABLE_ENTITY);
+        }
+        return {
+            success: true,
+            ...responseData,
+        };
     }
     async accountDeposit(accountTransferDto) {
         const { token, permissionKey, sourceAccount, sourceBranch, sourceAccountType, destinationAccount, destinationBranch, destinationAccountType, amount } = accountTransferDto;
@@ -591,7 +691,7 @@ let WelcomeBankService = class WelcomeBankService {
             throw new common_1.HttpException({
                 statusCode: common_1.HttpStatus.FORBIDDEN,
                 code: 403020704,
-                message: 'Bank permission key should not be empty.',
+                message: 'Permission key is required.',
                 data: { accountTransferDto }
             }, common_1.HttpStatus.FORBIDDEN);
         }
@@ -599,7 +699,7 @@ let WelcomeBankService = class WelcomeBankService {
             throw new common_1.HttpException({
                 statusCode: common_1.HttpStatus.BAD_REQUEST,
                 code: 400020706,
-                message: 'Bank source account number should not be empty.',
+                message: 'Source account number is required',
                 data: { accountTransferDto }
             }, common_1.HttpStatus.BAD_REQUEST);
         }
@@ -607,7 +707,7 @@ let WelcomeBankService = class WelcomeBankService {
             throw new common_1.HttpException({
                 statusCode: common_1.HttpStatus.BAD_REQUEST,
                 code: 400020708,
-                message: 'Bank source account type should not be empty.',
+                message: 'Source account type is required.',
                 data: { accountTransferDto }
             }, common_1.HttpStatus.BAD_REQUEST);
         }
@@ -615,7 +715,7 @@ let WelcomeBankService = class WelcomeBankService {
             throw new common_1.HttpException({
                 statusCode: common_1.HttpStatus.BAD_REQUEST,
                 code: 400020710,
-                message: 'Bank destination account number should not be empty.',
+                message: 'Destination account number is required',
                 data: { accountTransferDto }
             }, common_1.HttpStatus.BAD_REQUEST);
         }
@@ -631,7 +731,7 @@ let WelcomeBankService = class WelcomeBankService {
             throw new common_1.HttpException({
                 statusCode: common_1.HttpStatus.BAD_REQUEST,
                 code: 400020713,
-                message: 'Amount should not be empty.',
+                message: 'Transaction amount is required.',
                 data: { accountTransferDto }
             }, common_1.HttpStatus.BAD_REQUEST);
         }
@@ -642,6 +742,7 @@ let WelcomeBankService = class WelcomeBankService {
         const totpPrevious = this.generateTOTP(timeInSeconds - 30);
         this.logger.log(`TOTP GENERATED FOR WELCOME BANK DEPOSIT: ${totp}, For Time stamp: ${isoTimestamp}`);
         this.logger.log(`TOTP GENERATED FOR PREVIOUS TIME: ${totpPrevious}`);
+        let responseData;
         try {
             const headers = {
                 'Authorization': `Bearer ${token}`,
@@ -669,41 +770,68 @@ let WelcomeBankService = class WelcomeBankService {
                 headers: headers,
                 httpsAgent
             });
-            let responseData = response.data;
             this.logger.log({ responseData: response.data }, 'Welcom Bank Deposit Successful');
             if (String(this.config.WELCOMBANK_ENABLEENCRYPTION).toLowerCase() === 'true') {
-                const encryptedResponsePayload = responseData.data;
+                const encryptedResponsePayload = response.data.data;
                 if (!encryptedResponsePayload) {
                     throw new Error("Encrypted response expected but not found");
                 }
-                let decryptedResponse;
                 try {
-                    decryptedResponse = this.decryptPayloadWithOTP(encryptedResponsePayload, totp);
+                    responseData = this.decryptPayloadWithOTP(encryptedResponsePayload, totp);
                 }
                 catch (error) {
                     this.logger.warn("Decryption with current OTP failed, trying with previous OTP");
+                    responseData = this.decryptPayloadWithOTP(encryptedResponsePayload, totpPrevious);
                 }
-                if (!decryptedResponse) {
-                    decryptedResponse = this.decryptPayloadWithOTP(encryptedResponsePayload, totpPrevious);
-                }
-                return {
-                    success: true,
-                    data: decryptedResponse,
-                };
             }
             else {
-                return {
-                    success: true,
-                    ...responseData,
-                };
+                responseData = response.data;
             }
         }
         catch (error) {
             axios_error_helper_1.AxiosErrorHelper.handleAxiosError(error);
         }
+        if (responseData.data.status === "99999") {
+            throw new common_1.HttpException({
+                statusCode: common_1.HttpStatus.FORBIDDEN,
+                code: 403020703,
+                message: 'Invalid permission key.',
+                data: { ...accountTransferDto }
+            }, common_1.HttpStatus.FORBIDDEN);
+        }
+        if (responseData.data.status === "99997") {
+            throw new common_1.HttpException({
+                statusCode: common_1.HttpStatus.BAD_REQUEST,
+                code: 400020709,
+                message: 'Account not found.',
+                data: { ...accountTransferDto }
+            }, common_1.HttpStatus.BAD_REQUEST);
+        }
+        if (responseData.data.status === "00001") {
+            throw new common_1.HttpException({
+                statusCode: common_1.HttpStatus.BAD_REQUEST,
+                code: 400020711,
+                message: 'Account type is not supported.',
+                data: { ...accountTransferDto }
+            }, common_1.HttpStatus.BAD_REQUEST);
+        }
+        if (responseData.data.status === "00004") {
+            throw new common_1.HttpException({
+                statusCode: common_1.HttpStatus.UNPROCESSABLE_ENTITY,
+                code: 422020714,
+                message: 'Invalid transaction amount value.',
+                data: { ...accountTransferDto }
+            }, common_1.HttpStatus.UNPROCESSABLE_ENTITY);
+        }
+        return {
+            success: true,
+            ...responseData,
+        };
     }
     async getTransactionHistory(transactionHistoryDto) {
         const { token, permissionKey, account, branch, accountType, dateFrom, dateTo, page } = transactionHistoryDto;
+        const dateRegex = /^\d{4}-\d{2}-\d{2}$/;
+        const reformattedTransactions = {};
         if (!token) {
             throw new common_1.HttpException({
                 statusCode: common_1.HttpStatus.UNAUTHORIZED,
@@ -716,7 +844,7 @@ let WelcomeBankService = class WelcomeBankService {
             throw new common_1.HttpException({
                 statusCode: common_1.HttpStatus.FORBIDDEN,
                 code: 403020804,
-                message: 'Bank permission key should not be empty.',
+                message: 'Permission key is required.',
                 data: { transactionHistoryDto }
             }, common_1.HttpStatus.FORBIDDEN);
         }
@@ -724,7 +852,7 @@ let WelcomeBankService = class WelcomeBankService {
             throw new common_1.HttpException({
                 statusCode: common_1.HttpStatus.BAD_REQUEST,
                 code: 400020806,
-                message: 'Bank account number should not be empty.',
+                message: 'Account number is required',
                 data: { transactionHistoryDto }
             }, common_1.HttpStatus.BAD_REQUEST);
         }
@@ -732,7 +860,7 @@ let WelcomeBankService = class WelcomeBankService {
             throw new common_1.HttpException({
                 statusCode: common_1.HttpStatus.BAD_REQUEST,
                 code: 400020808,
-                message: 'Bank account type should not be empty.',
+                message: 'Account type is required.',
                 data: { transactionHistoryDto }
             }, common_1.HttpStatus.BAD_REQUEST);
         }
@@ -740,25 +868,42 @@ let WelcomeBankService = class WelcomeBankService {
             throw new common_1.HttpException({
                 statusCode: common_1.HttpStatus.BAD_REQUEST,
                 code: 400020810,
-                message: 'Date From should not be empty.',
+                message: 'Starting date is required.',
                 data: { transactionHistoryDto }
             }, common_1.HttpStatus.BAD_REQUEST);
         }
+        if (!dateRegex.test(dateFrom)) {
+            throw new common_1.HttpException({
+                statusCode: common_1.HttpStatus.UNPROCESSABLE_ENTITY,
+                code: 422020809,
+                message: 'Invalid starting date format. Format should be in YYYY-MM-DD.',
+                data: { ...transactionHistoryDto }
+            }, common_1.HttpStatus.UNPROCESSABLE_ENTITY);
+        }
         if (!dateTo) {
             throw new common_1.HttpException({
                 statusCode: common_1.HttpStatus.BAD_REQUEST,
                 code: 400020812,
-                message: 'Date From should not be empty.',
+                message: 'Ending date is required.',
                 data: { transactionHistoryDto }
             }, common_1.HttpStatus.BAD_REQUEST);
         }
+        if (!dateRegex.test(dateTo)) {
+            throw new common_1.HttpException({
+                statusCode: common_1.HttpStatus.UNPROCESSABLE_ENTITY,
+                code: 422020811,
+                message: 'Invalid starting date format. Format should be in YYYY-MM-DD.',
+                data: { ...transactionHistoryDto }
+            }, common_1.HttpStatus.UNPROCESSABLE_ENTITY);
+        }
         this.logger.log("Welcome Bank transaction history");
         const isoTimestamp = new Date().toISOString();
         const timeInSeconds = Math.floor(Date.parse(isoTimestamp) / 1000);
         const totp = this.generateTOTP(timeInSeconds);
         const totpPrevious = this.generateTOTP(timeInSeconds - 30);
-        this.logger.log(`TOTP GENERATED FOR WELCOME BANK VALIDATE OTP: ${totp}, For Time stamp: ${isoTimestamp}`);
+        this.logger.log(`TOTP GENERATED FOR WELCOME BANK TRANSACTION HISTORY: ${totp}, For Time stamp: ${isoTimestamp}`);
         this.logger.log(`TOTP GENERATED FOR PREVIOUS TIME: ${totpPrevious}`);
+        let responseData;
         try {
             const headers = {
                 'Authorization': `Bearer ${token}`,
@@ -785,38 +930,77 @@ let WelcomeBankService = class WelcomeBankService {
                 headers: headers,
                 httpsAgent
             });
-            let responseData = response.data;
             this.logger.log({ responseData: response.data }, 'Welcome Bank Transaction History Successful');
             if (String(this.config.WELCOMBANK_ENABLEENCRYPTION).toLowerCase() === 'true') {
-                const encryptedResponsePayload = responseData.data;
+                const encryptedResponsePayload = response.data.data;
                 if (!encryptedResponsePayload) {
                     throw new Error("Encrypted response expected but not found");
                 }
-                let decryptedResponse;
                 try {
-                    decryptedResponse = this.decryptPayloadWithOTP(encryptedResponsePayload, totp);
+                    responseData = this.decryptPayloadWithOTP(encryptedResponsePayload, totp);
                 }
                 catch (error) {
                     this.logger.warn("Decryption with current OTP failed, trying with previous OTP");
+                    responseData = this.decryptPayloadWithOTP(encryptedResponsePayload, totpPrevious);
                 }
-                if (!decryptedResponse) {
-                    decryptedResponse = this.decryptPayloadWithOTP(encryptedResponsePayload, totpPrevious);
-                }
-                return {
-                    success: true,
-                    data: decryptedResponse,
-                };
+                this.logger.log(`Decrypted Response Log: ${JSON.stringify(responseData)}`);
+                this.logger.log(`Decrypted.data.transactions Response Log: ${JSON.stringify(responseData.data.transaction)}`);
+                responseData.data.transaction.forEach((txn, index) => {
+                    const key = `${index + 1}`;
+                    reformattedTransactions[key] = {
+                        dateTime: txn.dateTime,
+                        amount: txn.amount,
+                        type: txn.type,
+                        description: txn.description,
+                        transactionReference: txn.tranReference
+                    };
+                });
             }
             else {
-                return {
-                    success: true,
-                    ...responseData,
-                };
+                responseData = response.data;
             }
         }
         catch (error) {
             axios_error_helper_1.AxiosErrorHelper.handleAxiosError(error);
         }
+        if (responseData.data.status === "99999") {
+            throw new common_1.HttpException({
+                statusCode: common_1.HttpStatus.FORBIDDEN,
+                code: 403020803,
+                message: 'Invalid permission key.',
+                data: { ...transactionHistoryDto }
+            }, common_1.HttpStatus.FORBIDDEN);
+        }
+        if (responseData.data.status === "99997") {
+            throw new common_1.HttpException({
+                statusCode: common_1.HttpStatus.BAD_REQUEST,
+                code: 400020805,
+                message: 'Account not found.',
+                data: { ...transactionHistoryDto }
+            }, common_1.HttpStatus.BAD_REQUEST);
+        }
+        if (responseData.data.status === "00001") {
+            throw new common_1.HttpException({
+                statusCode: common_1.HttpStatus.BAD_REQUEST,
+                code: 400020807,
+                message: 'Account type is not supported.',
+                data: { ...transactionHistoryDto }
+            }, common_1.HttpStatus.BAD_REQUEST);
+        }
+        if (responseData.data.status === "XXXXX") {
+            throw new common_1.HttpException({
+                statusCode: common_1.HttpStatus.UNPROCESSABLE_ENTITY,
+                code: 422020813,
+                message: 'Invalid page number format.',
+                data: { ...transactionHistoryDto }
+            }, common_1.HttpStatus.UNPROCESSABLE_ENTITY);
+        }
+        return {
+            success: true,
+            message: responseData.data.responseMessage,
+            timestamp: responseData.timestamp,
+            transactions: reformattedTransactions,
+        };
     }
     async findAccountDetailsRaw(token, userid) {
         return "Sorry Service Currently Unavaible";