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.

Sign up for GitHub

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

GRAD2-2761: replaced minCode with schoolId for School v2 endpoint & s… #703

Merged
merged 3 commits into from
Nov 21, 2024
Merged

GRAD2-2761: replaced minCode with schoolId for School v2 endpoint & s… #703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a2fc6e
GRAD2-2761: replaced minCode with schoolId for School v2 endpoint & s…
infstar Nov 20, 2024
7481e55
GRAD2-2761: schoolCategoryCode from TRAX is changed to schoolCategory…
infstar Nov 20, 2024
4e692a7
Fixed the wrong endpoint.
infstar Nov 20, 2024
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
269 changes: 0 additions & 269 deletions api/src/main/java/ca/bc/gov/educ/api/gradstudent/model/dto/CommonSchool.java
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions api/src/main/java/ca/bc/gov/educ/api/gradstudent/model/dto/GradSearchStudent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions api/src/main/java/ca/bc/gov/educ/api/gradstudent/model/dto/GraduationStudentRecord.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions ...rc/main/java/ca/bc/gov/educ/api/gradstudent/model/dto/GraduationStudentRecordHistory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions api/src/main/java/ca/bc/gov/educ/api/gradstudent/model/dto/ReportGradStudentData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions api/src/main/java/ca/bc/gov/educ/api/gradstudent/model/dto/School.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
+ "]";
Expand Down
2 changes: 1 addition & 1 deletion .../main/java/ca/bc/gov/educ/api/gradstudent/model/entity/GraduationStudentRecordEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ava/ca/bc/gov/educ/api/gradstudent/model/entity/GraduationStudentRecordHistoryEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/ca/bc/gov/educ/api/gradstudent/model/entity/GraduationStudentRecordView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
6 changes: 4 additions & 2 deletions api/src/main/java/ca/bc/gov/educ/api/gradstudent/service/GradStudentService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,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);
}

Expand All @@ -311,7 +312,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());
Expand All @@ -333,9 +334,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());
Expand Down
Loading
Loading