From 4aec86716618e4dc46ed87c57fd2a70440b517c7 Mon Sep 17 00:00:00 2001 From: "chris.ditcher" Date: Wed, 26 Jun 2024 14:50:13 -0700 Subject: [PATCH 1/9] 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 1ca4b55..642de96 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 c0f916e..908e4c7 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 ecafe31..d6c9e1a 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 0fce2ae..0335664 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 a69e562..1cc84d8 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 65ed110..9ad84f5 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 2eae993..4c1f2c1 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 719fdc0ea231ad566f98870dc6b088b891db8e6d Mon Sep 17 00:00:00 2001 From: githubmamatha Date: Mon, 22 Jul 2024 14:11:14 -0700 Subject: [PATCH 2/9] Added new column and updated the dates. --- .../V1.0.88__DDL-ALTER_TABLE-LETTER_GRADE.sql | 1 + ...V1.0.89__DML-UPDATE_TABLE-LETTER_GRADE.sql | 63 +++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 api/src/main/resources/db/migration/1.0/V1.0.88__DDL-ALTER_TABLE-LETTER_GRADE.sql create mode 100644 api/src/main/resources/db/migration/1.0/V1.0.89__DML-UPDATE_TABLE-LETTER_GRADE.sql diff --git a/api/src/main/resources/db/migration/1.0/V1.0.88__DDL-ALTER_TABLE-LETTER_GRADE.sql b/api/src/main/resources/db/migration/1.0/V1.0.88__DDL-ALTER_TABLE-LETTER_GRADE.sql new file mode 100644 index 0000000..38cc476 --- /dev/null +++ b/api/src/main/resources/db/migration/1.0/V1.0.88__DDL-ALTER_TABLE-LETTER_GRADE.sql @@ -0,0 +1 @@ +ALTER TABLE LETTER_GRADE ADD EFFECTIVE_DATE DATE DEFAULT TO_DATE('2024-07-01', 'YYYY-MM-DD') NOT NULL; \ No newline at end of file diff --git a/api/src/main/resources/db/migration/1.0/V1.0.89__DML-UPDATE_TABLE-LETTER_GRADE.sql b/api/src/main/resources/db/migration/1.0/V1.0.89__DML-UPDATE_TABLE-LETTER_GRADE.sql new file mode 100644 index 0000000..268f667 --- /dev/null +++ b/api/src/main/resources/db/migration/1.0/V1.0.89__DML-UPDATE_TABLE-LETTER_GRADE.sql @@ -0,0 +1,63 @@ +UPDATE LETTER_GRADE +SET UPDATE_USER='API_STUDENT_GRADUATION' , UPDATE_DATE=SYSTIMESTAMP , EFFECTIVE_DATE=TIMESTAMP'1940-01-01 00:00:00.0' +WHERE LETTER_GRADE='A'; + +UPDATE LETTER_GRADE +SET UPDATE_USER='API_STUDENT_GRADUATION' , UPDATE_DATE=SYSTIMESTAMP , EFFECTIVE_DATE=TIMESTAMP'1940-01-01 00:00:00.0' +WHERE LETTER_GRADE='B'; + +UPDATE LETTER_GRADE +SET UPDATE_USER='API_STUDENT_GRADUATION' , UPDATE_DATE=SYSTIMESTAMP , EFFECTIVE_DATE=TIMESTAMP'1940-01-01 00:00:00.0' +WHERE LETTER_GRADE='C+'; + +UPDATE LETTER_GRADE +SET UPDATE_USER='API_STUDENT_GRADUATION' , UPDATE_DATE=SYSTIMESTAMP , EFFECTIVE_DATE=TIMESTAMP'1940-01-01 00:00:00.0' +WHERE LETTER_GRADE='C'; + +UPDATE LETTER_GRADE +SET UPDATE_USER='API_STUDENT_GRADUATION' , UPDATE_DATE=SYSTIMESTAMP , EFFECTIVE_DATE=TIMESTAMP'1940-01-01 00:00:00.0' +WHERE LETTER_GRADE='C-'; + +UPDATE LETTER_GRADE +SET UPDATE_USER='API_STUDENT_GRADUATION' , UPDATE_DATE=SYSTIMESTAMP , EFFECTIVE_DATE=TIMESTAMP'1940-01-01 00:00:00.0' +WHERE LETTER_GRADE='F'; + +UPDATE LETTER_GRADE +SET UPDATE_USER='API_STUDENT_GRADUATION' , UPDATE_DATE=SYSTIMESTAMP , EFFECTIVE_DATE=TIMESTAMP'1940-01-01 00:00:00.0' +WHERE LETTER_GRADE='I'; + +UPDATE LETTER_GRADE +SET UPDATE_USER='API_STUDENT_GRADUATION' , UPDATE_DATE=SYSTIMESTAMP , EFFECTIVE_DATE=TIMESTAMP'2006-09-01 00:00:00.0' +WHERE LETTER_GRADE='NM'; + +UPDATE LETTER_GRADE +SET UPDATE_USER='API_STUDENT_GRADUATION' , UPDATE_DATE=SYSTIMESTAMP , EFFECTIVE_DATE=TIMESTAMP'1940-01-01 00:00:00.0', EXPIRY_DATE=TIMESTAMP'1994-08-31 00:00:00.0' +WHERE LETTER_GRADE='P'; + +UPDATE LETTER_GRADE +SET UPDATE_USER='API_STUDENT_GRADUATION' , UPDATE_DATE=SYSTIMESTAMP , EFFECTIVE_DATE=TIMESTAMP'2007-09-01 00:00:00.0', EXPIRY_DATE=TIMESTAMP'2021-07-31 00:00:00.0' +WHERE LETTER_GRADE='RM'; + +UPDATE LETTER_GRADE +SET UPDATE_USER='API_STUDENT_GRADUATION' , UPDATE_DATE=SYSTIMESTAMP , EFFECTIVE_DATE=TIMESTAMP'1940-01-01 00:00:00.0' +WHERE LETTER_GRADE='SG'; + +UPDATE LETTER_GRADE +SET UPDATE_USER='API_STUDENT_GRADUATION' , UPDATE_DATE=SYSTIMESTAMP , EFFECTIVE_DATE=TIMESTAMP'1940-01-01 00:00:00.0' +WHERE LETTER_GRADE='TS'; + +UPDATE LETTER_GRADE +SET UPDATE_USER='API_STUDENT_GRADUATION' , UPDATE_DATE=SYSTIMESTAMP , EFFECTIVE_DATE=TIMESTAMP'1940-01-01 00:00:00.0' +WHERE LETTER_GRADE='W'; + +UPDATE LETTER_GRADE +SET UPDATE_USER='API_STUDENT_GRADUATION' , UPDATE_DATE=SYSTIMESTAMP , EFFECTIVE_DATE=TIMESTAMP'1940-01-01 00:00:00.0', EXPIRY_DATE=TIMESTAMP'1994-08-31 00:00:00.0' +WHERE LETTER_GRADE='WF'; + +UPDATE LETTER_GRADE +SET UPDATE_USER='API_STUDENT_GRADUATION' , UPDATE_DATE=SYSTIMESTAMP , EFFECTIVE_DATE=TIMESTAMP'2007-09-01 00:00:00.0' +WHERE LETTER_GRADE='WR'; + +UPDATE LETTER_GRADE +SET UPDATE_USER='API_STUDENT_GRADUATION' , UPDATE_DATE=SYSTIMESTAMP , EFFECTIVE_DATE=TIMESTAMP'1994-09-01 00:00:00.0', EXPIRY_DATE=TIMESTAMP'1997-08-31 00:00:00.0' +WHERE LETTER_GRADE='IP'; From 6bff310bee0f8573557b23ab5ebb318721c020ae Mon Sep 17 00:00:00 2001 From: arybakov Date: Wed, 24 Jul 2024 11:55:03 -0600 Subject: [PATCH 3/9] GRAD2-2857 Update API to pass new Effecte_Date from Letter_Grade table --- .../educ/api/studentgraduation/model/dto/LetterGrade.java | 6 +++--- .../studentgraduation/model/entity/LetterGradeEntity.java | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/api/src/main/java/ca/bc/gov/educ/api/studentgraduation/model/dto/LetterGrade.java b/api/src/main/java/ca/bc/gov/educ/api/studentgraduation/model/dto/LetterGrade.java index 2e555ed..f7693f7 100644 --- a/api/src/main/java/ca/bc/gov/educ/api/studentgraduation/model/dto/LetterGrade.java +++ b/api/src/main/java/ca/bc/gov/educ/api/studentgraduation/model/dto/LetterGrade.java @@ -1,11 +1,9 @@ package ca.bc.gov.educ.api.studentgraduation.model.dto; -import org.springframework.stereotype.Component; - import lombok.Data; import lombok.EqualsAndHashCode; +import org.springframework.stereotype.Component; -import jakarta.persistence.Column; import java.util.Date; @Data @@ -21,6 +19,7 @@ public class LetterGrade extends BaseModel { private Integer percentRangeHigh; private Integer percentRangeLow; private Date expiryDate; + private Date effectiveDate; @Override public String toString() { @@ -33,6 +32,7 @@ public String toString() { ", percentRangeHigh=" + percentRangeHigh + ", percentRangeLow=" + percentRangeLow + ", expiryDate=" + expiryDate + + ", effectiveDate=" + effectiveDate + '}'; } } diff --git a/api/src/main/java/ca/bc/gov/educ/api/studentgraduation/model/entity/LetterGradeEntity.java b/api/src/main/java/ca/bc/gov/educ/api/studentgraduation/model/entity/LetterGradeEntity.java index baf032a..e38dc5a 100644 --- a/api/src/main/java/ca/bc/gov/educ/api/studentgraduation/model/entity/LetterGradeEntity.java +++ b/api/src/main/java/ca/bc/gov/educ/api/studentgraduation/model/entity/LetterGradeEntity.java @@ -4,11 +4,9 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.Table; - -import org.hibernate.annotations.Immutable; - import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.Immutable; import java.util.Date; @@ -44,4 +42,7 @@ public class LetterGradeEntity extends BaseEntity { @Column(name = "EXPIRY_DATE", nullable = true) private Date expiryDate; + @Column(name = "EFFECTIVE_DATE", nullable = true) + private Date effectiveDate; + } \ No newline at end of file From 034d900b6027e63820fced899d548c24c41ca2a3 Mon Sep 17 00:00:00 2001 From: Chris Ditcher Date: Mon, 12 Aug 2024 08:54:42 -0700 Subject: [PATCH 4/9] Updated to Ubuntu 22.04 (#314) (cherry picked from commit 4aec86716618e4dc46ed87c57fd2a70440b517c7) Co-authored-by: githubmamatha <106563495+githubmamatha@users.noreply.github.com> Co-authored-by: chris.ditcher From 718caaadbbf186f6d6fb0d3779f91913f5c5feda Mon Sep 17 00:00:00 2001 From: "chris.ditcher" Date: Tue, 20 Aug 2024 14:17:40 -0700 Subject: [PATCH 5/9] Added application-local to gitignore --- api/.gitignore | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/api/.gitignore b/api/.gitignore index 07c4142..4c77931 100644 --- a/api/.gitignore +++ b/api/.gitignore @@ -52,4 +52,7 @@ target/ build/ ### VS Code ### -.vscode/ \ No newline at end of file +.vscode/ + +### Local dev ### +**/application-local.yaml From 69e7ac70f2bf5a5dda00265a323de3eb8e04155a Mon Sep 17 00:00:00 2001 From: "chris.ditcher" Date: Tue, 20 Aug 2024 14:18:51 -0700 Subject: [PATCH 6/9] Added application-local to gitignore --- .gitignore | 5 ++++- api/.gitignore | 58 -------------------------------------------------- 2 files changed, 4 insertions(+), 59 deletions(-) delete mode 100644 api/.gitignore diff --git a/.gitignore b/.gitignore index 07c4142..1ca7b04 100644 --- a/.gitignore +++ b/.gitignore @@ -52,4 +52,7 @@ target/ build/ ### VS Code ### -.vscode/ \ No newline at end of file +.vscode/ + +### Local dev ### +**/application-local.yaml \ No newline at end of file diff --git a/api/.gitignore b/api/.gitignore deleted file mode 100644 index 4c77931..0000000 --- a/api/.gitignore +++ /dev/null @@ -1,58 +0,0 @@ -# Compiled class file -*.class - -# Log file -*.log - -# BlueJ files -*.ctxt - -# Mobile Tools for Java (J2ME) -.mtj.tmp/ - -# Package Files # -*.jar -*.war -*.nar -*.ear -*.zip -*.tar.gz -*.rar - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* - -HELP.md -target/ -!.mvn/wrapper/maven-wrapper.jar -!**/src/main/** -!**/src/test/** - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ -build/ - -### VS Code ### -.vscode/ - -### Local dev ### -**/application-local.yaml From f07cbabad472c95236c6676c9552534663d416b4 Mon Sep 17 00:00:00 2001 From: Chris Ditcher Date: Fri, 23 Aug 2024 13:48:53 -0700 Subject: [PATCH 7/9] Update update-configmap.sh (cherry picked from commit e3ccc51e5281f98e2d57046233b109ca091bfee5) --- tools/config/update-configmap.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/config/update-configmap.sh b/tools/config/update-configmap.sh index a8ce4ab..8de49a2 100644 --- a/tools/config/update-configmap.sh +++ b/tools/config/update-configmap.sh @@ -23,6 +23,7 @@ FLB_CONFIG="[SERVICE] Exclude_Path *.gz,*.zip Parser docker Mem_Buf_Limit 20MB + Buffer_Max_Size 1MB [FILTER] Name record_modifier Match * From f4eea4b43e3ea606802b7ba136ffcd54c49c6259 Mon Sep 17 00:00:00 2001 From: "chris.ditcher" Date: Thu, 12 Sep 2024 11:23:49 -0700 Subject: [PATCH 8/9] Increased header size --- api/src/main/resources/application.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/api/src/main/resources/application.yaml b/api/src/main/resources/application.yaml index 909d531..2724db6 100644 --- a/api/src/main/resources/application.yaml +++ b/api/src/main/resources/application.yaml @@ -79,6 +79,7 @@ server: worker: 128 io: 16 #port: ${HTTP_PORT} + max-http-request-header-size: 20000 #API Documentation springdoc: From e47fb830db37aa85d63ab9762f76fad25ebca5d3 Mon Sep 17 00:00:00 2001 From: githubmamatha <106563495+githubmamatha@users.noreply.github.com> Date: Thu, 12 Sep 2024 12:47:03 -0700 Subject: [PATCH 9/9] 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 b1b116a..4f75988 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -6,7 +6,7 @@ ca.bc.gov.educ educ-grad-student-graduation-api - 1.8.44 + 1.8.45 educ-grad-student-graduation-api Ministry of Education GRAD STUDENT GRADUATION API