Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Grad release 1.23 #315

Merged
merged 11 commits into from
Sep 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.from.main.branch.deploy.to.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create_tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ on:
jobs:
tag_image:
name: Tag Image
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
environment: dev

outputs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy_prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/on.pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
jobs:
quality_profile:

runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

defaults:
run:
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,7 @@ target/
build/

### VS Code ###
.vscode/
.vscode/

### Local dev ###
**/application-local.yaml
55 changes: 0 additions & 55 deletions api/.gitignore

This file was deleted.

2 changes: 1 addition & 1 deletion api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>ca.bc.gov.educ</groupId>
<artifactId>educ-grad-student-graduation-api</artifactId>
<version>1.8.44</version>
<version>1.8.45</version>
<name>educ-grad-student-graduation-api</name>
<description>Ministry of Education GRAD STUDENT GRADUATION API</description>

Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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() {
Expand All @@ -33,6 +32,7 @@ public String toString() {
", percentRangeHigh=" + percentRangeHigh +
", percentRangeLow=" + percentRangeLow +
", expiryDate=" + expiryDate +
", effectiveDate=" + effectiveDate +
'}';
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;

}
1 change: 1 addition & 0 deletions api/src/main/resources/application.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ server:
worker: 128
io: 16
#port: ${HTTP_PORT}
max-http-request-header-size: 20000

#API Documentation
springdoc:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ALTER TABLE LETTER_GRADE ADD EFFECTIVE_DATE DATE DEFAULT TO_DATE('2024-07-01', 'YYYY-MM-DD') NOT NULL;
Original file line number Diff line number Diff line change
@@ -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';
1 change: 1 addition & 0 deletions tools/config/update-configmap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 *
Expand Down
Loading