diff --git a/aconnect/src/main/java/com/mfsys/aconnect/client/service/ReversalTransactionService.java b/aconnect/src/main/java/com/mfsys/aconnect/client/service/ReversalTransactionService.java index 06d9cdf..b4fc070 100644 --- a/aconnect/src/main/java/com/mfsys/aconnect/client/service/ReversalTransactionService.java +++ b/aconnect/src/main/java/com/mfsys/aconnect/client/service/ReversalTransactionService.java @@ -5,9 +5,7 @@ import com.mfsys.aconnect.client.dto.GLReversalDTO; 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; @@ -20,15 +18,17 @@ public class ReversalTransactionService { @Value("${app.generalledger.uri}") private String generalledgerURI; - private final RestTemplate restTemplate; - public ReversalTransactionService(RestTemplate restTemplate) { - this.restTemplate = restTemplate; + private final WebClientConfig webClientConfig; + public ReversalTransactionService(WebClientConfig webClientConfig) { + this.webClientConfig = webClientConfig; } - public Object processDepositReversalTransaction(DepositReversalDTO reversalRequest, String tokenHeader) { + public ResponseEntity processDepositReversalTransaction(DepositReversalDTO reversalRequest, String tokenHeader) { + String porOrgacode = reversalRequest.getPorOrgacode(); String nodeID = reversalRequest.getNodeId(); String sgtGntrtranlink = reversalRequest.getSgtGntrtranlink(); + String url = depositURI + "/deposit/" + "/organizations/" + porOrgacode + "/transactions" + ACONNECT + "/reversals/nodes/" + nodeID + "/trannums/" + sgtGntrtranlink; HttpHeaders headers = new HttpHeaders(); headers.set("Authorization", tokenHeader); @@ -36,19 +36,15 @@ public class ReversalTransactionService { headers.set("SUS_USERCODE", reversalRequest.getSusUsercode()); headers.setContentType(MediaType.APPLICATION_JSON); - HttpEntity entity = new HttpEntity<>(reversalRequest, headers); - - ResponseEntity response = restTemplate.exchange( + return webClientConfig.post( url, - HttpMethod.POST, - entity, - Map.class + reversalRequest, + headers ); - - return ResponseEntity.status(response.getStatusCode()).body(response.getBody()); } - public Object processGLReversalTransaction(GLReversalDTO reversalRequest, String tokenHeader) { + public ResponseEntity processGLReversalTransaction(GLReversalDTO reversalRequest, String tokenHeader) { + String porOrgacode = reversalRequest.getPorOrgacode(); String nodeID = reversalRequest.getNodeId(); String sgtGntrtranlink = reversalRequest.getSgtGntrtranlink(); @@ -60,16 +56,11 @@ public class ReversalTransactionService { headers.set("SUS_USERCODE", reversalRequest.getSusUsercode()); headers.setContentType(MediaType.APPLICATION_JSON); - HttpEntity entity = new HttpEntity<>(reversalRequest, headers); - - ResponseEntity response = restTemplate.exchange( + return webClientConfig.post( url, - HttpMethod.POST, - entity, - Map.class + reversalRequest, + headers ); - - return ResponseEntity.status(response.getStatusCode()).body(response.getBody()); } }