refactoring security trace & add device params
This commit is contained in:
parent
680f697bd0
commit
497aa6f842
Binary file not shown.
@ -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() {
|
||||
|
||||
17
src/main/java/com/banesco/common/domain/model/Device.java
Normal file
17
src/main/java/com/banesco/common/domain/model/Device.java
Normal 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;
|
||||
}
|
||||
@ -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);
|
||||
|
||||
@ -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());
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -7,8 +7,10 @@ import com.banesco.module.legal_customer_product_directory.application.repositor
|
||||
import com.banesco.module.legal_customer_product_directory.application.usecase.LegalCustomerProductDirectoryUseCase;
|
||||
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 io.netty.util.internal.StringUtil;
|
||||
import jakarta.enterprise.context.ApplicationScoped;
|
||||
import jakarta.inject.Inject;
|
||||
import jakarta.ws.rs.core.Response;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
@Slf4j
|
||||
@ -28,23 +30,37 @@ public class LegalCustomerProductDirectoryService implements LegalCustomerProduc
|
||||
}
|
||||
|
||||
@Override
|
||||
public ApiResponse<LegalCustomerProductDirectoryResponse> execute(
|
||||
public Response execute(
|
||||
LegalCustomerProductDirectoryRequest request
|
||||
) {
|
||||
log.info("Iniciando ejecucion para el cliente: {}", request.getCustomerId());
|
||||
|
||||
Response response;
|
||||
|
||||
try {
|
||||
return storeProcedure(request);
|
||||
if(StringUtil.isNullOrEmpty(request.getCustomerId())) {
|
||||
log.error("Error en el codigo del cliente vacio");
|
||||
throw HttpStatusCodeException.badRequest("VRN01");
|
||||
}
|
||||
|
||||
ApiResponse<LegalCustomerProductDirectoryResponse> apiResponse = storeProcedure(request);
|
||||
|
||||
response = messageHelper.handleSuccess(
|
||||
apiResponse.getData(),
|
||||
apiResponse.getStatusResponse().getStatusCode()
|
||||
);
|
||||
} catch (PersistenceException e) {
|
||||
log.warn("Excepcion de la persistencia del sp: {} -> {}", e.getErrorCode(), e.getMessage());
|
||||
throw HttpStatusCodeException.badRequest(e.getErrorCode());
|
||||
response = messageHelper.handleException(HttpStatusCodeException.badRequest(e.getErrorCode()));
|
||||
} catch (HttpStatusCodeException e) {
|
||||
log.error("Excepcion HTTP del api de dominio: {} - {}", e.getStatusCode(), e.getErrorCode());
|
||||
throw e;
|
||||
log.error("Excepcion HTTP del api privada: {} - {}", e.getStatusCode(), e.getErrorCode());
|
||||
response = messageHelper.handleException(e);
|
||||
} catch (Exception e) {
|
||||
log.error("Excepcion generica del api de dominio: {}", e.getMessage());
|
||||
throw e;
|
||||
log.error("Excepcion generica del api privada: {}", e.getMessage());
|
||||
response = messageHelper.handleGenericException(e);
|
||||
}
|
||||
|
||||
return response;
|
||||
}
|
||||
|
||||
private ApiResponse<LegalCustomerProductDirectoryResponse> storeProcedure(
|
||||
|
||||
@ -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
|
||||
);
|
||||
}
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
package com.banesco.module.legal_customer_product_directory.domain.dto.request;
|
||||
|
||||
import com.banesco.common.domain.model.Device;
|
||||
import io.quarkus.runtime.annotations.RegisterForReflection;
|
||||
import lombok.*;
|
||||
|
||||
@ -15,7 +16,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)
|
||||
|
||||
@ -41,7 +41,7 @@ public class PersistenceAdapter implements PersistenceRepository {
|
||||
log.info("Cuentas obtenidas por el SP: {}", accountsFromSP.size());
|
||||
|
||||
if(accountsFromSP.isEmpty()) {
|
||||
throw HttpStatusCodeException.badRequest("400");
|
||||
throw HttpStatusCodeException.noContent("VRN02");
|
||||
}
|
||||
|
||||
return CustomerProductAndServiceDirectory.builder()
|
||||
|
||||
@ -63,7 +63,7 @@ public class AccountRepository {
|
||||
!StringUtil.isNullOrEmpty(results.get(0).getDscError()) &&
|
||||
results.get(0).getDscError().toUpperCase().equals(dataSourceConfig.getSpIbsError())
|
||||
) {
|
||||
throw new PersistenceException("ERROR", results.get(0).getDscError());
|
||||
throw new PersistenceException("VRN01", results.get(0).getDscError());
|
||||
}
|
||||
} catch (SQLException e) {
|
||||
log.error("Error en conexion o ejecucion del SP {}: {}", spCall, e.getMessage());
|
||||
|
||||
@ -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,14 +29,11 @@ import java.util.Objects;
|
||||
public class LegalCustomerProductDirectoryResource {
|
||||
|
||||
private final LegalCustomerProductDirectoryUseCase useCase;
|
||||
private final MessageHelper messageHelper;
|
||||
|
||||
@Inject
|
||||
public LegalCustomerProductDirectoryResource(
|
||||
MessageHelper messageHelper,
|
||||
LegalCustomerProductDirectoryUseCase useCase
|
||||
) {
|
||||
this.messageHelper = messageHelper;
|
||||
this.useCase = useCase;
|
||||
}
|
||||
|
||||
@ -45,7 +41,7 @@ public class LegalCustomerProductDirectoryResource {
|
||||
@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(
|
||||
@ -322,7 +318,7 @@ public class LegalCustomerProductDirectoryResource {
|
||||
})
|
||||
public Response retrieve(
|
||||
@PathParam("customerId")
|
||||
@Parameter(description = "Numero de cliente IBS (VCUSCUN)", example = "200053197")
|
||||
@Parameter(description = "Numero de cliente (VCUSCUN)", example = "200053197")
|
||||
String customerId,
|
||||
|
||||
@QueryParam("customerReferenceFintechId")
|
||||
@ -371,32 +367,50 @@ public class LegalCustomerProductDirectoryResource {
|
||||
|
||||
@QueryParam("casheaIndicator")
|
||||
@Parameter(description = "Indicador cash (VCASHEA). 'SI'=En tabla cashea, 'NO'=No en tabla cashea", example = "SI")
|
||||
String casheaIndicator
|
||||
) {
|
||||
log.info("Iniciando consulta para cliente IBS: {}", customerId);
|
||||
String casheaIndicator,
|
||||
|
||||
try {
|
||||
return Response.ok(useCase.execute(
|
||||
LegalCustomerProductDirectoryRequest.builder()
|
||||
.customerId(Objects.toString(customerId, ""))
|
||||
.customerReferenceFintechId(Objects.toString(customerReferenceFintechId, ""))
|
||||
.appId(Objects.toString(appId, ""))
|
||||
.bankNumber(Objects.toString(bankNumber, ""))
|
||||
.currencyCode(Objects.toString(currencyCode, ""))
|
||||
.accountStatus(Objects.toString(accountStatus, ""))
|
||||
.productCvCode(Objects.toString(productCvCode, ""))
|
||||
.productCode(Objects.toString(productCode, ""))
|
||||
.channelCode(Objects.toString(channelCode, ""))
|
||||
.serviceType(Objects.toString(serviceType, ""))
|
||||
.affiliationStatus(Objects.toString(affiliationStatus, ""))
|
||||
.limitType(Objects.toString(limitType, ""))
|
||||
.casheaIndicator(Objects.toString(casheaIndicator, ""))
|
||||
.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(Objects.toString(customerReferenceFintechId, ""))
|
||||
.appId(Objects.toString(appId, ""))
|
||||
.bankNumber(Objects.toString(bankNumber, ""))
|
||||
.currencyCode(Objects.toString(currencyCode, ""))
|
||||
.accountStatus(Objects.toString(accountStatus, ""))
|
||||
.productCvCode(Objects.toString(productCvCode, ""))
|
||||
.productCode(Objects.toString(productCode, ""))
|
||||
.channelCode(Objects.toString(channelCode, ""))
|
||||
.serviceType(Objects.toString(serviceType, ""))
|
||||
.affiliationStatus(Objects.toString(affiliationStatus, ""))
|
||||
.limitType(Objects.toString(limitType, ""))
|
||||
.casheaIndicator(Objects.toString(casheaIndicator, ""))
|
||||
.device(
|
||||
Device.builder()
|
||||
.deviceType(deviceType)
|
||||
.deviceDescription(deviceDescription)
|
||||
.deviceIp(deviceIp)
|
||||
.deviceSessionReference(deviceSessionReference)
|
||||
.build()
|
||||
)
|
||||
.build()
|
||||
);
|
||||
}
|
||||
}
|
||||
@ -23,7 +23,7 @@ api:
|
||||
dom-legal-customer-product-directory:
|
||||
messages:
|
||||
key: 'dom-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"},{"backend_code":"204","http_code":"200","status_code":"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":"VRN01","httpCode":"400","statusCode":"VRN01","description":"Campo Codigo de IBS Requerido"},{"backendCode":"VRN02","httpCode":"204","statusCode":"VRN02","description":"Cliente sin productos"}]'
|
||||
|
||||
datasource:
|
||||
sp:
|
||||
|
||||
File diff suppressed because one or more lines are too long
Loading…
x
Reference in New Issue
Block a user