From df91700e100e3e5ba3138cb13c6ab095bc553f25 Mon Sep 17 00:00:00 2001 From: arybakov Date: Mon, 24 Jun 2024 12:08:22 -0600 Subject: [PATCH 1/8] 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 17cc9cab16c41900253acc10040d96b55d532a2b Mon Sep 17 00:00:00 2001 From: arybakov Date: Mon, 24 Jun 2024 12:08:58 -0600 Subject: [PATCH 2/8] 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 3/8] 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 418865576bbcd600315676e027fe2929c02958dd Mon Sep 17 00:00:00 2001 From: Alexander Rybakov <83988488+arybakov-cgi@users.noreply.github.com> Date: Wed, 26 Jun 2024 09:53:59 -0600 Subject: [PATCH 4/8] Revert back accidental commit to grad-release --- .../educ/api/grad/report/util/GradLocalDateDeserializer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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..d2f2fbec 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).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()); From 5702f38cdc61d17b0f8d216186559aef816427c5 Mon Sep 17 00:00:00 2001 From: Alexander Rybakov <83988488+arybakov-cgi@users.noreply.github.com> Date: Wed, 26 Jun 2024 09:54:28 -0600 Subject: [PATCH 5/8] Revert back accidental commit to grad-release --- .../api/grad/report/util/GradLocalDateTimeDeserializer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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..b48b2de2 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).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 ab360fc79ed3f89c8f657d405459c5c3747987b1 Mon Sep 17 00:00:00 2001 From: arybakov Date: Wed, 26 Jun 2024 09:58:00 -0600 Subject: [PATCH 6/8] 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()); From 87482f33c9186bd81e4f3182f22febbb025d457a Mon Sep 17 00:00:00 2001 From: "chris.ditcher" Date: Wed, 26 Jun 2024 14:39:33 -0700 Subject: [PATCH 7/8] Updated to Ubuntu 22.04 --- .github/workflows/build.from.developer.branch.deploy.to.dev.yml | 2 +- .github/workflows/build.from.main.branch.deploy.to.dev.yml | 2 +- .github/workflows/build.from.release.branch.deploy.to.dev.yml | 2 +- .github/workflows/create_tag.yml | 2 +- .github/workflows/deploy_prod.yml | 2 +- .github/workflows/deploy_test.yml | 2 +- .github/workflows/on.pr.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.from.developer.branch.deploy.to.dev.yml b/.github/workflows/build.from.developer.branch.deploy.to.dev.yml index d348b915..a923005e 100644 --- a/.github/workflows/build.from.developer.branch.deploy.to.dev.yml +++ b/.github/workflows/build.from.developer.branch.deploy.to.dev.yml @@ -49,7 +49,7 @@ jobs: openshift-ci-cd: name: Build and deploy to OpenShift DEV from developer branch # ubuntu-20.04 can also be used. - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 environment: dev #outputs: diff --git a/.github/workflows/build.from.main.branch.deploy.to.dev.yml b/.github/workflows/build.from.main.branch.deploy.to.dev.yml index 2ff0e1d2..e0bbedd7 100644 --- a/.github/workflows/build.from.main.branch.deploy.to.dev.yml +++ b/.github/workflows/build.from.main.branch.deploy.to.dev.yml @@ -37,7 +37,7 @@ on: jobs: openshift-ci-cd: name: Build and deploy to OpenShift DEV - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 environment: dev steps: diff --git a/.github/workflows/build.from.release.branch.deploy.to.dev.yml b/.github/workflows/build.from.release.branch.deploy.to.dev.yml index 6834daa7..79bdfe6e 100644 --- a/.github/workflows/build.from.release.branch.deploy.to.dev.yml +++ b/.github/workflows/build.from.release.branch.deploy.to.dev.yml @@ -42,7 +42,7 @@ on: jobs: openshift-ci-cd: name: Build and deploy to OpenShift DEV from release branch - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 environment: dev steps: diff --git a/.github/workflows/create_tag.yml b/.github/workflows/create_tag.yml index 97b7eebd..d13628ed 100644 --- a/.github/workflows/create_tag.yml +++ b/.github/workflows/create_tag.yml @@ -26,7 +26,7 @@ on: jobs: tag_image: name: Tag Image - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 environment: dev outputs: diff --git a/.github/workflows/deploy_prod.yml b/.github/workflows/deploy_prod.yml index ac004af5..987d472c 100644 --- a/.github/workflows/deploy_prod.yml +++ b/.github/workflows/deploy_prod.yml @@ -31,7 +31,7 @@ on: jobs: deploy-to-openshift-prod: name: Deploy to OpenShift PROD - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 environment: prod outputs: diff --git a/.github/workflows/deploy_test.yml b/.github/workflows/deploy_test.yml index 94f14600..39576912 100644 --- a/.github/workflows/deploy_test.yml +++ b/.github/workflows/deploy_test.yml @@ -31,7 +31,7 @@ on: jobs: deploy-to-openshift-test: name: Deploy to OpenShift TEST - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 environment: test outputs: diff --git a/.github/workflows/on.pr.yml b/.github/workflows/on.pr.yml index 2eae9936..4c1f2c15 100644 --- a/.github/workflows/on.pr.yml +++ b/.github/workflows/on.pr.yml @@ -10,7 +10,7 @@ on: jobs: quality_profile: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 defaults: run: From 1b18f6b97c2ebb153e90e70b3d8c9b026d7fed50 Mon Sep 17 00:00:00 2001 From: githubmamatha <106563495+githubmamatha@users.noreply.github.com> Date: Tue, 9 Jul 2024 10:36:49 -0700 Subject: [PATCH 8/8] Update pom.xml --- api/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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