diff --git a/pom.xml b/pom.xml index 3dd61d6..67e195b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ rec-docservice-file-audit-trace 1.0-native-quarkus-jdk17 rec-docservice-file-audit-trace - API Reception - Read payment statuses of the file by ID + API Reception - Create payment file audit trace 17 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 c25cdfe..84fd5b4 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/RequestValidatorHelper.java b/src/main/java/com/banesco/common/application/helper/RequestValidatorHelper.java index d401e46..d8b0988 100644 --- a/src/main/java/com/banesco/common/application/helper/RequestValidatorHelper.java +++ b/src/main/java/com/banesco/common/application/helper/RequestValidatorHelper.java @@ -24,6 +24,7 @@ public class RequestValidatorHelper { ) { required(request.getDocumentName(), "document.documentName"); required(request.getDocumentDirectory(), "document.documentLocation[0].locationReference.locationValue"); + required(request.getChannelCode(), "procedureRequest.instructionPurposeType"); required(request.getCustomerReferenceFintechId(), "customerReferenceFintechId"); required(request.getAppId(), "appId"); } @@ -32,7 +33,7 @@ public class RequestValidatorHelper { DocserviceFileAuditTraceRequest request ) { validate(request.getDocumentName(), config.documentName(), "document.documentName"); - validate(request.getChannelCode(), config.channelCode(), "channelCode"); + validate(request.getChannelCode(), config.channelCode(), "procedureRequest.instructionPurposeType"); } private void required(String value, String fieldName) { diff --git a/src/main/java/com/banesco/common/application/service/HttpClientService.java b/src/main/java/com/banesco/common/application/service/HttpClientService.java index fb42a5c..416a6a2 100644 --- a/src/main/java/com/banesco/common/application/service/HttpClientService.java +++ b/src/main/java/com/banesco/common/application/service/HttpClientService.java @@ -36,56 +36,61 @@ public class HttpClientService implements HttpClientUseCase { @Override public T execute(HttpRequest request) { - return executeInternal(request); + return executeRequest(request); + } + + @Override + public Either executeEither(HttpRequest request) { + return executeEitherInternal(request, false); + } + + @Override + public Either, R> executeEitherList(HttpRequest request) { + return executeEitherInternal(request, true); } @Override public ApiResponse executeApiResponse(HttpRequest request) { - return executeInternal(request); + return executeRequest(request); } @Override - public ApiResponse> executeApiResponseList( - HttpRequest request - ) { - return executeInternal(request); + public ApiResponse> executeApiResponseList(HttpRequest request) { + return executeRequest(request); } @Override - public ApiPrivateResponse> executeApiPrivateResponse( - HttpRequest request - ) { - return executeInternal(request); + public ApiPrivateResponse> executeApiPrivateResponse(HttpRequest request) { + return executeRequest(request); } @Override - public ApiPrivateResponse, ApiPrivateError>> executeApiPrivateResponseList( - HttpRequest request - ) { - return executeInternal(request); + public ApiPrivateResponse, ApiPrivateError>> executeApiPrivateResponseList(HttpRequest request) { + return executeRequest(request); } - private T executeInternal(HttpRequest request) { - String finalUrl = buildFinalUrl(request); - - if (request.isLogRequestBody()) { - log.info("URL final: {}", finalUrl); - - if (request.getHeaders() != null && !request.getHeaders().isEmpty()) { - log.info("Headers: {}", request.getHeaders()); - } - - if (request.getQueryParams() != null && !request.getQueryParams().isEmpty()) { - log.info("Query params: {}", request.getQueryParams()); - } - - if (request.getBody() != null) { - log.info("Body: {}", request.getBody()); - } - } - + private Either executeEitherInternal(HttpRequest request, boolean isList) { try (Client client = createClient(request.getConnectTimeout(), request.getReadTimeout())) { - WebTarget target = client.target(finalUrl); + WebTarget target = client.target(buildFinalUrl(request)); + Invocation.Builder builder = target.request(MediaType.APPLICATION_JSON); + + if (request.getHeaders() != null) { + request.getHeaders().forEach(builder::header); + } + + Response response = buildRequest(builder, request); + return handleEitherResponse(request, response, isList); + + } catch (HttpStatusCodeException | HttpApiResponseException e) { + throw e; + } catch (Exception e) { + throw handleConnectionError(request, e); + } + } + + private T executeRequest(HttpRequest request) { + try (Client client = createClient(request.getConnectTimeout(), request.getReadTimeout())) { + WebTarget target = client.target(buildFinalUrl(request)); Invocation.Builder builder = target.request(MediaType.APPLICATION_JSON); if (request.getHeaders() != null) { @@ -97,14 +102,122 @@ public class HttpClientService implements HttpClientUseCase { } catch (HttpStatusCodeException | HttpApiResponseException e) { throw e; } catch (Exception e) { - log.error("Error de conexion {}: {}", request.getMethod(), e.getMessage()); - throw HttpStatusCodeException.serviceUnavailable( - "503", - "Error de conexion con el servicio externo: " + e.getMessage() - ); + throw handleConnectionError(request, e); } } + @SuppressWarnings("unchecked") + private Either handleEitherResponse(HttpRequest request, Response response, boolean isList) { + int statusCode = response.getStatus(); + + try (response) { + String responseBody = response.readEntity(String.class); + logResponse(request, statusCode, responseBody); + + if (statusCode >= 200 && statusCode < 300) { + Object successData = isList + ? parseSuccessListResponse(request, responseBody) + : parseSuccessResponse(request, responseBody); + return Either.left((T) successData); + } else { + logErrorResponse(request, statusCode, responseBody); + R errorData = tryParseErrorResponse(request, responseBody); + + if (errorData != null) { + return Either.right(errorData); + } + + throw mapHttpStatusToException(statusCode, responseBody); + } + } catch (HttpStatusCodeException | HttpApiResponseException e) { + throw e; + } catch (Exception e) { + throw handleProcessingError(request, e); + } + } + + @SuppressWarnings("unchecked") + private T parseSuccessResponse(HttpRequest request, String responseBody) throws JsonProcessingException { + Type successType = extractSuccessType(request); + + if (successType != null) { + if (successType instanceof Class) { + return objectMapper.readValue(responseBody, (Class) successType); + } else if (successType instanceof ParameterizedType) { + JavaType javaType = objectMapper.getTypeFactory().constructType(successType); + return objectMapper.readValue(responseBody, javaType); + } + } + + if (request.getResponseType() != null && request.getResponseType() != Object.class) { + return objectMapper.readValue(responseBody, objectMapper.getTypeFactory().constructType(request.getResponseType())); + } + + return (T) objectMapper.readValue(responseBody, Object.class); + } + + @SuppressWarnings("unchecked") + private List parseSuccessListResponse(HttpRequest request, String responseBody) throws JsonProcessingException { + Type successType = extractSuccessType(request); + + if ( + successType instanceof ParameterizedType paramType && + paramType.getRawType() == List.class && + paramType.getActualTypeArguments().length > 0 + ) { + Type elementType = paramType.getActualTypeArguments()[0]; + if (elementType instanceof Class) { + JavaType javaType = objectMapper.getTypeFactory().constructCollectionType( + List.class, (Class) elementType + ); + return objectMapper.readValue(responseBody, javaType); + } + } + + return objectMapper.readValue(responseBody, List.class); + } + + private Type extractSuccessType(HttpRequest request) { + if ( + request.getComplexType() != null && + request.getComplexType() instanceof ParameterizedType paramType && + paramType.getRawType() == Either.class && + paramType.getActualTypeArguments().length > 0 + ) { + return paramType.getActualTypeArguments()[0]; + } + + if (request.getGenericType() != null) { + return request.getGenericType(); + } + + return request.getResponseType(); + } + + @SuppressWarnings("unchecked") + private R tryParseErrorResponse(HttpRequest request, String responseBody) { + if (responseBody == null || responseBody.trim().isEmpty()) { + return null; + } + + try { + if (request.getErrorType() != null) { + return (R) objectMapper.readValue(responseBody, request.getErrorType()); + } + + if (request.getComplexType() != null && request.getComplexType() instanceof ParameterizedType paramType) { + Type[] typeArgs = paramType.getActualTypeArguments(); + if (typeArgs.length >= 2 && typeArgs[1] instanceof Class) { + return objectMapper.readValue(responseBody, (Class) typeArgs[1]); + } + } + } catch (Exception e) { + log.error("No se pudo parsear la respuesta como error type: {}", e.getMessage()); + } + + return null; + } + private String buildFinalUrl(HttpRequest request) { String finalUrl = request.getUrl(); @@ -115,7 +228,11 @@ public class HttpClientService implements HttpClientUseCase { } } - return appendQueryParams(finalUrl, request.getQueryParams()); + String url = appendQueryParams(finalUrl, request.getQueryParams()); + + log.info("Url Final: {}", url); + + return url; } private String appendQueryParams(String url, Map queryParams) { @@ -145,12 +262,13 @@ public class HttpClientService implements HttpClientUseCase { return urlBuilder.toString(); } - private Response buildRequest( - Invocation.Builder builder, - HttpRequest request - ) { + private Response buildRequest(Invocation.Builder builder, HttpRequest request) { log.info("Metodo HTTP: {}", request.getMethod().name()); + if(request.getBody() != null) { + log.info("Peticion Cuerpo: {}", request.getBody()); + } + return switch (request.getMethod()) { case GET -> builder.get(); case POST -> builder.post(Entity.entity(request.getBody(), MediaType.APPLICATION_JSON)); @@ -165,43 +283,26 @@ public class HttpClientService implements HttpClientUseCase { private Client createClient(int connectTimeout, int readTimeout) { return ClientBuilder.newBuilder() - .connectTimeout(connectTimeout, TimeUnit.MILLISECONDS) - .readTimeout(readTimeout, TimeUnit.MILLISECONDS) - .build(); + .connectTimeout(connectTimeout, TimeUnit.MILLISECONDS) + .readTimeout(readTimeout, TimeUnit.MILLISECONDS) + .build(); } - private T handleResponse( - HttpRequest request, - Response response - ) { + private T handleResponse(HttpRequest request, Response response) { int statusCode = response.getStatus(); - log.info("Respuesta {} - Status: {}", request.getMethod(), statusCode); try (response) { String responseBody = response.readEntity(String.class); - - if (request.isLogResponseBody()) { - log.info("Respuesta Cuerpo: {}", responseBody); - } + logResponse(request, statusCode, responseBody); if (statusCode >= 200 && statusCode < 300) { if (request.getResponseType() == Void.class || request.getResponseType() == void.class) { return null; } - T result = responseResult(request, responseBody); - - log.debug("Respuesta exitosa {} {}: {}", request.getMethod(), request.getUrl(), result); - - return result; + return responseResult(request, responseBody); } else { - log.error( - "Error HTTP {} {} - Status: {} - Body: {}", - request.getMethod(), - request.getUrl(), - statusCode, - responseBody - ); + logErrorResponse(request, statusCode, responseBody); if (isApiResponseFormat(responseBody)) { ApiResponse apiResponse = deserializeApiResponse(responseBody, request); @@ -213,53 +314,72 @@ public class HttpClientService implements HttpClientUseCase { } catch (HttpStatusCodeException | HttpApiResponseException e) { throw e; } catch (Exception e) { - log.error( - "Error procesando respuesta {} {}: {}", - request.getMethod(), - request.getUrl(), - e.getMessage() - ); - throw HttpStatusCodeException.internalServer( - "500", "Error procesando respuesta del servicio externo: " + e.getMessage() - ); + throw handleProcessingError(request, e); } } - private T responseResult( - HttpRequest request, - String responseBody - ) throws JsonProcessingException { + private void logResponse(HttpRequest request, int statusCode, String responseBody) { + if (request.isLogResponseBody()) { + log.info("Respuesta {} - Status: {}", request.getMethod(), statusCode); + log.info("Respuesta Cuerpo: {}", responseBody); + } + } + + private void logErrorResponse(HttpRequest request, int statusCode, String responseBody) { + log.error( + "Error HTTP {} {} - Status: {} - Body: {}", + request.getMethod(), + request.getUrl(), + statusCode, + responseBody + ); + } + + private HttpStatusCodeException handleConnectionError(HttpRequest request, Exception e) { + log.error("Error de conexion {}: {}", request.getMethod(), e.getMessage()); + + return HttpStatusCodeException.serviceUnavailable( + "503", "Error de conexion con el servicio externo: " + e.getMessage() + ); + } + + private HttpStatusCodeException handleProcessingError(HttpRequest request, Exception e) { + log.error( + "Error procesando respuesta {} {}: {}", + request.getMethod(), + request.getUrl(), + e.getMessage() + ); + return HttpStatusCodeException.internalServer( + "500", "Error procesando respuesta del servicio externo: " + e.getMessage() + ); + } + + private T responseResult(HttpRequest request, String responseBody) throws JsonProcessingException { if (request.isApiPrivateResponse() && request.isEitherResponse()) { return handleApiPrivateResponseWithEither(request, responseBody); } - T result; - if (request.getResponseType() == ApiResponse.class) { - result = deserializeApiResponse(responseBody, request); + return deserializeApiResponse(responseBody, request); } else if (request.getComplexType() != null) { JavaType javaType = objectMapper.getTypeFactory().constructParametricType( request.getResponseType(), objectMapper.getTypeFactory().constructType(request.getComplexType()) ); - result = objectMapper.readValue(responseBody, javaType); + return objectMapper.readValue(responseBody, javaType); } else if (request.getGenericType() != null) { JavaType javaType = objectMapper.getTypeFactory().constructParametricType( request.getResponseType(), objectMapper.getTypeFactory().constructType(request.getGenericType()) ); - result = objectMapper.readValue(responseBody, javaType); + return objectMapper.readValue(responseBody, javaType); } else { - result = objectMapper.readValue( + return objectMapper.readValue( responseBody, objectMapper.getTypeFactory().constructType(request.getResponseType()) ); } - - return result; } - private T handleApiPrivateResponseWithEither( - HttpRequest request, - String responseBody - ) throws JsonProcessingException { + private T handleApiPrivateResponseWithEither(HttpRequest request, String responseBody) throws JsonProcessingException { JsonNode rootNode = objectMapper.readTree(responseBody); String status = rootNode.has("estatus") ? rootNode.get("estatus").asText() : null; String message = rootNode.has("mensaje") ? rootNode.get("mensaje").asText() : null; @@ -273,12 +393,7 @@ public class HttpClientService implements HttpClientUseCase { } @SuppressWarnings("unchecked") - private T handleSuccessResponse( - HttpRequest request, - String status, - String message, - JsonNode detailNode - ) { + private T handleSuccessResponse(HttpRequest request, String status, String message, JsonNode detailNode) { Object successData; if (request.isListResponse()) { @@ -300,10 +415,7 @@ public class HttpClientService implements HttpClientUseCase { } } - private Object handleListSuccess( - HttpRequest request, - JsonNode detailNode - ) { + private Object handleListSuccess(HttpRequest request, JsonNode detailNode) { Class elementType = getElementTypeFromRequest(request); JavaType listType = objectMapper.getTypeFactory().constructCollectionType(List.class, elementType); @@ -314,10 +426,7 @@ public class HttpClientService implements HttpClientUseCase { return List.of(); } - private Object handleObjectSuccess( - HttpRequest request, - JsonNode detailNode - ) { + private Object handleObjectSuccess(HttpRequest request, JsonNode detailNode) { Class elementType = getElementTypeFromRequest(request); if (detailNode != null && !detailNode.isNull()) { @@ -328,11 +437,7 @@ public class HttpClientService implements HttpClientUseCase { } @SuppressWarnings("unchecked") - private T handleErrorResponse( - String status, - String message, - JsonNode detailNode - ) { + private T handleErrorResponse(String status, String message, JsonNode detailNode) { ApiPrivateError error = buildApiPrivateError(detailNode, message); ApiPrivateResponse> response = new ApiPrivateResponse<>(); @@ -343,10 +448,7 @@ public class HttpClientService implements HttpClientUseCase { return (T) response; } - private ApiPrivateError buildApiPrivateError( - JsonNode detailNode, - String message - ) { + private ApiPrivateError buildApiPrivateError(JsonNode detailNode, String message) { if (detailNode != null && !detailNode.isNull()) { try { return objectMapper.convertValue(detailNode, ApiPrivateError.class); @@ -390,15 +492,11 @@ public class HttpClientService implements HttpClientUseCase { } @SuppressWarnings("unchecked") - private T deserializeApiResponse( - String responseBody, - HttpRequest request - ) { + private T deserializeApiResponse(String responseBody, HttpRequest request) { try { if (request.getGenericType() != null) { JavaType javaType = objectMapper.getTypeFactory().constructParametricType( - ApiResponse.class, - objectMapper.getTypeFactory().constructType(request.getGenericType()) + ApiResponse.class, objectMapper.getTypeFactory().constructType(request.getGenericType()) ); return objectMapper.readValue(responseBody, javaType); } else { @@ -432,10 +530,7 @@ public class HttpClientService implements HttpClientUseCase { } } - private HttpStatusCodeException mapHttpStatusToException( - int statusCode, - String errorBody - ) { + private HttpStatusCodeException mapHttpStatusToException(int statusCode, String errorBody) { String errorCode = "HTTP_" + statusCode; String defaultMessage = "Error en servicio externo: HTTP " + statusCode; String message = errorBody != null && !errorBody.isEmpty() diff --git a/src/main/java/com/banesco/common/application/usecase/HttpClientUseCase.java b/src/main/java/com/banesco/common/application/usecase/HttpClientUseCase.java index c7a0b7b..b55922c 100644 --- a/src/main/java/com/banesco/common/application/usecase/HttpClientUseCase.java +++ b/src/main/java/com/banesco/common/application/usecase/HttpClientUseCase.java @@ -8,6 +8,10 @@ public interface HttpClientUseCase { T execute(HttpRequest request); + Either executeEither(HttpRequest request); + + Either, R> executeEitherList(HttpRequest request); + ApiResponse executeApiResponse(HttpRequest request); ApiResponse> executeApiResponseList(HttpRequest request); diff --git a/src/main/java/com/banesco/common/domain/exception/BusinessException.java b/src/main/java/com/banesco/common/domain/exception/BusinessException.java deleted file mode 100644 index 6d44727..0000000 --- a/src/main/java/com/banesco/common/domain/exception/BusinessException.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.banesco.common.domain.exception; - -public class BusinessException extends BaseApiException { - public BusinessException(String errorCode, String message, String fieldPath) { - super(errorCode, message, fieldPath, "business"); - } - - public BusinessException(String errorCode, String fieldPath) { - super(errorCode, fieldPath, "business"); - } -} 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 aa30769..680ce86 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 @@ -44,8 +44,7 @@ public class DocserviceFileAuditTraceRequest { @JsonIgnore public String getChannelCode() { return procedureRequest - .getInstructionPurposeType() - .name(); + .getInstructionPurposeType(); } @JsonIgnore diff --git a/src/main/java/com/banesco/module/docservice_file_audit_trace/infrastructure/client/BusDocserviceFileAuditTraceClient.java b/src/main/java/com/banesco/module/docservice_file_audit_trace/infrastructure/client/BusDocserviceFileAuditTraceClient.java index f38974d..22bef0e 100644 --- a/src/main/java/com/banesco/module/docservice_file_audit_trace/infrastructure/client/BusDocserviceFileAuditTraceClient.java +++ b/src/main/java/com/banesco/module/docservice_file_audit_trace/infrastructure/client/BusDocserviceFileAuditTraceClient.java @@ -46,10 +46,8 @@ public class BusDocserviceFileAuditTraceClient implements BusinessUseCase { businessConfig.getTimeout().getResponse() ); - log.debug("Request configurado: {}", request); - try { - ApiResponse response = httpClientUseCase.execute(request); + ApiResponse response = httpClientUseCase.executeApiResponse(request); log.info( "Solicitud del api de negocio exitoso: {}", 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 2818f87..f39b9d1 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 @@ -226,7 +226,6 @@ public class DocserviceFileAuditTraceResource { @RequestBody( description = "Request para la notificación del archivo", - required = true, content = @Content( mediaType = MediaType.APPLICATION_JSON, schema = @Schema(implementation = DocserviceFileAuditTraceRequest.class), diff --git a/src/main/java/com/banesco/module/instruction/domain/model/Instruction.java b/src/main/java/com/banesco/module/instruction/domain/model/Instruction.java index 4a99396..1361379 100644 --- a/src/main/java/com/banesco/module/instruction/domain/model/Instruction.java +++ b/src/main/java/com/banesco/module/instruction/domain/model/Instruction.java @@ -12,5 +12,5 @@ import lombok.*; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_NULL) public class Instruction { - private InstructionPurposeType instructionPurposeType; // Request JSON: "channelOrigin" (BOLE) + private String instructionPurposeType; // Request JSON: "channelOrigin" (BOLE) } diff --git a/src/main/java/com/banesco/module/instruction/domain/model/InstructionPurposeType.java b/src/main/java/com/banesco/module/instruction/domain/model/InstructionPurposeType.java deleted file mode 100644 index acf15e5..0000000 --- a/src/main/java/com/banesco/module/instruction/domain/model/InstructionPurposeType.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.banesco.module.instruction.domain.model; - -public enum InstructionPurposeType { - BOLE, - BOL, -}