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: DTO changes for SchoolClob. #494

Merged
merged 2 commits into from
Nov 21, 2024
Merged

GRAD2-2761: DTO changes for SchoolClob. #494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca0bc67
GRAD2-2761: DTO changes for school category & schoolOfRecordId.
infstar Nov 20, 2024
e7ce39c
Fixed the unit tests.
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
1 change: 1 addition & 0 deletions api/src/main/java/ca/bc/gov/educ/api/ruleengine/dto/GradSearchStudent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ public class GradSearchStudent implements Serializable {
private String trueStudentID;
private String program;
private String schoolOfRecord;
private String schoolOfRecordId;
private String schoolOfRecordName;
private String schoolOfRecordindependentAffiliation;
private String studentGrade;
Expand Down
6 changes: 3 additions & 3 deletions api/src/main/java/ca/bc/gov/educ/api/ruleengine/dto/School.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ public class School implements Serializable {
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 @@ -55,7 +55,7 @@ public String getOpenFlag() {

@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
4 changes: 2 additions & 2 deletions api/src/test/resources/2018-EN-109496042.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4873,8 +4873,8 @@
"countryCode": "CA",
"postal": "V3V5W4",
"openFlag": "Y",
"schoolCategoryCode": "01",
"schoolCategoryCodeInstitute": "PUBLIC"
"schoolCategoryLegacyCode": "01",
"schoolCategoryCode": "PUBLIC"
},
"ldCounter": 0,
"cpList": [],
Expand Down
4 changes: 2 additions & 2 deletions api/src/test/resources/2018-EN-123236440.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2762,8 +2762,8 @@
"countryCode": "CA",
"postal": "V8T4T5",
"openFlag": "Y",
"schoolCategoryCode": "01",
"schoolCategoryCodeInstitute": "PUBLIC"
"schoolCategoryLegacyCode": "01",
"schoolCategoryCode": "PUBLIC"
},
"ldCounter": 0,
"cpList": [],
Expand Down
4 changes: 2 additions & 2 deletions api/src/test/resources/2018-EN-126187616.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4915,8 +4915,8 @@
"countryCode": "CA",
"postal": "V0M1A1",
"openFlag": "Y",
"schoolCategoryCode": "01",
"schoolCategoryCodeInstitute": "PUBLIC"
"schoolCategoryLegacyCode": "01",
"schoolCategoryCode": "PUBLIC"
},
"ldCounter": 0,
"cpList": [],
Expand Down
4 changes: 2 additions & 2 deletions api/src/test/resources/2018-EN-127970861.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5282,8 +5282,8 @@
"countryCode": "CA",
"postal": "V6M3A5",
"openFlag": "Y",
"schoolCategoryCode": "01",
"schoolCategoryCodeInstitute": "PUBLIC"
"schoolCategoryLegacyCode": "01",
"schoolCategoryCode": "PUBLIC"
},
"ldCounter": 0,
"cpList": [],
Expand Down
4 changes: 2 additions & 2 deletions api/src/test/resources/2023-EN-109496042.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4873,8 +4873,8 @@
"countryCode": "CA",
"postal": "V3V5W4",
"openFlag": "Y",
"schoolCategoryCode": "01",
"schoolCategoryCodeInstitute": "PUBLIC"
"schoolCategoryLegacyCode": "01",
"schoolCategoryCode": "PUBLIC"
},
"ldCounter": 0,
"cpList": [],
Expand Down
4 changes: 2 additions & 2 deletions api/src/test/resources/FI-126259126.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5022,8 +5022,8 @@
"countryCode": "CA",
"postal": "V2S2P3",
"openFlag": "Y",
"schoolCategoryCode": "01",
"schoolCategoryCodeInstitute": "PUBLIC"
"schoolCategoryLegacyCode": "01",
"schoolCategoryCode": "PUBLIC"
},
"ldCounter": 0,
"cpList": [],
Expand Down
Loading