diff --git a/scripts/native/file/dom-docservice-file-audit-trace-1.0-native-quarkus-jdk17-runner b/scripts/native/file/dom-docservice-file-audit-trace-1.0-native-quarkus-jdk17-runner index 52066ee..5f71142 100644 Binary files a/scripts/native/file/dom-docservice-file-audit-trace-1.0-native-quarkus-jdk17-runner and b/scripts/native/file/dom-docservice-file-audit-trace-1.0-native-quarkus-jdk17-runner differ diff --git a/src/main/java/com/banesco/common/application/helper/MessageHelper.java b/src/main/java/com/banesco/common/application/helper/MessageHelper.java index 01d1e37..7d7e5bd 100644 --- a/src/main/java/com/banesco/common/application/helper/MessageHelper.java +++ b/src/main/java/com/banesco/common/application/helper/MessageHelper.java @@ -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: {} -> {}", @@ -110,6 +118,25 @@ public class MessageHelper { .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 initializeErrorMappings() { try { String json; diff --git a/src/main/java/com/banesco/common/application/helper/SerializationHelper.java b/src/main/java/com/banesco/common/application/helper/SerializationHelper.java index bdb43f3..80cfa89 100644 --- a/src/main/java/com/banesco/common/application/helper/SerializationHelper.java +++ b/src/main/java/com/banesco/common/application/helper/SerializationHelper.java @@ -144,7 +144,9 @@ public class SerializationHelper { String channelBase64 = encodeStringToBase64(channelOrigin); for (Object value : operationSortedMap.values()) { - concatenatedValues.append(value.toString()); + if(!Objects.isNull(value)) { + concatenatedValues.append(value); + } } String finalString = concatenatedValues + channelBase64; diff --git a/src/main/java/com/banesco/common/domain/model/Device.java b/src/main/java/com/banesco/common/domain/model/Device.java new file mode 100644 index 0000000..8299a06 --- /dev/null +++ b/src/main/java/com/banesco/common/domain/model/Device.java @@ -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; +} diff --git a/src/main/java/com/banesco/common/domain/model/HttpRequest.java b/src/main/java/com/banesco/common/domain/model/HttpRequest.java index af48ca7..7b99dae 100644 --- a/src/main/java/com/banesco/common/domain/model/HttpRequest.java +++ b/src/main/java/com/banesco/common/domain/model/HttpRequest.java @@ -58,103 +58,103 @@ public class HttpRequest { private boolean logResponseBody = true; public static HttpRequest forApiResponse( - String url, - HttpMethod method, - Class dataType + String url, + HttpMethod method, + Class dataType ) { return HttpRequest.builder() - .url(url) - .method(method) - .responseType(ApiResponse.class) - .genericType(dataType) - .apiResponse(true) - .build(); + .url(url) + .method(method) + .responseType(ApiResponse.class) + .genericType(dataType) + .apiResponse(true) + .build(); } public static HttpRequest forApiResponseList( - String url, - HttpMethod method, - Class elementType + String url, + HttpMethod method, + Class elementType ) { return HttpRequest.builder() - .url(url) - .method(method) - .responseType(ApiResponse.class) - .complexType(TypeBuilder.listOf(elementType)) - .apiResponse(true) - .listResponse(true) - .build(); + .url(url) + .method(method) + .responseType(ApiResponse.class) + .complexType(TypeBuilder.listOf(elementType)) + .apiResponse(true) + .listResponse(true) + .build(); } public static HttpRequest forApiPrivateResponse( - String url, - String statusSuccess, - HttpMethod method, - Class successType + String url, + String statusSuccess, + HttpMethod method, + Class successType ) { return HttpRequest.builder() - .url(url) - .method(method) - .responseType(ApiPrivateResponse.class) - .complexType(TypeBuilder.parametricType( - Either.class, - successType, - ApiPrivateError.class - )) - .apiPrivateResponse(true) - .eitherResponse(true) - .errorType(ApiPrivateError.class) - .statusSuccess(statusSuccess) - .build(); + .url(url) + .method(method) + .responseType(ApiPrivateResponse.class) + .complexType(TypeBuilder.parametricType( + Either.class, + successType, + ApiPrivateError.class + )) + .apiPrivateResponse(true) + .eitherResponse(true) + .errorType(ApiPrivateError.class) + .statusSuccess(statusSuccess) + .build(); } public static HttpRequest forApiPrivateResponseList( - String url, - String statusSuccess, - HttpMethod method, - Class elementType + String url, + String statusSuccess, + HttpMethod method, + Class elementType ) { return HttpRequest.builder() - .url(url) - .method(method) - .responseType(ApiPrivateResponse.class) - .complexType(TypeBuilder.parametricType( - Either.class, - TypeBuilder.listOf(elementType), - ApiPrivateError.class - )) - .apiPrivateResponse(true) - .eitherResponse(true) - .listResponse(true) - .errorType(ApiPrivateError.class) - .statusSuccess(statusSuccess) - .build(); + .url(url) + .method(method) + .responseType(ApiPrivateResponse.class) + .complexType(TypeBuilder.parametricType( + Either.class, + TypeBuilder.listOf(elementType), + ApiPrivateError.class + )) + .apiPrivateResponse(true) + .eitherResponse(true) + .listResponse(true) + .errorType(ApiPrivateError.class) + .statusSuccess(statusSuccess) + .build(); } public static HttpRequest forDirectResponse( - String url, - HttpMethod method, - Class responseType + String url, + HttpMethod method, + Class responseType ) { return HttpRequest.builder() - .url(url) - .method(method) - .responseType(responseType) - .build(); + .url(url) + .method(method) + .responseType(responseType) + .build(); } public static HttpRequest forGenericResponse( - String url, - HttpMethod method, - Class rawType, - Class genericType + String url, + HttpMethod method, + Class rawType, + Class genericType ) { return HttpRequest.builder() - .url(url) - .method(method) - .responseType(rawType) - .complexType(TypeBuilder.parametricType(rawType, genericType)) - .build(); + .url(url) + .method(method) + .responseType(rawType) + .complexType(TypeBuilder.parametricType(rawType, genericType)) + .build(); } public HttpRequest withHeaders(Map headers) { diff --git a/src/main/java/com/banesco/common/infrastructure/context/RequestContext.java b/src/main/java/com/banesco/common/infrastructure/context/RequestContext.java index 633fd0f..bf29549 100644 --- a/src/main/java/com/banesco/common/infrastructure/context/RequestContext.java +++ b/src/main/java/com/banesco/common/infrastructure/context/RequestContext.java @@ -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); diff --git a/src/main/java/com/banesco/common/infrastructure/filter/RequestIdFilter.java b/src/main/java/com/banesco/common/infrastructure/filter/RequestIdFilter.java index c6090ec..e14b02b 100644 --- a/src/main/java/com/banesco/common/infrastructure/filter/RequestIdFilter.java +++ b/src/main/java/com/banesco/common/infrastructure/filter/RequestIdFilter.java @@ -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()); + } } -} +} \ No newline at end of file diff --git a/src/main/java/com/banesco/module/docservice_file_audit_trace/application/service/DocserviceFileAuditTraceService.java b/src/main/java/com/banesco/module/docservice_file_audit_trace/application/service/DocserviceFileAuditTraceService.java index 188c3af..73992e3 100644 --- a/src/main/java/com/banesco/module/docservice_file_audit_trace/application/service/DocserviceFileAuditTraceService.java +++ b/src/main/java/com/banesco/module/docservice_file_audit_trace/application/service/DocserviceFileAuditTraceService.java @@ -9,6 +9,7 @@ import com.banesco.module.docservice_file_audit_trace.domain.dto.request.Docserv import com.banesco.module.docservice_file_audit_trace.domain.dto.response.DocserviceFileAuditTraceResponse; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; +import jakarta.ws.rs.core.Response; import lombok.extern.slf4j.Slf4j; @Slf4j @@ -28,27 +29,29 @@ public class DocserviceFileAuditTraceService implements DocserviceFileAuditTrace } @Override - public ApiResponse execute( + public Response execute( DocserviceFileAuditTraceRequest request ) { log.info("Iniciando ejecucion para el archivo: {}", request.getDocumentName()); + Response response; + try { - return apiPrivate(request); - } catch (ApiPrivateException e) { - log.warn( - "Excepcion de la api privada: {} -> {}", - e.getStatusCode(), - e.getMessage() + ApiResponse apiResponse = apiPrivate(request); + + response = messageHelper.handleSuccess( + apiResponse.getData(), + apiResponse.getStatusResponse().getStatusCode() ); - throw HttpStatusCodeException.badRequest("400"); } catch (HttpStatusCodeException e) { - log.error("Excepcion HTTP del api privada: {} - {}", e.getStatusCode(), e.getErrorCode()); - throw e; + log.error("Excepcion HTTP del api de dominio: {} - {}", e.getStatusCode(), e.getErrorCode()); + response = messageHelper.handleException(e); } catch (Exception e) { - log.error("Excepcion generica del api privada: {}", e.getMessage()); - throw e; + log.error("Excepcion generica del api de dominio: {}", e.getMessage()); + response = messageHelper.handleGenericException(e); } + + return response; } private ApiResponse apiPrivate( diff --git a/src/main/java/com/banesco/module/docservice_file_audit_trace/application/usecase/DocserviceFileAuditTraceUseCase.java b/src/main/java/com/banesco/module/docservice_file_audit_trace/application/usecase/DocserviceFileAuditTraceUseCase.java index c06e3ce..f9c68a0 100644 --- a/src/main/java/com/banesco/module/docservice_file_audit_trace/application/usecase/DocserviceFileAuditTraceUseCase.java +++ b/src/main/java/com/banesco/module/docservice_file_audit_trace/application/usecase/DocserviceFileAuditTraceUseCase.java @@ -1,11 +1,10 @@ package com.banesco.module.docservice_file_audit_trace.application.usecase; -import com.banesco.common.domain.model.ApiResponse; import com.banesco.module.docservice_file_audit_trace.domain.dto.request.DocserviceFileAuditTraceRequest; -import com.banesco.module.docservice_file_audit_trace.domain.dto.response.DocserviceFileAuditTraceResponse; +import jakarta.ws.rs.core.Response; public interface DocserviceFileAuditTraceUseCase { - ApiResponse execute( + Response execute( DocserviceFileAuditTraceRequest request ); } diff --git a/src/main/java/com/banesco/module/docservice_file_audit_trace/domain/dto/request/DocserviceFileAuditTraceRequest.java b/src/main/java/com/banesco/module/docservice_file_audit_trace/domain/dto/request/DocserviceFileAuditTraceRequest.java index 06af584..06271b5 100644 --- a/src/main/java/com/banesco/module/docservice_file_audit_trace/domain/dto/request/DocserviceFileAuditTraceRequest.java +++ b/src/main/java/com/banesco/module/docservice_file_audit_trace/domain/dto/request/DocserviceFileAuditTraceRequest.java @@ -1,10 +1,16 @@ package com.banesco.module.docservice_file_audit_trace.domain.dto.request; +import com.banesco.common.domain.model.Device; +import com.banesco.common.infrastructure.context.RequestContext; import com.banesco.module.document.domain.model.Document; import com.banesco.module.instruction.domain.model.Instruction; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.netty.util.internal.StringUtil; import io.quarkus.runtime.annotations.RegisterForReflection; import lombok.*; +import java.util.Objects; + @Getter @ToString @Builder @@ -20,11 +26,15 @@ public class DocserviceFileAuditTraceRequest { private Document document; @NonNull private Instruction procedureRequest; + @NonNull + private Device device; + @JsonIgnore public String getDocumentName() { return document.getDocumentName(); } + @JsonIgnore public String getDocumentDirectory() { return document .getDocumentLocation() @@ -32,4 +42,37 @@ public class DocserviceFileAuditTraceRequest { .getLocationReference() .getLocationValue(); } + + @JsonIgnore + public String getChannelCode() { + return procedureRequest + .getInstructionPurposeType() + .name(); + } + + @JsonIgnore + public static DocserviceFileAuditTraceRequest fromResource( + String customerReferenceFintechId, + String appId, + DocserviceFileAuditTraceRequest request + ) { + return DocserviceFileAuditTraceRequest.builder() + .customerReferenceFintechId(customerReferenceFintechId) + .appId(appId) + .document(request.getDocument()) + .procedureRequest(request.getProcedureRequest()) + .device( + Device.builder() + .deviceType(request.getDevice().getDeviceType()) + .deviceDescription(request.getDevice().getDeviceDescription()) + .deviceIp(request.getDevice().getDeviceIp()) + .deviceSessionReference( + (!StringUtil.isNullOrEmpty(request.getDevice().getDeviceSessionReference())) + ? request.getDevice().getDeviceSessionReference() + : RequestContext.getRequestId() + ) + .build() + ) + .build(); + } } \ No newline at end of file diff --git a/src/main/java/com/banesco/module/docservice_file_audit_trace/infrastructure/resource/DocserviceFileAuditTraceResource.java b/src/main/java/com/banesco/module/docservice_file_audit_trace/infrastructure/resource/DocserviceFileAuditTraceResource.java index 356b3a7..e197063 100644 --- a/src/main/java/com/banesco/module/docservice_file_audit_trace/infrastructure/resource/DocserviceFileAuditTraceResource.java +++ b/src/main/java/com/banesco/module/docservice_file_audit_trace/infrastructure/resource/DocserviceFileAuditTraceResource.java @@ -1,7 +1,5 @@ package com.banesco.module.docservice_file_audit_trace.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.StatusResponse; import com.banesco.module.docservice_file_audit_trace.application.usecase.DocserviceFileAuditTraceUseCase; @@ -28,14 +26,11 @@ import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; public class DocserviceFileAuditTraceResource { private final DocserviceFileAuditTraceUseCase useCase; - private final MessageHelper messageHelper; @Inject public DocserviceFileAuditTraceResource( - MessageHelper messageHelper, DocserviceFileAuditTraceUseCase useCase ) { - this.messageHelper = messageHelper; this.useCase = useCase; } @@ -244,6 +239,12 @@ public class DocserviceFileAuditTraceResource { }, "procedureRequest": { "instructionPurposeType": "BOLE" + }, + "device": { + "deviceType": "Mobile", + "deviceDescription": "Xiaomi Note 11 PRO", + "deviceIp": "127.0.0.1", + "deviceSessionReference": "12345678901304" } } """ @@ -254,12 +255,6 @@ public class DocserviceFileAuditTraceResource { ) { log.info("Iniciando consulta para instruccion de archivo: {}", request.getDocumentName()); - try { - return Response.ok(useCase.execute(request)).build(); - } catch (HttpStatusCodeException e) { - return messageHelper.handleException(e); - } catch (Exception e) { - return messageHelper.handleGenericException(e); - } + return useCase.execute(request); } } \ No newline at end of file diff --git a/src/main/java/com/banesco/module/payment_file/infrastructure/client/PaymentFileClient.java b/src/main/java/com/banesco/module/payment_file/infrastructure/client/PaymentFileClient.java index 0d7ed5c..ada8d64 100644 --- a/src/main/java/com/banesco/module/payment_file/infrastructure/client/PaymentFileClient.java +++ b/src/main/java/com/banesco/module/payment_file/infrastructure/client/PaymentFileClient.java @@ -54,8 +54,6 @@ public class PaymentFileClient implements PaymentFileUseCase { paymentStatusConfig.getTimeout().getResponse() ); - log.debug("Request configurado: {}", request); - try { ApiPrivateResponse> response = httpClientUseCase.executeApiPrivateResponse(request);