diff --git a/scripts/native/file/dom-service-order-payment-search-1.0-native-quarkus-jdk17-runner b/scripts/native/file/dom-service-order-payment-search-1.0-native-quarkus-jdk17-runner index e4838d0..0726ed8 100644 Binary files a/scripts/native/file/dom-service-order-payment-search-1.0-native-quarkus-jdk17-runner and b/scripts/native/file/dom-service-order-payment-search-1.0-native-quarkus-jdk17-runner differ diff --git a/src/main/java/com/banesco/common/application/service/HttpClientService.java b/src/main/java/com/banesco/common/application/service/HttpClientService.java index 122e6e8..fb42a5c 100644 --- a/src/main/java/com/banesco/common/application/service/HttpClientService.java +++ b/src/main/java/com/banesco/common/application/service/HttpClientService.java @@ -17,6 +17,8 @@ import lombok.extern.slf4j.Slf4j; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -132,9 +134,12 @@ public class HttpClientService implements HttpClientUseCase { urlBuilder.append("&"); } - urlBuilder.append(entry.getKey()) - .append("=") - .append(entry.getValue() != null ? entry.getValue() : ""); + String encodedKey = URLEncoder.encode(entry.getKey(), StandardCharsets.UTF_8); + String encodedValue = entry.getValue() != null + ? URLEncoder.encode(entry.getValue(), StandardCharsets.UTF_8) + : ""; + + urlBuilder.append(encodedKey).append("=").append(encodedValue); } return urlBuilder.toString(); diff --git a/src/main/java/com/banesco/module/service_order_payment_search/domain/dto/request/ServiceOrderPaymentSearchRequest.java b/src/main/java/com/banesco/module/service_order_payment_search/domain/dto/request/ServiceOrderPaymentSearchRequest.java index 97881c1..81a5bd6 100644 --- a/src/main/java/com/banesco/module/service_order_payment_search/domain/dto/request/ServiceOrderPaymentSearchRequest.java +++ b/src/main/java/com/banesco/module/service_order_payment_search/domain/dto/request/ServiceOrderPaymentSearchRequest.java @@ -41,7 +41,7 @@ public class ServiceOrderPaymentSearchRequest { .getDate(); } - public String getPaymentRequestId() { + public String getInstructionRequestId() { return getProcedureRequest() .getInstructionIdentifier() .getIdentification() @@ -68,7 +68,7 @@ public class ServiceOrderPaymentSearchRequest { entry("appId", Objects.toString(getAppId(), "")), entry("customerReferenceFintechId", Objects.toString(getCustomerReferenceFintechId(), "")), entry("initiatedDate", Objects.toString(getInitiatedDate(), "")), - entry("paymentRequestId", Objects.toString(getPaymentRequestId(), "")) + entry("instructionRequestId", Objects.toString(getInstructionRequestId(), "")) ); } } \ No newline at end of file diff --git a/src/main/java/com/banesco/module/service_order_payment_search/infrastructure/adapter/ApiPrivateAdapter.java b/src/main/java/com/banesco/module/service_order_payment_search/infrastructure/adapter/ApiPrivateAdapter.java index fb871b8..b69bc51 100644 --- a/src/main/java/com/banesco/module/service_order_payment_search/infrastructure/adapter/ApiPrivateAdapter.java +++ b/src/main/java/com/banesco/module/service_order_payment_search/infrastructure/adapter/ApiPrivateAdapter.java @@ -2,6 +2,7 @@ package com.banesco.module.service_order_payment_search.infrastructure.adapter; import com.banesco.common.domain.exception.HttpStatusCodeException; import com.banesco.module.payment_order.application.usecase.PaymentOrderUseCase; +import com.banesco.module.payment_order.domain.dto.request.PaymentOrderRequest; import com.banesco.module.payment_order.domain.model.PaymentOrderBol; import com.banesco.module.payment_order.domain.model.PaymentOrderBole; import com.banesco.module.service_order_payment_search.application.repository.ApiPrivateRepository; @@ -30,15 +31,19 @@ public class ApiPrivateAdapter implements ApiPrivateRepository { public List execute( ServiceOrderPaymentSearchRequest request ) { - return request.isBole() ? executeBole(request) : executeBol(request); + PaymentOrderRequest paymentOrderRequest = + ServicingOrderMapper.toPaymentRequest(request); + + return request.isBole() + ? executeBole(paymentOrderRequest) + : executeBol(paymentOrderRequest); } private List executeBole( - ServiceOrderPaymentSearchRequest request + PaymentOrderRequest request ) { List response = paymentOrderUseCase.execute( - ServicingOrderMapper.toPaymentRequest(request), - PaymentOrderBole.class + request, PaymentOrderBole.class ); log.info("Resultado de las transacciones obtenidas (BOLE): {}", response.size()); @@ -49,11 +54,10 @@ public class ApiPrivateAdapter implements ApiPrivateRepository { } private List executeBol( - ServiceOrderPaymentSearchRequest request + PaymentOrderRequest request ) { List response = paymentOrderUseCase.execute( - ServicingOrderMapper.toPaymentRequest(request), - PaymentOrderBol.class + request, PaymentOrderBol.class ); log.info("Resultado de las transacciones obtenidas (BOL): {}", response.size()); diff --git a/src/main/java/com/banesco/module/service_order_payment_search/infrastructure/mapper/ServicingOrderMapper.java b/src/main/java/com/banesco/module/service_order_payment_search/infrastructure/mapper/ServicingOrderMapper.java index bee24ec..cefaf42 100644 --- a/src/main/java/com/banesco/module/service_order_payment_search/infrastructure/mapper/ServicingOrderMapper.java +++ b/src/main/java/com/banesco/module/service_order_payment_search/infrastructure/mapper/ServicingOrderMapper.java @@ -31,8 +31,8 @@ public class ServicingOrderMapper { ? request.getInitiatedDate() : null ) - .id((!StringUtil.isNullOrEmpty(request.getPaymentRequestId())) - ? Long.valueOf(request.getPaymentRequestId()) + .id((!StringUtil.isNullOrEmpty(request.getInstructionRequestId())) + ? Long.valueOf(request.getInstructionRequestId()) : null ) .build()