Skip to content

Commit 327911a

Browse files
committed
[PIDM-40] refactoring
1 parent d9d7e3e commit 327911a

File tree

2 files changed

+24
-1
lines changed

2 files changed

+24
-1
lines changed

src/main/java/it/gov/pagopa/payments/config/LoggingAspect.java

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
import static it.gov.pagopa.payments.utils.CommonUtil.deNull;
44

55
import com.fasterxml.jackson.core.JsonProcessingException;
6+
import com.fasterxml.jackson.databind.JsonNode;
67
import com.fasterxml.jackson.databind.ObjectMapper;
8+
import com.fasterxml.jackson.databind.node.ObjectNode;
79
import it.gov.pagopa.payments.exception.AppError;
810
import it.gov.pagopa.payments.model.ProblemJson;
911
import java.lang.reflect.Method;
@@ -42,6 +44,7 @@ public class LoggingAspect {
4244
public static final String REQUEST_ID = "requestId";
4345
public static final String OPERATION_ID = "operationId";
4446
public static final String ARGS = "args";
47+
private static final ObjectMapper objectMapper = new ObjectMapper();
4548

4649
final HttpServletRequest httRequest;
4750

@@ -92,6 +95,11 @@ private static Map<String, String> getParams(ProceedingJoinPoint joinPoint) {
9295
var paramName = parameter.getName();
9396
var arg = joinPoint.getArgs()[i++];
9497
arg = jaxToString(arg);
98+
99+
if(method.getName().equals("paSendRTV2") || method.getName().equals("paSendRT")) {
100+
arg = removeValueKey(deNull(arg));
101+
}
102+
95103
params.put(paramName, deNull(arg));
96104
}
97105
return params;
@@ -183,4 +191,19 @@ private static Object jaxToString(Object arg) {
183191
}
184192
return arg;
185193
}
194+
195+
private static String removeValueKey(String json) {
196+
try {
197+
JsonNode rootNode = objectMapper.readTree(json);
198+
System.out.println(rootNode);
199+
200+
if (rootNode.isObject()) {
201+
((ObjectNode) rootNode).replace("value", null);
202+
}
203+
204+
return objectMapper.writeValueAsString(rootNode);
205+
} catch (JsonProcessingException e) {
206+
return json;
207+
}
208+
}
186209
}

src/main/java/it/gov/pagopa/payments/mapper/ConvertTableEntityToReceiptModelResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public static ReceiptModelResponse mapTableEntityToReceiptModelResponse(TableEnt
1616
.organizationFiscalCode(tableEntity.getPartitionKey())
1717
.iuv(tableEntity.getRowKey())
1818
.debtor(tableEntity.getProperty(DEBTOR_PROPERTY).toString())
19-
.paymentDateTime((LocalDateTime) tableEntity.getProperty(PAYMENT_DATE_PROPERTY))
19+
.paymentDateTime(LocalDateTime.parse(tableEntity.getProperty(PAYMENT_DATE_PROPERTY).toString()))
2020
.status(ReceiptStatus.valueOf(tableEntity.getProperty(STATUS_PROPERTY).toString()))
2121
.build();
2222
}

0 commit comments

Comments
 (0)