diff --git a/scripts/native/file/rec-service-order-payment-search-1.0-native-quarkus-jdk17-runner b/scripts/native/file/rec-service-order-payment-search-1.0-native-quarkus-jdk17-runner index 8977bc8..14060f4 100644 Binary files a/scripts/native/file/rec-service-order-payment-search-1.0-native-quarkus-jdk17-runner and b/scripts/native/file/rec-service-order-payment-search-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/service_order_payment_search/application/service/ServiceOrderPaymentSearchService.java b/src/main/java/com/banesco/module/service_order_payment_search/application/service/ServiceOrderPaymentSearchService.java index d94da44..c88152c 100644 --- a/src/main/java/com/banesco/module/service_order_payment_search/application/service/ServiceOrderPaymentSearchService.java +++ b/src/main/java/com/banesco/module/service_order_payment_search/application/service/ServiceOrderPaymentSearchService.java @@ -10,6 +10,7 @@ import com.banesco.module.service_order_payment_search.domain.dto.request.Servic import com.banesco.module.service_order_payment_search.domain.dto.response.ServiceOrderPaymentSearchResponse; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; +import jakarta.ws.rs.core.Response; import lombok.extern.slf4j.Slf4j; import java.util.Objects; @@ -34,33 +35,31 @@ public class ServiceOrderPaymentSearchService implements ServiceOrderPaymentSear } @Override - public ApiResponse execute( + public Response execute( ServiceOrderPaymentSearchRequest request ) { - log.info("Iniciando ejecucion para el transaccion: {}", request.getPartyId()); + log.info("Iniciando ejecucion para la transaccion: {}", request.getPartyId()); + + 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/service_order_payment_search/application/usecase/ServiceOrderPaymentSearchUseCase.java b/src/main/java/com/banesco/module/service_order_payment_search/application/usecase/ServiceOrderPaymentSearchUseCase.java index 9f25995..19a16e9 100644 --- a/src/main/java/com/banesco/module/service_order_payment_search/application/usecase/ServiceOrderPaymentSearchUseCase.java +++ b/src/main/java/com/banesco/module/service_order_payment_search/application/usecase/ServiceOrderPaymentSearchUseCase.java @@ -1,11 +1,10 @@ package com.banesco.module.service_order_payment_search.application.usecase; -import com.banesco.common.domain.model.ApiResponse; import com.banesco.module.service_order_payment_search.domain.dto.request.ServiceOrderPaymentSearchRequest; -import com.banesco.module.service_order_payment_search.domain.dto.response.ServiceOrderPaymentSearchResponse; +import jakarta.ws.rs.core.Response; public interface ServiceOrderPaymentSearchUseCase { - ApiResponse execute( + Response execute( ServiceOrderPaymentSearchRequest request ); } diff --git a/src/main/java/com/banesco/module/service_order_payment_search/domain/dto/request/ServiceOrderPaymentSearchRequest.java b/src/main/java/com/banesco/module/service_order_payment_search/domain/dto/request/ServiceOrderPaymentSearchRequest.java index 81a5bd6..0e9a5a2 100644 --- a/src/main/java/com/banesco/module/service_order_payment_search/domain/dto/request/ServiceOrderPaymentSearchRequest.java +++ b/src/main/java/com/banesco/module/service_order_payment_search/domain/dto/request/ServiceOrderPaymentSearchRequest.java @@ -1,7 +1,10 @@ package com.banesco.module.service_order_payment_search.domain.dto.request; +import com.banesco.common.domain.model.Device; +import com.banesco.common.infrastructure.context.RequestContext; import com.banesco.module.instruction.domain.model.Instruction; import com.banesco.module.instruction.domain.model.InstructionPurposeType; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.quarkus.runtime.annotations.RegisterForReflection; import lombok.*; @@ -18,12 +21,17 @@ import static java.util.Map.entry; @RegisterForReflection public class ServiceOrderPaymentSearchRequest { @NonNull + @JsonIgnore private String customerReferenceFintechId; @NonNull + @JsonIgnore private String appId; @NonNull private Instruction procedureRequest; + @NonNull + private Device device; + @JsonIgnore public String getPartyId() { return getProcedureRequest() .getInstructionInvolvement() @@ -34,6 +42,7 @@ public class ServiceOrderPaymentSearchRequest { .getIdentifierValue(); } + @JsonIgnore public String getInitiatedDate() { return getProcedureRequest() .getInstructionDate() @@ -41,6 +50,7 @@ public class ServiceOrderPaymentSearchRequest { .getDate(); } + @JsonIgnore public String getInstructionRequestId() { return getProcedureRequest() .getInstructionIdentifier() @@ -48,14 +58,20 @@ public class ServiceOrderPaymentSearchRequest { .getIdentifierValue(); } + @JsonIgnore public String getChannelCode() { - return getProcedureRequest().getInstructionPurposeType().name(); + return getProcedureRequest() + .getInstructionPurposeType() + .name(); } + @JsonIgnore public boolean isBole() { - return getProcedureRequest().getInstructionPurposeType() == InstructionPurposeType.BOLE; + return getProcedureRequest() + .getInstructionPurposeType() == InstructionPurposeType.BOLE; } + @JsonIgnore public Map toParams() { return Map.ofEntries( entry("partyReferenceId", Objects.toString(getPartyId(), "")), @@ -63,12 +79,20 @@ public class ServiceOrderPaymentSearchRequest { ); } + @JsonIgnore public Map toQueryString() { return Map.ofEntries( entry("appId", Objects.toString(getAppId(), "")), entry("customerReferenceFintechId", Objects.toString(getCustomerReferenceFintechId(), "")), entry("initiatedDate", Objects.toString(getInitiatedDate(), "")), - entry("instructionRequestId", Objects.toString(getInstructionRequestId(), "")) + entry("instructionRequestId", Objects.toString(getInstructionRequestId(), "")), + entry("deviceType", Objects.toString(getDevice().getDeviceType(), "")), + entry("deviceDescription", Objects.toString(getDevice().getDeviceDescription(), "")), + entry("deviceIp", Objects.toString(getDevice().getDeviceIp(), "")), + entry("deviceSessionReference", Objects.toString( + getDevice().getDeviceSessionReference(), + RequestContext.getRequestId() + )) ); } } \ No newline at end of file diff --git a/src/main/java/com/banesco/module/service_order_payment_search/infrastructure/client/BusServiceOrderPaymentSearchClient.java b/src/main/java/com/banesco/module/service_order_payment_search/infrastructure/client/BusServiceOrderPaymentSearchClient.java index 2d30705..7b53164 100644 --- a/src/main/java/com/banesco/module/service_order_payment_search/infrastructure/client/BusServiceOrderPaymentSearchClient.java +++ b/src/main/java/com/banesco/module/service_order_payment_search/infrastructure/client/BusServiceOrderPaymentSearchClient.java @@ -47,8 +47,6 @@ public class BusServiceOrderPaymentSearchClient implements BusinessUseCase { businessConfig.getTimeout().getResponse() ); - log.debug("Request configurado: {}", request); - try { ApiResponse response = httpClientUseCase.executeApiResponse(request); diff --git a/src/main/java/com/banesco/module/service_order_payment_search/infrastructure/resource/ServiceOrderPaymentSearchResource.java b/src/main/java/com/banesco/module/service_order_payment_search/infrastructure/resource/ServiceOrderPaymentSearchResource.java index c2b2a00..3f5dabc 100644 --- a/src/main/java/com/banesco/module/service_order_payment_search/infrastructure/resource/ServiceOrderPaymentSearchResource.java +++ b/src/main/java/com/banesco/module/service_order_payment_search/infrastructure/resource/ServiceOrderPaymentSearchResource.java @@ -1,8 +1,7 @@ package com.banesco.module.service_order_payment_search.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.instruction.domain.model.Instruction; import com.banesco.module.service_order_payment_search.application.usecase.ServiceOrderPaymentSearchUseCase; @@ -31,14 +30,11 @@ import java.util.Objects; public class ServiceOrderPaymentSearchResource { private final ServiceOrderPaymentSearchUseCase useCase; - private final MessageHelper messageHelper; @Inject public ServiceOrderPaymentSearchResource( - MessageHelper messageHelper, ServiceOrderPaymentSearchUseCase useCase ) { - this.messageHelper = messageHelper; this.useCase = useCase; } @@ -447,27 +443,45 @@ public class ServiceOrderPaymentSearchResource { @QueryParam("instructionRequestId") @Parameter(description = "ID de la peticion de pago", example = "1") - String instructionRequestId + String instructionRequestId, + + @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 instruccion de archivo id: {}", partyReferenceId); - try { - return Response.ok(useCase.execute( - ServiceOrderPaymentSearchRequest.builder() - .customerReferenceFintechId(Objects.toString(customerReferenceFintechId, "")) - .appId(Objects.toString(appId, "")) - .procedureRequest(Instruction.fromResource( - partyReferenceId, - initiatedDate, - instructionRequestId, - channelCode - )) - .build() - )).build(); - } catch (HttpStatusCodeException e) { - return messageHelper.handleException(e); - } catch (Exception e) { - return messageHelper.handleGenericException(e); - } + return useCase.execute( + ServiceOrderPaymentSearchRequest.builder() + .customerReferenceFintechId(Objects.toString(customerReferenceFintechId, "")) + .appId(Objects.toString(appId, "")) + .procedureRequest(Instruction.fromResource( + partyReferenceId, + initiatedDate, + instructionRequestId, + channelCode + )) + .device( + Device.builder() + .deviceType(deviceType) + .deviceDescription(deviceDescription) + .deviceIp(deviceIp) + .deviceSessionReference(deviceSessionReference) + .build() + ) + .build() + ); } } \ No newline at end of file