Update channelOrigin as String

pom.xml

@@ -5,7 +5,7 @@
     <artifactId>rec-service-order-payment-search</artifactId>
     <version>1.0-native-quarkus-jdk17</version>
     <name>rec-service-order-payment-search</name>
-    <description>API Reception - Read payment statuses of the file by ID</description>
+    <description>API Reception - Read payment order by parameters</description>
 
     <properties>
         <maven.compiler.release>17</maven.compiler.release>

src/main/java/com/banesco/common/application/service/HttpClientService.java

@@ -36,56 +36,61 @@ public class HttpClientService implements HttpClientUseCase {
 
     @Override
     public <T> T execute(HttpRequest request) {
-        return executeInternal(request);
+        return executeRequest(request);
+    }
+
+    @Override
+    public <T, R> Either<T, R> executeEither(HttpRequest request) {
+        return executeEitherInternal(request, false);
+    }
+
+    @Override
+    public <T, R> Either<List<T>, R> executeEitherList(HttpRequest request) {
+        return executeEitherInternal(request, true);
     }
 
     @Override
     public <T> ApiResponse<T> executeApiResponse(HttpRequest request) {
-        return executeInternal(request);
+        return executeRequest(request);
     }
 
     @Override
-    public <T> ApiResponse<List<T>> executeApiResponseList(
+    public <T> ApiResponse<List<T>> executeApiResponseList(HttpRequest request) {
-        HttpRequest request
+        return executeRequest(request);
-    ) {
-        return executeInternal(request);
     }
 
     @Override
-    public <T> ApiPrivateResponse<Either<T, ApiPrivateError>> executeApiPrivateResponse(
+    public <T> ApiPrivateResponse<Either<T, ApiPrivateError>> executeApiPrivateResponse(HttpRequest request) {
-        HttpRequest request
+        return executeRequest(request);
-    ) {
-        return executeInternal(request);
     }
 
     @Override
-    public <T> ApiPrivateResponse<Either<List<T>, ApiPrivateError>> executeApiPrivateResponseList(
+    public <T> ApiPrivateResponse<Either<List<T>, ApiPrivateError>> executeApiPrivateResponseList(HttpRequest request) {
-        HttpRequest request
+        return executeRequest(request);
-    ) {
-        return executeInternal(request);
     }
 
-    private <T> T executeInternal(HttpRequest request) {
+    private <T, R> Either<T, R> executeEitherInternal(HttpRequest request, boolean isList) {
-        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());
-            }
-        }
-
         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> 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 handleConnectionError(request, e);
-            throw HttpStatusCodeException.serviceUnavailable(
-                "503",
-                "Error de conexion con el servicio externo: " + e.getMessage()
-            );
         }
     }
 
+    @SuppressWarnings("unchecked")
+    private <T, R> Either<T, R> 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> T parseSuccessResponse(HttpRequest request, String responseBody) throws JsonProcessingException {
+        Type successType = extractSuccessType(request);
+
+        if (successType != null) {
+            if (successType instanceof Class) {
+                return objectMapper.readValue(responseBody, (Class<T>) 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 <T> List<T> 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<T>) 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> 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<R>) 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<String, String> queryParams) {
@@ -145,12 +262,13 @@ public class HttpClientService implements HttpClientUseCase {
         return urlBuilder.toString();
     }
 
-    private Response buildRequest(
+    private Response buildRequest(Invocation.Builder builder, HttpRequest request) {
-        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)
+                .connectTimeout(connectTimeout, TimeUnit.MILLISECONDS)
-            .readTimeout(readTimeout, TimeUnit.MILLISECONDS)
+                .readTimeout(readTimeout, TimeUnit.MILLISECONDS)
-            .build();
+                .build();
     }
 
-    private <T> T handleResponse(
+    private <T> T handleResponse(HttpRequest request, Response response) {
-        HttpRequest request,
-        Response response
-    ) {
         int statusCode = response.getStatus();
-        log.info("Respuesta {} - Status: {}", request.getMethod(), statusCode);
 
         try (response) {
             String responseBody = response.readEntity(String.class);
-
+            logResponse(request, statusCode, responseBody);
-            if (request.isLogResponseBody()) {
-                log.info("Respuesta Cuerpo: {}", responseBody);
-            }
 
             if (statusCode >= 200 && statusCode < 300) {
                 if (request.getResponseType() == Void.class || request.getResponseType() == void.class) {
                     return null;
                 }
 
-                T result = responseResult(request, responseBody);
+                return responseResult(request, responseBody);
-
-                log.debug("Respuesta exitosa {} {}: {}", request.getMethod(), request.getUrl(), result);
-
-                return result;
             } else {
-                log.error(
+                logErrorResponse(request, statusCode, responseBody);
-                    "Error HTTP {} {} - Status: {} - Body: {}",
-                    request.getMethod(),
-                    request.getUrl(),
-                    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(
+            throw handleProcessingError(request, e);
-                "Error procesando respuesta {} {}: {}",
-                request.getMethod(),
-                request.getUrl(),
-                e.getMessage()
-            );
-            throw HttpStatusCodeException.internalServer(
-                "500", "Error procesando respuesta del servicio externo: " + e.getMessage()
-            );
         }
     }
 
-    private <T> T responseResult(
+    private void logResponse(HttpRequest request, int statusCode, String responseBody) {
-        HttpRequest request,
+        if (request.isLogResponseBody()) {
-        String responseBody
+            log.info("Respuesta {} - Status: {}", request.getMethod(), statusCode);
-    ) throws JsonProcessingException {
+            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> 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> T handleApiPrivateResponseWithEither(
+    private <T> T handleApiPrivateResponseWithEither(HttpRequest request, String responseBody) throws JsonProcessingException {
-        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> T handleSuccessResponse(
+    private <T> T handleSuccessResponse(HttpRequest request, String status, String message, JsonNode detailNode) {
-        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(
+    private Object handleListSuccess(HttpRequest request, JsonNode detailNode) {
-        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(
+    private Object handleObjectSuccess(HttpRequest request, JsonNode detailNode) {
-        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> T handleErrorResponse(
+    private <T> T handleErrorResponse(String status, String message, JsonNode detailNode) {
-        String status,
-        String message,
-        JsonNode detailNode
-    ) {
         ApiPrivateError error = buildApiPrivateError(detailNode, message);
         ApiPrivateResponse<Either<Object, ApiPrivateError>> response = new ApiPrivateResponse<>();
 
@@ -343,10 +448,7 @@ public class HttpClientService implements HttpClientUseCase {
         return (T) response;
     }
 
-    private ApiPrivateError buildApiPrivateError(
+    private ApiPrivateError buildApiPrivateError(JsonNode detailNode, String message) {
-        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> T deserializeApiResponse(
+    private <T> T deserializeApiResponse(String responseBody, HttpRequest request) {
-        String responseBody,
-        HttpRequest request
-    ) {
         try {
             if (request.getGenericType() != null) {
                 JavaType javaType = objectMapper.getTypeFactory().constructParametricType(
-                    ApiResponse.class,
+                    ApiResponse.class, objectMapper.getTypeFactory().constructType(request.getGenericType())
-                    objectMapper.getTypeFactory().constructType(request.getGenericType())
                 );
                 return objectMapper.readValue(responseBody, javaType);
             } else {
@@ -432,10 +530,7 @@ public class HttpClientService implements HttpClientUseCase {
         }
     }
 
-    private HttpStatusCodeException mapHttpStatusToException(
+    private HttpStatusCodeException mapHttpStatusToException(int statusCode, String errorBody) {
-        int statusCode,
-        String errorBody
-    ) {
         String errorCode = "HTTP_" + statusCode;
         String defaultMessage = "Error en servicio externo: HTTP " + statusCode;
         String message = errorBody != null && !errorBody.isEmpty()

src/main/java/com/banesco/common/application/usecase/HttpClientUseCase.java

@@ -8,6 +8,10 @@ public interface HttpClientUseCase {
 
     <T> T execute(HttpRequest request);
 
+    <T, R> Either<T, R> executeEither(HttpRequest request);
+
+    <T, R> Either<List<T>, R> executeEitherList(HttpRequest request);
+
     <T> ApiResponse<T> executeApiResponse(HttpRequest request);
 
     <T> ApiResponse<List<T>> executeApiResponseList(HttpRequest request);

src/main/java/com/banesco/common/domain/exception/BusinessException.java

@@ -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");
-    }
-}

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<InstructionDateTime> 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();
     }
 }

src/main/java/com/banesco/module/instruction/domain/model/InstructionPurposeType.java

@@ -1,6 +0,0 @@
-package com.banesco.module.instruction.domain.model;
-
-public enum InstructionPurposeType {
-    BOLE,
-    BOL,
-}

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()
+        return procedureRequest
-            .getInstructionPurposeType()
+            .getInstructionPurposeType();
-            .name();
     }
 
     @JsonIgnore
     public boolean isBole() {
-        return getProcedureRequest()
+        return Objects.equals(procedureRequest
-            .getInstructionPurposeType() == InstructionPurposeType.BOLE;
+            .getInstructionPurposeType().toUpperCase(), "BOLE");
     }
 
     @JsonIgnore

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,
 }