ramon.ramirez/rec-create-security-notification
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update channelOrigin as String

Browse Source
This commit is contained in:
Ramon Ramirez 2026-01-27 12:12:27 -04:00
parent 24f6114695
commit fcfcec3832
11 changed files with 232 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
scripts/native/file/rec-create-security-notification-1.0-native-quarkus-jdk17-runner
View File

Binary file not shown.

3
src/main/java/com/banesco/common/application/helper/RequestValidatorHelper.java
View File

@ -26,6 +26,7 @@ public class RequestValidatorHelper {
) {
required(request.getCodeType(), "correspondenceOutbound.sourceReference");
required(request.getRecipientId(), "correspondenceOutbound.customerReference.partyIdentification[0].partyIdentification.identifierValue");
required(request.getChannelCode(), "procedureRequest.instructionPurposeType");
required(request.getCustomerReferenceFintechId(), "customerReferenceFintechId");
required(request.getAppId(), "appId");
}
@ -35,7 +36,7 @@ public class RequestValidatorHelper {
) {
validate(request.getRecipientId(), config.recipientIdNumber(), "correspondenceOutbound.customerReference.partyIdentification[0].partyIdentification.identifierValue");
validate(request.getAmount(), "paymentInstruction.amount[0].value");
validate(request.getChannelCode(), config.channelCode(), "channelCode");
validate(request.getChannelCode(), config.channelCode(), "procedureRequest.instructionPurposeType");
}
private void required(String value, String fieldName) {

347
src/main/java/com/banesco/common/application/service/HttpClientService.java
View File

@ -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("Peticion Cuerpo: {}", 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()

4
src/main/java/com/banesco/common/application/usecase/HttpClientUseCase.java
View File

@ -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
src/main/java/com/banesco/common/domain/exception/BusinessException.java
View File

@ -1,11 +0,0 @@
package com.banesco.common.domain.exception;
public class BusinessException extends BaseApiException {
public BusinessException(String errorCode, String message, String fieldPath) {
super(errorCode, message, fieldPath, "business");
}
public BusinessException(String errorCode, String fieldPath) {
super(errorCode, fieldPath, "business");
}
}

3
src/main/java/com/banesco/module/correspondence/domain/dto/request/CorrespondenceRequest.java
View File

@ -95,8 +95,7 @@ public class CorrespondenceRequest {
@JsonIgnore
public String getChannelCode() {
return procedureRequest
.getInstructionPurposeType()
.name();
.getInstructionPurposeType();
}
@JsonIgnore

4
src/main/java/com/banesco/module/correspondence/infrastructure/client/BusCorrespondenceClient.java
View File

@ -46,10 +46,8 @@ public class BusCorrespondenceClient implements BusinessUseCase {
businessConfig.getTimeout().getResponse()
);
log.debug("Request configurado: {}", request);
try {
ApiResponse<T> response = httpClientUseCase.execute(request);
ApiResponse<T> response = httpClientUseCase.executeApiResponse(request);
log.info(
"Solicitud del api de negocio exitoso: {}",

2
src/main/java/com/banesco/module/instruction/domain/model/Instruction.java
View File

@ -12,5 +12,5 @@ import lombok.*;
@RegisterForReflection
@JsonInclude(JsonInclude.Include.NON_NULL)
public class Instruction {
private InstructionPurposeType instructionPurposeType; // Request JSON: "channelOrigin" (BOL)
private String instructionPurposeType; // Request JSON: "channelOrigin" (BOL)
}

5
src/main/java/com/banesco/module/instruction/domain/model/InstructionPurposeType.java
View File

@ -1,5 +0,0 @@
package com.banesco.module.instruction.domain.model;
public enum InstructionPurposeType {
PREDICTIVE_CONSOLE,
}

2
src/main/resources/application-dev.yml
View File

@ -11,7 +11,7 @@ api:
allowed:
request-validation:
recipient-id-number: '^[VEJG]\d+$'
channel-code: '^(PREDICTIVE_CONSOLE)$'
channel-code: '^(consolaPredictiva)$'
read-messages:
from-props: true
rec-create-security-notification:

3
src/main/resources/configmap.yaml
View File

@ -54,7 +54,6 @@ metadata:
'f:app': {}
data:
quarkus.application.version: 1.0.0
api.allowed.request-validation.document-name: (?i).*\.(csv)$
quarkus.log.level: INFO
quarkus.debug.reflection: 'false'
quarkus.debug.print-startup-times: 'true'
@ -70,7 +69,7 @@ data:
quarkus.http.port: '8080'
quarkus.profile: dev
quarkus.log.console.format: '%d{HH:mm:ss.SSS} %-5p [%t] [%X{requestId}] %c{1} - %s%e%n'
api.allowed.request-validation.channel-code: ^(BOL)$
api.allowed.request-validation.channel-code: ^(consolaPredictiva)$
quarkus.smallrye-health.liveness-path: /actuator/health/live
api.source-id: RCSN
quarkus.smallrye-health.root-path: /actuator/health