Merge pull request #557 from bcgov/develop/alex

REASON OF OVERRIDE: Fixes which won't break the reviewed code, but will save a lot of time for early morning testing.
bcgov · Jul 25, 2023 · e00b278 · e00b278
2 parents fa9e543 + 799c7ed
commit e00b278
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 16 deletions.
diff --git a/api/src/main/java/ca/bc/gov/educ/api/gradstudent/model/dto/ReportGradStudentData.java b/api/src/main/java/ca/bc/gov/educ/api/gradstudent/model/dto/ReportGradStudentData.java
@@ -1,6 +1,5 @@
 package ca.bc.gov.educ.api.gradstudent.model.dto;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -38,7 +37,6 @@ public class ReportGradStudentData implements Serializable {
     private String honorsStanding;
     private String graduated;
     private String transcriptTypeCode;
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateDate;
     private List<CertificateType> certificateTypes;
     private List<NonGradReason> nonGradReasons;

diff --git a/api/src/main/java/ca/bc/gov/educ/api/gradstudent/util/EducGradStudentApiConstants.java b/api/src/main/java/ca/bc/gov/educ/api/gradstudent/util/EducGradStudentApiConstants.java
@@ -107,7 +107,9 @@ public class EducGradStudentApiConstants {
     public static final String DEFAULT_UPDATED_BY = "API_GRAD_STUDENT";
 
     public static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd";
-    public static final String DATETIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
+    public static final String DEFAULT_DATE_TIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
+    public static final String SECOND_DEFAULT_DATE_FORMAT = "yyyy/MM/dd";
+    public static final String SECOND_DEFAULT_DATE_TIME_FORMAT = "yyyy/MM/dd HH:mm:ss";
     public static final String TRAX_DATE_FORMAT = "yyyyMM";
     public static final String PROGRAM_COMPLETION_DATE_FORMAT = "yyyy/MM";
     public static final String DATE_FORMAT = "yyyy/MM/dd";

diff --git a/api/src/main/java/ca/bc/gov/educ/api/gradstudent/util/GradLocalDateDeserializer.java b/api/src/main/java/ca/bc/gov/educ/api/gradstudent/util/GradLocalDateDeserializer.java
@@ -12,6 +12,8 @@
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 
+import static ca.bc.gov.educ.api.gradstudent.util.EducGradStudentApiConstants.SECOND_DEFAULT_DATE_FORMAT;
+
 public class GradLocalDateDeserializer extends StdDeserializer<LocalDate> {
 
     public GradLocalDateDeserializer() {
@@ -30,7 +32,7 @@ public LocalDate deserialize(JsonParser jsonParser, DeserializationContext deser
                 dateAsString = dateAsString + "/01";
             }
             if(slashCount > 0) {
-                formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd");
+                formatter = DateTimeFormatter.ofPattern(SECOND_DEFAULT_DATE_FORMAT);
             }
             return LocalDate.parse(dateAsString, formatter);
         } else if(jsonParser.hasToken(JsonToken.VALUE_NUMBER_INT)) {
@@ -39,7 +41,7 @@ public LocalDate deserialize(JsonParser jsonParser, DeserializationContext deser
         } else if(StringUtils.isNotBlank(dateAsString) && dateAsString.length() == 10 && dateAsString.contains("-")) {
             return LocalDate.parse(dateAsString, formatter);
         } else if(StringUtils.isNotBlank(dateAsString) && dateAsString.length() == 10 && dateAsString.contains("/")) {
-            formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd");
+            formatter = DateTimeFormatter.ofPattern(SECOND_DEFAULT_DATE_FORMAT);
             return LocalDate.parse(dateAsString, formatter);
         } else if(StringUtils.isNotBlank(dateAsString)) {
             return LocalDate.parse(dateAsString, formatter);

diff --git a/api/src/main/java/ca/bc/gov/educ/api/gradstudent/util/GradLocalDateTimeDeserializer.java b/api/src/main/java/ca/bc/gov/educ/api/gradstudent/util/GradLocalDateTimeDeserializer.java
@@ -13,6 +13,8 @@
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 
+import static ca.bc.gov.educ.api.gradstudent.util.EducGradStudentApiConstants.*;
+
 public class GradLocalDateTimeDeserializer extends StdDeserializer<LocalDateTime> {
 
     public GradLocalDateTimeDeserializer() {
@@ -31,31 +33,25 @@ public LocalDateTime deserialize(JsonParser jsonParser, DeserializationContext d
                 dateAsString = dateAsString + "/01";
             }
             if(slashCount > 0) {
-                formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd");
+                formatter = DateTimeFormatter.ofPattern(SECOND_DEFAULT_DATE_FORMAT);
             }
             return LocalDateTime.parse(dateAsString, formatter);
         } else if(jsonParser.hasToken(JsonToken.VALUE_NUMBER_INT)) {
             long timestamp = jsonParser.getValueAsLong();
             return LocalDateTime.ofInstant(Instant.ofEpochMilli(timestamp), ZoneId.systemDefault());
         } else if(StringUtils.isNotBlank(dateAsString) && dateAsString.length() == 10 && dateAsString.contains("-")) {
-            formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+            formatter = DateTimeFormatter.ofPattern(DEFAULT_DATE_FORMAT);
             LocalDate localDate = LocalDate.parse(dateAsString, formatter);
             return localDate.atStartOfDay();
         } else if(StringUtils.isNotBlank(dateAsString) && dateAsString.length() == 10 && dateAsString.contains("/")) {
-            formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd");
+            formatter = DateTimeFormatter.ofPattern(SECOND_DEFAULT_DATE_FORMAT);
             LocalDate localDate = LocalDate.parse(dateAsString, formatter);
             return localDate.atStartOfDay();
         } else if(StringUtils.isNotBlank(dateAsString) && dateAsString.length() > 10 && dateAsString.contains("/") && dateAsString.contains(" ")) {
-            formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss");
+            formatter = DateTimeFormatter.ofPattern(SECOND_DEFAULT_DATE_TIME_FORMAT);
             return LocalDateTime.parse(dateAsString, formatter);
         } else if(StringUtils.isNotBlank(dateAsString) && dateAsString.length() > 10 && dateAsString.contains("-") && dateAsString.contains(" ")) {
-            formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-            return LocalDateTime.parse(dateAsString, formatter);
-        } else if(StringUtils.isNotBlank(dateAsString) && dateAsString.length() > 10 && dateAsString.contains("/") && dateAsString.contains("T")) {
-            formatter = DateTimeFormatter.ofPattern("yyyy/MM/ddTHH:mm:ss.000+00:00");
-            return LocalDateTime.parse(dateAsString, formatter);
-        } else if(StringUtils.isNotBlank(dateAsString) && dateAsString.length() > 10 && dateAsString.contains("-") && dateAsString.contains("T")) {
-            formatter = DateTimeFormatter.ISO_OFFSET_DATE_TIME;
+            formatter = DateTimeFormatter.ofPattern(DEFAULT_DATE_TIME_FORMAT);
             return LocalDateTime.parse(dateAsString, formatter);
         } else if(StringUtils.isNotBlank(dateAsString)) {
             return LocalDateTime.parse(dateAsString, formatter);