diff --git a/scripts/native/file/rec-docservice-file-audit-trace-1.0-native-quarkus-jdk17-runner b/scripts/native/file/rec-docservice-file-audit-trace-1.0-native-quarkus-jdk17-runner index be9c88b..0e1ed5e 100644 Binary files a/scripts/native/file/rec-docservice-file-audit-trace-1.0-native-quarkus-jdk17-runner and b/scripts/native/file/rec-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 2bf57bc..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: {} -> {}", @@ -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 initializeErrorMappings() { 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/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 6be6108..e8bf736 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 @@ -10,10 +10,9 @@ 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; -import java.util.Objects; - @Slf4j @ApplicationScoped public class DocserviceFileAuditTraceService implements DocserviceFileAuditTraceUseCase { @@ -34,33 +33,31 @@ 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; + validate(request); try { - ApiResponse response = business(request); + ApiResponse apiResponse = business(request); - if ( - !Objects.isNull(response.getData()) && - messageHelper.isSuccessStatusCode(response.getStatusResponse()) - ) { - return new ApiResponse<>(response.getData(), messageHelper.createStatusResponse( - response.getStatusResponse().getStatusCode() - )); - } - - 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; + 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 de negocio: {}", e.getMessage()); - throw e; + log.error("Excepcion generica del api de dominio: {}", e.getMessage()); + response = messageHelper.handleGenericException(e); } + + return response; } private void validate( 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 681a982..aa30769 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,7 +1,11 @@ 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.*; @@ -20,11 +24,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() @@ -33,12 +41,14 @@ public class DocserviceFileAuditTraceRequest { .getLocationValue(); } + @JsonIgnore public String getChannelCode() { return procedureRequest .getInstructionPurposeType() .name(); } + @JsonIgnore public static DocserviceFileAuditTraceRequest fromResource( String customerReferenceFintechId, String appId, @@ -49,6 +59,18 @@ public class DocserviceFileAuditTraceRequest { .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 77e6b92..2818f87 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; @@ -29,14 +27,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; } @@ -251,6 +246,12 @@ public class DocserviceFileAuditTraceResource { }, "procedureRequest": { "instructionPurposeType": "BOLE" + }, + "device": { + "deviceType": "Mobile", + "deviceDescription": "Xiaomi Note 11 PRO", + "deviceIp": "127.0.0.1", + "deviceSessionReference": "12345678901304" } } """ @@ -261,14 +262,8 @@ public class DocserviceFileAuditTraceResource { ) { log.info("Iniciando consulta para instruccion de archivo: {}", request.getDocumentName()); - try { - return Response.ok(useCase.execute(DocserviceFileAuditTraceRequest.fromResource( - customerReferenceFintechId, appId, request - ))).build(); - } catch (HttpStatusCodeException e) { - return messageHelper.handleException(e); - } catch (Exception e) { - return messageHelper.handleGenericException(e); - } + return useCase.execute(DocserviceFileAuditTraceRequest.fromResource( + customerReferenceFintechId, appId, request + )); } } \ No newline at end of file