Skip to content

Commit

Permalink
Merge pull request #315 from bcgov/grad-release
Browse files Browse the repository at this point in the history
Grad release 1.23
  • Loading branch information
githubmamatha authored Sep 12, 2024
2 parents e3ccc51 + e47fb83 commit e484c08
Show file tree
Hide file tree
Showing 8 changed files with 77 additions and 63 deletions.
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';

0 comments on commit e484c08

Please sign in to comment.