diff --git a/api/pom.xml b/api/pom.xml
index be807d14..97eee1f9 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -6,7 +6,7 @@
ca.bc.gov.educ
educ-grad-graduation-report-api
- 1.8.48
+ 1.8.49
educ-grad-graduation-report-api
Grad Graduation Report API for GRAD team
diff --git a/api/src/main/java/ca/bc/gov/educ/api/grad/report/util/GradLocalDateDeserializer.java b/api/src/main/java/ca/bc/gov/educ/api/grad/report/util/GradLocalDateDeserializer.java
index 31b813e0..c05a2d39 100644
--- a/api/src/main/java/ca/bc/gov/educ/api/grad/report/util/GradLocalDateDeserializer.java
+++ b/api/src/main/java/ca/bc/gov/educ/api/grad/report/util/GradLocalDateDeserializer.java
@@ -11,6 +11,7 @@
import java.time.LocalDate;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
+import java.time.temporal.TemporalAdjusters;
import static ca.bc.gov.educ.api.grad.report.util.EducGradReportApiConstants.SECOND_DEFAULT_DATE_FORMAT;
@@ -34,7 +35,7 @@ public LocalDate deserialize(JsonParser jsonParser, DeserializationContext deser
if(slashCount > 0) {
formatter = DateTimeFormatter.ofPattern(SECOND_DEFAULT_DATE_FORMAT);
}
- return LocalDate.parse(dateAsString, formatter);
+ return LocalDate.parse(dateAsString, formatter).with(TemporalAdjusters.lastDayOfMonth());
} else if(jsonParser.hasToken(JsonToken.VALUE_NUMBER_INT)) {
long timestamp = jsonParser.getValueAsLong();
return LocalDate.ofInstant(Instant.ofEpochMilli(timestamp), ZoneId.systemDefault());
diff --git a/api/src/main/java/ca/bc/gov/educ/api/grad/report/util/GradLocalDateTimeDeserializer.java b/api/src/main/java/ca/bc/gov/educ/api/grad/report/util/GradLocalDateTimeDeserializer.java
index d96766d6..e0c5f2f8 100644
--- a/api/src/main/java/ca/bc/gov/educ/api/grad/report/util/GradLocalDateTimeDeserializer.java
+++ b/api/src/main/java/ca/bc/gov/educ/api/grad/report/util/GradLocalDateTimeDeserializer.java
@@ -12,6 +12,7 @@
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
+import java.time.temporal.TemporalAdjusters;
import static ca.bc.gov.educ.api.grad.report.util.EducGradReportApiConstants.*;
@@ -35,7 +36,7 @@ public LocalDateTime deserialize(JsonParser jsonParser, DeserializationContext d
if(slashCount > 0) {
formatter = DateTimeFormatter.ofPattern(SECOND_DEFAULT_DATE_FORMAT);
}
- return LocalDateTime.parse(dateAsString, formatter);
+ return LocalDateTime.parse(dateAsString, formatter).with(TemporalAdjusters.lastDayOfMonth());
} else if(jsonParser.hasToken(JsonToken.VALUE_NUMBER_INT)) {
long timestamp = jsonParser.getValueAsLong();
return LocalDateTime.ofInstant(Instant.ofEpochMilli(timestamp), ZoneId.systemDefault());