diff --git a/pom.xml b/pom.xml
index ec605ee..12ab381 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
bus-service-order-payment-search
1.0-native-quarkus-jdk17
bus-service-order-payment-search
- API Business - Read payment statuses of the file by ID
+ API Business - Read payment order by parameters
17
diff --git a/scripts/native/file/bus-service-order-payment-search-1.0-native-quarkus-jdk17-runner b/scripts/native/file/bus-service-order-payment-search-1.0-native-quarkus-jdk17-runner
index 7b0d8ce..cf35283 100644
Binary files a/scripts/native/file/bus-service-order-payment-search-1.0-native-quarkus-jdk17-runner and b/scripts/native/file/bus-service-order-payment-search-1.0-native-quarkus-jdk17-runner differ
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/instruction/domain/model/Instruction.java b/src/main/java/com/banesco/module/instruction/domain/model/Instruction.java
index 8c1f700..2b0b751 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
@@ -1,6 +1,5 @@
package com.banesco.module.instruction.domain.model;
-import com.banesco.common.domain.exception.HttpStatusCodeException;
import com.banesco.common.domain.model.Identifier;
import com.banesco.module.party.domain.model.Party;
import com.banesco.module.party.domain.model.PartyIdentification;
@@ -8,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude;
import io.quarkus.runtime.annotations.RegisterForReflection;
import lombok.*;
-import java.util.Arrays;
import java.util.List;
import java.util.Objects;
@@ -23,7 +21,7 @@ public class Instruction {
private InstructionInvolvement instructionInvolvement; // Request JSON: "recipientId"
private List instructionDate; // Request JSON: "dateCreate"
private InstructionIdentification instructionIdentifier; // Request JSON: "id"
- private InstructionPurposeType instructionPurposeType; // Request JSON: "channelOrigin" (BOLE)
+ private String instructionPurposeType; // Request JSON: "channelOrigin" (BOLE)
public static Instruction fromResource(
String partyReferenceId,
@@ -31,14 +29,6 @@ public class Instruction {
String instructionRequestId,
String channelCode
) {
- boolean isChannelCodeValid = (Arrays.stream(
- InstructionPurposeType.values()
- ).anyMatch(type -> Objects.equals(type.name(), channelCode)));
-
- if(!isChannelCodeValid) {
- throw HttpStatusCodeException.badRequest("VDE02", "channelCode");
- }
-
return Instruction.builder()
.instructionInvolvement(
InstructionInvolvement.builder()
@@ -72,7 +62,7 @@ public class Instruction {
.date(Objects.toString(initiatedDate, ""))
.build()
))
- .instructionPurposeType(InstructionPurposeType.valueOf(channelCode))
+ .instructionPurposeType(channelCode)
.build();
}
}
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,
-}
diff --git a/src/main/java/com/banesco/module/security_trace/infrastructure/client/SecurityTraceClient.java b/src/main/java/com/banesco/module/security_trace/infrastructure/client/SecurityTraceClient.java
index da70900..5ddaeb4 100644
--- a/src/main/java/com/banesco/module/security_trace/infrastructure/client/SecurityTraceClient.java
+++ b/src/main/java/com/banesco/module/security_trace/infrastructure/client/SecurityTraceClient.java
@@ -59,8 +59,6 @@ public class SecurityTraceClient implements SecurityTraceUseCase {
securityTraceConfig.getTimeout().getResponse()
);
- log.debug("Request configurado: {}", request);
-
try {
T response = httpClientUseCase.execute(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 defe4d0..c75be4b 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
@@ -3,7 +3,6 @@ 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.netty.util.internal.StringUtil;
import io.quarkus.runtime.annotations.RegisterForReflection;
@@ -34,7 +33,7 @@ public class ServiceOrderPaymentSearchRequest {
@JsonIgnore
public String getPartyId() {
- return getProcedureRequest()
+ return procedureRequest
.getInstructionInvolvement()
.getPartyReference()
.getPartyIdentification()
@@ -45,7 +44,7 @@ public class ServiceOrderPaymentSearchRequest {
@JsonIgnore
public String getInitiatedDate() {
- return getProcedureRequest()
+ return procedureRequest
.getInstructionDate()
.get(0)
.getDate();
@@ -53,7 +52,7 @@ public class ServiceOrderPaymentSearchRequest {
@JsonIgnore
public String getInstructionRequestId() {
- return getProcedureRequest()
+ return procedureRequest
.getInstructionIdentifier()
.getIdentification()
.getIdentifierValue();
@@ -61,15 +60,14 @@ public class ServiceOrderPaymentSearchRequest {
@JsonIgnore
public String getChannelCode() {
- return getProcedureRequest()
- .getInstructionPurposeType()
- .name();
+ return procedureRequest
+ .getInstructionPurposeType();
}
@JsonIgnore
public boolean isBole() {
- return getProcedureRequest()
- .getInstructionPurposeType() == InstructionPurposeType.BOLE;
+ return Objects.equals(procedureRequest
+ .getInstructionPurposeType().toUpperCase(), "BOLE");
}
@JsonIgnore
diff --git a/src/main/java/com/banesco/module/service_status/infrastructure/client/ServiceStatusClient.java b/src/main/java/com/banesco/module/service_status/infrastructure/client/ServiceStatusClient.java
index f362237..b50513d 100644
--- a/src/main/java/com/banesco/module/service_status/infrastructure/client/ServiceStatusClient.java
+++ b/src/main/java/com/banesco/module/service_status/infrastructure/client/ServiceStatusClient.java
@@ -48,8 +48,6 @@ public class ServiceStatusClient implements ServiceStatusUseCase {
serviceStatusConfig.getTimeout().getResponse()
);
- log.debug("Request configurado: {}", request);
-
try {
T response = httpClientUseCase.execute(request);
diff --git a/src/main/java/com/banesco/module/transaction/domain/model/TransactionStatusType.java b/src/main/java/com/banesco/module/transaction/domain/model/TransactionStatusType.java
index 1ed587d..a30f6d2 100644
--- a/src/main/java/com/banesco/module/transaction/domain/model/TransactionStatusType.java
+++ b/src/main/java/com/banesco/module/transaction/domain/model/TransactionStatusType.java
@@ -17,4 +17,8 @@ public enum TransactionStatusType {
EXPIRED,
SENT,
RECEIVED,
+ ACTIVE,
+ READ,
+ PROGRAMED,
+ ATYPICAL_TRANSACTION,
}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 1b65472..0059c03 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -8,8 +8,6 @@ quarkus:
api:
source-id: BSOPS
- allowed:
- app-id: '[{"appId":"DANIAPP","request":{"serviceType":"P2P","limitType":"REC","casheaIndicator":"NO"}}]'
read-messages:
from-props: true
bus-service-order-payment-search:
@@ -18,5 +16,5 @@ api:
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":"VRN04","httpCode":"503","statusCode":"VRN04","description":"Servicio en horario de mantenimiento","status":"error"},{"backendCode":"VRN02","httpCode":"204","statusCode":"VRN02","description":"Cliente sin productos"}]'
rest-client:
dom-service-order-payment-search: '{"url":"http://localhost:8083/service-order-payment-search/retrieve/{partyReferenceId}/{channelCode}","timeout":{"connect":10000,"response":10000}}'
- security-trace: '{"url":"http://api-register-security-route-apis-banesco-dev.apps.desplakur3.desintra.banesco.com/register-security/save","timeout":{"connect":10000,"response":10000},"request":{"sp":"spAPI_Traza","codEve":"P2PVUEL","codEve2":"P2PVUEL","codBan":"01","codMon":"BS"}}'
+ security-trace: '{"url":"http://api-register-security-route-apis-banesco-dev.apps.desplakur3.desintra.banesco.com/register-security/save","timeout":{"connect":10000,"response":10000},"request":{"sp":"spAPI_Traza","codEve":"CONSSOLPAR","codEve2":"CONSSOLPAR","codBan":"01","codMon":"BS"}}'
service-status: '{"url":"http://api-get-service-status-route-apis-banesco-dev.apps.desplakur3.desintra.banesco.com/service/status","timeout":{"connect":10000,"response":10000},"request":{"applicationId": "","transactionId": "","bankService": {"bankCode": "01","serviceCode": "APIFI","eventCode": "P2PVUEL"}}}'
\ No newline at end of file
diff --git a/src/main/resources/configmap.yaml b/src/main/resources/configmap.yaml
index dc75fb4..88aba86 100644
--- a/src/main/resources/configmap.yaml
+++ b/src/main/resources/configmap.yaml
@@ -64,7 +64,6 @@ data:
quarkus.application.version: 1.0.0
quarkus.log.level: INFO
quarkus.debug.reflection: 'false'
- api.allowed.app-id: '[{"appId":"DANIAPP","request":{"serviceType":"P2P","limitType":"REC","casheaIndicator":"NO"}}]'
quarkus.debug.print-startup-times: 'true'
quarkus.swagger-ui.path: /swagger-ui
quarkus.application.name: bus-service-order-payment-search
@@ -80,7 +79,7 @@ data:
api.rest-client.dom-service-order-payment-search: '{"url":"http://dom-service-order-payment-search-route-proyecto-prueba-ja.apps.desplakur3.desintra.banesco.com/service-order-payment-search/retrieve/{partyReferenceId}/{channelCode}/{signatureIdentifier}","timeout":{"connect":10000,"response":10000}}'
quarkus.log.console.format: '%d{HH:mm:ss.SSS} %-5p [%t] [%X{requestId}] %c{1} - %s%e%n'
quarkus.http.idle-timeout: 30s
- api.rest-client.security-trace: '{"url":"http://api-register-security-route-apis-banesco-dev.apps.desplakur3.desintra.banesco.com/register-security/save","timeout":{"connect":10000,"response":10000},"request":{"sp":"spAPI_Traza","codEve":"P2PVUEL","codEve2":"P2PVUEL","codBan":"01","codMon":"BS"}}'
+ api.rest-client.security-trace: '{"url":"http://api-register-security-route-apis-banesco-dev.apps.desplakur3.desintra.banesco.com/register-security/save","timeout":{"connect":10000,"response":10000},"request":{"sp":"spAPI_Traza","codEve":"CONSSOLPAR","codEve2":"CONSSOLPAR","codBan":"01","codMon":"BS"}}'
quarkus.thread-pool.max-threads: '100'
quarkus.smallrye-health.liveness-path: /actuator/health/live
api.source-id: BSOPS