CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 28 Packages Projects Releases Wiki Activity

[FINERACT-1965] Dateformat validation error message with the original dateformat

Browse Source
This commit is contained in:
taskain7
2023-08-30 09:50:03 +02:00
committed by Arnold Gálovics
parent e7013309ca
commit c9e9a5f546
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-core/src/main/java/org/apache/fineract/infrastructure/core/serialization/JsonParserHelper.java
+5 -4
View File
@@ -473,11 +473,12 @@ public class JsonParserHelper {
parametersPassedInCommand.add(parameterName); parametersPassedInCommand.add(parameterName);
try { try {
timeFormat = timeFormat.replace("y", "u"); String strictResolveCompatibleTimeFormat = timeFormat.replace("y", "u");
final JsonPrimitive primitive = object.get(parameterName).getAsJsonPrimitive(); final JsonPrimitive primitive = object.get(parameterName).getAsJsonPrimitive();
timeValueAsString = primitive.getAsString(); timeValueAsString = primitive.getAsString();
DateTimeFormatter timeFormatter = new DateTimeFormatterBuilder().parseCaseInsensitive().parseLenient() DateTimeFormatter timeFormatter = new DateTimeFormatterBuilder().parseCaseInsensitive().parseLenient()
.appendPattern(timeFormat).toFormatter(clientApplicationLocale).withResolverStyle(ResolverStyle.STRICT); .appendPattern(strictResolveCompatibleTimeFormat).toFormatter(clientApplicationLocale)
.withResolverStyle(ResolverStyle.STRICT);
if (StringUtils.isNotBlank(timeValueAsString)) { if (StringUtils.isNotBlank(timeValueAsString)) {
value = LocalDateTime.parse(timeValueAsString, timeFormatter); value = LocalDateTime.parse(timeValueAsString, timeFormatter);
} }
@@ -540,9 +541,9 @@ public class JsonParserHelper {
LocalDateTime eventLocalDateTime = null; LocalDateTime eventLocalDateTime = null;
if (StringUtils.isNotBlank(dateTimeAsString)) { if (StringUtils.isNotBlank(dateTimeAsString)) {
try { try {
dateTimeFormat = dateTimeFormat.replace("y", "u"); String strictResolveCompatibleDateTimeFormat = dateTimeFormat.replace("y", "u");
DateTimeFormatter formatter = new DateTimeFormatterBuilder().parseCaseInsensitive().parseLenient() DateTimeFormatter formatter = new DateTimeFormatterBuilder().parseCaseInsensitive().parseLenient()
.appendPattern(dateTimeFormat).optionalStart().appendPattern(" HH:mm:ss").optionalEnd() .appendPattern(strictResolveCompatibleDateTimeFormat).optionalStart().appendPattern(" HH:mm:ss").optionalEnd()
.parseDefaulting(ChronoField.HOUR_OF_DAY, 0).parseDefaulting(ChronoField.MINUTE_OF_HOUR, 0) .parseDefaulting(ChronoField.HOUR_OF_DAY, 0).parseDefaulting(ChronoField.MINUTE_OF_HOUR, 0)
.parseDefaulting(ChronoField.SECOND_OF_MINUTE, 0).toFormatter(clientApplicationLocale) .parseDefaulting(ChronoField.SECOND_OF_MINUTE, 0).toFormatter(clientApplicationLocale)
.withResolverStyle(ResolverStyle.STRICT); .withResolverStyle(ResolverStyle.STRICT);
integration-tests/src/test/java/org/apache/fineract/integrationtests/DateValidationTest.java
+2 -2
View File
@@ -119,7 +119,7 @@ public class DateValidationTest {
HashMap<String, Object> error = errors.get(0); HashMap<String, Object> error = errors.get(0);
assertNotNull(error); assertNotNull(error);
assertEquals( assertEquals(
"The parameter `expectedDisbursementDate` is invalid based on the dateFormat: `dd MMMM uuuu` and locale: `en_GB` provided:", "The parameter `expectedDisbursementDate` is invalid based on the dateFormat: `dd MMMM yyyy` and locale: `en_GB` provided:",
error.get("developerMessage")); error.get("developerMessage"));
} }
@@ -134,7 +134,7 @@ public class DateValidationTest {
assertNotNull(errors); assertNotNull(errors);
Map<String, Object> error = errors.get(0); Map<String, Object> error = errors.get(0);
assertNotNull(error); assertNotNull(error);
assertEquals("The parameter `expiration` is invalid based on the dateFormat: `dd MMMM uuuu HH:mm:ss` and locale: `en` provided:", assertEquals("The parameter `expiration` is invalid based on the dateFormat: `dd MMMM yyyy HH:mm:ss` and locale: `en` provided:",
error.get("developerMessage")); error.get("developerMessage"));
} }