Merge pull request #313 from bcgov/develop/alex-GRAD2-2857

GRAD2-2857
bcgov · Jul 25, 2024 · c638f03 · c638f03
2 parents b0038c5 + 6bff310
commit c638f03
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 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
@@ -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
@@ -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;
+
 }