From 17cc9cab16c41900253acc10040d96b55d532a2b Mon Sep 17 00:00:00 2001 From: arybakov Date: Mon, 24 Jun 2024 12:08:58 -0600 Subject: [PATCH 1/3] Revert "GRAD2-2799-P3 GRAD Incident: REGALG is creating SCCP certificates for students with future completion dates- edit summary" This reverts commit df91700e100e3e5ba3138cb13c6ab095bc553f25. --- .../educ/api/grad/report/util/GradLocalDateDeserializer.java | 3 +-- .../api/grad/report/util/GradLocalDateTimeDeserializer.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) 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 c05a2d39..31b813e0 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,7 +11,6 @@ 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; @@ -35,7 +34,7 @@ public LocalDate deserialize(JsonParser jsonParser, DeserializationContext deser if(slashCount > 0) { formatter = DateTimeFormatter.ofPattern(SECOND_DEFAULT_DATE_FORMAT); } - return LocalDate.parse(dateAsString, formatter).with(TemporalAdjusters.lastDayOfMonth()); + return LocalDate.parse(dateAsString, formatter); } 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 e0c5f2f8..d96766d6 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,7 +12,6 @@ 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.*; @@ -36,7 +35,7 @@ public LocalDateTime deserialize(JsonParser jsonParser, DeserializationContext d if(slashCount > 0) { formatter = DateTimeFormatter.ofPattern(SECOND_DEFAULT_DATE_FORMAT); } - return LocalDateTime.parse(dateAsString, formatter).with(TemporalAdjusters.lastDayOfMonth()); + 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()); From 7e2f2d81dac4557e6cdbaa6df077d8c99c1b3721 Mon Sep 17 00:00:00 2001 From: arybakov Date: Mon, 24 Jun 2024 12:10:21 -0600 Subject: [PATCH 2/3] GRAD2-2799-P3 GRAD Incident: REGALG is creating SCCP certificates for students with future completion dates- edit summary P3 GRAD Incident: REGALG is creating SCCP certificates for students with future completion dates --- .../educ/api/grad/report/util/GradLocalDateDeserializer.java | 3 ++- .../api/grad/report/util/GradLocalDateTimeDeserializer.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) 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()); From ab360fc79ed3f89c8f657d405459c5c3747987b1 Mon Sep 17 00:00:00 2001 From: arybakov Date: Wed, 26 Jun 2024 09:58:00 -0600 Subject: [PATCH 3/3] GRAD2-2799-P3 GRAD Incident: REGALG is creating SCCP certificates for students with future completion dates- edit summary P3 GRAD Incident: REGALG is creating SCCP certificates for students with future completion dates --- .../educ/api/grad/report/util/GradLocalDateDeserializer.java | 2 +- .../api/grad/report/util/GradLocalDateTimeDeserializer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 d2f2fbec..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 @@ -35,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 b48b2de2..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 @@ -36,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());