Compare commits
No commits in common. "b78195b2f26e9a34a876fecb44058b22df94e804" and "08ecdd84c0dd1a5d9b172d32aeb770d3d3dd5cd3" have entirely different histories.
b78195b2f2
...
08ecdd84c0
2
pom.xml
2
pom.xml
@ -5,7 +5,7 @@
|
||||
<artifactId>dom-payment-initiation-request</artifactId>
|
||||
<version>1.0-native-quarkus-jdk17</version>
|
||||
<name>dom-payment-initiation-request</name>
|
||||
<description>API Domain - Read payment statuses of the file by ID</description>
|
||||
<description>API Domain - Create payment single request</description>
|
||||
|
||||
<properties>
|
||||
<maven.compiler.release>17</maven.compiler.release>
|
||||
|
||||
Binary file not shown.
@ -36,56 +36,61 @@ public class HttpClientService implements HttpClientUseCase {
|
||||
|
||||
@Override
|
||||
public <T> T execute(HttpRequest request) {
|
||||
return executeInternal(request);
|
||||
return executeRequest(request);
|
||||
}
|
||||
|
||||
@Override
|
||||
public <T, R> Either<T, R> executeEither(HttpRequest request) {
|
||||
return executeEitherInternal(request, false);
|
||||
}
|
||||
|
||||
@Override
|
||||
public <T, R> Either<List<T>, R> executeEitherList(HttpRequest request) {
|
||||
return executeEitherInternal(request, true);
|
||||
}
|
||||
|
||||
@Override
|
||||
public <T> ApiResponse<T> executeApiResponse(HttpRequest request) {
|
||||
return executeInternal(request);
|
||||
return executeRequest(request);
|
||||
}
|
||||
|
||||
@Override
|
||||
public <T> ApiResponse<List<T>> executeApiResponseList(
|
||||
HttpRequest request
|
||||
) {
|
||||
return executeInternal(request);
|
||||
public <T> ApiResponse<List<T>> executeApiResponseList(HttpRequest request) {
|
||||
return executeRequest(request);
|
||||
}
|
||||
|
||||
@Override
|
||||
public <T> ApiPrivateResponse<Either<T, ApiPrivateError>> executeApiPrivateResponse(
|
||||
HttpRequest request
|
||||
) {
|
||||
return executeInternal(request);
|
||||
public <T> ApiPrivateResponse<Either<T, ApiPrivateError>> executeApiPrivateResponse(HttpRequest request) {
|
||||
return executeRequest(request);
|
||||
}
|
||||
|
||||
@Override
|
||||
public <T> ApiPrivateResponse<Either<List<T>, ApiPrivateError>> executeApiPrivateResponseList(
|
||||
HttpRequest request
|
||||
) {
|
||||
return executeInternal(request);
|
||||
public <T> ApiPrivateResponse<Either<List<T>, ApiPrivateError>> executeApiPrivateResponseList(HttpRequest request) {
|
||||
return executeRequest(request);
|
||||
}
|
||||
|
||||
private <T> T executeInternal(HttpRequest request) {
|
||||
String finalUrl = buildFinalUrl(request);
|
||||
|
||||
if (request.isLogRequestBody()) {
|
||||
log.info("URL final: {}", finalUrl);
|
||||
|
||||
if (request.getHeaders() != null && !request.getHeaders().isEmpty()) {
|
||||
log.info("Headers: {}", request.getHeaders());
|
||||
}
|
||||
|
||||
if (request.getQueryParams() != null && !request.getQueryParams().isEmpty()) {
|
||||
log.info("Query params: {}", request.getQueryParams());
|
||||
}
|
||||
|
||||
if (request.getBody() != null) {
|
||||
log.info("Body: {}", request.getBody());
|
||||
}
|
||||
}
|
||||
|
||||
private <T, R> Either<T, R> executeEitherInternal(HttpRequest request, boolean isList) {
|
||||
try (Client client = createClient(request.getConnectTimeout(), request.getReadTimeout())) {
|
||||
WebTarget target = client.target(finalUrl);
|
||||
WebTarget target = client.target(buildFinalUrl(request));
|
||||
Invocation.Builder builder = target.request(MediaType.APPLICATION_JSON);
|
||||
|
||||
if (request.getHeaders() != null) {
|
||||
request.getHeaders().forEach(builder::header);
|
||||
}
|
||||
|
||||
Response response = buildRequest(builder, request);
|
||||
return handleEitherResponse(request, response, isList);
|
||||
|
||||
} catch (HttpStatusCodeException | HttpApiResponseException e) {
|
||||
throw e;
|
||||
} catch (Exception e) {
|
||||
throw handleConnectionError(request, e);
|
||||
}
|
||||
}
|
||||
|
||||
private <T> T executeRequest(HttpRequest request) {
|
||||
try (Client client = createClient(request.getConnectTimeout(), request.getReadTimeout())) {
|
||||
WebTarget target = client.target(buildFinalUrl(request));
|
||||
Invocation.Builder builder = target.request(MediaType.APPLICATION_JSON);
|
||||
|
||||
if (request.getHeaders() != null) {
|
||||
@ -97,14 +102,122 @@ public class HttpClientService implements HttpClientUseCase {
|
||||
} catch (HttpStatusCodeException | HttpApiResponseException e) {
|
||||
throw e;
|
||||
} catch (Exception e) {
|
||||
log.error("Error de conexion {}: {}", request.getMethod(), e.getMessage());
|
||||
throw HttpStatusCodeException.serviceUnavailable(
|
||||
"503",
|
||||
"Error de conexion con el servicio externo: " + e.getMessage()
|
||||
);
|
||||
throw handleConnectionError(request, e);
|
||||
}
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private <T, R> Either<T, R> handleEitherResponse(HttpRequest request, Response response, boolean isList) {
|
||||
int statusCode = response.getStatus();
|
||||
|
||||
try (response) {
|
||||
String responseBody = response.readEntity(String.class);
|
||||
logResponse(request, statusCode, responseBody);
|
||||
|
||||
if (statusCode >= 200 && statusCode < 300) {
|
||||
Object successData = isList
|
||||
? parseSuccessListResponse(request, responseBody)
|
||||
: parseSuccessResponse(request, responseBody);
|
||||
return Either.left((T) successData);
|
||||
} else {
|
||||
logErrorResponse(request, statusCode, responseBody);
|
||||
R errorData = tryParseErrorResponse(request, responseBody);
|
||||
|
||||
if (errorData != null) {
|
||||
return Either.right(errorData);
|
||||
}
|
||||
|
||||
throw mapHttpStatusToException(statusCode, responseBody);
|
||||
}
|
||||
} catch (HttpStatusCodeException | HttpApiResponseException e) {
|
||||
throw e;
|
||||
} catch (Exception e) {
|
||||
throw handleProcessingError(request, e);
|
||||
}
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private <T> T parseSuccessResponse(HttpRequest request, String responseBody) throws JsonProcessingException {
|
||||
Type successType = extractSuccessType(request);
|
||||
|
||||
if (successType != null) {
|
||||
if (successType instanceof Class) {
|
||||
return objectMapper.readValue(responseBody, (Class<T>) successType);
|
||||
} else if (successType instanceof ParameterizedType) {
|
||||
JavaType javaType = objectMapper.getTypeFactory().constructType(successType);
|
||||
return objectMapper.readValue(responseBody, javaType);
|
||||
}
|
||||
}
|
||||
|
||||
if (request.getResponseType() != null && request.getResponseType() != Object.class) {
|
||||
return objectMapper.readValue(responseBody, objectMapper.getTypeFactory().constructType(request.getResponseType()));
|
||||
}
|
||||
|
||||
return (T) objectMapper.readValue(responseBody, Object.class);
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private <T> List<T> parseSuccessListResponse(HttpRequest request, String responseBody) throws JsonProcessingException {
|
||||
Type successType = extractSuccessType(request);
|
||||
|
||||
if (
|
||||
successType instanceof ParameterizedType paramType &&
|
||||
paramType.getRawType() == List.class &&
|
||||
paramType.getActualTypeArguments().length > 0
|
||||
) {
|
||||
Type elementType = paramType.getActualTypeArguments()[0];
|
||||
if (elementType instanceof Class) {
|
||||
JavaType javaType = objectMapper.getTypeFactory().constructCollectionType(
|
||||
List.class, (Class<T>) elementType
|
||||
);
|
||||
return objectMapper.readValue(responseBody, javaType);
|
||||
}
|
||||
}
|
||||
|
||||
return objectMapper.readValue(responseBody, List.class);
|
||||
}
|
||||
|
||||
private Type extractSuccessType(HttpRequest request) {
|
||||
if (
|
||||
request.getComplexType() != null &&
|
||||
request.getComplexType() instanceof ParameterizedType paramType &&
|
||||
paramType.getRawType() == Either.class &&
|
||||
paramType.getActualTypeArguments().length > 0
|
||||
) {
|
||||
return paramType.getActualTypeArguments()[0];
|
||||
}
|
||||
|
||||
if (request.getGenericType() != null) {
|
||||
return request.getGenericType();
|
||||
}
|
||||
|
||||
return request.getResponseType();
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private <R> R tryParseErrorResponse(HttpRequest request, String responseBody) {
|
||||
if (responseBody == null || responseBody.trim().isEmpty()) {
|
||||
return null;
|
||||
}
|
||||
|
||||
try {
|
||||
if (request.getErrorType() != null) {
|
||||
return (R) objectMapper.readValue(responseBody, request.getErrorType());
|
||||
}
|
||||
|
||||
if (request.getComplexType() != null && request.getComplexType() instanceof ParameterizedType paramType) {
|
||||
Type[] typeArgs = paramType.getActualTypeArguments();
|
||||
if (typeArgs.length >= 2 && typeArgs[1] instanceof Class) {
|
||||
return objectMapper.readValue(responseBody, (Class<R>) typeArgs[1]);
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.error("No se pudo parsear la respuesta como error type: {}", e.getMessage());
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private String buildFinalUrl(HttpRequest request) {
|
||||
String finalUrl = request.getUrl();
|
||||
|
||||
@ -115,7 +228,11 @@ public class HttpClientService implements HttpClientUseCase {
|
||||
}
|
||||
}
|
||||
|
||||
return appendQueryParams(finalUrl, request.getQueryParams());
|
||||
String url = appendQueryParams(finalUrl, request.getQueryParams());
|
||||
|
||||
log.info("Url Final: {}", url);
|
||||
|
||||
return url;
|
||||
}
|
||||
|
||||
private String appendQueryParams(String url, Map<String, String> queryParams) {
|
||||
@ -145,12 +262,13 @@ public class HttpClientService implements HttpClientUseCase {
|
||||
return urlBuilder.toString();
|
||||
}
|
||||
|
||||
private Response buildRequest(
|
||||
Invocation.Builder builder,
|
||||
HttpRequest request
|
||||
) {
|
||||
private Response buildRequest(Invocation.Builder builder, HttpRequest request) {
|
||||
log.info("Metodo HTTP: {}", request.getMethod().name());
|
||||
|
||||
if(request.getBody() != null) {
|
||||
log.info("Cuerpo de la Peticion: {}", request.getBody());
|
||||
}
|
||||
|
||||
return switch (request.getMethod()) {
|
||||
case GET -> builder.get();
|
||||
case POST -> builder.post(Entity.entity(request.getBody(), MediaType.APPLICATION_JSON));
|
||||
@ -165,43 +283,26 @@ public class HttpClientService implements HttpClientUseCase {
|
||||
|
||||
private Client createClient(int connectTimeout, int readTimeout) {
|
||||
return ClientBuilder.newBuilder()
|
||||
.connectTimeout(connectTimeout, TimeUnit.MILLISECONDS)
|
||||
.readTimeout(readTimeout, TimeUnit.MILLISECONDS)
|
||||
.build();
|
||||
.connectTimeout(connectTimeout, TimeUnit.MILLISECONDS)
|
||||
.readTimeout(readTimeout, TimeUnit.MILLISECONDS)
|
||||
.build();
|
||||
}
|
||||
|
||||
private <T> T handleResponse(
|
||||
HttpRequest request,
|
||||
Response response
|
||||
) {
|
||||
private <T> T handleResponse(HttpRequest request, Response response) {
|
||||
int statusCode = response.getStatus();
|
||||
log.info("Respuesta {} - Status: {}", request.getMethod(), statusCode);
|
||||
|
||||
try (response) {
|
||||
String responseBody = response.readEntity(String.class);
|
||||
|
||||
if (request.isLogResponseBody()) {
|
||||
log.info("Respuesta Cuerpo: {}", responseBody);
|
||||
}
|
||||
logResponse(request, statusCode, responseBody);
|
||||
|
||||
if (statusCode >= 200 && statusCode < 300) {
|
||||
if (request.getResponseType() == Void.class || request.getResponseType() == void.class) {
|
||||
return null;
|
||||
}
|
||||
|
||||
T result = responseResult(request, responseBody);
|
||||
|
||||
log.debug("Respuesta exitosa {} {}: {}", request.getMethod(), request.getUrl(), result);
|
||||
|
||||
return result;
|
||||
return responseResult(request, responseBody);
|
||||
} else {
|
||||
log.error(
|
||||
"Error HTTP {} {} - Status: {} - Body: {}",
|
||||
request.getMethod(),
|
||||
request.getUrl(),
|
||||
statusCode,
|
||||
responseBody
|
||||
);
|
||||
logErrorResponse(request, statusCode, responseBody);
|
||||
|
||||
if (isApiResponseFormat(responseBody)) {
|
||||
ApiResponse<?> apiResponse = deserializeApiResponse(responseBody, request);
|
||||
@ -213,53 +314,72 @@ public class HttpClientService implements HttpClientUseCase {
|
||||
} catch (HttpStatusCodeException | HttpApiResponseException e) {
|
||||
throw e;
|
||||
} catch (Exception e) {
|
||||
log.error(
|
||||
"Error procesando respuesta {} {}: {}",
|
||||
request.getMethod(),
|
||||
request.getUrl(),
|
||||
e.getMessage()
|
||||
);
|
||||
throw HttpStatusCodeException.internalServer(
|
||||
"500", "Error procesando respuesta del servicio externo: " + e.getMessage()
|
||||
);
|
||||
throw handleProcessingError(request, e);
|
||||
}
|
||||
}
|
||||
|
||||
private <T> T responseResult(
|
||||
HttpRequest request,
|
||||
String responseBody
|
||||
) throws JsonProcessingException {
|
||||
private void logResponse(HttpRequest request, int statusCode, String responseBody) {
|
||||
if (request.isLogResponseBody()) {
|
||||
log.info("Respuesta {} - Status: {}", request.getMethod(), statusCode);
|
||||
log.info("Respuesta Cuerpo: {}", responseBody);
|
||||
}
|
||||
}
|
||||
|
||||
private void logErrorResponse(HttpRequest request, int statusCode, String responseBody) {
|
||||
log.error(
|
||||
"Error HTTP {} {} - Status: {} - Body: {}",
|
||||
request.getMethod(),
|
||||
request.getUrl(),
|
||||
statusCode,
|
||||
responseBody
|
||||
);
|
||||
}
|
||||
|
||||
private HttpStatusCodeException handleConnectionError(HttpRequest request, Exception e) {
|
||||
log.error("Error de conexion {}: {}", request.getMethod(), e.getMessage());
|
||||
|
||||
return HttpStatusCodeException.serviceUnavailable(
|
||||
"503", "Error de conexion con el servicio externo: " + e.getMessage()
|
||||
);
|
||||
}
|
||||
|
||||
private HttpStatusCodeException handleProcessingError(HttpRequest request, Exception e) {
|
||||
log.error(
|
||||
"Error procesando respuesta {} {}: {}",
|
||||
request.getMethod(),
|
||||
request.getUrl(),
|
||||
e.getMessage()
|
||||
);
|
||||
return HttpStatusCodeException.internalServer(
|
||||
"500", "Error procesando respuesta del servicio externo: " + e.getMessage()
|
||||
);
|
||||
}
|
||||
|
||||
private <T> T responseResult(HttpRequest request, String responseBody) throws JsonProcessingException {
|
||||
if (request.isApiPrivateResponse() && request.isEitherResponse()) {
|
||||
return handleApiPrivateResponseWithEither(request, responseBody);
|
||||
}
|
||||
|
||||
T result;
|
||||
|
||||
if (request.getResponseType() == ApiResponse.class) {
|
||||
result = deserializeApiResponse(responseBody, request);
|
||||
return deserializeApiResponse(responseBody, request);
|
||||
} else if (request.getComplexType() != null) {
|
||||
JavaType javaType = objectMapper.getTypeFactory().constructParametricType(
|
||||
request.getResponseType(), objectMapper.getTypeFactory().constructType(request.getComplexType())
|
||||
);
|
||||
result = objectMapper.readValue(responseBody, javaType);
|
||||
return objectMapper.readValue(responseBody, javaType);
|
||||
} else if (request.getGenericType() != null) {
|
||||
JavaType javaType = objectMapper.getTypeFactory().constructParametricType(
|
||||
request.getResponseType(), objectMapper.getTypeFactory().constructType(request.getGenericType())
|
||||
);
|
||||
result = objectMapper.readValue(responseBody, javaType);
|
||||
return objectMapper.readValue(responseBody, javaType);
|
||||
} else {
|
||||
result = objectMapper.readValue(
|
||||
return objectMapper.readValue(
|
||||
responseBody, objectMapper.getTypeFactory().constructType(request.getResponseType())
|
||||
);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
private <T> T handleApiPrivateResponseWithEither(
|
||||
HttpRequest request,
|
||||
String responseBody
|
||||
) throws JsonProcessingException {
|
||||
private <T> T handleApiPrivateResponseWithEither(HttpRequest request, String responseBody) throws JsonProcessingException {
|
||||
JsonNode rootNode = objectMapper.readTree(responseBody);
|
||||
String status = rootNode.has("estatus") ? rootNode.get("estatus").asText() : null;
|
||||
String message = rootNode.has("mensaje") ? rootNode.get("mensaje").asText() : null;
|
||||
@ -273,12 +393,7 @@ public class HttpClientService implements HttpClientUseCase {
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private <T> T handleSuccessResponse(
|
||||
HttpRequest request,
|
||||
String status,
|
||||
String message,
|
||||
JsonNode detailNode
|
||||
) {
|
||||
private <T> T handleSuccessResponse(HttpRequest request, String status, String message, JsonNode detailNode) {
|
||||
Object successData;
|
||||
|
||||
if (request.isListResponse()) {
|
||||
@ -300,10 +415,7 @@ public class HttpClientService implements HttpClientUseCase {
|
||||
}
|
||||
}
|
||||
|
||||
private Object handleListSuccess(
|
||||
HttpRequest request,
|
||||
JsonNode detailNode
|
||||
) {
|
||||
private Object handleListSuccess(HttpRequest request, JsonNode detailNode) {
|
||||
Class<?> elementType = getElementTypeFromRequest(request);
|
||||
JavaType listType = objectMapper.getTypeFactory().constructCollectionType(List.class, elementType);
|
||||
|
||||
@ -314,10 +426,7 @@ public class HttpClientService implements HttpClientUseCase {
|
||||
return List.of();
|
||||
}
|
||||
|
||||
private Object handleObjectSuccess(
|
||||
HttpRequest request,
|
||||
JsonNode detailNode
|
||||
) {
|
||||
private Object handleObjectSuccess(HttpRequest request, JsonNode detailNode) {
|
||||
Class<?> elementType = getElementTypeFromRequest(request);
|
||||
|
||||
if (detailNode != null && !detailNode.isNull()) {
|
||||
@ -328,11 +437,7 @@ public class HttpClientService implements HttpClientUseCase {
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private <T> T handleErrorResponse(
|
||||
String status,
|
||||
String message,
|
||||
JsonNode detailNode
|
||||
) {
|
||||
private <T> T handleErrorResponse(String status, String message, JsonNode detailNode) {
|
||||
ApiPrivateError error = buildApiPrivateError(detailNode, message);
|
||||
ApiPrivateResponse<Either<Object, ApiPrivateError>> response = new ApiPrivateResponse<>();
|
||||
|
||||
@ -343,10 +448,7 @@ public class HttpClientService implements HttpClientUseCase {
|
||||
return (T) response;
|
||||
}
|
||||
|
||||
private ApiPrivateError buildApiPrivateError(
|
||||
JsonNode detailNode,
|
||||
String message
|
||||
) {
|
||||
private ApiPrivateError buildApiPrivateError(JsonNode detailNode, String message) {
|
||||
if (detailNode != null && !detailNode.isNull()) {
|
||||
try {
|
||||
return objectMapper.convertValue(detailNode, ApiPrivateError.class);
|
||||
@ -390,15 +492,11 @@ public class HttpClientService implements HttpClientUseCase {
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private <T> T deserializeApiResponse(
|
||||
String responseBody,
|
||||
HttpRequest request
|
||||
) {
|
||||
private <T> T deserializeApiResponse(String responseBody, HttpRequest request) {
|
||||
try {
|
||||
if (request.getGenericType() != null) {
|
||||
JavaType javaType = objectMapper.getTypeFactory().constructParametricType(
|
||||
ApiResponse.class,
|
||||
objectMapper.getTypeFactory().constructType(request.getGenericType())
|
||||
ApiResponse.class, objectMapper.getTypeFactory().constructType(request.getGenericType())
|
||||
);
|
||||
return objectMapper.readValue(responseBody, javaType);
|
||||
} else {
|
||||
@ -432,10 +530,7 @@ public class HttpClientService implements HttpClientUseCase {
|
||||
}
|
||||
}
|
||||
|
||||
private HttpStatusCodeException mapHttpStatusToException(
|
||||
int statusCode,
|
||||
String errorBody
|
||||
) {
|
||||
private HttpStatusCodeException mapHttpStatusToException(int statusCode, String errorBody) {
|
||||
String errorCode = "HTTP_" + statusCode;
|
||||
String defaultMessage = "Error en servicio externo: HTTP " + statusCode;
|
||||
String message = errorBody != null && !errorBody.isEmpty()
|
||||
|
||||
@ -8,6 +8,10 @@ public interface HttpClientUseCase {
|
||||
|
||||
<T> T execute(HttpRequest request);
|
||||
|
||||
<T, R> Either<T, R> executeEither(HttpRequest request);
|
||||
|
||||
<T, R> Either<List<T>, R> executeEitherList(HttpRequest request);
|
||||
|
||||
<T> ApiResponse<T> executeApiResponse(HttpRequest request);
|
||||
|
||||
<T> ApiResponse<List<T>> executeApiResponseList(HttpRequest request);
|
||||
|
||||
@ -11,8 +11,8 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema;
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@RegisterForReflection
|
||||
@Schema(description = "Respuesta de la notificación del cliente")
|
||||
@Schema(description = "Respuesta de la solicitud de pago del cliente")
|
||||
public class PaymentInitiationRequestResponse {
|
||||
@Schema(description = "Instancia de la notificación del cliente")
|
||||
@Schema(description = "Instancia de la solicitud de pago del cliente")
|
||||
private PaymentInitiationTransaction paymentInitiationTransaction;
|
||||
}
|
||||
|
||||
@ -14,10 +14,10 @@ import java.math.BigDecimal;
|
||||
@AllArgsConstructor
|
||||
@RegisterForReflection
|
||||
public class PaymentInitiationTransactionInstanceRecord {
|
||||
private PaymentTransactionType paymentTransactionType;
|
||||
private Payer payerReference;
|
||||
private Payee payeeReference;
|
||||
private BigDecimal amount;
|
||||
private String currencyCode;
|
||||
private String paymentPurpose;
|
||||
private PaymentTransactionType paymentTransactionType; // operationTypeCode
|
||||
private Payer payerReference; // applicantId
|
||||
private Payee payeeReference; // recipientId
|
||||
private BigDecimal amount; // amount
|
||||
private String currencyCode; // currency
|
||||
private String paymentPurpose; // concept
|
||||
}
|
||||
|
||||
@ -16,20 +16,20 @@ import java.util.Objects;
|
||||
@Slf4j
|
||||
@ApplicationScoped
|
||||
public class ApiPrivateAdapter implements ApiPrivateRepository {
|
||||
private final PaymentRequestUseCase paymentStatusUseCase;
|
||||
private final PaymentRequestUseCase paymentRequestUseCase;
|
||||
|
||||
@Inject
|
||||
public ApiPrivateAdapter(
|
||||
PaymentRequestUseCase paymentStatusUseCase
|
||||
PaymentRequestUseCase paymentRequestUseCase
|
||||
) {
|
||||
this.paymentStatusUseCase = paymentStatusUseCase;
|
||||
this.paymentRequestUseCase = paymentRequestUseCase;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PaymentInitiationTransaction execute(
|
||||
PaymentInitiationRequestRequest request
|
||||
) {
|
||||
PaymentRequest response = paymentStatusUseCase.execute(
|
||||
PaymentRequest response = paymentRequestUseCase.execute(
|
||||
ServicingIssueMapper.toPaymentRequest(request), PaymentRequest.class
|
||||
);
|
||||
|
||||
|
||||
@ -32,7 +32,7 @@ public class ServicingIssueMapper {
|
||||
.concept(request.getPurpose())
|
||||
.build()
|
||||
)
|
||||
.channelOrigin(request.getProcedureRequest().getInstructionPurposeType().name())
|
||||
.channelOrigin(request.getChannelCode())
|
||||
.build();
|
||||
}
|
||||
|
||||
|
||||
@ -37,8 +37,8 @@ public class PaymentInitiationRequestResource {
|
||||
@POST
|
||||
@Path("/initiate")
|
||||
@Operation(
|
||||
summary = "Proveer informacion de la transaccion",
|
||||
description = "Envía la notificación del cliente"
|
||||
summary = "Genera informacion de la solicitud de pago",
|
||||
description = "Envía la solicitud del pago del cliente"
|
||||
)
|
||||
@APIResponses(value = {
|
||||
@APIResponse(
|
||||
@ -64,7 +64,7 @@ public class PaymentInitiationRequestResource {
|
||||
value = """
|
||||
{
|
||||
"data": {
|
||||
"documentService": {
|
||||
"paymentInitiationTransaction": {
|
||||
"transaction": {
|
||||
"transactionIdentification": {
|
||||
"identifierValue": "1"
|
||||
@ -216,8 +216,7 @@ public class PaymentInitiationRequestResource {
|
||||
})
|
||||
public Response initiate(
|
||||
@RequestBody(
|
||||
description = "Request para la notificación del cliente",
|
||||
required = true,
|
||||
description = "Request de la solicitud del pago del cliente",
|
||||
content = @Content(
|
||||
mediaType = MediaType.APPLICATION_JSON,
|
||||
schema = @Schema(implementation = PaymentInitiationRequestRequest.class),
|
||||
|
||||
@ -19,7 +19,7 @@ import java.util.Map;
|
||||
public class PaymentRequestClient implements PaymentRequestUseCase {
|
||||
private final SerializationHelper serializationHelper;
|
||||
private final HttpClientUseCase httpClientUseCase;
|
||||
private final PaymentRequestConfig paymentStatusConfig;
|
||||
private final PaymentRequestConfig paymentRequestConfig;
|
||||
|
||||
@Inject
|
||||
public PaymentRequestClient(
|
||||
@ -29,8 +29,8 @@ public class PaymentRequestClient implements PaymentRequestUseCase {
|
||||
) {
|
||||
this.serializationHelper = serializationHelper;
|
||||
this.httpClientUseCase = httpClientUseCase;
|
||||
this.paymentStatusConfig = restClientConfig.getPaymentRequestConfig();
|
||||
log.info("Configuracion cargada para payment-status: {}", paymentStatusConfig);
|
||||
this.paymentRequestConfig = restClientConfig.getPaymentRequestConfig();
|
||||
log.info("Configuracion cargada para payment-request: {}", paymentRequestConfig);
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -42,16 +42,16 @@ public class PaymentRequestClient implements PaymentRequestUseCase {
|
||||
String applicantId = params.getOperation().getApplicantId();
|
||||
Map<String, Object> payload = getPayload(params);
|
||||
HttpRequest request = HttpRequest.forApiPrivateResponse(
|
||||
paymentStatusConfig.getUrl(),
|
||||
paymentStatusConfig.getStatusSuccess(),
|
||||
paymentRequestConfig.getUrl(),
|
||||
paymentRequestConfig.getStatusSuccess(),
|
||||
HttpRequest.HttpMethod.POST,
|
||||
responseType
|
||||
)
|
||||
.withBody(payload)
|
||||
.withHeaders(Map.of("fintechId", fintechId))
|
||||
.withTimeout(
|
||||
paymentStatusConfig.getTimeout().getConnect(),
|
||||
paymentStatusConfig.getTimeout().getResponse()
|
||||
paymentRequestConfig.getTimeout().getConnect(),
|
||||
paymentRequestConfig.getTimeout().getResponse()
|
||||
);
|
||||
|
||||
try {
|
||||
@ -110,21 +110,21 @@ public class PaymentRequestClient implements PaymentRequestUseCase {
|
||||
}
|
||||
|
||||
private Map<String, Object> getPayload(PaymentRequestRequest params) {
|
||||
Map<String, Object> paymentStatusRequest = serializationHelper.toMap(params);
|
||||
Map<String, Object> paymentRequestRequest = serializationHelper.toMap(params);
|
||||
Map<String, Object> operation = serializationHelper.toMap(params.getOperation());
|
||||
String signature = serializationHelper.generateSignature(
|
||||
params.getOperation(), params.getChannelOrigin()
|
||||
);
|
||||
|
||||
paymentStatusRequest.put("signature", signature);
|
||||
paymentStatusRequest.put("operation", operation);
|
||||
paymentRequestRequest.put("signature", signature);
|
||||
paymentRequestRequest.put("operation", operation);
|
||||
|
||||
paymentStatusRequest.remove("fintechId");
|
||||
paymentRequestRequest.remove("fintechId");
|
||||
|
||||
log.info("3. Firma generada: {}", signature);
|
||||
log.info("4. Parametros de la solicitud: {}", paymentStatusRequest);
|
||||
log.info("5. Solicitud final: {}", paymentStatusRequest);
|
||||
log.info("4. Parametros de la solicitud: {}", paymentRequestRequest);
|
||||
log.info("5. Solicitud final: {}", paymentRequestRequest);
|
||||
|
||||
return paymentStatusRequest;
|
||||
return paymentRequestRequest;
|
||||
}
|
||||
}
|
||||
@ -7,7 +7,7 @@ quarkus:
|
||||
core-threads: 1
|
||||
|
||||
api:
|
||||
source-id: DDFAT
|
||||
source-id: DPIR
|
||||
read-messages:
|
||||
from-props: true
|
||||
dom-payment-initiation-request:
|
||||
|
||||
@ -12,7 +12,7 @@ metadata:
|
||||
annotations:
|
||||
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
|
||||
kubectl.kubernetes.io/last-applied-configuration: |
|
||||
{"apiVersion":"v1","data":{"api.dom-payment-initiation-request.messages.content":"[{\"backendCode\":\"200\",\"httpCode\":200,\"statusCode\":\"200\",\"description\":\"Operacion exitosa\"},{\"backendCode\":\"R404\",\"httpCode\":404,\"statusCode\":\"404\",\"description\":\"Datos de validacion no encontrado.\"},{\"backendCode\":\"503\",\"httpCode\":503,\"statusCode\":\"503\",\"description\":\"Uso interno\"},{\"backendCode\":\"422\",\"httpCode\":422,\"statusCode\":\"422\",\"description\":\"Uso interno\"},{\"backendCode\":\"500\",\"httpCode\":500,\"statusCode\":\"500\",\"description\":\"Uso interno\"},{\"backendCode\":\"100\",\"httpCode\":503,\"statusCode\":\"503\",\"description\":\"VDR13 - OSB Disponible\"},{\"backendCode\":\"OSB-382505\",\"httpCode\":503,\"statusCode\":\"503\",\"description\":\"VDR13 - OSB Disponible\"},{\"backendCode\":\"OSB-380002\",\"httpCode\":503,\"statusCode\":\"503\",\"description\":\"VDR13 - OSB Disponible\"},{\"backendCode\":\"ERROR\",\"httpCode\":400,\"statusCode\":\"400\",\"description\":\"Uso interno\"},{\"backendCode\":\"400\",\"httpCode\":400,\"statusCode\":\"400\",\"description\":\"Uso interno\"},{\"backendCode\":\"401\",\"httpCode\":401,\"statusCode\":\"401\",\"description\":\"Uso interno\"},{\"backendCode\":\"403\",\"httpCode\":403,\"statusCode\":\"403\",\"description\":\"Uso interno\"},{\"backendCode\":\"404\",\"httpCode\":404,\"statusCode\":\"404\",\"description\":\"Uso interno\"},{\"backendCode\":\"default\",\"httpCode\":409,\"statusCode\":\"409\",\"description\":\"Conflicto\"},{\"backendCode\":\"424\",\"httpCode\":424,\"statusCode\":\"424\",\"description\":\"Error de dependencia\"},{\"backendCode\":\"VDE01\",\"httpCode\":400,\"statusCode\":\"VDE01\",\"description\":\"VDE01 - Error en dato de entrada obligatorio: %s\"},{\"backendCode\":\"VDE02\",\"httpCode\":400,\"statusCode\":\"VDE02\",\"description\":\"VDE02 - Error en valor permitido para campo: %s\"},{\"backend_code\":\"204\",\"http_code\":\"200\",\"status_code\":\"200\",\"description\":\"Cliente sin productos\",\"status\":\"ok\"}]","api.dom-payment-initiation-request.messages.key":"dom-payment-initiation-request","api.read-messages.from-props":"true","api.rest-client.payment-file":"{\"url\":\"http://10.135.193.156:8080/RequestPayment/notificationRequestPayment/v1/generate/createRequestFile\",\"timeout\":{\"connect\":10000,\"response\":10000},\"statusSuccess\":\"00\"}","api.source-id":"DDFAT","quarkus.application.name":"dom-payment-initiation-request","quarkus.application.version":"1.0.0","quarkus.debug.print-startup-times":"true","quarkus.debug.reflection":"false","quarkus.http.idle-timeout":"30s","quarkus.http.non-application-root-path":"actuator","quarkus.http.port":"8080","quarkus.log.console.enable":"true","quarkus.log.console.format":"%d{HH:mm:ss.SSS} %-5p [%t] [%X{requestId}] %c{1} - %s%e%n","quarkus.log.level":"INFO","quarkus.profile":"dev","quarkus.smallrye-health.liveness-path":"/actuator/health/live","quarkus.smallrye-health.readiness-path":"/actuator/health/ready","quarkus.smallrye-health.root-path":"/actuator/health","quarkus.smallrye-health.ui.enable":"false","quarkus.smallrye-openapi.enable":"true","quarkus.smallrye-openapi.path":"/openapi","quarkus.swagger-ui.always-include":"true","quarkus.swagger-ui.path":"/swagger-ui","quarkus.thread-pool.core-threads":"1","quarkus.thread-pool.max-threads":"100"},"kind":"ConfigMap","metadata":{"annotations":{"argocd.argoproj.io/sync-options":"SkipDryRunOnMissingResource=true"},"app":"dom-payment-initiation-request","labels":{"app":"dom-payment-initiation-request","business_group":"Accounts"},"name":"configmap-dom-payment-initiation-request","namespace":"proyecto-prueba-ja"}}
|
||||
{"apiVersion":"v1","data":{"api.dom-payment-initiation-request.messages.content":"[{\"backendCode\":\"200\",\"httpCode\":200,\"statusCode\":\"200\",\"description\":\"Operacion exitosa\"},{\"backendCode\":\"R404\",\"httpCode\":404,\"statusCode\":\"404\",\"description\":\"Datos de validacion no encontrado.\"},{\"backendCode\":\"503\",\"httpCode\":503,\"statusCode\":\"503\",\"description\":\"Uso interno\"},{\"backendCode\":\"422\",\"httpCode\":422,\"statusCode\":\"422\",\"description\":\"Uso interno\"},{\"backendCode\":\"500\",\"httpCode\":500,\"statusCode\":\"500\",\"description\":\"Uso interno\"},{\"backendCode\":\"100\",\"httpCode\":503,\"statusCode\":\"503\",\"description\":\"VDR13 - OSB Disponible\"},{\"backendCode\":\"OSB-382505\",\"httpCode\":503,\"statusCode\":\"503\",\"description\":\"VDR13 - OSB Disponible\"},{\"backendCode\":\"OSB-380002\",\"httpCode\":503,\"statusCode\":\"503\",\"description\":\"VDR13 - OSB Disponible\"},{\"backendCode\":\"ERROR\",\"httpCode\":400,\"statusCode\":\"400\",\"description\":\"Uso interno\"},{\"backendCode\":\"400\",\"httpCode\":400,\"statusCode\":\"400\",\"description\":\"Uso interno\"},{\"backendCode\":\"401\",\"httpCode\":401,\"statusCode\":\"401\",\"description\":\"Uso interno\"},{\"backendCode\":\"403\",\"httpCode\":403,\"statusCode\":\"403\",\"description\":\"Uso interno\"},{\"backendCode\":\"404\",\"httpCode\":404,\"statusCode\":\"404\",\"description\":\"Uso interno\"},{\"backendCode\":\"default\",\"httpCode\":409,\"statusCode\":\"409\",\"description\":\"Conflicto\"},{\"backendCode\":\"424\",\"httpCode\":424,\"statusCode\":\"424\",\"description\":\"Error de dependencia\"},{\"backendCode\":\"VDE01\",\"httpCode\":400,\"statusCode\":\"VDE01\",\"description\":\"VDE01 - Error en dato de entrada obligatorio: %s\"},{\"backendCode\":\"VDE02\",\"httpCode\":400,\"statusCode\":\"VDE02\",\"description\":\"VDE02 - Error en valor permitido para campo: %s\"},{\"backend_code\":\"204\",\"http_code\":\"200\",\"status_code\":\"200\",\"description\":\"Cliente sin productos\",\"status\":\"ok\"}]","api.dom-payment-initiation-request.messages.key":"dom-payment-initiation-request","api.read-messages.from-props":"true","api.rest-client.payment-file":"{\"url\":\"http://10.135.193.156:8080/RequestPayment/notificationRequestPayment/v1/generate/createRequestFile\",\"timeout\":{\"connect\":10000,\"response\":10000},\"statusSuccess\":\"00\"}","api.source-id":"DPIR","quarkus.application.name":"dom-payment-initiation-request","quarkus.application.version":"1.0.0","quarkus.debug.print-startup-times":"true","quarkus.debug.reflection":"false","quarkus.http.idle-timeout":"30s","quarkus.http.non-application-root-path":"actuator","quarkus.http.port":"8080","quarkus.log.console.enable":"true","quarkus.log.console.format":"%d{HH:mm:ss.SSS} %-5p [%t] [%X{requestId}] %c{1} - %s%e%n","quarkus.log.level":"INFO","quarkus.profile":"dev","quarkus.smallrye-health.liveness-path":"/actuator/health/live","quarkus.smallrye-health.readiness-path":"/actuator/health/ready","quarkus.smallrye-health.root-path":"/actuator/health","quarkus.smallrye-health.ui.enable":"false","quarkus.smallrye-openapi.enable":"true","quarkus.smallrye-openapi.path":"/openapi","quarkus.swagger-ui.always-include":"true","quarkus.swagger-ui.path":"/swagger-ui","quarkus.thread-pool.core-threads":"1","quarkus.thread-pool.max-threads":"100"},"kind":"ConfigMap","metadata":{"annotations":{"argocd.argoproj.io/sync-options":"SkipDryRunOnMissingResource=true"},"app":"dom-payment-initiation-request","labels":{"app":"dom-payment-initiation-request","business_group":"Accounts"},"name":"configmap-dom-payment-initiation-request","namespace":"proyecto-prueba-ja"}}
|
||||
managedFields:
|
||||
- manager: kubectl-client-side-apply
|
||||
operation: Update
|
||||
@ -78,7 +78,7 @@ data:
|
||||
quarkus.thread-pool.max-threads: '100'
|
||||
api.dom-payment-initiation-request.messages.key: dom-payment-initiation-request
|
||||
quarkus.smallrye-health.liveness-path: /actuator/health/live
|
||||
api.source-id: DDFAT
|
||||
api.source-id: DPIR
|
||||
quarkus.smallrye-health.root-path: /actuator/health
|
||||
quarkus.smallrye-openapi.enable: 'true'
|
||||
quarkus.smallrye-health.readiness-path: /actuator/health/ready
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user