Fix Date format when T present

bcgov · Jul 25, 2023 · 7b50871 · 7b50871
1 parent b31a98e
commit 7b50871
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/api/src/main/java/ca/bc/gov/educ/api/distribution/util/GradLocalDateTimeDeserializer.java b/api/src/main/java/ca/bc/gov/educ/api/distribution/util/GradLocalDateTimeDeserializer.java
@@ -54,11 +54,11 @@ public LocalDateTime deserialize(JsonParser jsonParser, DeserializationContext d
             formatter = DateTimeFormatter.ofPattern(DEFAULT_DATE_TIME_FORMAT);
             return LocalDateTime.parse(dateAsString, formatter);
         } else if(StringUtils.isNotBlank(dateAsString) && dateAsString.length() > 19 && dateAsString.contains("/") && dateAsString.contains("T")) {
-            formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss.000+00:00");
-            return LocalDateTime.parse(StringUtils.replace(dateAsString, "T", " "), formatter);
+            formatter = DateTimeFormatter.ofPattern(SECOND_DEFAULT_DATE_TIME_FORMAT);
+            return LocalDateTime.parse(StringUtils.replace(StringUtils.substringBefore(dateAsString, "."), "T", " "), formatter);
         } else if(StringUtils.isNotBlank(dateAsString) && dateAsString.length() > 19 && dateAsString.contains("-") && dateAsString.contains("T")) {
-            formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.000+00:00");
-            return LocalDateTime.parse(StringUtils.replace(dateAsString, "T", " "), formatter);
+            formatter = DateTimeFormatter.ofPattern(DEFAULT_DATE_TIME_FORMAT);
+            return LocalDateTime.parse(StringUtils.replace(StringUtils.substringBefore(dateAsString, "."), "T", " "), formatter);
         } else if(StringUtils.isNotBlank(dateAsString)) {
             return LocalDateTime.parse(dateAsString, formatter);
         }