From f6030e3f9b29db94cc0204f3779fd24787aca06f Mon Sep 17 00:00:00 2001
From: Wasiullah Khan Jadoon <wasiullah.khan@mfsys.ca>
Date: Fri, 30 Jan 2026 10:55:26 +0500
Subject: [PATCH] Updated RejectTransactionService from Rest Template to Web
 Client

---
 .../service/RejectTransactionService.java     | 36 +++++++------------
 1 file changed, 12 insertions(+), 24 deletions(-)

diff --git a/aconnect/src/main/java/com/mfsys/aconnect/client/service/RejectTransactionService.java b/aconnect/src/main/java/com/mfsys/aconnect/client/service/RejectTransactionService.java
index 2200c5f..a18c71c 100644
--- a/aconnect/src/main/java/com/mfsys/aconnect/client/service/RejectTransactionService.java
+++ b/aconnect/src/main/java/com/mfsys/aconnect/client/service/RejectTransactionService.java
@@ -4,9 +4,7 @@ import com.mfsys.aconnect.client.dto.DepositRejectDTO;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.*;
 import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
-
-import java.util.Map;
+import com.mfsys.aconnect.configuration.config.WebClientConfig;
 
 import static com.mfsys.common.configuration.constant.AconnectURI.ACONNECT;
 
@@ -19,12 +17,12 @@ public class RejectTransactionService {
     @Value("${app.generalledger.uri}")
     private String generalledgerURI;
 
-    private final RestTemplate restTemplate;
-    public RejectTransactionService(RestTemplate restTemplate) {
-        this.restTemplate = restTemplate;
+    private final WebClientConfig webClientConfig;
+    public RejectTransactionService(WebClientConfig webClientConfig) {
+        this.webClientConfig = webClientConfig;
     }
 
-    public Object processDepositRejectionTransaction(DepositRejectDTO rejectRequest, String tokenHeader) {
+    public ResponseEntity<Object> processDepositRejectionTransaction(DepositRejectDTO rejectRequest, String tokenHeader) {
         String porOrgacode  = rejectRequest.getPorOrgacode();
         String url = depositURI + "/deposit/" + "/organizations/" + porOrgacode + "/transactions" + ACONNECT +"/rejection";
         HttpHeaders headers = new HttpHeaders();
@@ -33,19 +31,14 @@ public class RejectTransactionService {
         headers.set("SUS_USERCODE", rejectRequest.getSusUsercode());
         headers.setContentType(MediaType.APPLICATION_JSON);
 
-        HttpEntity<DepositRejectDTO> entity = new HttpEntity<>(rejectRequest, headers);
-
-        ResponseEntity<Map> response = restTemplate.exchange(
+        return webClientConfig.post(
                 url,
-                HttpMethod.POST,
-                entity,
-                Map.class
+                rejectRequest,
+                headers
         );
-
-        return ResponseEntity.status(response.getStatusCode()).body(response.getBody());
     }
 
-    public Object processGLRejectionTransaction(DepositRejectDTO rejectRequest, String tokenHeader) {
+    public ResponseEntity<Object> processGLRejectionTransaction(DepositRejectDTO rejectRequest, String tokenHeader) {
         String porOrgacode  = rejectRequest.getPorOrgacode();
         String url = generalledgerURI + "/generalledger/" + "/organizations/" + porOrgacode + "/transactions" + ACONNECT +"/rejection";
         HttpHeaders headers = new HttpHeaders();
@@ -54,16 +47,11 @@ public class RejectTransactionService {
         headers.set("SUS_USERCODE", rejectRequest.getSusUsercode());
         headers.setContentType(MediaType.APPLICATION_JSON);
 
-        HttpEntity<DepositRejectDTO> entity = new HttpEntity<>(rejectRequest, headers);
-
-        ResponseEntity<Map> response = restTemplate.exchange(
+        return webClientConfig.post(
                 url,
-                HttpMethod.POST,
-                entity,
-                Map.class
+                rejectRequest,
+                headers
         );
-
-        return ResponseEntity.status(response.getStatusCode()).body(response.getBody());
     }
 
 }