From 53349ffadc0bf380a81e55324ba63350be90857b Mon Sep 17 00:00:00 2001 From: Naeem Ullah Date: Fri, 23 Jan 2026 16:23:57 +0500 Subject: [PATCH] Add transaction URI to logs and update deposit approval endpoints Introduced a transactionUri field to TransactionLog and updated TransactionLogService methods to accept and store the URI. Refactored deposit approval endpoints in DepositAccountController to use new URIs and updated AconnectURI and TokenBypassURI constants accordingly for individual and business deposit approvals. --- .../controller/DepositAccountController.java | 20 +++++++++++++------ .../aconnect/client/model/TransactionLog.java | 3 +++ .../client/service/TransactionLogService.java | 12 +++++++---- .../client/service/TransactionService.java | 8 ++++---- .../configuration/constant/AconnectURI.java | 3 ++- .../constant/TokenBypassURI.java | 1 + 6 files changed, 32 insertions(+), 15 deletions(-) diff --git a/aconnect/src/main/java/com/mfsys/aconnect/client/controller/DepositAccountController.java b/aconnect/src/main/java/com/mfsys/aconnect/client/controller/DepositAccountController.java index fcf9aed..a2f6f0b 100644 --- a/aconnect/src/main/java/com/mfsys/aconnect/client/controller/DepositAccountController.java +++ b/aconnect/src/main/java/com/mfsys/aconnect/client/controller/DepositAccountController.java @@ -25,15 +25,23 @@ public class DepositAccountController { return depositAccountService.createIndividualDeposit(workflowRequestDTO, token); } - @PatchMapping(AconnectURI.UPDATE_DEPOSIT_CREATION_URI) - public Object updateIndividualDeposit(@RequestBody WorkflowApprovalDTO workflowRequestDTO, - @RequestHeader("Authorization") String token) { - return depositAccountService.approvalIndividualDeposit(workflowRequestDTO, token); - } - @PostMapping(AconnectURI.BUSINESS_DEPOSIT_CREATION_URI) public Object createBusinessCRM(@RequestBody WorkflowRequestDTO workflowRequestDTO, @RequestHeader("Authorization") String token) { return depositAccountService.createBusinessDeposit(workflowRequestDTO, token); } + + + @PostMapping(AconnectURI.APPROVE_INDIVIDUAL_DEPOSIT_CREATION_URI) + public Object approveIndividualDeposit(@RequestBody WorkflowApprovalDTO workflowRequestDTO, + @RequestHeader("Authorization") String token) { + return depositAccountService.approvalIndividualDeposit(workflowRequestDTO, token); + } + + + @PostMapping(AconnectURI.APPROVE_BUSINESS_DEPOSIT_CREATION_URI) + public Object approveBusinessDeposit(@RequestBody WorkflowApprovalDTO workflowRequestDTO, + @RequestHeader("Authorization") String token) { + return depositAccountService.approvalIndividualDeposit(workflowRequestDTO, token); + } } diff --git a/aconnect/src/main/java/com/mfsys/aconnect/client/model/TransactionLog.java b/aconnect/src/main/java/com/mfsys/aconnect/client/model/TransactionLog.java index 50b20d0..d809dca 100644 --- a/aconnect/src/main/java/com/mfsys/aconnect/client/model/TransactionLog.java +++ b/aconnect/src/main/java/com/mfsys/aconnect/client/model/TransactionLog.java @@ -30,6 +30,9 @@ public class TransactionLog { @Column(name = "CR_PCAGLACCODE", nullable = true, updatable = false, columnDefinition = FieldNameLength.ACCOUNT_NUMBER) private String crPcaglacode; + @Column(name = "TRANSACTION_URI", nullable = true, updatable = false, columnDefinition = FieldNameLength.ACCOUNT_TITLE) + private String transactionUri; + @Column(name = "DR_PCAGLACCODE", nullable = true, updatable = false, columnDefinition = FieldNameLength.ACCOUNT_NUMBER) private String drPcaGlacode; diff --git a/aconnect/src/main/java/com/mfsys/aconnect/client/service/TransactionLogService.java b/aconnect/src/main/java/com/mfsys/aconnect/client/service/TransactionLogService.java index f9ffdc8..bc65e16 100644 --- a/aconnect/src/main/java/com/mfsys/aconnect/client/service/TransactionLogService.java +++ b/aconnect/src/main/java/com/mfsys/aconnect/client/service/TransactionLogService.java @@ -26,7 +26,7 @@ public class TransactionLogService { return transactionLogRepository.findAll(); } - public TransactionLog createTransactionLog(AccountGLTransactionRequest accountGLTransactionRequest) { + public TransactionLog createTransactionLog(AccountGLTransactionRequest accountGLTransactionRequest, String URI) { TransactionLog transactionLog = new TransactionLog(); transactionLog.setPorOrgacode(accountGLTransactionRequest.getPorOrgacode()); transactionLog.setChannelCode(accountGLTransactionRequest.getSgtGntrcreateusr()); @@ -40,6 +40,7 @@ public class TransactionLogService { transactionLog.setCreatedAt(LocalDateTime.now()); transactionLog.setUpdatedAt(LocalDateTime.now()); transactionLog.setSgtGntrdate(LocalDate.parse(accountGLTransactionRequest.getSgtGntrvaluedate())); + transactionLog.setTransactionUri(URI); return transactionLogRepository.save(transactionLog); } @@ -57,7 +58,7 @@ public class TransactionLogService { } - public TransactionLog createGLtoGLTransactionLog(GLtoGLRequest gLtoGLRequest) { + public TransactionLog createGLtoGLTransactionLog(GLtoGLRequest gLtoGLRequest, String URI) { TransactionLog transactionLog = new TransactionLog(); transactionLog.setPorOrgacode(gLtoGLRequest.getPorOrgacode()); transactionLog.setChannelCode(gLtoGLRequest.getSgtGntrcreateusr()); @@ -71,10 +72,11 @@ public class TransactionLogService { transactionLog.setCreatedAt(LocalDateTime.now()); transactionLog.setUpdatedAt(LocalDateTime.now()); transactionLog.setSgtGntrdate(LocalDate.parse(gLtoGLRequest.getSgtGntrvaluedate())); + transactionLog.setTransactionUri(URI); return transactionLogRepository.save(transactionLog); } - public TransactionLog createAccToAccTransactionLog(AccountToAccountDTO accountToAccountDTO) { + public TransactionLog createAccToAccTransactionLog(AccountToAccountDTO accountToAccountDTO, String URI) { TransactionLog transactionLog = new TransactionLog(); transactionLog.setPorOrgacode(accountToAccountDTO.getPorOrgacode()); transactionLog.setChannelCode(accountToAccountDTO.getSgtGntrcreateusr()); @@ -88,10 +90,11 @@ public class TransactionLogService { transactionLog.setCreatedAt(LocalDateTime.now()); transactionLog.setUpdatedAt(LocalDateTime.now()); transactionLog.setSgtGntrdate(accountToAccountDTO.getSgtGntrvaluedate()); + transactionLog.setTransactionUri(URI); return transactionLogRepository.save(transactionLog); } - public TransactionLog createGLToAccTransactionLog(GlToAccountDTO glToAccountDTO) { + public TransactionLog createGLToAccTransactionLog(GlToAccountDTO glToAccountDTO, String URI) { TransactionLog transactionLog = new TransactionLog(); transactionLog.setPorOrgacode(glToAccountDTO.getPorOrgacode()); transactionLog.setChannelCode(glToAccountDTO.getSgtGntrcreateusr()); @@ -105,6 +108,7 @@ public class TransactionLogService { transactionLog.setCreatedAt(LocalDateTime.now()); transactionLog.setUpdatedAt(LocalDateTime.now()); transactionLog.setSgtGntrdate(glToAccountDTO.getSgtGntrvaluedate()); + transactionLog.setTransactionUri(URI); return transactionLogRepository.save(transactionLog); } } 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 a2a0e65..36784f5 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 @@ -88,7 +88,7 @@ public class TransactionService { headers.setAccept(java.util.List.of(MediaType.APPLICATION_JSON)); HttpEntity entity = new HttpEntity<>(accountGLTransactionRequest, headers); - TransactionLog log = transactionLogService.createTransactionLog(accountGLTransactionRequest); + TransactionLog log = transactionLogService.createTransactionLog(accountGLTransactionRequest, url); RestTemplate restTemplate = new RestTemplate(); ResponseEntity response = restTemplate.exchange( url, @@ -154,7 +154,7 @@ public class TransactionService { HttpEntity entity = new HttpEntity<>(gLtoGLRequest, headers); RestTemplate restTemplate = new RestTemplate(); - TransactionLog log = transactionLogService.createGLtoGLTransactionLog(gLtoGLRequest); + TransactionLog log = transactionLogService.createGLtoGLTransactionLog(gLtoGLRequest, url); ResponseEntity response = restTemplate.exchange( url, HttpMethod.POST, @@ -217,7 +217,7 @@ public class TransactionService { HttpEntity entity = new HttpEntity<>(accountToAccountDTO, headers); RestTemplate restTemplate = new RestTemplate(); - TransactionLog log = transactionLogService.createAccToAccTransactionLog(accountToAccountDTO); + TransactionLog log = transactionLogService.createAccToAccTransactionLog(accountToAccountDTO, url); ResponseEntity response = restTemplate.exchange( url, HttpMethod.POST, @@ -261,7 +261,7 @@ public class TransactionService { HttpEntity entity = new HttpEntity<>(glToAccountDTO, headers); RestTemplate restTemplate = new RestTemplate(); - TransactionLog log = transactionLogService.createGLToAccTransactionLog(glToAccountDTO); + TransactionLog log = transactionLogService.createGLToAccTransactionLog(glToAccountDTO, url); ResponseEntity response = restTemplate.exchange( url, diff --git a/common/src/main/java/com/mfsys/common/configuration/constant/AconnectURI.java b/common/src/main/java/com/mfsys/common/configuration/constant/AconnectURI.java index 9b1d8c9..aeca2fa 100644 --- a/common/src/main/java/com/mfsys/common/configuration/constant/AconnectURI.java +++ b/common/src/main/java/com/mfsys/common/configuration/constant/AconnectURI.java @@ -40,7 +40,8 @@ public interface AconnectURI { String CHECK_BUSINESS_APPLICATIONS_URI = CRM + BUSINESS + "/inprocess"; String BUSINESS_CRM_CREATION_URI = CRM + BUSINESS + "/create"; String INDIVIDUAL_DEPOSIT_CREATION_URI = DEPOSIT + INDIVIDUAL + "/create"; - String UPDATE_DEPOSIT_CREATION_URI = DEPOSIT + INDIVIDUAL + "/approval"; + String APPROVE_INDIVIDUAL_DEPOSIT_CREATION_URI = DEPOSIT + INDIVIDUAL + "/approval"; + String APPROVE_BUSINESS_DEPOSIT_CREATION_URI = DEPOSIT + BUSINESS + "/approval"; String BUSINESS_DEPOSIT_CREATION_URI = DEPOSIT + BUSINESS + "/create"; diff --git a/common/src/main/java/com/mfsys/common/configuration/constant/TokenBypassURI.java b/common/src/main/java/com/mfsys/common/configuration/constant/TokenBypassURI.java index 1d5ec84..cbaf55a 100644 --- a/common/src/main/java/com/mfsys/common/configuration/constant/TokenBypassURI.java +++ b/common/src/main/java/com/mfsys/common/configuration/constant/TokenBypassURI.java @@ -31,6 +31,7 @@ public interface TokenBypassURI { "/aconnect/crm/business/create", "/aconnect/deposit/individual/create", "/aconnect/deposit/individual/approval", + "/aconnect/deposit/business/approval", "/aconnect/deposit/business/create", "/aconnect/loan/individual/create", "/aconnect/loan/individual/approval",