Compare commits

...

No commits in common. "08ecdd84c0dd1a5d9b172d32aeb770d3d3dd5cd3" and "b78195b2f26e9a34a876fecb44058b22df94e804" have entirely different histories.

12 changed files with 156 additions and 254 deletions

View File

@ -5,7 +5,7 @@
<artifactId>dom-payment-initiation-request</artifactId> <artifactId>dom-payment-initiation-request</artifactId>
<version>1.0-native-quarkus-jdk17</version> <version>1.0-native-quarkus-jdk17</version>
<name>dom-payment-initiation-request</name> <name>dom-payment-initiation-request</name>
<description>API Domain - Create payment single request</description> <description>API Domain - Read payment statuses of the file by ID</description>
<properties> <properties>
<maven.compiler.release>17</maven.compiler.release> <maven.compiler.release>17</maven.compiler.release>

View File

@ -36,61 +36,56 @@ public class HttpClientService implements HttpClientUseCase {
@Override @Override
public <T> T execute(HttpRequest request) { public <T> T execute(HttpRequest request) {
return executeRequest(request); return executeInternal(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 @Override
public <T> ApiResponse<T> executeApiResponse(HttpRequest request) { public <T> ApiResponse<T> executeApiResponse(HttpRequest request) {
return executeRequest(request); return executeInternal(request);
} }
@Override @Override
public <T> ApiResponse<List<T>> executeApiResponseList(HttpRequest request) { public <T> ApiResponse<List<T>> executeApiResponseList(
return executeRequest(request); HttpRequest request
) {
return executeInternal(request);
} }
@Override @Override
public <T> ApiPrivateResponse<Either<T, ApiPrivateError>> executeApiPrivateResponse(HttpRequest request) { public <T> ApiPrivateResponse<Either<T, ApiPrivateError>> executeApiPrivateResponse(
return executeRequest(request); HttpRequest request
) {
return executeInternal(request);
} }
@Override @Override
public <T> ApiPrivateResponse<Either<List<T>, ApiPrivateError>> executeApiPrivateResponseList(HttpRequest request) { public <T> ApiPrivateResponse<Either<List<T>, ApiPrivateError>> executeApiPrivateResponseList(
return executeRequest(request); HttpRequest request
) {
return executeInternal(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())) { try (Client client = createClient(request.getConnectTimeout(), request.getReadTimeout())) {
WebTarget target = client.target(buildFinalUrl(request)); WebTarget target = client.target(finalUrl);
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); Invocation.Builder builder = target.request(MediaType.APPLICATION_JSON);
if (request.getHeaders() != null) { if (request.getHeaders() != null) {
@ -102,122 +97,14 @@ public class HttpClientService implements HttpClientUseCase {
} catch (HttpStatusCodeException | HttpApiResponseException e) { } catch (HttpStatusCodeException | HttpApiResponseException e) {
throw e; throw e;
} catch (Exception e) { } catch (Exception e) {
throw handleConnectionError(request, e); log.error("Error de conexion {}: {}", request.getMethod(), e.getMessage());
} throw HttpStatusCodeException.serviceUnavailable(
} "503",
"Error de conexion con el servicio externo: " + e.getMessage()
@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) { private String buildFinalUrl(HttpRequest request) {
String finalUrl = request.getUrl(); String finalUrl = request.getUrl();
@ -228,11 +115,7 @@ public class HttpClientService implements HttpClientUseCase {
} }
} }
String url = appendQueryParams(finalUrl, request.getQueryParams()); return appendQueryParams(finalUrl, request.getQueryParams());
log.info("Url Final: {}", url);
return url;
} }
private String appendQueryParams(String url, Map<String, String> queryParams) { private String appendQueryParams(String url, Map<String, String> queryParams) {
@ -262,13 +145,12 @@ public class HttpClientService implements HttpClientUseCase {
return urlBuilder.toString(); 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()); log.info("Metodo HTTP: {}", request.getMethod().name());
if(request.getBody() != null) {
log.info("Cuerpo de la Peticion: {}", request.getBody());
}
return switch (request.getMethod()) { return switch (request.getMethod()) {
case GET -> builder.get(); case GET -> builder.get();
case POST -> builder.post(Entity.entity(request.getBody(), MediaType.APPLICATION_JSON)); case POST -> builder.post(Entity.entity(request.getBody(), MediaType.APPLICATION_JSON));
@ -288,21 +170,38 @@ public class HttpClientService implements HttpClientUseCase {
.build(); .build();
} }
private <T> T handleResponse(HttpRequest request, Response response) { private <T> T handleResponse(
HttpRequest request,
Response response
) {
int statusCode = response.getStatus(); int statusCode = response.getStatus();
log.info("Respuesta {} - Status: {}", request.getMethod(), statusCode);
try (response) { try (response) {
String responseBody = response.readEntity(String.class); String responseBody = response.readEntity(String.class);
logResponse(request, statusCode, responseBody);
if (request.isLogResponseBody()) {
log.info("Respuesta Cuerpo: {}", responseBody);
}
if (statusCode >= 200 && statusCode < 300) { if (statusCode >= 200 && statusCode < 300) {
if (request.getResponseType() == Void.class || request.getResponseType() == void.class) { if (request.getResponseType() == Void.class || request.getResponseType() == void.class) {
return null; return null;
} }
return responseResult(request, responseBody); T result = responseResult(request, responseBody);
log.debug("Respuesta exitosa {} {}: {}", request.getMethod(), request.getUrl(), result);
return result;
} else { } else {
logErrorResponse(request, statusCode, responseBody); log.error(
"Error HTTP {} {} - Status: {} - Body: {}",
request.getMethod(),
request.getUrl(),
statusCode,
responseBody
);
if (isApiResponseFormat(responseBody)) { if (isApiResponseFormat(responseBody)) {
ApiResponse<?> apiResponse = deserializeApiResponse(responseBody, request); ApiResponse<?> apiResponse = deserializeApiResponse(responseBody, request);
@ -314,72 +213,53 @@ public class HttpClientService implements HttpClientUseCase {
} catch (HttpStatusCodeException | HttpApiResponseException e) { } catch (HttpStatusCodeException | HttpApiResponseException e) {
throw e; throw e;
} catch (Exception e) { } catch (Exception e) {
throw handleProcessingError(request, e);
}
}
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( log.error(
"Error procesando respuesta {} {}: {}", "Error procesando respuesta {} {}: {}",
request.getMethod(), request.getMethod(),
request.getUrl(), request.getUrl(),
e.getMessage() e.getMessage()
); );
return HttpStatusCodeException.internalServer( throw HttpStatusCodeException.internalServer(
"500", "Error procesando respuesta del servicio externo: " + e.getMessage() "500", "Error procesando respuesta del servicio externo: " + e.getMessage()
); );
} }
}
private <T> T responseResult(HttpRequest request, String responseBody) throws JsonProcessingException { private <T> T responseResult(
HttpRequest request,
String responseBody
) throws JsonProcessingException {
if (request.isApiPrivateResponse() && request.isEitherResponse()) { if (request.isApiPrivateResponse() && request.isEitherResponse()) {
return handleApiPrivateResponseWithEither(request, responseBody); return handleApiPrivateResponseWithEither(request, responseBody);
} }
T result;
if (request.getResponseType() == ApiResponse.class) { if (request.getResponseType() == ApiResponse.class) {
return deserializeApiResponse(responseBody, request); result = deserializeApiResponse(responseBody, request);
} else if (request.getComplexType() != null) { } else if (request.getComplexType() != null) {
JavaType javaType = objectMapper.getTypeFactory().constructParametricType( JavaType javaType = objectMapper.getTypeFactory().constructParametricType(
request.getResponseType(), objectMapper.getTypeFactory().constructType(request.getComplexType()) request.getResponseType(), objectMapper.getTypeFactory().constructType(request.getComplexType())
); );
return objectMapper.readValue(responseBody, javaType); result = objectMapper.readValue(responseBody, javaType);
} else if (request.getGenericType() != null) { } else if (request.getGenericType() != null) {
JavaType javaType = objectMapper.getTypeFactory().constructParametricType( JavaType javaType = objectMapper.getTypeFactory().constructParametricType(
request.getResponseType(), objectMapper.getTypeFactory().constructType(request.getGenericType()) request.getResponseType(), objectMapper.getTypeFactory().constructType(request.getGenericType())
); );
return objectMapper.readValue(responseBody, javaType); result = objectMapper.readValue(responseBody, javaType);
} else { } else {
return objectMapper.readValue( result = objectMapper.readValue(
responseBody, objectMapper.getTypeFactory().constructType(request.getResponseType()) 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); JsonNode rootNode = objectMapper.readTree(responseBody);
String status = rootNode.has("estatus") ? rootNode.get("estatus").asText() : null; String status = rootNode.has("estatus") ? rootNode.get("estatus").asText() : null;
String message = rootNode.has("mensaje") ? rootNode.get("mensaje").asText() : null; String message = rootNode.has("mensaje") ? rootNode.get("mensaje").asText() : null;
@ -393,7 +273,12 @@ public class HttpClientService implements HttpClientUseCase {
} }
@SuppressWarnings("unchecked") @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; Object successData;
if (request.isListResponse()) { if (request.isListResponse()) {
@ -415,7 +300,10 @@ public class HttpClientService implements HttpClientUseCase {
} }
} }
private Object handleListSuccess(HttpRequest request, JsonNode detailNode) { private Object handleListSuccess(
HttpRequest request,
JsonNode detailNode
) {
Class<?> elementType = getElementTypeFromRequest(request); Class<?> elementType = getElementTypeFromRequest(request);
JavaType listType = objectMapper.getTypeFactory().constructCollectionType(List.class, elementType); JavaType listType = objectMapper.getTypeFactory().constructCollectionType(List.class, elementType);
@ -426,7 +314,10 @@ public class HttpClientService implements HttpClientUseCase {
return List.of(); return List.of();
} }
private Object handleObjectSuccess(HttpRequest request, JsonNode detailNode) { private Object handleObjectSuccess(
HttpRequest request,
JsonNode detailNode
) {
Class<?> elementType = getElementTypeFromRequest(request); Class<?> elementType = getElementTypeFromRequest(request);
if (detailNode != null && !detailNode.isNull()) { if (detailNode != null && !detailNode.isNull()) {
@ -437,7 +328,11 @@ public class HttpClientService implements HttpClientUseCase {
} }
@SuppressWarnings("unchecked") @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); ApiPrivateError error = buildApiPrivateError(detailNode, message);
ApiPrivateResponse<Either<Object, ApiPrivateError>> response = new ApiPrivateResponse<>(); ApiPrivateResponse<Either<Object, ApiPrivateError>> response = new ApiPrivateResponse<>();
@ -448,7 +343,10 @@ public class HttpClientService implements HttpClientUseCase {
return (T) response; return (T) response;
} }
private ApiPrivateError buildApiPrivateError(JsonNode detailNode, String message) { private ApiPrivateError buildApiPrivateError(
JsonNode detailNode,
String message
) {
if (detailNode != null && !detailNode.isNull()) { if (detailNode != null && !detailNode.isNull()) {
try { try {
return objectMapper.convertValue(detailNode, ApiPrivateError.class); return objectMapper.convertValue(detailNode, ApiPrivateError.class);
@ -492,11 +390,15 @@ public class HttpClientService implements HttpClientUseCase {
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private <T> T deserializeApiResponse(String responseBody, HttpRequest request) { private <T> T deserializeApiResponse(
String responseBody,
HttpRequest request
) {
try { try {
if (request.getGenericType() != null) { if (request.getGenericType() != null) {
JavaType javaType = objectMapper.getTypeFactory().constructParametricType( JavaType javaType = objectMapper.getTypeFactory().constructParametricType(
ApiResponse.class, objectMapper.getTypeFactory().constructType(request.getGenericType()) ApiResponse.class,
objectMapper.getTypeFactory().constructType(request.getGenericType())
); );
return objectMapper.readValue(responseBody, javaType); return objectMapper.readValue(responseBody, javaType);
} else { } else {
@ -530,7 +432,10 @@ public class HttpClientService implements HttpClientUseCase {
} }
} }
private HttpStatusCodeException mapHttpStatusToException(int statusCode, String errorBody) { private HttpStatusCodeException mapHttpStatusToException(
int statusCode,
String errorBody
) {
String errorCode = "HTTP_" + statusCode; String errorCode = "HTTP_" + statusCode;
String defaultMessage = "Error en servicio externo: HTTP " + statusCode; String defaultMessage = "Error en servicio externo: HTTP " + statusCode;
String message = errorBody != null && !errorBody.isEmpty() String message = errorBody != null && !errorBody.isEmpty()

View File

@ -8,10 +8,6 @@ public interface HttpClientUseCase {
<T> T execute(HttpRequest request); <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<T> executeApiResponse(HttpRequest request);
<T> ApiResponse<List<T>> executeApiResponseList(HttpRequest request); <T> ApiResponse<List<T>> executeApiResponseList(HttpRequest request);

View File

@ -11,8 +11,8 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@RegisterForReflection @RegisterForReflection
@Schema(description = "Respuesta de la solicitud de pago del cliente") @Schema(description = "Respuesta de la notificación del cliente")
public class PaymentInitiationRequestResponse { public class PaymentInitiationRequestResponse {
@Schema(description = "Instancia de la solicitud de pago del cliente") @Schema(description = "Instancia de la notificación del cliente")
private PaymentInitiationTransaction paymentInitiationTransaction; private PaymentInitiationTransaction paymentInitiationTransaction;
} }

View File

@ -14,10 +14,10 @@ import java.math.BigDecimal;
@AllArgsConstructor @AllArgsConstructor
@RegisterForReflection @RegisterForReflection
public class PaymentInitiationTransactionInstanceRecord { public class PaymentInitiationTransactionInstanceRecord {
private PaymentTransactionType paymentTransactionType; // operationTypeCode private PaymentTransactionType paymentTransactionType;
private Payer payerReference; // applicantId private Payer payerReference;
private Payee payeeReference; // recipientId private Payee payeeReference;
private BigDecimal amount; // amount private BigDecimal amount;
private String currencyCode; // currency private String currencyCode;
private String paymentPurpose; // concept private String paymentPurpose;
} }

View File

@ -16,20 +16,20 @@ import java.util.Objects;
@Slf4j @Slf4j
@ApplicationScoped @ApplicationScoped
public class ApiPrivateAdapter implements ApiPrivateRepository { public class ApiPrivateAdapter implements ApiPrivateRepository {
private final PaymentRequestUseCase paymentRequestUseCase; private final PaymentRequestUseCase paymentStatusUseCase;
@Inject @Inject
public ApiPrivateAdapter( public ApiPrivateAdapter(
PaymentRequestUseCase paymentRequestUseCase PaymentRequestUseCase paymentStatusUseCase
) { ) {
this.paymentRequestUseCase = paymentRequestUseCase; this.paymentStatusUseCase = paymentStatusUseCase;
} }
@Override @Override
public PaymentInitiationTransaction execute( public PaymentInitiationTransaction execute(
PaymentInitiationRequestRequest request PaymentInitiationRequestRequest request
) { ) {
PaymentRequest response = paymentRequestUseCase.execute( PaymentRequest response = paymentStatusUseCase.execute(
ServicingIssueMapper.toPaymentRequest(request), PaymentRequest.class ServicingIssueMapper.toPaymentRequest(request), PaymentRequest.class
); );

View File

@ -32,7 +32,7 @@ public class ServicingIssueMapper {
.concept(request.getPurpose()) .concept(request.getPurpose())
.build() .build()
) )
.channelOrigin(request.getChannelCode()) .channelOrigin(request.getProcedureRequest().getInstructionPurposeType().name())
.build(); .build();
} }

View File

@ -37,8 +37,8 @@ public class PaymentInitiationRequestResource {
@POST @POST
@Path("/initiate") @Path("/initiate")
@Operation( @Operation(
summary = "Genera informacion de la solicitud de pago", summary = "Proveer informacion de la transaccion",
description = "Envía la solicitud del pago del cliente" description = "Envía la notificación del cliente"
) )
@APIResponses(value = { @APIResponses(value = {
@APIResponse( @APIResponse(
@ -64,7 +64,7 @@ public class PaymentInitiationRequestResource {
value = """ value = """
{ {
"data": { "data": {
"paymentInitiationTransaction": { "documentService": {
"transaction": { "transaction": {
"transactionIdentification": { "transactionIdentification": {
"identifierValue": "1" "identifierValue": "1"
@ -216,7 +216,8 @@ public class PaymentInitiationRequestResource {
}) })
public Response initiate( public Response initiate(
@RequestBody( @RequestBody(
description = "Request de la solicitud del pago del cliente", description = "Request para la notificación del cliente",
required = true,
content = @Content( content = @Content(
mediaType = MediaType.APPLICATION_JSON, mediaType = MediaType.APPLICATION_JSON,
schema = @Schema(implementation = PaymentInitiationRequestRequest.class), schema = @Schema(implementation = PaymentInitiationRequestRequest.class),

View File

@ -19,7 +19,7 @@ import java.util.Map;
public class PaymentRequestClient implements PaymentRequestUseCase { public class PaymentRequestClient implements PaymentRequestUseCase {
private final SerializationHelper serializationHelper; private final SerializationHelper serializationHelper;
private final HttpClientUseCase httpClientUseCase; private final HttpClientUseCase httpClientUseCase;
private final PaymentRequestConfig paymentRequestConfig; private final PaymentRequestConfig paymentStatusConfig;
@Inject @Inject
public PaymentRequestClient( public PaymentRequestClient(
@ -29,8 +29,8 @@ public class PaymentRequestClient implements PaymentRequestUseCase {
) { ) {
this.serializationHelper = serializationHelper; this.serializationHelper = serializationHelper;
this.httpClientUseCase = httpClientUseCase; this.httpClientUseCase = httpClientUseCase;
this.paymentRequestConfig = restClientConfig.getPaymentRequestConfig(); this.paymentStatusConfig = restClientConfig.getPaymentRequestConfig();
log.info("Configuracion cargada para payment-request: {}", paymentRequestConfig); log.info("Configuracion cargada para payment-status: {}", paymentStatusConfig);
} }
@Override @Override
@ -42,16 +42,16 @@ public class PaymentRequestClient implements PaymentRequestUseCase {
String applicantId = params.getOperation().getApplicantId(); String applicantId = params.getOperation().getApplicantId();
Map<String, Object> payload = getPayload(params); Map<String, Object> payload = getPayload(params);
HttpRequest request = HttpRequest.forApiPrivateResponse( HttpRequest request = HttpRequest.forApiPrivateResponse(
paymentRequestConfig.getUrl(), paymentStatusConfig.getUrl(),
paymentRequestConfig.getStatusSuccess(), paymentStatusConfig.getStatusSuccess(),
HttpRequest.HttpMethod.POST, HttpRequest.HttpMethod.POST,
responseType responseType
) )
.withBody(payload) .withBody(payload)
.withHeaders(Map.of("fintechId", fintechId)) .withHeaders(Map.of("fintechId", fintechId))
.withTimeout( .withTimeout(
paymentRequestConfig.getTimeout().getConnect(), paymentStatusConfig.getTimeout().getConnect(),
paymentRequestConfig.getTimeout().getResponse() paymentStatusConfig.getTimeout().getResponse()
); );
try { try {
@ -110,21 +110,21 @@ public class PaymentRequestClient implements PaymentRequestUseCase {
} }
private Map<String, Object> getPayload(PaymentRequestRequest params) { private Map<String, Object> getPayload(PaymentRequestRequest params) {
Map<String, Object> paymentRequestRequest = serializationHelper.toMap(params); Map<String, Object> paymentStatusRequest = serializationHelper.toMap(params);
Map<String, Object> operation = serializationHelper.toMap(params.getOperation()); Map<String, Object> operation = serializationHelper.toMap(params.getOperation());
String signature = serializationHelper.generateSignature( String signature = serializationHelper.generateSignature(
params.getOperation(), params.getChannelOrigin() params.getOperation(), params.getChannelOrigin()
); );
paymentRequestRequest.put("signature", signature); paymentStatusRequest.put("signature", signature);
paymentRequestRequest.put("operation", operation); paymentStatusRequest.put("operation", operation);
paymentRequestRequest.remove("fintechId"); paymentStatusRequest.remove("fintechId");
log.info("3. Firma generada: {}", signature); log.info("3. Firma generada: {}", signature);
log.info("4. Parametros de la solicitud: {}", paymentRequestRequest); log.info("4. Parametros de la solicitud: {}", paymentStatusRequest);
log.info("5. Solicitud final: {}", paymentRequestRequest); log.info("5. Solicitud final: {}", paymentStatusRequest);
return paymentRequestRequest; return paymentStatusRequest;
} }
} }

View File

@ -7,7 +7,7 @@ quarkus:
core-threads: 1 core-threads: 1
api: api:
source-id: DPIR source-id: DDFAT
read-messages: read-messages:
from-props: true from-props: true
dom-payment-initiation-request: dom-payment-initiation-request:

View File

@ -12,7 +12,7 @@ metadata:
annotations: annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
kubectl.kubernetes.io/last-applied-configuration: | 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":"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"}} {"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"}}
managedFields: managedFields:
- manager: kubectl-client-side-apply - manager: kubectl-client-side-apply
operation: Update operation: Update
@ -78,7 +78,7 @@ data:
quarkus.thread-pool.max-threads: '100' quarkus.thread-pool.max-threads: '100'
api.dom-payment-initiation-request.messages.key: dom-payment-initiation-request api.dom-payment-initiation-request.messages.key: dom-payment-initiation-request
quarkus.smallrye-health.liveness-path: /actuator/health/live quarkus.smallrye-health.liveness-path: /actuator/health/live
api.source-id: DPIR api.source-id: DDFAT
quarkus.smallrye-health.root-path: /actuator/health quarkus.smallrye-health.root-path: /actuator/health
quarkus.smallrye-openapi.enable: 'true' quarkus.smallrye-openapi.enable: 'true'
quarkus.smallrye-health.readiness-path: /actuator/health/ready quarkus.smallrye-health.readiness-path: /actuator/health/ready