Merge pull request #703 from bcgov/feature/GRAD2-2761

GRAD2-2761: replaced minCode with schoolId for School v2 endpoint & s…
bcgov · Nov 21, 2024 · 38d8cf4 · 38d8cf4
2 parents 698092f + 4e692a7
commit 38d8cf4
Show file tree

Hide file tree

Showing 16 changed files with 79 additions and 331 deletions.
diff --git a/api/src/main/java/ca/bc/gov/educ/api/gradstudent/model/dto/CommonSchool.java b/api/src/main/java/ca/bc/gov/educ/api/gradstudent/model/dto/CommonSchool.java
diff --git a/api/src/main/java/ca/bc/gov/educ/api/gradstudent/model/dto/GradSearchStudent.java b/api/src/main/java/ca/bc/gov/educ/api/gradstudent/model/dto/GradSearchStudent.java
@@ -42,6 +42,7 @@ public class GradSearchStudent {
 	private String trueStudentID;
 	private String program;
 	private String schoolOfRecord;
+	private String schoolOfRecordId;
 	private String schoolOfRecordName;
 	private String schoolOfRecordindependentAffiliation;
 	private String studentGrade;

diff --git a/api/src/main/java/ca/bc/gov/educ/api/gradstudent/model/dto/GraduationStudentRecord.java b/api/src/main/java/ca/bc/gov/educ/api/gradstudent/model/dto/GraduationStudentRecord.java
@@ -32,6 +32,7 @@ public class GraduationStudentRecord extends BaseModel {
     private String studentStatusName;
     private UUID studentID;
     private String schoolAtGrad;
+    private UUID schoolAtGradId;
     private String schoolAtGradName;
     private String recalculateProjectedGrad;
     private Long batchId;

diff --git a/...rc/main/java/ca/bc/gov/educ/api/gradstudent/model/dto/GraduationStudentRecordHistory.java b/...rc/main/java/ca/bc/gov/educ/api/gradstudent/model/dto/GraduationStudentRecordHistory.java
@@ -27,10 +27,12 @@ public class GraduationStudentRecordHistory extends BaseModel{
     private String honoursStanding;
     private String recalculateGradStatus;   
     private String schoolOfRecord;
+    private UUID schoolOfRecordId;
     private String studentGrade;	
     private String studentStatus;
     private UUID studentID;
     private String schoolAtGrad;
+    private UUID schoolAtGradId;
     private String recalculateProjectedGrad;
     private Long batchId;
     private String consumerEducationRequirementMet;

diff --git a/api/src/main/java/ca/bc/gov/educ/api/gradstudent/model/dto/ReportGradStudentData.java b/api/src/main/java/ca/bc/gov/educ/api/gradstudent/model/dto/ReportGradStudentData.java
@@ -15,6 +15,8 @@ public class ReportGradStudentData implements Serializable {
     private UUID graduationStudentRecordId;
     private String mincode;
     private String mincodeAtGrad;
+    private String schoolOfRecordId;
+    private String schoolAtGradId;
     private String distcode;
     private String distcodeAtGrad;
     private String pen;

diff --git a/api/src/main/java/ca/bc/gov/educ/api/gradstudent/model/dto/School.java b/api/src/main/java/ca/bc/gov/educ/api/gradstudent/model/dto/School.java
@@ -21,7 +21,7 @@ public class School {
     private String postal;
 	private String openFlag;
 	private String schoolCategoryCode;
-	private String schoolCategoryCodeInstitute;
+	private String schoolCategoryLegacyCode;
 
 	public String getSchoolName() {
 		return  schoolName != null ? schoolName.trim(): null;
@@ -49,7 +49,7 @@ public String getPostal() {
 
 	@Override
 	public String toString() {
-		return "School [minCode=" + minCode + ", schoolId=" + schoolId + ", schoolCategoryCode=" + schoolCategoryCode + ", schoolCategoryCodeInstitute=" + schoolCategoryCodeInstitute
+		return "School [minCode=" + minCode + ", schoolId=" + schoolId + ", schoolCategoryCode=" + schoolCategoryCode + ", schoolCategoryLegacyCode=" + schoolCategoryLegacyCode
 				+ ", schoolName=" + schoolName + ", districtName=" + districtName + ", transcriptEligibility=" + transcriptEligibility + ", certificateEligibility=" + certificateEligibility
 				+ ", address1=" + address1 + ", address2=" + address2 + ", city=" + city + ", provCode=" + provCode + ", countryCode=" + countryCode + ", postal=" + postal + ", openFlag=" + openFlag
 				+ "]";

diff --git a/.../main/java/ca/bc/gov/educ/api/gradstudent/model/entity/GraduationStudentRecordEntity.java b/.../main/java/ca/bc/gov/educ/api/gradstudent/model/entity/GraduationStudentRecordEntity.java
@@ -82,7 +82,7 @@ public GraduationStudentRecordEntity() {
     private UUID schoolOfRecordId;
 
     @Column(name = "SCHOOL_AT_GRADUATION_ID", nullable = true)
-    private UUID schoolAtGraduationId;
+    private UUID schoolAtGradId;
 
     @Transient
     private String legalFirstName;

diff --git a/...ava/ca/bc/gov/educ/api/gradstudent/model/entity/GraduationStudentRecordHistoryEntity.java b/...ava/ca/bc/gov/educ/api/gradstudent/model/entity/GraduationStudentRecordHistoryEntity.java
@@ -79,7 +79,7 @@ public class GraduationStudentRecordHistoryEntity extends BaseEntity {
     private UUID schoolOfRecordId;
 
     @Column(name = "SCHOOL_AT_GRADUATION_ID", nullable = true)
-    private UUID schoolAtGraduationId;
+    private UUID schoolAtGradId;
 
     //@Lob
     //@Column(name = "STUDENT_PROJECTED_GRAD_DATA", columnDefinition="CLOB")

diff --git a/...rc/main/java/ca/bc/gov/educ/api/gradstudent/model/entity/GraduationStudentRecordView.java b/...rc/main/java/ca/bc/gov/educ/api/gradstudent/model/entity/GraduationStudentRecordView.java
@@ -23,7 +23,7 @@ public interface GraduationStudentRecordView {
     public Date getAdultStartDate();
     public String getStudentProjectedGradData() ;
     public UUID getSchoolOfRecordId();
-    public UUID getSchoolAtGraduationId();
+    public UUID getSchoolAtGradId();
     public LocalDateTime getCreateDate();
     public LocalDateTime getUpdateDate();
 }
diff --git a/api/src/main/java/ca/bc/gov/educ/api/gradstudent/service/GradStudentService.java b/api/src/main/java/ca/bc/gov/educ/api/gradstudent/service/GradStudentService.java
@@ -301,6 +301,7 @@ private GradSearchStudent populateGradStudent(GraduationStudentRecordView gradRe
 		GradSearchStudent gradStu = new GradSearchStudent();
 		BeanUtils.copyProperties(gradRecord, gradStu);
 		gradStu.setStudentID(gradRecord.getStudentID().toString());
+		gradStu.setSchoolOfRecordId(gradRecord.getSchoolOfRecordId() != null? gradRecord.getSchoolOfRecordId().toString() : null);
 		return populateGradStudent(gradStu, accessToken);
 	}
 
@@ -314,7 +315,7 @@ private GradSearchStudent populateGradStudent(GradSearchStudent gradStu, String
 		if(studentPen != null) {
 			BeanUtils.copyProperties(studentPen, gradStu);
 		}
-		School school = webClient.get().uri(String.format(constants.getSchoolByMincodeUrl(), gradStu.getSchoolOfRecord()))
+		School school = webClient.get().uri(String.format(constants.getSchoolClobBySchoolIdUrl(), gradStu.getSchoolOfRecordId()))
 				.headers(h -> {
 					h.setBearerAuth(accessToken);
 					h.set(EducGradStudentApiConstants.CORRELATION_ID, ThreadLocalStateUtil.getCorrelationID());
@@ -336,9 +337,10 @@ private GradSearchStudent populateGradSearchStudent(Student student, String acce
 			gradStu.setStudentGrade(gradObj.getStudentGrade());
 			gradStu.setStudentStatus(gradObj.getStudentStatus());
 			gradStu.setSchoolOfRecord(gradObj.getSchoolOfRecord());
+			gradStu.setSchoolOfRecordId(gradObj.getSchoolOfRecordId() != null? gradObj.getSchoolOfRecordId().toString() : null);
 			gradStu.setStudentCitizenship(gradObj.getStudentCitizenship());
 
-			School school = webClient.get().uri(String.format(constants.getSchoolByMincodeUrl(), gradStu.getSchoolOfRecord()))
+			School school = webClient.get().uri(String.format(constants.getSchoolClobBySchoolIdUrl(), gradStu.getSchoolOfRecordId()))
 				.headers(h -> {
 					h.setBearerAuth(accessToken);
 					h.set(EducGradStudentApiConstants.CORRELATION_ID, ThreadLocalStateUtil.getCorrelationID());