Update channelOrigin as String
This commit is contained in:
parent
2a1be38401
commit
dc00d84d7e
2
pom.xml
2
pom.xml
@ -5,7 +5,7 @@
|
|||||||
<artifactId>dom-docservice-file-audit-trace</artifactId>
|
<artifactId>dom-docservice-file-audit-trace</artifactId>
|
||||||
<version>1.0-native-quarkus-jdk17</version>
|
<version>1.0-native-quarkus-jdk17</version>
|
||||||
<name>dom-docservice-file-audit-trace</name>
|
<name>dom-docservice-file-audit-trace</name>
|
||||||
<description>API Domain - Read payment statuses of the file by ID</description>
|
<description>API Domain - Create payment file audit trace</description>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<maven.compiler.release>17</maven.compiler.release>
|
<maven.compiler.release>17</maven.compiler.release>
|
||||||
|
|||||||
Binary file not shown.
@ -156,4 +156,17 @@ public class SerializationHelper {
|
|||||||
|
|
||||||
return encodeSha256(finalString);
|
return encodeSha256(finalString);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String generateSignature(
|
||||||
|
Long id,
|
||||||
|
String channelOrigin
|
||||||
|
) {
|
||||||
|
String channelBase64 = encodeStringToBase64(channelOrigin);
|
||||||
|
String finalString = id + channelBase64;
|
||||||
|
|
||||||
|
log.info("1. Operation concatenando valores: {}", finalString);
|
||||||
|
log.info("2. Channel Origin codificado: {}", channelBase64);
|
||||||
|
|
||||||
|
return encodeSha256(finalString);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -36,56 +36,61 @@ public class HttpClientService implements HttpClientUseCase {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public <T> T execute(HttpRequest request) {
|
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
|
@Override
|
||||||
public <T> ApiResponse<T> executeApiResponse(HttpRequest request) {
|
public <T> ApiResponse<T> executeApiResponse(HttpRequest request) {
|
||||||
return executeInternal(request);
|
return executeRequest(request);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public <T> ApiResponse<List<T>> executeApiResponseList(
|
public <T> ApiResponse<List<T>> executeApiResponseList(HttpRequest request) {
|
||||||
HttpRequest request
|
return executeRequest(request);
|
||||||
) {
|
|
||||||
return executeInternal(request);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@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
|
@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) {
|
|
||||||
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 <T, R> Either<T, R> executeEitherInternal(HttpRequest request, boolean isList) {
|
||||||
try (Client client = createClient(request.getConnectTimeout(), request.getReadTimeout())) {
|
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);
|
Invocation.Builder builder = target.request(MediaType.APPLICATION_JSON);
|
||||||
|
|
||||||
if (request.getHeaders() != null) {
|
if (request.getHeaders() != null) {
|
||||||
@ -97,14 +102,122 @@ public class HttpClientService implements HttpClientUseCase {
|
|||||||
} catch (HttpStatusCodeException | HttpApiResponseException e) {
|
} catch (HttpStatusCodeException | HttpApiResponseException e) {
|
||||||
throw e;
|
throw e;
|
||||||
} catch (Exception 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) {
|
private String buildFinalUrl(HttpRequest request) {
|
||||||
String finalUrl = request.getUrl();
|
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) {
|
private String appendQueryParams(String url, Map<String, String> queryParams) {
|
||||||
@ -145,12 +262,13 @@ public class HttpClientService implements HttpClientUseCase {
|
|||||||
return urlBuilder.toString();
|
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());
|
log.info("Metodo HTTP: {}", request.getMethod().name());
|
||||||
|
|
||||||
|
if(request.getBody() != null) {
|
||||||
|
log.info("Peticion Cuerpo: {}", request.getBody());
|
||||||
|
}
|
||||||
|
|
||||||
return switch (request.getMethod()) {
|
return switch (request.getMethod()) {
|
||||||
case GET -> builder.get();
|
case GET -> builder.get();
|
||||||
case POST -> builder.post(Entity.entity(request.getBody(), MediaType.APPLICATION_JSON));
|
case POST -> builder.post(Entity.entity(request.getBody(), MediaType.APPLICATION_JSON));
|
||||||
@ -170,38 +288,21 @@ public class HttpClientService implements HttpClientUseCase {
|
|||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
private <T> T handleResponse(
|
private <T> T handleResponse(HttpRequest request, Response response) {
|
||||||
HttpRequest request,
|
|
||||||
Response response
|
|
||||||
) {
|
|
||||||
int statusCode = response.getStatus();
|
int statusCode = response.getStatus();
|
||||||
log.info("Respuesta {} - Status: {}", request.getMethod(), statusCode);
|
|
||||||
|
|
||||||
try (response) {
|
try (response) {
|
||||||
String responseBody = response.readEntity(String.class);
|
String responseBody = response.readEntity(String.class);
|
||||||
|
logResponse(request, statusCode, responseBody);
|
||||||
if (request.isLogResponseBody()) {
|
|
||||||
log.info("Respuesta Cuerpo: {}", responseBody);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (statusCode >= 200 && statusCode < 300) {
|
if (statusCode >= 200 && statusCode < 300) {
|
||||||
if (request.getResponseType() == Void.class || request.getResponseType() == void.class) {
|
if (request.getResponseType() == Void.class || request.getResponseType() == void.class) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
T result = responseResult(request, responseBody);
|
return responseResult(request, responseBody);
|
||||||
|
|
||||||
log.debug("Respuesta exitosa {} {}: {}", request.getMethod(), request.getUrl(), result);
|
|
||||||
|
|
||||||
return result;
|
|
||||||
} else {
|
} else {
|
||||||
log.error(
|
logErrorResponse(request, statusCode, responseBody);
|
||||||
"Error HTTP {} {} - Status: {} - Body: {}",
|
|
||||||
request.getMethod(),
|
|
||||||
request.getUrl(),
|
|
||||||
statusCode,
|
|
||||||
responseBody
|
|
||||||
);
|
|
||||||
|
|
||||||
if (isApiResponseFormat(responseBody)) {
|
if (isApiResponseFormat(responseBody)) {
|
||||||
ApiResponse<?> apiResponse = deserializeApiResponse(responseBody, request);
|
ApiResponse<?> apiResponse = deserializeApiResponse(responseBody, request);
|
||||||
@ -213,53 +314,72 @@ public class HttpClientService implements HttpClientUseCase {
|
|||||||
} catch (HttpStatusCodeException | HttpApiResponseException e) {
|
} catch (HttpStatusCodeException | HttpApiResponseException e) {
|
||||||
throw e;
|
throw e;
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
throw handleProcessingError(request, e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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(
|
log.error(
|
||||||
"Error procesando respuesta {} {}: {}",
|
"Error procesando respuesta {} {}: {}",
|
||||||
request.getMethod(),
|
request.getMethod(),
|
||||||
request.getUrl(),
|
request.getUrl(),
|
||||||
e.getMessage()
|
e.getMessage()
|
||||||
);
|
);
|
||||||
throw HttpStatusCodeException.internalServer(
|
return HttpStatusCodeException.internalServer(
|
||||||
"500", "Error procesando respuesta del servicio externo: " + e.getMessage()
|
"500", "Error procesando respuesta del servicio externo: " + e.getMessage()
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
private <T> T responseResult(
|
private <T> T responseResult(HttpRequest request, String responseBody) throws JsonProcessingException {
|
||||||
HttpRequest request,
|
|
||||||
String responseBody
|
|
||||||
) throws JsonProcessingException {
|
|
||||||
if (request.isApiPrivateResponse() && request.isEitherResponse()) {
|
if (request.isApiPrivateResponse() && request.isEitherResponse()) {
|
||||||
return handleApiPrivateResponseWithEither(request, responseBody);
|
return handleApiPrivateResponseWithEither(request, responseBody);
|
||||||
}
|
}
|
||||||
|
|
||||||
T result;
|
|
||||||
|
|
||||||
if (request.getResponseType() == ApiResponse.class) {
|
if (request.getResponseType() == ApiResponse.class) {
|
||||||
result = deserializeApiResponse(responseBody, request);
|
return deserializeApiResponse(responseBody, request);
|
||||||
} else if (request.getComplexType() != null) {
|
} else if (request.getComplexType() != null) {
|
||||||
JavaType javaType = objectMapper.getTypeFactory().constructParametricType(
|
JavaType javaType = objectMapper.getTypeFactory().constructParametricType(
|
||||||
request.getResponseType(), objectMapper.getTypeFactory().constructType(request.getComplexType())
|
request.getResponseType(), objectMapper.getTypeFactory().constructType(request.getComplexType())
|
||||||
);
|
);
|
||||||
result = objectMapper.readValue(responseBody, javaType);
|
return objectMapper.readValue(responseBody, javaType);
|
||||||
} else if (request.getGenericType() != null) {
|
} else if (request.getGenericType() != null) {
|
||||||
JavaType javaType = objectMapper.getTypeFactory().constructParametricType(
|
JavaType javaType = objectMapper.getTypeFactory().constructParametricType(
|
||||||
request.getResponseType(), objectMapper.getTypeFactory().constructType(request.getGenericType())
|
request.getResponseType(), objectMapper.getTypeFactory().constructType(request.getGenericType())
|
||||||
);
|
);
|
||||||
result = objectMapper.readValue(responseBody, javaType);
|
return objectMapper.readValue(responseBody, javaType);
|
||||||
} else {
|
} else {
|
||||||
result = objectMapper.readValue(
|
return objectMapper.readValue(
|
||||||
responseBody, objectMapper.getTypeFactory().constructType(request.getResponseType())
|
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);
|
JsonNode rootNode = objectMapper.readTree(responseBody);
|
||||||
String status = rootNode.has("estatus") ? rootNode.get("estatus").asText() : null;
|
String status = rootNode.has("estatus") ? rootNode.get("estatus").asText() : null;
|
||||||
String message = rootNode.has("mensaje") ? rootNode.get("mensaje").asText() : null;
|
String message = rootNode.has("mensaje") ? rootNode.get("mensaje").asText() : null;
|
||||||
@ -273,12 +393,7 @@ public class HttpClientService implements HttpClientUseCase {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@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;
|
Object successData;
|
||||||
|
|
||||||
if (request.isListResponse()) {
|
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);
|
Class<?> elementType = getElementTypeFromRequest(request);
|
||||||
JavaType listType = objectMapper.getTypeFactory().constructCollectionType(List.class, elementType);
|
JavaType listType = objectMapper.getTypeFactory().constructCollectionType(List.class, elementType);
|
||||||
|
|
||||||
@ -314,10 +426,7 @@ public class HttpClientService implements HttpClientUseCase {
|
|||||||
return List.of();
|
return List.of();
|
||||||
}
|
}
|
||||||
|
|
||||||
private Object handleObjectSuccess(
|
private Object handleObjectSuccess(HttpRequest request, JsonNode detailNode) {
|
||||||
HttpRequest request,
|
|
||||||
JsonNode detailNode
|
|
||||||
) {
|
|
||||||
Class<?> elementType = getElementTypeFromRequest(request);
|
Class<?> elementType = getElementTypeFromRequest(request);
|
||||||
|
|
||||||
if (detailNode != null && !detailNode.isNull()) {
|
if (detailNode != null && !detailNode.isNull()) {
|
||||||
@ -328,11 +437,7 @@ public class HttpClientService implements HttpClientUseCase {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@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);
|
ApiPrivateError error = buildApiPrivateError(detailNode, message);
|
||||||
ApiPrivateResponse<Either<Object, ApiPrivateError>> response = new ApiPrivateResponse<>();
|
ApiPrivateResponse<Either<Object, ApiPrivateError>> response = new ApiPrivateResponse<>();
|
||||||
|
|
||||||
@ -343,10 +448,7 @@ public class HttpClientService implements HttpClientUseCase {
|
|||||||
return (T) response;
|
return (T) response;
|
||||||
}
|
}
|
||||||
|
|
||||||
private ApiPrivateError buildApiPrivateError(
|
private ApiPrivateError buildApiPrivateError(JsonNode detailNode, String message) {
|
||||||
JsonNode detailNode,
|
|
||||||
String message
|
|
||||||
) {
|
|
||||||
if (detailNode != null && !detailNode.isNull()) {
|
if (detailNode != null && !detailNode.isNull()) {
|
||||||
try {
|
try {
|
||||||
return objectMapper.convertValue(detailNode, ApiPrivateError.class);
|
return objectMapper.convertValue(detailNode, ApiPrivateError.class);
|
||||||
@ -390,15 +492,11 @@ public class HttpClientService implements HttpClientUseCase {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
private <T> T deserializeApiResponse(
|
private <T> T deserializeApiResponse(String responseBody, HttpRequest request) {
|
||||||
String responseBody,
|
|
||||||
HttpRequest request
|
|
||||||
) {
|
|
||||||
try {
|
try {
|
||||||
if (request.getGenericType() != null) {
|
if (request.getGenericType() != null) {
|
||||||
JavaType javaType = objectMapper.getTypeFactory().constructParametricType(
|
JavaType javaType = objectMapper.getTypeFactory().constructParametricType(
|
||||||
ApiResponse.class,
|
ApiResponse.class, objectMapper.getTypeFactory().constructType(request.getGenericType())
|
||||||
objectMapper.getTypeFactory().constructType(request.getGenericType())
|
|
||||||
);
|
);
|
||||||
return objectMapper.readValue(responseBody, javaType);
|
return objectMapper.readValue(responseBody, javaType);
|
||||||
} else {
|
} 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 errorCode = "HTTP_" + statusCode;
|
||||||
String defaultMessage = "Error en servicio externo: HTTP " + statusCode;
|
String defaultMessage = "Error en servicio externo: HTTP " + statusCode;
|
||||||
String message = errorBody != null && !errorBody.isEmpty()
|
String message = errorBody != null && !errorBody.isEmpty()
|
||||||
|
|||||||
@ -8,6 +8,10 @@ public interface HttpClientUseCase {
|
|||||||
|
|
||||||
<T> T execute(HttpRequest request);
|
<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<T> executeApiResponse(HttpRequest request);
|
||||||
|
|
||||||
<T> ApiResponse<List<T>> executeApiResponseList(HttpRequest request);
|
<T> ApiResponse<List<T>> executeApiResponseList(HttpRequest request);
|
||||||
|
|||||||
@ -43,6 +43,9 @@ public class DocserviceFileAuditTraceService implements DocserviceFileAuditTrace
|
|||||||
apiResponse.getData(),
|
apiResponse.getData(),
|
||||||
apiResponse.getStatusResponse().getStatusCode()
|
apiResponse.getStatusResponse().getStatusCode()
|
||||||
);
|
);
|
||||||
|
} catch (ApiPrivateException e) {
|
||||||
|
log.warn("Excepcion de la api privada: {} -> {}", e.getStatusCode(), e.getMessage());
|
||||||
|
response = messageHelper.handleException(HttpStatusCodeException.badRequest("400"));
|
||||||
} catch (HttpStatusCodeException e) {
|
} catch (HttpStatusCodeException e) {
|
||||||
log.error("Excepcion HTTP del api privada: {} - {}", e.getStatusCode(), e.getErrorCode());
|
log.error("Excepcion HTTP del api privada: {} - {}", e.getStatusCode(), e.getErrorCode());
|
||||||
response = messageHelper.handleException(e);
|
response = messageHelper.handleException(e);
|
||||||
|
|||||||
@ -46,8 +46,7 @@ public class DocserviceFileAuditTraceRequest {
|
|||||||
@JsonIgnore
|
@JsonIgnore
|
||||||
public String getChannelCode() {
|
public String getChannelCode() {
|
||||||
return procedureRequest
|
return procedureRequest
|
||||||
.getInstructionPurposeType()
|
.getInstructionPurposeType();
|
||||||
.name();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@JsonIgnore
|
@JsonIgnore
|
||||||
|
|||||||
@ -16,21 +16,22 @@ import java.util.Objects;
|
|||||||
@Slf4j
|
@Slf4j
|
||||||
@ApplicationScoped
|
@ApplicationScoped
|
||||||
public class ApiPrivateAdapter implements ApiPrivateRepository {
|
public class ApiPrivateAdapter implements ApiPrivateRepository {
|
||||||
private final PaymentFileUseCase paymentStatusUseCase;
|
private final PaymentFileUseCase paymentFileUseCase;
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
public ApiPrivateAdapter(
|
public ApiPrivateAdapter(
|
||||||
PaymentFileUseCase paymentStatusUseCase
|
PaymentFileUseCase paymentFileUseCase
|
||||||
) {
|
) {
|
||||||
this.paymentStatusUseCase = paymentStatusUseCase;
|
this.paymentFileUseCase = paymentFileUseCase;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public DocumentService execute(
|
public DocumentService execute(
|
||||||
DocserviceFileAuditTraceRequest request
|
DocserviceFileAuditTraceRequest request
|
||||||
) {
|
) {
|
||||||
PaymentFile response = paymentStatusUseCase.execute(
|
PaymentFile response = paymentFileUseCase.execute(
|
||||||
ServicingIssueMapper.toPaymentRequest(request), PaymentFile.class
|
ServicingIssueMapper.toPaymentRequest(request),
|
||||||
|
PaymentFile.class
|
||||||
);
|
);
|
||||||
|
|
||||||
if(Objects.isNull(response) || Objects.isNull(response.getId())) {
|
if(Objects.isNull(response) || Objects.isNull(response.getId())) {
|
||||||
|
|||||||
@ -25,7 +25,7 @@ public class ServicingIssueMapper {
|
|||||||
.directorio(request.getDocumentDirectory())
|
.directorio(request.getDocumentDirectory())
|
||||||
.build()
|
.build()
|
||||||
)
|
)
|
||||||
.channelOrigin(request.getProcedureRequest().getInstructionPurposeType().name())
|
.channelOrigin(request.getChannelCode())
|
||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -217,7 +217,6 @@ public class DocserviceFileAuditTraceResource {
|
|||||||
public Response provide(
|
public Response provide(
|
||||||
@RequestBody(
|
@RequestBody(
|
||||||
description = "Request para la notificación del archivo",
|
description = "Request para la notificación del archivo",
|
||||||
required = true,
|
|
||||||
content = @Content(
|
content = @Content(
|
||||||
mediaType = MediaType.APPLICATION_JSON,
|
mediaType = MediaType.APPLICATION_JSON,
|
||||||
schema = @Schema(implementation = DocserviceFileAuditTraceRequest.class),
|
schema = @Schema(implementation = DocserviceFileAuditTraceRequest.class),
|
||||||
|
|||||||
@ -12,5 +12,5 @@ import lombok.*;
|
|||||||
@RegisterForReflection
|
@RegisterForReflection
|
||||||
@JsonInclude(JsonInclude.Include.NON_NULL)
|
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||||
public class Instruction {
|
public class Instruction {
|
||||||
private InstructionPurposeType instructionPurposeType; // Request JSON: "channelOrigin" (BOLE)
|
private String instructionPurposeType; // Request JSON: "channelOrigin" (BOLE)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +0,0 @@
|
|||||||
package com.banesco.module.instruction.domain.model;
|
|
||||||
|
|
||||||
public enum InstructionPurposeType {
|
|
||||||
BOLE,
|
|
||||||
BOL,
|
|
||||||
}
|
|
||||||
@ -19,7 +19,7 @@ import java.util.Map;
|
|||||||
public class PaymentFileClient implements PaymentFileUseCase {
|
public class PaymentFileClient implements PaymentFileUseCase {
|
||||||
private final SerializationHelper serializationHelper;
|
private final SerializationHelper serializationHelper;
|
||||||
private final HttpClientUseCase httpClientUseCase;
|
private final HttpClientUseCase httpClientUseCase;
|
||||||
private final PaymentFileConfig paymentStatusConfig;
|
private final PaymentFileConfig paymentFileConfig;
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
public PaymentFileClient(
|
public PaymentFileClient(
|
||||||
@ -29,8 +29,8 @@ public class PaymentFileClient implements PaymentFileUseCase {
|
|||||||
) {
|
) {
|
||||||
this.serializationHelper = serializationHelper;
|
this.serializationHelper = serializationHelper;
|
||||||
this.httpClientUseCase = httpClientUseCase;
|
this.httpClientUseCase = httpClientUseCase;
|
||||||
this.paymentStatusConfig = restClientConfig.getPaymentFileConfig();
|
this.paymentFileConfig = restClientConfig.getPaymentFileConfig();
|
||||||
log.info("Configuracion cargada para payment-status: {}", paymentStatusConfig);
|
log.info("Configuracion cargada para docservice-file: {}", paymentFileConfig);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -42,16 +42,16 @@ public class PaymentFileClient implements PaymentFileUseCase {
|
|||||||
String fileName = params.getOperation().getName();
|
String fileName = params.getOperation().getName();
|
||||||
Map<String, Object> payload = getPayload(params);
|
Map<String, Object> payload = getPayload(params);
|
||||||
HttpRequest request = HttpRequest.forApiPrivateResponse(
|
HttpRequest request = HttpRequest.forApiPrivateResponse(
|
||||||
paymentStatusConfig.getUrl(),
|
paymentFileConfig.getUrl(),
|
||||||
paymentStatusConfig.getStatusSuccess(),
|
paymentFileConfig.getStatusSuccess(),
|
||||||
HttpRequest.HttpMethod.POST,
|
HttpRequest.HttpMethod.POST,
|
||||||
responseType
|
responseType
|
||||||
)
|
)
|
||||||
.withBody(payload)
|
.withBody(payload)
|
||||||
.withHeaders(Map.of("fintechId", fintechId))
|
.withHeaders(Map.of("fintechId", fintechId))
|
||||||
.withTimeout(
|
.withTimeout(
|
||||||
paymentStatusConfig.getTimeout().getConnect(),
|
paymentFileConfig.getTimeout().getConnect(),
|
||||||
paymentStatusConfig.getTimeout().getResponse()
|
paymentFileConfig.getTimeout().getResponse()
|
||||||
);
|
);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@ -110,21 +110,21 @@ public class PaymentFileClient implements PaymentFileUseCase {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private Map<String, Object> getPayload(PaymentFileRequest params) {
|
private Map<String, Object> getPayload(PaymentFileRequest params) {
|
||||||
Map<String, Object> paymentStatusRequest = serializationHelper.toMap(params);
|
Map<String, Object> paymentFileRequest = serializationHelper.toMap(params);
|
||||||
Map<String, Object> operation = serializationHelper.toMap(params.getOperation());
|
Map<String, Object> operation = serializationHelper.toMap(params.getOperation());
|
||||||
String signature = serializationHelper.generateSignature(
|
String signature = serializationHelper.generateSignature(
|
||||||
params.getOperation(), params.getChannelOrigin()
|
params.getOperation(), params.getChannelOrigin()
|
||||||
);
|
);
|
||||||
|
|
||||||
paymentStatusRequest.put("signature", signature);
|
paymentFileRequest.put("signature", signature);
|
||||||
paymentStatusRequest.put("operation", operation);
|
paymentFileRequest.put("operation", operation);
|
||||||
|
|
||||||
paymentStatusRequest.remove("fintechId");
|
paymentFileRequest.remove("fintechId");
|
||||||
|
|
||||||
log.info("3. Firma generada: {}", signature);
|
log.info("3. Firma generada: {}", signature);
|
||||||
log.info("4. Parametros de la solicitud: {}", paymentStatusRequest);
|
log.info("4. Parametros de la solicitud: {}", paymentFileRequest);
|
||||||
log.info("5. Solicitud final: {}", paymentStatusRequest);
|
log.info("5. Solicitud final: {}", paymentFileRequest);
|
||||||
|
|
||||||
return paymentStatusRequest;
|
return paymentFileRequest;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Loading…
x
Reference in New Issue
Block a user