refactoring security trace & add device params

This commit is contained in:
Ramon Ramirez 2026-01-20 12:11:13 -04:00
parent 57823dd6f9
commit e1000caeab
14 changed files with 207 additions and 62 deletions

View File

@ -40,6 +40,14 @@ public class MessageHelper {
this.errorMappings = initializeErrorMappings();
}
public Response handleSuccess(Object data, String statusCode) {
log.info(
"Respuesta exitosa controlada: {}",
statusCode
);
return buildResponse(data, statusCode);
}
public Response handleException(HttpStatusCodeException exception) {
log.error(
"Error interno controlado: {} -> {}",
@ -106,8 +114,27 @@ public class MessageHelper {
);
return Response.status(mapping.getHttpCode())
.entity(new ApiResponse<>(status))
.build();
.entity(new ApiResponse<>(status))
.build();
}
private Response buildResponse(Object data, String statusCode) {
ErrorMapping mapping = errorMappings.getOrDefault(
statusCode, errorMappings.getOrDefault(
statusCode, createDefaultMapping()
)
);
StatusResponse status = createError(mapping, null);
log.error(
"[Success] Message {} -> {}",
statusCode,
status.getMessage()
);
return Response.status(mapping.getHttpCode())
.entity(new ApiResponse<>(data, status))
.build();
}
private Map<String, ErrorMapping> initializeErrorMappings() {

View File

@ -31,10 +31,6 @@ public class RequestValidatorHelper {
LegalCustomerProductDirectoryRequest request
) {
validate(request.getCustomerId(), config.customerId(), "customerId");
validate(request.getAccountStatus(), config.accountStatus(), "accountStatus");
validate(request.getProductCvCode(), config.productCvCode(), "productCvCode");
validate(request.getLimitType(), config.limitType(), "limitType");
validate(request.getCasheaIndicator(), config.cacheaIndicator(), "casheaIndicator");
}
private void required(String value, String fieldName) {

View File

@ -17,6 +17,8 @@ import lombok.extern.slf4j.Slf4j;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
@ -132,9 +134,12 @@ public class HttpClientService implements HttpClientUseCase {
urlBuilder.append("&");
}
urlBuilder.append(entry.getKey())
.append("=")
.append(entry.getValue() != null ? entry.getValue() : "");
String encodedKey = URLEncoder.encode(entry.getKey(), StandardCharsets.UTF_8);
String encodedValue = entry.getValue() != null
? URLEncoder.encode(entry.getValue(), StandardCharsets.UTF_8)
: "";
urlBuilder.append(encodedKey).append("=").append(encodedValue);
}
return urlBuilder.toString();

View File

@ -0,0 +1,17 @@
package com.banesco.common.domain.model;
import io.quarkus.runtime.annotations.RegisterForReflection;
import lombok.*;
@Getter
@ToString
@Builder
@NoArgsConstructor
@AllArgsConstructor
@RegisterForReflection
public class Device {
private String deviceType;
private String deviceDescription;
private String deviceIp;
private String deviceSessionReference;
}

View File

@ -6,7 +6,9 @@ public class RequestContext {
private RequestContext() {}
private static final String REQUEST_ID = "requestId";
public static final String REQUEST_ID = "requestId";
public static final String DEVICE = "device";
public static final String DEVICE_SESSION_REFERENCE = "deviceSessionReference";
public static String getRequestId() {
return MDC.get(REQUEST_ID);

View File

@ -6,15 +6,88 @@ import jakarta.ws.rs.container.ContainerRequestFilter;
import jakarta.ws.rs.container.ContainerResponseContext;
import jakarta.ws.rs.container.ContainerResponseFilter;
import jakarta.ws.rs.ext.Provider;
import lombok.extern.slf4j.Slf4j;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.nio.charset.StandardCharsets;
import java.util.UUID;
@Slf4j
@Provider
public class RequestIdFilter implements ContainerRequestFilter, ContainerResponseFilter {
@Override
public void filter(ContainerRequestContext requestContext) {
RequestContext.setRequestId(UUID.randomUUID().toString().substring(0, 13));
String requestId = requestContext.getHeaderString(RequestContext.DEVICE_SESSION_REFERENCE);
if (isEmpty(requestId)) {
requestId = requestContext.getUriInfo()
.getQueryParameters()
.getFirst(RequestContext.DEVICE_SESSION_REFERENCE);
}
if (isEmpty(requestId) && hasJsonBody(requestContext)) {
requestId = extractRequestIdFromBody(requestContext);
}
if (isEmpty(requestId)) {
requestId = UUID.randomUUID().toString().substring(0, 13);
}
RequestContext.setRequestId(requestId);
}
private boolean isEmpty(String value) {
return value == null || value.trim().isEmpty();
}
private boolean hasJsonBody(ContainerRequestContext context) {
try {
String method = context.getMethod();
String contentType = context.getHeaderString("Content-Type");
return ("POST".equals(method) || "PUT".equals(method))
&& contentType != null
&& contentType.contains("application/json");
} catch (Exception e) {
log.warn("La peticion no es un POST o PUT: {}", e.getMessage());
return false;
}
}
private String extractRequestIdFromBody(ContainerRequestContext context) {
try {
ByteArrayOutputStream buffer = new ByteArrayOutputStream();
context.getEntityStream().transferTo(buffer);
byte[] bodyBytes = buffer.toByteArray();
context.setEntityStream(new ByteArrayInputStream(bodyBytes));
String bodyString = new String(bodyBytes, StandardCharsets.UTF_8);
io.vertx.core.json.JsonObject jsonObject = new io.vertx.core.json.JsonObject(bodyString);
if (jsonObject.containsKey(RequestContext.DEVICE)) {
io.vertx.core.json.JsonObject device = jsonObject.getJsonObject(RequestContext.DEVICE);
if (device.containsKey(RequestContext.DEVICE_SESSION_REFERENCE)) {
return device.getString(RequestContext.DEVICE_SESSION_REFERENCE);
}
}
if (jsonObject.containsKey(RequestContext.REQUEST_ID)) {
return jsonObject.getString(RequestContext.REQUEST_ID);
}
if (jsonObject.containsKey(RequestContext.DEVICE_SESSION_REFERENCE)) {
return jsonObject.getString(RequestContext.DEVICE_SESSION_REFERENCE);
}
return null;
} catch (Exception e) {
log.error("Error extrayendo el requestId del cuerpo de la peticion: {}", e.getMessage());
return null;
}
}
@Override
@ -22,6 +95,10 @@ public class RequestIdFilter implements ContainerRequestFilter, ContainerRespons
ContainerRequestContext requestContext,
ContainerResponseContext responseContext
) {
RequestContext.clear();
try {
RequestContext.clear();
} catch (Exception e) {
log.error("Error limpiando el filtro: {}", e.getMessage());
}
}
}
}

View File

@ -10,10 +10,9 @@ import com.banesco.module.legal_customer_product_directory.domain.dto.request.Le
import com.banesco.module.legal_customer_product_directory.domain.dto.response.LegalCustomerProductDirectoryResponse;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import jakarta.ws.rs.core.Response;
import lombok.extern.slf4j.Slf4j;
import java.util.Objects;
@Slf4j
@ApplicationScoped
public class LegalCustomerProductDirectoryService implements LegalCustomerProductDirectoryUseCase {
@ -34,39 +33,38 @@ public class LegalCustomerProductDirectoryService implements LegalCustomerProduc
}
@Override
public ApiResponse<LegalCustomerProductDirectoryResponse> execute(
public Response execute(
LegalCustomerProductDirectoryRequest request
) {
log.info("Iniciando ejecucion para el cliente: {}", request.getCustomerId());
validate(request);
Response response;
try {
ApiResponse<LegalCustomerProductDirectoryResponse> response = business(request);
validate(request);
if (
!Objects.isNull(response.getData()) &&
messageHelper.isSuccessStatusCode(response.getStatusResponse())
) {
return new ApiResponse<>(response.getData(), messageHelper.createStatusResponse(
response.getStatusResponse().getStatusCode()
));
}
ApiResponse<LegalCustomerProductDirectoryResponse> apiResponse = business(request);
throw HttpStatusCodeException.serviceUnavailable("503");
response = messageHelper.handleSuccess(
apiResponse.getData(),
apiResponse.getStatusResponse().getStatusCode()
);
} catch (HttpStatusCodeException e) {
log.error("Excepcion HTTP del api de negocio: {} - {}", e.getStatusCode(), e.getErrorCode());
throw e;
response = messageHelper.handleException(e);
} catch (Exception e) {
log.error("Excepcion generica del api de negocio: {}", e.getMessage());
throw e;
response = messageHelper.handleGenericException(e);
}
return response;
}
private void validate(
LegalCustomerProductDirectoryRequest request
) {
requestValidatorHelper.validateRequired(request);
requestValidatorHelper.validateFieldValues(request);
}
private ApiResponse<LegalCustomerProductDirectoryResponse> business(

View File

@ -1,11 +1,10 @@
package com.banesco.module.legal_customer_product_directory.application.usecase;
import com.banesco.common.domain.model.ApiResponse;
import com.banesco.module.legal_customer_product_directory.domain.dto.request.LegalCustomerProductDirectoryRequest;
import com.banesco.module.legal_customer_product_directory.domain.dto.response.LegalCustomerProductDirectoryResponse;
import jakarta.ws.rs.core.Response;
public interface LegalCustomerProductDirectoryUseCase {
ApiResponse<LegalCustomerProductDirectoryResponse> execute(
Response execute(
LegalCustomerProductDirectoryRequest request
);
}

View File

@ -1,5 +1,8 @@
package com.banesco.module.legal_customer_product_directory.domain.dto.request;
import com.banesco.common.domain.model.Device;
import com.banesco.common.infrastructure.context.RequestContext;
import io.netty.util.internal.StringUtil;
import io.quarkus.runtime.annotations.RegisterForReflection;
import lombok.*;
@ -20,7 +23,9 @@ public class LegalCustomerProductDirectoryRequest {
@NonNull
private String appId; // Header obligatorio
@NonNull
private String customerId; // VCUSCUN - Obligatorio (Numero de cliente IBS)
private String customerId; // VCUSCUN - Obligatorio (Numero de cliente IBS)
@NonNull
private Device device;
private String bankNumber; // VACMBNK - Numero de Banco (filtro)
private String currencyCode; // VACMCCY - Moneda (filtro)
@ -36,7 +41,14 @@ public class LegalCustomerProductDirectoryRequest {
public Map<String, String> toQueryString() {
return Map.ofEntries(
entry("appId", Objects.toString(getAppId(), "")),
entry("customerReferenceFintechId", Objects.toString(getCustomerReferenceFintechId(), ""))
entry("customerReferenceFintechId", Objects.toString(getCustomerReferenceFintechId(), "")),
entry("deviceType", Objects.toString(getDevice().getDeviceType(), "")),
entry("deviceDescription", Objects.toString(getDevice().getDeviceDescription(), "")),
entry("deviceIp", Objects.toString(getDevice().getDeviceIp(), "")),
entry("deviceSessionReference", (!StringUtil.isNullOrEmpty(getDevice().getDeviceSessionReference()))
? getDevice().getDeviceSessionReference()
: RequestContext.getRequestId()
)
);
}
}

View File

@ -49,8 +49,6 @@ public class BusLegalCustomerProductDirectoryClient implements BusinessUseCase {
businessConfig.getTimeout().getResponse()
);
log.debug("Request configurado: {}", request);
try {
ApiResponse<T> response = httpClientUseCase.execute(request);

View File

@ -1,8 +1,7 @@
package com.banesco.module.legal_customer_product_directory.infrastructure.resource;
import com.banesco.common.application.helper.MessageHelper;
import com.banesco.common.domain.exception.HttpStatusCodeException;
import com.banesco.common.domain.model.ApiResponse;
import com.banesco.common.domain.model.Device;
import com.banesco.common.domain.model.StatusResponse;
import com.banesco.module.legal_customer_product_directory.application.usecase.LegalCustomerProductDirectoryUseCase;
import com.banesco.module.legal_customer_product_directory.domain.dto.request.LegalCustomerProductDirectoryRequest;
@ -30,22 +29,19 @@ import java.util.Objects;
public class LegalCustomerProductDirectoryResource {
private final LegalCustomerProductDirectoryUseCase useCase;
private final MessageHelper messageHelper;
@Inject
public LegalCustomerProductDirectoryResource(
LegalCustomerProductDirectoryUseCase useCase,
MessageHelper messageHelper
LegalCustomerProductDirectoryUseCase useCase
) {
this.useCase = useCase;
this.messageHelper = messageHelper;
}
@GET
@Path("/retrieve/{customerId : (?!retrieve$).*}")
@Operation(
summary = "Recuperar productos de cliente legal",
description = "Consulta masiva de cuentas por numero de cliente IBS"
description = "Consulta masiva de cuentas por numero de cliente "
)
@APIResponses(value = {
@APIResponse(
@ -330,23 +326,41 @@ public class LegalCustomerProductDirectoryResource {
String appId,
@PathParam("customerId")
@Parameter(description = "Numero de cliente IBS (VCUSCUN)", example = "200053197")
String customerId
) {
log.info("Iniciando consulta para cliente IBS: {}", customerId);
@Parameter(description = "Numero de cliente (VCUSCUN)", example = "200053197")
String customerId,
try {
return Response.ok(useCase.execute(
LegalCustomerProductDirectoryRequest.builder()
.customerId(Objects.toString(customerId, ""))
.customerReferenceFintechId(customerReferenceFintechId)
.appId(appId)
.build()
)).build();
} catch (HttpStatusCodeException e) {
return messageHelper.handleException(e);
} catch (Exception e) {
return messageHelper.handleGenericException(e);
}
@QueryParam("deviceType")
@Parameter(description = "Tipo de dispositivo", example = "Mobile")
String deviceType,
@QueryParam("deviceDescription")
@Parameter(description = "Descripcion del dispositivo", example = "Xiaomi Note 11 PRO")
String deviceDescription,
@QueryParam("deviceIp")
@Parameter(description = "Direccion IP del dispositivo", example = "127.0.0.1")
String deviceIp,
@QueryParam("deviceSessionReference")
@Parameter(description = "Referencia de la peticion del dispositivo", example = "12345678901304")
String deviceSessionReference
) {
log.info("Iniciando consulta para cliente : {}", customerId);
return useCase.execute(
LegalCustomerProductDirectoryRequest.builder()
.customerId(Objects.toString(customerId, ""))
.customerReferenceFintechId(customerReferenceFintechId)
.appId(appId)
.device(
Device.builder()
.deviceType(deviceType)
.deviceDescription(deviceDescription)
.deviceIp(deviceIp)
.deviceSessionReference(deviceSessionReference)
.build()
)
.build()
);
}
}

View File

@ -21,6 +21,6 @@ api:
rec-legal-customer-product-directory:
messages:
key: 'rec-legal-customer-product-directory'
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"},{"backendCode":"VRN04","httpCode":"503","statusCode":"VRN04","description":"Servicio en horario de mantenimiento","status":"error"},{"backendCode":"204","httpCode":"200","statusCode":"200","description":"Cliente sin productos","status":"ok"}]'
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"},{"backendCode":"VRN04","httpCode":"503","statusCode":"VRN04","description":"Servicio en horario de mantenimiento","status":"error"},{"backendCode":"VRN01","httpCode":"400","statusCode":"VRN01","description":"Campo Codigo de IBS Requerido"},{"backendCode":"VRN02","httpCode":"204","statusCode":"VRN02","description":"Cliente sin productos"}]'
rest-client:
bus-legal-customer-product-directory: '{"url":"http://localhost:8082/legal-customer-product-directory/retrieve/{customerId}","timeout":{"connect":15000,"response":15000},"config":{}}'

View File

@ -68,7 +68,7 @@ data:
api.allowed.request-validation.limit-type: ^(PAG|REC)$
api.allowed.request-validation.product-cv-code: ^(CV|CVFL)$
api.read-messages.from-props: 'true'
api.rest-client.register-security: '{"url":"http://api-register-security-route-proyecto-prueba-ja.apps.desplakur3.desintra.banesco.com/register-security/save","timeout":{"connect":20000,"response":20000},"config":{"sp":"spAPI_Traza","eventCod":"CANCTARJ","bankCod":"01","curCod":"BS"}}'
api.rest-client.register-security: '{"url":"http://api-register-security-route-proyecto-prueba-ja.apps.desplakur3.desintra.banesco.com/register-security/save","timeout":{"connect":20000,"response":20000},"config":{"sp":"spAPI_Traza","codEve":"P2PVUEL","codEve2":"P2PVUEL","codBan":"01","codMon":"BS"}}'
quarkus.http.port: '8080'
api.allowed.request-validation.customer-ibs-number: \d+
quarkus.profile: dev