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 7b92e81..44dae6c 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/domain/model/HttpRequest.java b/src/main/java/com/banesco/common/domain/model/HttpRequest.java index 7b99dae..35a46e8 100644 --- a/src/main/java/com/banesco/common/domain/model/HttpRequest.java +++ b/src/main/java/com/banesco/common/domain/model/HttpRequest.java @@ -143,6 +143,20 @@ public class HttpRequest { .build(); } + public static HttpRequest forDirectResponse( + String url, + HttpMethod method, + Class responseType, + Class errorType + ) { + return HttpRequest.builder() + .url(url) + .method(method) + .responseType(responseType) + .errorType(errorType) + .build(); + } + public static HttpRequest forGenericResponse( String url, HttpMethod method, 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 0173e9a..b2bde40 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 @@ -45,7 +45,7 @@ public class DocserviceFileAuditTraceService implements DocserviceFileAuditTrace ); } catch (ApiPrivateException e) { log.warn("Excepcion de la api privada: {} -> {}", e.getStatusCode(), e.getMessage()); - response = messageHelper.handleException(HttpStatusCodeException.badRequest("400")); + response = messageHelper.handleException(HttpStatusCodeException.conflict(e.getStatusCode())); } catch (HttpStatusCodeException e) { log.error("Excepcion HTTP del api privada: {} - {}", e.getStatusCode(), e.getErrorCode()); response = messageHelper.handleException(e); diff --git a/src/main/java/com/banesco/module/docservice_file_audit_trace/infrastructure/adapter/ApiPrivateAdapter.java b/src/main/java/com/banesco/module/docservice_file_audit_trace/infrastructure/adapter/ApiPrivateAdapter.java index ed06e44..899d47c 100644 --- a/src/main/java/com/banesco/module/docservice_file_audit_trace/infrastructure/adapter/ApiPrivateAdapter.java +++ b/src/main/java/com/banesco/module/docservice_file_audit_trace/infrastructure/adapter/ApiPrivateAdapter.java @@ -35,7 +35,7 @@ public class ApiPrivateAdapter implements ApiPrivateRepository { ); if(Objects.isNull(response) || Objects.isNull(response.getId())) { - throw HttpStatusCodeException.badRequest("400"); + throw HttpStatusCodeException.conflict("PIBE-00"); } log.info("Resultado de la transaccion obtenida: {}", response.getId()); 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 919905f..f929388 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 @@ -21,6 +21,8 @@ public class PaymentFileClient implements PaymentFileUseCase { private final HttpClientUseCase httpClientUseCase; private final PaymentFileConfig paymentFileConfig; + private static final String EMPTY_MESSAGE = "EMPTY_MESSAGE"; + @Inject public PaymentFileClient( SerializationHelper serializationHelper, @@ -67,12 +69,19 @@ public class PaymentFileClient implements PaymentFileUseCase { ); throw ApiPrivateException.builder() - .statusCode(response.getEstatus()) - .message("EMPTY_MESSAGE") + .statusCode("PIBE-00") + .message(EMPTY_MESSAGE) .build(); } if (detail.isLeft()) { + if(detail.getLeft() == null) { + throw ApiPrivateException.builder() + .statusCode("PIBE-00") + .message(EMPTY_MESSAGE) + .build(); + } + return detail.getLeft(); } @@ -87,10 +96,10 @@ public class PaymentFileClient implements PaymentFileUseCase { ); throw ApiPrivateException.builder() - .statusCode(response.getEstatus()) + .statusCode("PIBE-01") .message((error.getCodError() != null) ? error.getCodError() + ":" + error.getMensajeError() - : "EMPTY_MESSAGE" + : EMPTY_MESSAGE ) .build(); } catch (ApiPrivateException e) { diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 52bb3b2..c6784a9 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -13,6 +13,6 @@ api: dom-docservice-file-audit-trace: messages: key: 'dom-docservice-file-audit-trace' - 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":"VRN02","httpCode":"204","statusCode":"VRN02","description":"Cliente sin productos"}]' + 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":"PIBE-00","httpCode":409,"statusCode":"PIB-00","description":"Error Interno backend"},{"backendCode":"PIBE-01","httpCode":409,"statusCode":"PIB-01","description":"Error Interno backend"}]' rest-client: payment-file: '{"url":"http://10.135.193.156:8080/RequestPayment/notificationRequestPayment/v1/generate/createRequestFile","timeout":{"connect":10000,"response":10000},"statusSuccess":"00"}' \ No newline at end of file diff --git a/src/main/resources/configmap.yaml b/src/main/resources/configmap.yaml index ef345ef..e4ba670 100644 --- a/src/main/resources/configmap.yaml +++ b/src/main/resources/configmap.yaml @@ -72,7 +72,7 @@ data: api.read-messages.from-props: 'true' quarkus.http.port: '8080' quarkus.profile: dev - api.dom-docservice-file-audit-trace.messages.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"}]' + api.dom-docservice-file-audit-trace.messages.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":"PIBE-00","httpCode":409,"statusCode":"PIB-00","description":"Error Interno backend"},{"backendCode":"PIBE-01","httpCode":409,"statusCode":"PIB-01","description":"Error Interno backend"}]' quarkus.log.console.format: '%d{HH:mm:ss.SSS} %-5p [%t] [%X{requestId}] %c{1} - %s%e%n' quarkus.http.idle-timeout: 30s quarkus.thread-pool.max-threads: '100'