From 5388b85261266bdbe7ae157ff28d014b8aeb6c69 Mon Sep 17 00:00:00 2001 From: Naeem Ullah Date: Wed, 21 Jan 2026 15:33:34 +0500 Subject: [PATCH] added validations added validations --- .../client/service/TransactionService.java | 32 ++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/aconnect/src/main/java/com/mfsys/aconnect/client/service/TransactionService.java b/aconnect/src/main/java/com/mfsys/aconnect/client/service/TransactionService.java index cdbfe40..2618b4b 100644 --- a/aconnect/src/main/java/com/mfsys/aconnect/client/service/TransactionService.java +++ b/aconnect/src/main/java/com/mfsys/aconnect/client/service/TransactionService.java @@ -107,6 +107,21 @@ public class TransactionService { Double creditAmount = gLtoGLRequest.getCreditGl().getSgtGntramtfc(); Double debitAmount = gLtoGLRequest.getDebitGl().getSgtGntramtfc(); + String crGL = gLtoGLRequest.getCreditGl().getPcaGlaccode(); + String drGL = gLtoGLRequest.getDebitGl().getPcaGlaccode(); + + if(crGL == null || drGL == null) { + return ResponseEntity + .badRequest() + .body("Credit and Debit GL codes are required"); + } + + if(crGL.equals(drGL)) { + return ResponseEntity + .badRequest() + .body("Credit and Debit GL codes cannot be same"); + } + if (creditAmount == null || debitAmount == null) { return ResponseEntity .badRequest() @@ -126,7 +141,7 @@ public class TransactionService { } String porOrgacode = gLtoGLRequest.getPorOrgacode(); - String url = generalledgerURI + "/generalledger/" + "/organizations/" + porOrgacode + "/transactions" + ACONNECT +"/gltogls"; + String url = generalledgerURI + "/generalledger" + "/organizations/" + porOrgacode + "/transactions" + ACONNECT +"/gltogls"; HttpHeaders headers = new HttpHeaders(); headers.set("Authorization", tokenHeader); headers.set("POR_ORGACODE", porOrgacode); @@ -154,6 +169,21 @@ public class TransactionService { BigDecimal creditAmount = accountToAccountDTO.getCreditAcc().getSgtGntramtfc(); BigDecimal debitAmount = accountToAccountDTO.getDebitAcc().getSgtGntramtfc(); + String crAcc = accountToAccountDTO.getCreditAcc().getMbmBkmsnumber(); + String drAcc = accountToAccountDTO.getDebitAcc().getMbmBkmsnumber(); + + if(crAcc == null || drAcc == null) { + return ResponseEntity + .badRequest() + .body("Credit and Debit account numbers are required"); + } + + if(crAcc.equals(drAcc)) { + return ResponseEntity + .badRequest() + .body("Debit Account Number and Credit Account Number shouldn't be same"); + } + if (creditAmount == null || debitAmount == null) { return ResponseEntity .badRequest()